Skip to content

L
linux
Commit 8f84985f authored by Li RongQing's avatar Li RongQing Committed by David S. Miller
Browse files
Options

net: unify the pcpu_tstats and br_cpu_netstats as one 

They are same, so unify them as one, pcpu_sw_netstats.

Define pcpu_sw_netstat in netdevice.h, remove pcpu_tstats
from if_tunnel and remove br_cpu_netstats from br_private.h

Cc: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarLi RongQing <roy.qing.li@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 653864d9
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 66 deletions
drivers/net/vxlan.c
View file @ 8f84985f
...@@ -1081,7 +1081,7 @@ static void vxlan_rcv(struct vxlan_sock *vs, ...@@ -1081,7 +1081,7 @@ static void vxlan_rcv(struct vxlan_sock *vs,
struct iphdr *oip = NULL; struct iphdr *oip = NULL;
struct ipv6hdr *oip6 = NULL; struct ipv6hdr *oip6 = NULL;
struct vxlan_dev *vxlan; struct vxlan_dev *vxlan;
struct pcpu_tstats *stats; struct pcpu_sw_netstats *stats;
union vxlan_addr saddr; union vxlan_addr saddr;
__u32 vni; __u32 vni;
int err = 0; int err = 0;
...@@ -1587,11 +1587,12 @@ EXPORT_SYMBOL_GPL(vxlan_xmit_skb); ...@@ -1587,11 +1587,12 @@ EXPORT_SYMBOL_GPL(vxlan_xmit_skb);
static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan, static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan,
struct vxlan_dev *dst_vxlan) struct vxlan_dev *dst_vxlan)
{ {
struct pcpu_tstats *tx_stats = this_cpu_ptr(src_vxlan->dev->tstats); struct pcpu_sw_netstats *tx_stats, *rx_stats;
struct pcpu_tstats *rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
union vxlan_addr loopback; union vxlan_addr loopback;
union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip; union vxlan_addr *remote_ip = &dst_vxlan->default_dst.remote_ip;
tx_stats = this_cpu_ptr(src_vxlan->dev->tstats);
rx_stats = this_cpu_ptr(dst_vxlan->dev->tstats);
skb->pkt_type = PACKET_HOST; skb->pkt_type = PACKET_HOST;
skb->encapsulation = 0; skb->encapsulation = 0;
skb->dev = dst_vxlan->dev; skb->dev = dst_vxlan->dev;
...@@ -1897,12 +1898,12 @@ static int vxlan_init(struct net_device *dev) ...@@ -1897,12 +1898,12 @@ static int vxlan_init(struct net_device *dev)
struct vxlan_sock *vs; struct vxlan_sock *vs;
int i; int i;
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *vxlan_stats; struct pcpu_sw_netstats *vxlan_stats;
vxlan_stats = per_cpu_ptr(dev->tstats, i); vxlan_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&vxlan_stats->syncp); u64_stats_init(&vxlan_stats->syncp);
} }
......
include/linux/if_tunnel.h
View file @ 8f84985f
...@@ -13,13 +13,4 @@ ...@@ -13,13 +13,4 @@
#define for_each_ip_tunnel_rcu(pos, start) \ #define for_each_ip_tunnel_rcu(pos, start) \
for (pos = rcu_dereference(start); pos; pos = rcu_dereference(pos->next)) for (pos = rcu_dereference(start); pos; pos = rcu_dereference(pos->next))
/* often modified stats are per cpu, other are shared (netdev->stats) */
struct pcpu_tstats {
u64 rx_packets;
u64 rx_bytes;
u64 tx_packets;
u64 tx_bytes;
struct u64_stats_sync syncp;
};
#endif /* _IF_TUNNEL_H_ */ #endif /* _IF_TUNNEL_H_ */
include/linux/netdevice.h
View file @ 8f84985f
...@@ -1409,7 +1409,7 @@ struct net_device { ...@@ -1409,7 +1409,7 @@ struct net_device {
union { union {
void *ml_priv; void *ml_priv;
struct pcpu_lstats __percpu *lstats; /* loopback stats */ struct pcpu_lstats __percpu *lstats; /* loopback stats */
struct pcpu_tstats __percpu *tstats; /* tunnel stats */ struct pcpu_sw_netstats __percpu *tstats;
struct pcpu_dstats __percpu *dstats; /* dummy stats */ struct pcpu_dstats __percpu *dstats; /* dummy stats */
struct pcpu_vstats __percpu *vstats; /* veth stats */ struct pcpu_vstats __percpu *vstats; /* veth stats */
}; };
...@@ -1685,6 +1685,15 @@ struct packet_offload { ...@@ -1685,6 +1685,15 @@ struct packet_offload {
struct list_head list; struct list_head list;
}; };
/* often modified stats are per cpu, other are shared (netdev->stats) */
struct pcpu_sw_netstats {
u64 rx_packets;
u64 rx_bytes;
u64 tx_packets;
u64 tx_bytes;
struct u64_stats_sync syncp;
};
#include <linux/notifier.h> #include <linux/notifier.h>
/* netdevice notifier chain. Please remember to update the rtnetlink /* netdevice notifier chain. Please remember to update the rtnetlink
......
include/net/ip6_tunnel.h
View file @ 8f84985f
...@@ -79,7 +79,7 @@ static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -79,7 +79,7 @@ static inline void ip6tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
err = ip6_local_out(skb); err = ip6_local_out(skb);
if (net_xmit_eval(err) == 0) { if (net_xmit_eval(err) == 0) {
struct pcpu_tstats *tstats = this_cpu_ptr(dev->tstats); struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats);
u64_stats_update_begin(&tstats->syncp); u64_stats_update_begin(&tstats->syncp);
tstats->tx_bytes += pkt_len; tstats->tx_bytes += pkt_len;
tstats->tx_packets++; tstats->tx_packets++;
......
include/net/ip_tunnels.h
View file @ 8f84985f
...@@ -162,10 +162,10 @@ struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, bool gre_csum, ...@@ -162,10 +162,10 @@ struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, bool gre_csum,
static inline void iptunnel_xmit_stats(int err, static inline void iptunnel_xmit_stats(int err,
struct net_device_stats *err_stats, struct net_device_stats *err_stats,
struct pcpu_tstats __percpu *stats) struct pcpu_sw_netstats __percpu *stats)
{ {
if (err > 0) { if (err > 0) {
struct pcpu_tstats *tstats = this_cpu_ptr(stats); struct pcpu_sw_netstats *tstats = this_cpu_ptr(stats);
u64_stats_update_begin(&tstats->syncp); u64_stats_update_begin(&tstats->syncp);
tstats->tx_bytes += err; tstats->tx_bytes += err;
......
net/bridge/br_device.c
View file @ 8f84985f
...@@ -32,7 +32,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -32,7 +32,7 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
const unsigned char *dest = skb->data; const unsigned char *dest = skb->data;
struct net_bridge_fdb_entry *dst; struct net_bridge_fdb_entry *dst;
struct net_bridge_mdb_entry *mdst; struct net_bridge_mdb_entry *mdst;
struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats); struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
u16 vid = 0; u16 vid = 0;
rcu_read_lock(); rcu_read_lock();
...@@ -90,12 +90,12 @@ static int br_dev_init(struct net_device *dev) ...@@ -90,12 +90,12 @@ static int br_dev_init(struct net_device *dev)
struct net_bridge *br = netdev_priv(dev); struct net_bridge *br = netdev_priv(dev);
int i; int i;
br->stats = alloc_percpu(struct br_cpu_netstats); br->stats = alloc_percpu(struct pcpu_sw_netstats);
if (!br->stats) if (!br->stats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct br_cpu_netstats *br_dev_stats; struct pcpu_sw_netstats *br_dev_stats;
br_dev_stats = per_cpu_ptr(br->stats, i); br_dev_stats = per_cpu_ptr(br->stats, i);
u64_stats_init(&br_dev_stats->syncp); u64_stats_init(&br_dev_stats->syncp);
} }
...@@ -135,12 +135,12 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev, ...@@ -135,12 +135,12 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev,
struct rtnl_link_stats64 *stats) struct rtnl_link_stats64 *stats)
{ {
struct net_bridge *br = netdev_priv(dev); struct net_bridge *br = netdev_priv(dev);
struct br_cpu_netstats tmp, sum = { 0 }; struct pcpu_sw_netstats tmp, sum = { 0 };
unsigned int cpu; unsigned int cpu;
for_each_possible_cpu(cpu) { for_each_possible_cpu(cpu) {
unsigned int start; unsigned int start;
const struct br_cpu_netstats *bstats const struct pcpu_sw_netstats *bstats
= per_cpu_ptr(br->stats, cpu); = per_cpu_ptr(br->stats, cpu);
do { do {
start = u64_stats_fetch_begin_bh(&bstats->syncp); start = u64_stats_fetch_begin_bh(&bstats->syncp);
......
net/bridge/br_input.c
View file @ 8f84985f
...@@ -28,7 +28,7 @@ static int br_pass_frame_up(struct sk_buff *skb) ...@@ -28,7 +28,7 @@ static int br_pass_frame_up(struct sk_buff *skb)
{ {
struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev; struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
struct net_bridge *br = netdev_priv(brdev); struct net_bridge *br = netdev_priv(brdev);
struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats); struct pcpu_sw_netstats *brstats = this_cpu_ptr(br->stats);
u64_stats_update_begin(&brstats->syncp); u64_stats_update_begin(&brstats->syncp);
brstats->rx_packets++; brstats->rx_packets++;
......
net/bridge/br_private.h
View file @ 8f84985f
...@@ -210,21 +210,13 @@ static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device * ...@@ -210,21 +210,13 @@ static inline struct net_bridge_port *br_port_get_rtnl(const struct net_device *
rtnl_dereference(dev->rx_handler_data) : NULL; rtnl_dereference(dev->rx_handler_data) : NULL;
} }
struct br_cpu_netstats {
u64 rx_packets;
u64 rx_bytes;
u64 tx_packets;
u64 tx_bytes;
struct u64_stats_sync syncp;
};
struct net_bridge struct net_bridge
{ {
spinlock_t lock; spinlock_t lock;
struct list_head port_list; struct list_head port_list;
struct net_device *dev; struct net_device *dev;
struct br_cpu_netstats __percpu *stats; struct pcpu_sw_netstats __percpu *stats;
spinlock_t hash_lock; spinlock_t hash_lock;
struct hlist_head hash[BR_HASH_SIZE]; struct hlist_head hash[BR_HASH_SIZE];
#ifdef CONFIG_BRIDGE_NETFILTER #ifdef CONFIG_BRIDGE_NETFILTER
......
net/ipv4/ip_tunnel.c
View file @ 8f84985f
...@@ -132,7 +132,8 @@ struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev, ...@@ -132,7 +132,8 @@ struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev,
int i; int i;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct pcpu_tstats *tstats = per_cpu_ptr(dev->tstats, i); const struct pcpu_sw_netstats *tstats =
per_cpu_ptr(dev->tstats, i);
u64 rx_packets, rx_bytes, tx_packets, tx_bytes; u64 rx_packets, rx_bytes, tx_packets, tx_bytes;
unsigned int start; unsigned int start;
...@@ -460,7 +461,7 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net, ...@@ -460,7 +461,7 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net,
int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
const struct tnl_ptk_info *tpi, bool log_ecn_error) const struct tnl_ptk_info *tpi, bool log_ecn_error)
{ {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
const struct iphdr *iph = ip_hdr(skb); const struct iphdr *iph = ip_hdr(skb);
int err; int err;
...@@ -1049,12 +1050,12 @@ int ip_tunnel_init(struct net_device *dev) ...@@ -1049,12 +1050,12 @@ int ip_tunnel_init(struct net_device *dev)
int i, err; int i, err;
dev->destructor = ip_tunnel_dev_free; dev->destructor = ip_tunnel_dev_free;
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ipt_stats; struct pcpu_sw_netstats *ipt_stats;
ipt_stats = per_cpu_ptr(dev->tstats, i); ipt_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ipt_stats->syncp); u64_stats_init(&ipt_stats->syncp);
} }
......
net/ipv4/ip_vti.c
View file @ 8f84985f
...@@ -60,7 +60,7 @@ static int vti_rcv(struct sk_buff *skb) ...@@ -60,7 +60,7 @@ static int vti_rcv(struct sk_buff *skb)
tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, TUNNEL_NO_KEY, tunnel = ip_tunnel_lookup(itn, skb->dev->ifindex, TUNNEL_NO_KEY,
iph->saddr, iph->daddr, 0); iph->saddr, iph->daddr, 0);
if (tunnel != NULL) { if (tunnel != NULL) {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
u32 oldmark = skb->mark; u32 oldmark = skb->mark;
int ret; int ret;
......
net/ipv6/ip6_gre.c
View file @ 8f84985f
...@@ -498,7 +498,7 @@ static int ip6gre_rcv(struct sk_buff *skb) ...@@ -498,7 +498,7 @@ static int ip6gre_rcv(struct sk_buff *skb)
&ipv6h->saddr, &ipv6h->daddr, key, &ipv6h->saddr, &ipv6h->daddr, key,
gre_proto); gre_proto);
if (tunnel) { if (tunnel) {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb)) if (!xfrm6_policy_check(NULL, XFRM_POLICY_IN, skb))
goto drop; goto drop;
...@@ -1265,12 +1265,12 @@ static int ip6gre_tunnel_init(struct net_device *dev) ...@@ -1265,12 +1265,12 @@ static int ip6gre_tunnel_init(struct net_device *dev)
if (ipv6_addr_any(&tunnel->parms.raddr)) if (ipv6_addr_any(&tunnel->parms.raddr))
dev->header_ops = &ip6gre_header_ops; dev->header_ops = &ip6gre_header_ops;
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ip6gre_tunnel_stats; struct pcpu_sw_netstats *ip6gre_tunnel_stats;
ip6gre_tunnel_stats = per_cpu_ptr(dev->tstats, i); ip6gre_tunnel_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ip6gre_tunnel_stats->syncp); u64_stats_init(&ip6gre_tunnel_stats->syncp);
} }
...@@ -1466,12 +1466,12 @@ static int ip6gre_tap_init(struct net_device *dev) ...@@ -1466,12 +1466,12 @@ static int ip6gre_tap_init(struct net_device *dev)
ip6gre_tnl_link_config(tunnel, 1); ip6gre_tnl_link_config(tunnel, 1);
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ip6gre_tap_stats; struct pcpu_sw_netstats *ip6gre_tap_stats;
ip6gre_tap_stats = per_cpu_ptr(dev->tstats, i); ip6gre_tap_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ip6gre_tap_stats->syncp); u64_stats_init(&ip6gre_tap_stats->syncp);
} }
......
net/ipv6/ip6_tunnel.c
View file @ 8f84985f
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
#include <linux/if.h> #include <linux/if.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/if_tunnel.h>
#include <linux/net.h> #include <linux/net.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -102,11 +101,12 @@ struct ip6_tnl_net { ...@@ -102,11 +101,12 @@ struct ip6_tnl_net {
static struct net_device_stats *ip6_get_stats(struct net_device *dev) static struct net_device_stats *ip6_get_stats(struct net_device *dev)
{ {
struct pcpu_tstats sum = { 0 }; struct pcpu_sw_netstats sum = { 0 };
int i; int i;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct pcpu_tstats *tstats = per_cpu_ptr(dev->tstats, i); const struct pcpu_sw_netstats *tstats =
per_cpu_ptr(dev->tstats, i);
sum.rx_packets += tstats->rx_packets; sum.rx_packets += tstats->rx_packets;
sum.rx_bytes += tstats->rx_bytes; sum.rx_bytes += tstats->rx_bytes;
...@@ -784,7 +784,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol, ...@@ -784,7 +784,7 @@ static int ip6_tnl_rcv(struct sk_buff *skb, __u16 protocol,
if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr, if ((t = ip6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr,
&ipv6h->daddr)) != NULL) { &ipv6h->daddr)) != NULL) {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
if (t->parms.proto != ipproto && t->parms.proto != 0) { if (t->parms.proto != ipproto && t->parms.proto != 0) {
rcu_read_unlock(); rcu_read_unlock();
...@@ -1497,12 +1497,12 @@ ip6_tnl_dev_init_gen(struct net_device *dev) ...@@ -1497,12 +1497,12 @@ ip6_tnl_dev_init_gen(struct net_device *dev)
t->dev = dev; t->dev = dev;
t->net = dev_net(dev); t->net = dev_net(dev);
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ip6_tnl_stats; struct pcpu_sw_netstats *ip6_tnl_stats;
ip6_tnl_stats = per_cpu_ptr(dev->tstats, i); ip6_tnl_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ip6_tnl_stats->syncp); u64_stats_init(&ip6_tnl_stats->syncp);
} }
......
net/ipv6/ip6_vti.c
View file @ 8f84985f
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <linux/if.h> #include <linux/if.h>
#include <linux/in.h> #include <linux/in.h>
#include <linux/ip.h> #include <linux/ip.h>
#include <linux/if_tunnel.h>
#include <linux/net.h> #include <linux/net.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
...@@ -77,11 +76,12 @@ struct vti6_net { ...@@ -77,11 +76,12 @@ struct vti6_net {
static struct net_device_stats *vti6_get_stats(struct net_device *dev) static struct net_device_stats *vti6_get_stats(struct net_device *dev)
{ {
struct pcpu_tstats sum = { 0 }; struct pcpu_sw_netstats sum = { 0 };
int i; int i;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct pcpu_tstats *tstats = per_cpu_ptr(dev->tstats, i); const struct pcpu_sw_netstats *tstats =
per_cpu_ptr(dev->tstats, i);
sum.rx_packets += tstats->rx_packets; sum.rx_packets += tstats->rx_packets;
sum.rx_bytes += tstats->rx_bytes; sum.rx_bytes += tstats->rx_bytes;
...@@ -312,7 +312,7 @@ static int vti6_rcv(struct sk_buff *skb) ...@@ -312,7 +312,7 @@ static int vti6_rcv(struct sk_buff *skb)
if ((t = vti6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr, if ((t = vti6_tnl_lookup(dev_net(skb->dev), &ipv6h->saddr,
&ipv6h->daddr)) != NULL) { &ipv6h->daddr)) != NULL) {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
if (t->parms.proto != IPPROTO_IPV6 && t->parms.proto != 0) { if (t->parms.proto != IPPROTO_IPV6 && t->parms.proto != 0) {
rcu_read_unlock(); rcu_read_unlock();
...@@ -753,7 +753,7 @@ static inline int vti6_dev_init_gen(struct net_device *dev) ...@@ -753,7 +753,7 @@ static inline int vti6_dev_init_gen(struct net_device *dev)
t->dev = dev; t->dev = dev;
t->net = dev_net(dev); t->net = dev_net(dev);
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
return 0; return 0;
......
net/ipv6/sit.c
View file @ 8f84985f
...@@ -671,7 +671,7 @@ static int ipip6_rcv(struct sk_buff *skb) ...@@ -671,7 +671,7 @@ static int ipip6_rcv(struct sk_buff *skb)
tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev, tunnel = ipip6_tunnel_lookup(dev_net(skb->dev), skb->dev,
iph->saddr, iph->daddr); iph->saddr, iph->daddr);
if (tunnel != NULL) { if (tunnel != NULL) {
struct pcpu_tstats *tstats; struct pcpu_sw_netstats *tstats;
if (tunnel->parms.iph.protocol != IPPROTO_IPV6 && if (tunnel->parms.iph.protocol != IPPROTO_IPV6 &&
tunnel->parms.iph.protocol != 0) tunnel->parms.iph.protocol != 0)
...@@ -1361,12 +1361,12 @@ static int ipip6_tunnel_init(struct net_device *dev) ...@@ -1361,12 +1361,12 @@ static int ipip6_tunnel_init(struct net_device *dev)
memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4); memcpy(dev->broadcast, &tunnel->parms.iph.daddr, 4);
ipip6_tunnel_bind_dev(dev); ipip6_tunnel_bind_dev(dev);
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ipip6_tunnel_stats; struct pcpu_sw_netstats *ipip6_tunnel_stats;
ipip6_tunnel_stats = per_cpu_ptr(dev->tstats, i); ipip6_tunnel_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ipip6_tunnel_stats->syncp); u64_stats_init(&ipip6_tunnel_stats->syncp);
} }
...@@ -1391,12 +1391,12 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev) ...@@ -1391,12 +1391,12 @@ static int __net_init ipip6_fb_tunnel_init(struct net_device *dev)
iph->ihl = 5; iph->ihl = 5;
iph->ttl = 64; iph->ttl = 64;
dev->tstats = alloc_percpu(struct pcpu_tstats); dev->tstats = alloc_percpu(struct pcpu_sw_netstats);
if (!dev->tstats) if (!dev->tstats)
return -ENOMEM; return -ENOMEM;
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *ipip6_fb_stats; struct pcpu_sw_netstats *ipip6_fb_stats;
ipip6_fb_stats = per_cpu_ptr(dev->tstats, i); ipip6_fb_stats = per_cpu_ptr(dev->tstats, i);
u64_stats_init(&ipip6_fb_stats->syncp); u64_stats_init(&ipip6_fb_stats->syncp);
} }
......
net/openvswitch/vport.c
View file @ 8f84985f
...@@ -136,14 +136,14 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops, ...@@ -136,14 +136,14 @@ struct vport *ovs_vport_alloc(int priv_size, const struct vport_ops *ops,
vport->ops = ops; vport->ops = ops;
INIT_HLIST_NODE(&vport->dp_hash_node); INIT_HLIST_NODE(&vport->dp_hash_node);
vport->percpu_stats = alloc_percpu(struct pcpu_tstats); vport->percpu_stats = alloc_percpu(struct pcpu_sw_netstats);
if (!vport->percpu_stats) { if (!vport->percpu_stats) {
kfree(vport); kfree(vport);
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
struct pcpu_tstats *vport_stats; struct pcpu_sw_netstats *vport_stats;
vport_stats = per_cpu_ptr(vport->percpu_stats, i); vport_stats = per_cpu_ptr(vport->percpu_stats, i);
u64_stats_init(&vport_stats->syncp); u64_stats_init(&vport_stats->syncp);
} }
...@@ -275,8 +275,8 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats) ...@@ -275,8 +275,8 @@ void ovs_vport_get_stats(struct vport *vport, struct ovs_vport_stats *stats)
spin_unlock_bh(&vport->stats_lock); spin_unlock_bh(&vport->stats_lock);
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
const struct pcpu_tstats *percpu_stats; const struct pcpu_sw_netstats *percpu_stats;
struct pcpu_tstats local_stats; struct pcpu_sw_netstats local_stats;
unsigned int start; unsigned int start;
percpu_stats = per_cpu_ptr(vport->percpu_stats, i); percpu_stats = per_cpu_ptr(vport->percpu_stats, i);
...@@ -344,7 +344,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb) ...@@ -344,7 +344,7 @@ int ovs_vport_get_options(const struct vport *vport, struct sk_buff *skb)
void ovs_vport_receive(struct vport *vport, struct sk_buff *skb, void ovs_vport_receive(struct vport *vport, struct sk_buff *skb,
struct ovs_key_ipv4_tunnel *tun_key) struct ovs_key_ipv4_tunnel *tun_key)
{ {
struct pcpu_tstats *stats; struct pcpu_sw_netstats *stats;
stats = this_cpu_ptr(vport->percpu_stats); stats = this_cpu_ptr(vport->percpu_stats);
u64_stats_update_begin(&stats->syncp); u64_stats_update_begin(&stats->syncp);
...@@ -370,7 +370,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb) ...@@ -370,7 +370,7 @@ int ovs_vport_send(struct vport *vport, struct sk_buff *skb)
int sent = vport->ops->send(vport, skb); int sent = vport->ops->send(vport, skb);
if (likely(sent > 0)) { if (likely(sent > 0)) {
struct pcpu_tstats *stats; struct pcpu_sw_netstats *stats;
stats = this_cpu_ptr(vport->percpu_stats); stats = this_cpu_ptr(vport->percpu_stats);
......
net/openvswitch/vport.h
View file @ 8f84985f
...@@ -87,7 +87,7 @@ struct vport { ...@@ -87,7 +87,7 @@ struct vport {
struct hlist_node dp_hash_node; struct hlist_node dp_hash_node;
const struct vport_ops *ops; const struct vport_ops *ops;
struct pcpu_tstats __percpu *percpu_stats; struct pcpu_sw_netstats __percpu *percpu_stats;
spinlock_t stats_lock; spinlock_t stats_lock;
struct vport_err_stats err_stats; struct vport_err_stats err_stats;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7