mirror of
https://github.com/torvalds/linux.git
synced 2024-12-21 02:21:36 +00:00
cc998ff881
Pull networking changes from David Miller:
"Noteworthy changes this time around:
1) Multicast rejoin support for team driver, from Jiri Pirko.
2) Centralize and simplify TCP RTT measurement handling in order to
reduce the impact of bad RTO seeding from SYN/ACKs. Also, when
both timestamps and local RTT measurements are available prefer
the later because there are broken middleware devices which
scramble the timestamp.
From Yuchung Cheng.
3) Add TCP_NOTSENT_LOWAT socket option to limit the amount of kernel
memory consumed to queue up unsend user data. From Eric Dumazet.
4) Add a "physical port ID" abstraction for network devices, from
Jiri Pirko.
5) Add a "suppress" operation to influence fib_rules lookups, from
Stefan Tomanek.
6) Add a networking development FAQ, from Paul Gortmaker.
7) Extend the information provided by tcp_probe and add ipv6 support,
from Daniel Borkmann.
8) Use RCU locking more extensively in openvswitch data paths, from
Pravin B Shelar.
9) Add SCTP support to openvswitch, from Joe Stringer.
10) Add EF10 chip support to SFC driver, from Ben Hutchings.
11) Add new SYNPROXY netfilter target, from Patrick McHardy.
12) Compute a rate approximation for sending in TCP sockets, and use
this to more intelligently coalesce TSO frames. Furthermore, add
a new packet scheduler which takes advantage of this estimate when
available. From Eric Dumazet.
13) Allow AF_PACKET fanouts with random selection, from Daniel
Borkmann.
14) Add ipv6 support to vxlan driver, from Cong Wang"
Resolved conflicts as per discussion.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1218 commits)
openvswitch: Fix alignment of struct sw_flow_key.
netfilter: Fix build errors with xt_socket.c
tcp: Add missing braces to do_tcp_setsockopt
caif: Add missing braces to multiline if in cfctrl_linkup_request
bnx2x: Add missing braces in bnx2x:bnx2x_link_initialize
vxlan: Fix kernel panic on device delete.
net: mvneta: implement ->ndo_do_ioctl() to support PHY ioctls
net: mvneta: properly disable HW PHY polling and ensure adjust_link() works
icplus: Use netif_running to determine device state
ethernet/arc/arc_emac: Fix huge delays in large file copies
tuntap: orphan frags before trying to set tx timestamp
tuntap: purge socket error queue on detach
qlcnic: use standard NAPI weights
ipv6:introduce function to find route for redirect
bnx2x: VF RSS support - VF side
bnx2x: VF RSS support - PF side
vxlan: Notify drivers for listening UDP port changes
net: usbnet: update addr_assign_type if appropriate
driver/net: enic: update enic maintainers and driver
driver/net: enic: Exposing symbols for Cisco's low latency driver
...
72 lines
1.4 KiB
C
72 lines
1.4 KiB
C
/*
|
|
* netprio_cgroup.h Control Group Priority set
|
|
*
|
|
*
|
|
* Authors: Neil Horman <nhorman@tuxdriver.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*
|
|
*/
|
|
|
|
#ifndef _NETPRIO_CGROUP_H
|
|
#define _NETPRIO_CGROUP_H
|
|
#include <linux/cgroup.h>
|
|
#include <linux/hardirq.h>
|
|
#include <linux/rcupdate.h>
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
|
|
struct netprio_map {
|
|
struct rcu_head rcu;
|
|
u32 priomap_len;
|
|
u32 priomap[];
|
|
};
|
|
|
|
void sock_update_netprioidx(struct sock *sk);
|
|
|
|
#if IS_BUILTIN(CONFIG_NETPRIO_CGROUP)
|
|
|
|
static inline u32 task_netprioidx(struct task_struct *p)
|
|
{
|
|
struct cgroup_subsys_state *css;
|
|
u32 idx;
|
|
|
|
rcu_read_lock();
|
|
css = task_css(p, net_prio_subsys_id);
|
|
idx = css->cgroup->id;
|
|
rcu_read_unlock();
|
|
return idx;
|
|
}
|
|
|
|
#elif IS_MODULE(CONFIG_NETPRIO_CGROUP)
|
|
|
|
static inline u32 task_netprioidx(struct task_struct *p)
|
|
{
|
|
struct cgroup_subsys_state *css;
|
|
u32 idx = 0;
|
|
|
|
rcu_read_lock();
|
|
css = task_css(p, net_prio_subsys_id);
|
|
if (css)
|
|
idx = css->cgroup->id;
|
|
rcu_read_unlock();
|
|
return idx;
|
|
}
|
|
#endif
|
|
|
|
#else /* !CONFIG_NETPRIO_CGROUP */
|
|
|
|
static inline u32 task_netprioidx(struct task_struct *p)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#define sock_update_netprioidx(sk)
|
|
|
|
#endif /* CONFIG_NETPRIO_CGROUP */
|
|
|
|
#endif /* _NET_CLS_CGROUP_H */
|