From patchwork Mon Oct 5 20:34:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376952 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v3072vszB445 for ; Tue, 6 Oct 2020 08:33:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729205AbgJEUeo (ORCPT ); Mon, 5 Oct 2020 16:34:44 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49326 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726935AbgJEUeo (ORCPT ); Mon, 5 Oct 2020 16:34:44 -0400 IronPort-SDR: 5UJJ2ztZuermn/HKPMlDXYbxr2onSa5jvZdSeaMTyvJObu/jdR6Qy1DVHAJYq3hsP1PhKZ8ip8 CCrf7XC41edcjdtwRN4VmG8Ya4kj5jkNA5lBqO3XTPp7vlnTIEZsTuXtepoUY+w8oQ2moc1rG2 0RA0R3FUUk9+kCrjTRs9PeAf7mra1mH4kr5U/qfM+FEkT/HOjarGe0L7uyId6ePBQGDqaH7o5Q /G8tQNIvZRQuPgpAplF1w221AkUaXmZx/IS3nuFENGWe8dbZDYGyETw23m0Wyx/jVOGpkctgKi LRc= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:OOADfBzJo/D3wsDXCy+O+j09IxM/srCxBDY+r6Qd0u4TKvad9pjvdHbS+e9qxAeQG9mCtLQY0aGP6PmocFdDyK7JiGoFfp1IWk1NouQttCtkPvS4D1bmJuXhdS0wEZcKflZk+3amLRodQ56mNBXdrXKo8DEdBAj0OxZrKeTpAI7SiNm82/yv95HJbAhEmTiwbal9IRmoogndq8cbjZZ/Iast1xXFpWdFdf5Lzm1yP1KTmBj85sa0/JF99ilbpuws+c1dX6jkZqo0VbNXAigoPGAz/83rqALMTRCT6XsGU2UZiQRHDg7Y5xznRJjxsy/6tu1g2CmGOMD9UL45VSi+46ptVRTljjoMOTwk/2HNksF+jLxVrg+vqRJ8xIDbb46bOeFicq7eZ94WWXBMUtpNWyFHH4iyb5EPD+0EPetAr4fyvUABrRqkCgmqGejhyiVIiWHr0qIkyeQhEB3J3A89FN8JvnTbts76NKkJXOCuz6nJzTPDYO1K2Tvn84fHbAksrPeRVr1/bcTf01MgFx/ZjlqOs4zlOSuY2OoOvmWf7+RtVOKih3Appg9xvzWj2toghpXIi4waxV7J6Ct0zZgoKNC4SkN2f9GqHIdeuS+VM4Z4QsMsT39stSs817YIuoa7cTAOxZg63RLTdv+Kf5aS7h7+VeucIS10iG9kdb+5mh2861KvyvfmWcmxyFtKqy1FncTSuX0VzBzT79SHSuN6/ke8xTaDzwDT5f9AIUAzjafbL5khzaIqmZoXsUTDGTT2mFnsgK+ScUUr5vKn6+D6bbXho5+TLY50igfmPqQvnMywH/g4PxAKUmSG4+iwyb7u8VPjTLlXj/A7krPVvI3bKMgDo662GQ5V0oIt6xalCDem1cwVnXcdI11edhKKlJPpO1LOIfD+E/i/n06gnyx1yPzeJL3uHo3NLmTfkLfmZbty9lRTyBQtwtBa/J9bF6sOIOztVU/0sNzYCRE5MxCuz+bhFtp9ypsUWXiTDa+BLKPSrViI6/osI+mRf4Aaoi3wK/s76P70i382h1sdcbOu3ZsNZ3CyBu5mLFmBYXrwntcBFn8HvgwgQ+z2lVKNTyBTam2sX6Iz+D47EpiqDYTdSYC3hryOwiO7EodRZmBcBVCGCW3oeJmcW/cQdCKSJddskiQeWre6T48h0gqjtAnkxLp7IOrU+ykYtY7929hv/eHTkgsy9TNsBcSHz26NV310nn8PRzIu2KBwu0J9ylCZ0ah3nfNVDtNT5/VUUgc/Mp7cye96C8voVgLGZNeJR06sQs+6DjEpUtIx39gObl5mG9W+kB/D0SSqDKETl7CRB5w09rjT32PqJ8lj0XbGyLIsj0I4TcRTKG2mgLBw9xTJC4HVlEWZkr6gdb4A0y7V6GeD0W2OsVlYUAFuS6XKRm4QZlHKrdni6UPCSLmuBqkgMgtb08KNMLNKZcfvjVpcXvvjP87eY22rl2iqGBaC3qmMY5bye2UBwCXdD1AJkxgI/XaGKwc+Aj2uo3jFATxpC1LvZVng8e5kqHO0VkU01R2Fb1V917qp/R4YneGTRO0N3r8fvychsyt7HFCj39LNBduAphZhc7lcYd8n51dHz23ZvRRnPpO8N6BimkIecwNvskLu0BV3EYVAkcY3rHMozQp/MqaY0FJHdzOF0pH8I7zXKnHs/B2ucaLW3Uve0NmO8KcV9Ps4s0njvB2uFkc68HVnzthU032C6ZXWFwcSVInxXlgt+xh7obHaeDMx6JnI2nF2K6m0ryfI28g1C+s91hagY9BfPbuKFADoCMIaCdOjKPcpm1mpaBILIvxS+LQvMMy4JLO63/unNfhtmRqqhHpK5YR63F7K8SdgDqbLwpwM6/KVxA2KU3H7lljl+sb6hYxJexkMEWeljyvpHohcYut1Z4lYJ32pJpiZz99/jpildWRV+FO5BlgFkJuncBCcR0f+zAtdyQIdrCr0ymOD0zVonmRx/eKk1yvUzrG6eQ== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCFC4FCgTiIMoUagUE/hF+KNAS3TYJxgxOEa5JUDyKDDp4RLZJngXmgMIF6TSAYgyRQGQ2OKAMXjiZCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCFC4FCgTiIMoUagUE/hF+KNAS3TYJxgxOEa5JUDyKDDp4RLZJngXmgMIF6TSAYgyRQGQ2OKAMXjiZCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:34:41 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: pablo@netfilter.org, laforge@gnumonks.org, steffen.klassert@secunet.com, herbert@gondor.apana.org.au, pshelar@ovn.org, dev@openvswitch.org, yoshfuji@linux-ipv6.org, kuznet@ms2.inr.ac.ru, Fabian Frederick Subject: [PATCH 1/9 net-next] net: netdevice.h: sw_netstats_rx_add helper Date: Mon, 5 Oct 2020 22:34:18 +0200 Message-Id: <20201005203418.55128-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org some drivers/network protocols update rx bytes/packets under u64_stats_update_begin/end sequence. Add a specific helper like dev_lstats_add() Signed-off-by: Fabian Frederick --- include/linux/netdevice.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 0c79d9e56a5e5..42b18e034adde 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2530,6 +2530,17 @@ struct pcpu_lstats { void dev_lstats_read(struct net_device *dev, u64 *packets, u64 *bytes); +static inline void dev_sw_netstats_rx_add(struct net_device *dev, unsigned int len) +{ + struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); + + u64_stats_update_begin(&tstats->syncp); + tstats->rx_bytes += len; + tstats->rx_packets++; + u64_stats_update_end(&tstats->syncp); + +} + static inline void dev_lstats_add(struct net_device *dev, unsigned int len) { struct pcpu_lstats *lstats = this_cpu_ptr(dev->lstats); From patchwork Mon Oct 5 20:34:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376953 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v313lvWzB442 for ; Tue, 6 Oct 2020 08:33:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729193AbgJEUe4 (ORCPT ); Mon, 5 Oct 2020 16:34:56 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49351 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgJEUe4 (ORCPT ); Mon, 5 Oct 2020 16:34:56 -0400 IronPort-SDR: 5zb/ogqFKYZYSSJ7DzNsEki1SA7h5zRcHEVPkyWZTXVYH2OFKQ2J7c5AoTavzi8kklTcG4qXkH g8nFjZZ0Qjz/qWz7nHHRWe9w/P4BLjZh8nwiqmwssSd40sCBy+ChV7mu5WDJ8nW/71Q4sPpbb5 MGZ3BLL6+4bzVM1z32q92OpYF5ZLqkqewTQw/Adrr2Rc5qtPwz0jfTcH1z/XfPsS2ZkS59Akkv Rxpy4Jkq1v40E97uYHmXj9N8QNGoakuyuzEFwiRas4WBRDgwJ8WtcOolAuN16vpzFnEAPuNOBc rN4= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:0Yt3uhRQZFMIborLYA5QVpFwa9psv+yvbD5Q0YIujvd0So/mwa6zbBSN2/xhgRfzUJnB7Loc0qyK6v+mBTZLuM3Y+Fk5M7V0HycfjssXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aFRrwLxd6KfroEYDOkcu3y/qy+5rOaAlUmTaxe7x/IAi0oAnLucQan4RuJrs/xxfUv3BFZ/lYyWR0KFyJgh3y/N2w/Jlt8yRRv/Iu6ctNWrjkcqo7ULJVEi0oP3g668P3uxbDSxCP5mYHXWUNjhVIGQnF4wrkUZr3ryD3q/By2CiePc3xULA0RTGv5LplRRP0lCsKMSMy/WfKgcJyka1bugqsqRxhzYDJbo+bN/1wcazSc94BWWZMXdxcWzBbD4+gc4cCCfcKM+ZCr4n6olsDtRuwChO3C+Pu0DBIgGL9060g0+s/DA7JwhYgH9MSv3TXsd74M6kSXvquw6nG1jjDdPBW2Df76IfWbhAtu+qDUqxpfMfX1EIgGB/LgE+Kpoz5IzOayP4Ns26D4uRuVu+ij24ppgBxrzSxyMoiipTEip4IxlzY9Ch3z4k7KMC2RUNlfNOpEJlduj+VOYdqTM0sTGVltiY6xLEYvZO2ejUBxpc/xxPHb/GLbpKE7g/gWeqPOzt0mXNodbKlixqv8EWtzPD3WNOu31ZQtCVFl8HBtnUK1xPO9MeKUuB9/kK92TaX0ADT9/1ELVg0laXFL54hxaY9lp4UsUvfBCD2nEX2jKiNdkU44OSo7+Pnban8qZ+YKoB0jQT+Pb4vmsy5Geg4Mw4OUHaH+emk0LDv4Ff1TKhJg/EoiKXVrZHXKMQBqqKkAgJZyoMj5Ay+Dzei3tQYh34HLFdddRKJlYfmIF/OLevjDfe8g1Wslilkx+zcMrL6HJrBNmLDn6v5fbZh905czxI+ws1F6JJKFL4BJen+VVLru9zGEBA5Ngi0w+HpCNVhzI8eX3yAArOBOqPIrVCI/v4vI/WLZIINuzb9NuMq6OT1gH86h1AdZ6+p0oUTaHyiGfRmOUqZa2L2gtgdCWcKohY+TOvyhV2ETzFTe2u9ULwi5jwgFoKmApnMRpq3jLyCwii7BJtWaX5CClyWFnfobYqEUe8WaC2OOs9hjiAEVb+5Ro8vzx6hrwH6xqF8LurX+iwYs4zs1MRv6+LIix5hvQBzWsiUzWyIZ219gG4NQzg4wOZ5rFA5glSe26FQgPFCE9FXofRTXUNyM5PAw+FkI879VxiHfdqTTluiBNK8DmIfVNU0lvEHaUd0HZ2MlB3P0jCrCLxdw7KCDpIc6aHN2XXtYcxwnSWVnJI9hkUrF5McfVatgbRyolDe X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:34:54 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: Fabian Frederick Subject: [PATCH 2/9 net-next] vxlan: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:34:28 +0200 Message-Id: <20201005203428.55178-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- drivers/net/vxlan.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index be3bf233a809e..1a557aeba32b4 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1826,7 +1826,6 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph, /* Callback from net/ipv4/udp.c to receive packets */ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) { - struct pcpu_sw_netstats *stats; struct vxlan_dev *vxlan; struct vxlan_sock *vs; struct vxlanhdr unparsed; @@ -1940,12 +1939,7 @@ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) goto drop; } - stats = this_cpu_ptr(vxlan->dev->tstats); - u64_stats_update_begin(&stats->syncp); - stats->rx_packets++; - stats->rx_bytes += skb->len; - u64_stats_update_end(&stats->syncp); - + dev_sw_netstats_rx_add(vxlan->dev, skb->len); gro_cells_receive(&vxlan->gro_cells, skb); rcu_read_unlock(); From patchwork Mon Oct 5 20:34:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376954 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v3206x7zB447 for ; Tue, 6 Oct 2020 08:33:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729082AbgJEUfY (ORCPT ); Mon, 5 Oct 2020 16:35:24 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49393 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgJEUfY (ORCPT ); Mon, 5 Oct 2020 16:35:24 -0400 IronPort-SDR: 3j7vIEqw4oUy9+ktbwqeJp/JZR1dToNBtZJlZZIB+hfTqV++roT2YOBD09MAhR4p4cwpKqcfQ+ ihiSOAitIy9M3FlmsekrIUPl8IEHp6VO2IuMH9F4Rf7jsZvKesqtF0NaS11jn99OvGS/pPUa4k EOVW+yMtpEIemvaqWl2et4UAYFT20UULqWTN5bc1Zzag7lPS0gsfBPWXQpCkpzQgv8YNiAqaM1 eJCUnajL3eZOvO7VIEZkoRLZrgAfRTdbrisHi+NdJhGewhxlqnUK2eql9uz5P45GoaIETCWQxB 6TY= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:1V6AqBTkm5NyMcIHfp84V8IRbdpsv+yvbD5Q0YIujvd0So/mwa6zbBSN2/xhgRfzUJnB7Loc0qyK6v+mBTZLuM3Y+Fk5M7V0HycfjssXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aFRrwLxd6KfroEYDOkcu3y/qy+5rOaAlUmTaxe7x/IAi0oAnLucQan4RuJrs/xxfUv3BFZ/lYyWR0KFyJgh3y/N2w/Jlt8yRRv/Iu6ctNWrjkcqo7ULJVEi0oP3g668P3uxbDSxCP5mYHXWUNjhVIGQnF4wrkUZr3ryD3q/By2CiePc3xULA0RTGv5LplRRP0lCsKMSMy/WfKgcJyka1bugqsqRxhzYDJbo+bN/1wcazSc94BWWZMXdxcWzBbD4+gc4cCCfcKM+ZCr4n6olsDtRuwChO3C+Pu0DBIgGL9060g0+s/DA7JwhYgH9MSv3TXsd74M6kSXvquw6nG1jjDdPBW2Df76IfWbhAtu+qDUqxpfMfX1EIgGB/LgE+Kpoz5IzOayP4Ns26D4uRuVu+ij24ppgBxrzSxyMoiipTEip4IxlzY9Ch3z4k7KMC2RUNlfNOpEJlduj+VOYdqTM0sTGVltiY6xLEYvZO2ejUBxpc/xxPHb/GLbpKE7g/gWeqPOzt0mXNodbKlixqv8EWtzPD3WNOu31ZQtCVFl8HBtnUK1xPO9MeKUuB9/kK92TaX0ADT9/1ELVg0laXFL54hxaY9lp4UsUvfBCD2nEX2jKiNdkU44OSo7+Pnban8qZ+YKoB0jQT+Pb4vmsy5Geg4Mw4OUHaH+emk0LDv4Ff1TKhJg/EoiKXVrZHXKMQBqqKkAgJZyoMj5Ay+Dzei3tQYh34HLFdddRKJlYfmIF/OLevjDfe8g1Wslilkx+zcMrL6HJrBNmLDn6v5fbZh905czxI+ws1F6JJKFL4BJen+VVLru9zGEBA5Ngi0w+HpCNVhzI8eX3yAArOBOqPIrVCI/v4vI/WLZIINuzb9NuMq6OT1gH86h1AdZ6+p0oUTaHyiGfRmOUqZa2L2gtgdCWcKohY+TOvyhV2ETzFTe2u9ULwi5jwgFoKmApnMRpq3jLyCwii7BJtWaX5CClyWFnfobYqEUe8WaC2OOs9hjiAEVb+5Ro8vzx6hrwH6xqF8LurX+iwYs4zs1MRv6+LIix5hvQBzWsiUzWyIZ219gG4NQzg4wOZ5rFA5glSe26FQgPFCE9FXofRTXUNyM5PAw+FkI879VxiHfdqTTluiBNK8DmIfVNU0lvEHaUd0HZ2MlB3P0jCrCLxdw7KCDpIc6aHN2XXtYcxwnSWVnJI9hkUrF5McfVatgbRyolDe X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C8CADggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUgCgRyCUV+NP5JWilmFMYF8CwEBAQEBAQEBATUBAgQBAYRKgjsmOgQNAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDRwsBIyOBPxKDJoJYKaoXM4QQgUSDR4FCgTiIMoUagUE/gRGDToo0BLdNgnGDE4RrklQPIqEfLZJnoiwNgWpNIBiDJFAZDY4rF44mQjA3AgYKAQEDCVcBPQGNMgEB X-IPAS-Result: A2C8CADggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUgCgRyCUV+NP5JWilmFMYF8CwEBAQEBAQEBATUBAgQBAYRKgjsmOgQNAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDRwsBIyOBPxKDJoJYKaoXM4QQgUSDR4FCgTiIMoUagUE/gRGDToo0BLdNgnGDE4RrklQPIqEfLZJnoiwNgWpNIBiDJFAZDY4rF44mQjA3AgYKAQEDCVcBPQGNMgEB Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:35:21 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: Fabian Frederick Subject: [PATCH 3/9 net-next] geneve: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:34:58 +0200 Message-Id: <20201005203458.55228-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- drivers/net/geneve.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 974a244f45ba0..d07008a818df6 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c @@ -217,7 +217,6 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, { struct genevehdr *gnvh = geneve_hdr(skb); struct metadata_dst *tun_dst = NULL; - struct pcpu_sw_netstats *stats; unsigned int len; int err = 0; void *oiph; @@ -296,13 +295,9 @@ static void geneve_rx(struct geneve_dev *geneve, struct geneve_sock *gs, len = skb->len; err = gro_cells_receive(&geneve->gro_cells, skb); - if (likely(err == NET_RX_SUCCESS)) { - stats = this_cpu_ptr(geneve->dev->tstats); - u64_stats_update_begin(&stats->syncp); - stats->rx_packets++; - stats->rx_bytes += len; - u64_stats_update_end(&stats->syncp); - } + if (likely(err == NET_RX_SUCCESS)) + dev_sw_netstats_rx_add(geneve->dev, len); + return; drop: /* Consume bad packet */ From patchwork Mon Oct 5 20:35:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376955 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v324hLjzB442 for ; Tue, 6 Oct 2020 08:33:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729207AbgJEUfl (ORCPT ); Mon, 5 Oct 2020 16:35:41 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49414 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgJEUfk (ORCPT ); Mon, 5 Oct 2020 16:35:40 -0400 IronPort-SDR: iV/6qVTijZF9FGv5C+vBkRl/DzMIj/Mob6Aa5MbG27kimPkBv35oaW9GiP/jpLlTcc/1qi1TDC MlwviKtVJLhC/0Oy43UtaKnv0Ig0s8c2r+7q0mCISBpGhoqPx9OgwuYMjL3WJpKqtTrjgmrkux ahEZHkNpDk730fpIYq2GtO0ALAMsFjReLU3Omxm5KzTRMUNGS2thhWKaqZ52YJOF+3U2KQLaWc HmG1AKwinT65xxrnOLNenkyL/fE6feQGK4c+oiat+VEW9QuTlxtnm2LYLwUxUj6VuHZx+lgfT2 ukM= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:wndjwBfRQq2ncymabO8FBPn7lGMj4u6mDksu8pMizoh2WeGdxcWyZB7h7PlgxGXEQZ/co6odzbaP7Oa8AydZus/JmUtBWaQEbwUCh8QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYdFRrlKAV6OPn+FJLMgMSrzeCy/IDYbxlViDanbr5+MRe7oR/eu8UIjoduN6g8xgbUqXZUZupawn9lK0iOlBjm/Mew+5Bj8yVUu/0/8sNLTLv3caclQ7FGFToqK2866tHluhnFVguP+2ATUn4KnRpSAgjK9w/1U5HsuSbnrOV92S2aPcrrTbAoXDmp8qlmRAP0hCoBKjU09nzchM5tg6JBuB+vpwJxzZPabo+WM/RxcazTcMgGSWdCRMtdSzZMDp+gY4YJEuEPPfxYr474p1YWrRWxHxKjBOL1xT9Om3T43bc63Po8Hg7YxgwgHs4BsHfJp9jyOqcdS/u6zKfTwDXYbPNX2TH955bUchw7uv6DQ6t9fMzMwkYgCw3LlE+fqZD5PzyLzOQNtXCW4eRjWO+ri2AqqgF8riahy8ksl4TFmp8ZxkzF+Ct2z4g4ONO1RVBmbNOkEpZdqS6UO5d4TM0tR2xmuCY0xqMCtJO9YSMEy4wnygbbZvCaaYSE/xHuWPiLLTtlhX9oeKiziwuz/EWm1+byTNO70ExQoSpAitTMs3cN2AHN5cWfUft9+1uh2S6I1wDO9uFIOUA0mrTfK54m2rMwkp0TvljZES/ymEX2i7SWdlk+9uis7OTofq/pppuBOI9zjwHxKKUumsqnDeQ5NAgBQXSb9Py42bH+50H1XbZHguMsnqXEsZ3XJd4XqrO4DgNN14Ys8Re/DzOo0NQCmnkHKUpIeBydgIfyNVHDO+v4DfS/glSqjjhr2+rKMab/DZnVNHjMjK/hfaph605b0Ac80MpQ54xKBbEEO//8R1X+tMLGAR88Nwy0xOjnCMln2oMYR22PHreTMLnOvl+Q+uIvP+6MaZcWuDbgMPcq/eXjjXwnll8He6mmw58XZGq/HvR8LEWTeWDsjcsZEWcWogo+S/TniFucXj5Penm9Qbw86yolCIKpE4jDXJqhgL+f0yehGJ1ZeGRGBkqLEXfyeIWOQ+0MZz6KIs99jjwEUqCsS4E72h61ug/30KFnLunU+y0eq53jyMJ56PbNmkJ6yTshA82D3mSlQ2hqk2YMQDEqmqZyvQg1yUqJ2IB7juZeGNgV4OlGFk88OILQwvJSFd//QETCc82PRVLgRc+pUh8rSddk7dYEYk97U/u4gxzOxSuhAPdBmbWBCrQv8bPa0mS3LcsrmCWO77Uok1RzGpgHDmahnKMqrwU= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C8CADggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUgCgRyCUV+NP5JWilmFMYF8CwEBAQEBAQEBATUBAgQBAYRKgjsmOgQNAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDRwsBIyOBPxKDJoJYKaoXM4QQgUSDR4FCgTiIMoUagUE/gRGDToo0BLdNgnGDE4RrklQPIqEfLZJnm2KGSgyBa00gGIMkUBkNnGhCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2C8CADggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUgCgRyCUV+NP5JWilmFMYF8CwEBAQEBAQEBATUBAgQBAYRKgjsmOgQNAgMBAQEDAgUBAQYBAQEBAQEFBAGGD0WCNyKDRwsBIyOBPxKDJoJYKaoXM4QQgUSDR4FCgTiIMoUagUE/gRGDToo0BLdNgnGDE4RrklQPIqEfLZJnm2KGSgyBa00gGIMkUBkNnGhCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:35:38 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: Fabian Frederick Subject: [PATCH 4/9 net-next] bareudp: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:35:15 +0200 Message-Id: <20201005203515.55280-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- drivers/net/bareudp.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/net/bareudp.c b/drivers/net/bareudp.c index 841910f1db655..ff0bea1554f9b 100644 --- a/drivers/net/bareudp.c +++ b/drivers/net/bareudp.c @@ -54,7 +54,6 @@ struct bareudp_dev { static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) { struct metadata_dst *tun_dst = NULL; - struct pcpu_sw_netstats *stats; struct bareudp_dev *bareudp; unsigned short family; unsigned int len; @@ -160,13 +159,9 @@ static int bareudp_udp_encap_recv(struct sock *sk, struct sk_buff *skb) len = skb->len; err = gro_cells_receive(&bareudp->gro_cells, skb); - if (likely(err == NET_RX_SUCCESS)) { - stats = this_cpu_ptr(bareudp->dev->tstats); - u64_stats_update_begin(&stats->syncp); - stats->rx_packets++; - stats->rx_bytes += len; - u64_stats_update_end(&stats->syncp); - } + if (likely(err == NET_RX_SUCCESS)) + dev_sw_netstats_rx_add(bareudp->dev, len); + return 0; drop: /* Consume bad packet */ From patchwork Mon Oct 5 20:35:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376956 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v336P6pzB442 for ; Tue, 6 Oct 2020 08:33:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729126AbgJEUgM (ORCPT ); Mon, 5 Oct 2020 16:36:12 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49467 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725864AbgJEUgM (ORCPT ); Mon, 5 Oct 2020 16:36:12 -0400 IronPort-SDR: iyoHWhF0CvKnOQjjHNp6VQqthifw0gpxVK6tEJ5Iwp4D0TcgwJmU4yOkhhiVkKVEejjG0FfAjF pYEflkJdiyF0k7bUBJJXQxBZtGCH7vSG4G1T263Wrppuu+tscmDhF9k1qRmPIHBQSgPcwKOTh2 zBy7uht0P9k88k4Yk3dvNmgEO4yDmHMZw6xT7FX9l9A2Y8ysBhxX424gNe/a1uwO3OrRMtsPlp +Z0lYDEC1val80y85LD8VNrlLokE1QlfEUdovlIry5WTxTvlPfcTQYNOY+8FvmteqRQOe4VTiO kaQ= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:nonfNxYE0pGCq3+84mZhjub/LSx+4OfEezUN459isYplN5qZpsyzZB7h7PlgxGXEQZ/co6odzbaP7Oa8AydZus/JmUtBWaQEbwUCh8QSkl5oK+++Imq/EsTXaTcnFt9JTl5v8iLzG0FUHMHjew+a+SXqvnYdFRrlKAV6OPn+FJLMgMSrzeCy/IDYbxlViDanbr5+MRe7oR/eu8UIjoduN6g8xgbUqXZUZupawn9lK0iOlBjm/Mew+5Bj8yVUu/0/8sNLTLv3caclQ7FGFToqK2866tHluhnFVguP+2ATUn4KnRpSAgjK9w/1U5HsuSbnrOV92S2aPcrrTbAoXDmp8qlmRAP0hCoBKjU09nzchM5tg6JBuB+vpwJxzZPabo+WM/RxcazTcMgGSWdCRMtdSzZMDp+gY4YJEuEPPfxYr474p1YWrRWxHxKjBOL1xT9Om3T43bc63Po8Hg7YxgwgHs4BsHfJp9jyOqcdS/u6zKfTwDXYbPNX2TH955bUchw7uv6DQ6t9fMzMwkYgCw3LlE+fqZD5PzyLzOQNtXCW4eRjWO+ri2AqqgF8riahy8ksl4TFmp8ZxkzF+Ct2z4g4ONO1RVBmbNOkEpZdqS6UO5d4TM0tR2xmuCY0xqMCtJO9YSMEy4wnygbbZvCaaYSE/xHuWPiLLTtlhX9oeKiziwuz/EWm1+byTNO70ExQoSpAitTMs3cN2AHN5cWfUft9+1uh2S6I1wDO9uFIOUA0mrTfK54m2rMwkp0TvljZES/ymEX2i7SWdlk+9uis7OTofq/pppuBOI9zjwHxKKUumsqnDeQ5NAgBQXSb9Py42bH+50H1XbZHguMsnqXEsZ3XJd4XqrO4DgNN14Ys8Re/DzOo0NQCmnkHKUpIeBydgIfyNVHDO+v4DfS/glSqjjhr2+rKMab/DZnVNHjMjK/hfaph605b0Ac80MpQ54xKBbEEO//8R1X+tMLGAR88Nwy0xOjnCMln2oMYR22PHreTMLnOvl+Q+uIvP+6MaZcWuDbgMPcq/eXjjXwnll8He6mmw58XZGq/HvR8LEWTeWDsjcsZEWcWogo+S/TniFucXj5Penm9Qbw86yolCIKpE4jDXJqhgL+f0yehGJ1ZeGRGBkqLEXfyeIWOQ+0MZz6KIs99jjwEUqCsS5c72h61sA/6zKFqLuzK9S0Eu5Lj1dx15/HNmhEo7zB0CN6d026VRWFugmwIXyM23Lx4oUFlzleMy6Z4g/tCFdxc+fxESQg6NZjBz+x/DNDyXAHBfsyTRFahWNWmDik7TsgtzN8Wf0Z9B9KigwjN3yWwGLAVmaeGBIc38qPc2Xj+Odp9x2zd26Y/3BEaRZ5DPHOrg4Zz/hbeAorOnVnfkau2MewfwSTE3GSO12yDuAdfSgE0GaPIQXwSeGPIotnjoEDPVbmjDfIgKAQS59SFL/5kY9fohFMOau3uNNnEYmmy0zO+DByG7qiPfYznZyMX0XOOWwA/jwkP8CPeZkAFDSC7rjeGAQ== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNnGhCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNnGhCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:36:10 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: pablo@netfilter.org, laforge@gnumonks.org, Fabian Frederick Subject: [PATCH 5/9 net-next] gtp: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:35:46 +0200 Message-Id: <20201005203546.55332-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick Acked-by: Harald Welte --- drivers/net/gtp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/net/gtp.c b/drivers/net/gtp.c index c09fe18c6c52d..030a1a5afe05a 100644 --- a/drivers/net/gtp.c +++ b/drivers/net/gtp.c @@ -182,8 +182,6 @@ static bool gtp_check_ms(struct sk_buff *skb, struct pdp_ctx *pctx, static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, unsigned int hdrlen, unsigned int role) { - struct pcpu_sw_netstats *stats; - if (!gtp_check_ms(skb, pctx, hdrlen, role)) { netdev_dbg(pctx->dev, "No PDP ctx for this MS\n"); return 1; @@ -204,11 +202,7 @@ static int gtp_rx(struct pdp_ctx *pctx, struct sk_buff *skb, skb->dev = pctx->dev; - stats = this_cpu_ptr(pctx->dev->tstats); - u64_stats_update_begin(&stats->syncp); - stats->rx_packets++; - stats->rx_bytes += skb->len; - u64_stats_update_end(&stats->syncp); + dev_sw_netstats_rx_add(pctx->dev, skb->len); netif_rx(skb); return 0; From patchwork Mon Oct 5 20:36:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376957 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v394mvJzB44F for ; Tue, 6 Oct 2020 08:33:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729904AbgJEUg4 (ORCPT ); Mon, 5 Oct 2020 16:36:56 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49513 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729273AbgJEUgo (ORCPT ); Mon, 5 Oct 2020 16:36:44 -0400 IronPort-SDR: f7Q7fvpmyrrJVFvQljq0BqxY68CaasLHQmz7uRmNqj3UqszYMyuyz8xq2ZLMncDv97/J8eTC5k 0jSxWhshSrG2Ckd3/WpfMrBb/fPaz/qPHhLgf6BCkhxAbu/TxJfVvPxmP4UdZGD5QXEIt8n0xQ Wt3/U0y5/HAS7elxM6xrGndXaf1XQY/tNyElKBcqKSIGNBesyri/xb1AMktuOu9mpBMbEQoZcj yRWYt4RftR8xYy+qN+PBUT1z8dBb0KAxhCNsK49Q1rjtzCJgiw+OqquQEPJiAEmgcWjZDlE2e7 5bw= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:DUCfjhey+gtNpqUgnqmsULVhlGMj4u6mDksu8pMizoh2WeGdxc26bRyN2/xhgRfzUJnB7Loc0qyK6v+mBTZLuM3Y+Fk5M7V0HycfjssXmwFySOWkMmbcaMDQUiohAc5ZX0Vk9XzoeWJcGcL5ekGA6ibqtW1aFRrwLxd6KfroEYDOkcu3y/qy+5rOaAlUmTaxe7x/IAi0oAnLucQan4RuJrs/xxfUv3BFZ/lYyWR0KFyJgh3y/N2w/Jlt8yRRv/Iu6ctNWrjkcqo7ULJVEi0oP3g668P3uxbDSxCP5mYHXWUNjhVIGQnF4wrkUZr3ryD3q/By2CiePc3xULA0RTGv5LplRRP0lCsKMSMy/WfKgcJyka1bugqsqRxhzYDJbo+bN/1wcazSc94BWWZMXdxcWzBbD4+gc4cCCfcKM+ZCr4n6olsDtRuwChO3C+Pu0DBIgGL9060g0+s/DA7JwhYgH9MSv3TXsd74M6kSXvquw6nG1jjDdPBW2Df76IfWbhAtu+qDUqxpfMfX1EIgGB/LgE+Kpoz5IzOayP4Ns26D4uRuVu+ij24ppgBxrzSxyMoiipTEip4IxlzY9Ch3z4k7KMC2RUNlfNOpEJlduj+VOYdqTM0sTGVltiY6xLEYvZO2ejUBxpc/xxPHb/GLbpKE7g/gWeqPOzt0mXNodbKlixqv8EWtzPD3WNOu31ZQtCVFl8HBtnUK1xPO9MeKUuB9/kK92TaX0ADT9/1ELVg0laXFL54hxaY9lp4UsUvfBCD2nEX2jKiNdkU44OSo7+Pnban8qZ+YKoB0jQT+Pb4vmsy5Geg4Mw4OUHaH+emk0LDv4Ff1TKhJg/EoiKXVrZHXKMQBqqKkAgJZyoMj5Ay+Dzei3tQYh34HLFdddRKJlYfmIF/OLevjDfe8g1Wslilkx+zcMrL6HJrBNmLDn6v5fbZh905czxI+ws1F6JJKFL4BJen+VVLru9zGEBA5Ngi0w+HpCNVhzI8eX3yAArOBOqPIrVCI/v4vI/WLZIINuzb9NuMq6OT1gH86h1AdZ6+p0oUTaHyiGfRmOUqZa2L2gtgdCWcKohY+TOvyhV2ETzFTe2u9ULwi5jwgFoKmApnMRpq3jLyCwii7BJtWaX5CClyWFnfobYqEUe8WaC2OOs9hjiAEVb+5Ro8iyBGvtQn6xKR7LufP/y0Yrozv2MJ05+3VjxE+7yZ7ANiH32GXUmF+hnkISCMu3KBjvUx9zU+O0Kh/g/xDFdxT6e5JUgU7NZPHy+x6CtbyWh/Of9uQSVamWsumDDArQtI22d8ObF53G8++gRDbwyqqH7gVmqSFBJMu6a3c0WP8J91+y3fG0qkukUUmTtFUOmK41eZD8F3fDpDElm2VnrincKAb0jKL8mqfiSKNoUtReA19S6PIWTYYfESS5dL0+k/PUZewBrk9dAhM08iPLu1NcNK6o09BQaLNMd7famT5tX29CRuSx7iPJN7kcm8T9D7eGU4Jj0YZ8CDVZkAFGi69rjeGX3RVHlX1bha0/A== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnm2KGR4F6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0BjTIBAQ X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnm2KGR4F6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0BjTIBAQ Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:36:42 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: kuznet@ms2.inr.ac.ru, yoshfuji@linux-ipv6.org, Fabian Frederick Subject: [PATCH 6/9 net-next] ipv6: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:36:19 +0200 Message-Id: <20201005203619.55383-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- net/ipv6/ip6_vti.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c index fac01b80a1040..5f9c4fdc120d6 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -347,7 +347,6 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) { unsigned short family; struct net_device *dev; - struct pcpu_sw_netstats *tstats; struct xfrm_state *x; const struct xfrm_mode *inner_mode; struct ip6_tnl *t = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip6; @@ -390,12 +389,7 @@ static int vti6_rcv_cb(struct sk_buff *skb, int err) skb_scrub_packet(skb, !net_eq(t->net, dev_net(skb->dev))); skb->dev = dev; - - tstats = this_cpu_ptr(dev->tstats); - u64_stats_update_begin(&tstats->syncp); - tstats->rx_packets++; - tstats->rx_bytes += skb->len; - u64_stats_update_end(&tstats->syncp); + dev_sw_netstats_rx_add(dev, skb->len); return 0; } From patchwork Mon Oct 5 20:36:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376958 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v3C6ZGfzB44F for ; Tue, 6 Oct 2020 08:33:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729341AbgJEUhO (ORCPT ); Mon, 5 Oct 2020 16:37:14 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49542 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729231AbgJEUhI (ORCPT ); Mon, 5 Oct 2020 16:37:08 -0400 IronPort-SDR: xfM8e/s1NvphrdxcbvW6sCe8mwA2VxAVB2FptAZCmpWkWCXmm9cEOK64z/Fqccf/7JTBwzxAfp +CAkOZ2wflT2+WExnAGHPkLK2LZ5KDc95IUQRvPoSh1zzcoEeTUKY+/b7pSeVEfQXEVwkj1NFx B8AS0xNzsCnzSqa4k43iafdxfOsda1AG2lYRtmUsuNwm/FQkEdnA1ctvPJSFGPbvD9RwauvAuY UNdwH2YgL0dsdSICRhUP8eNsUo2EbbS+hLJiikRPMiun68jM484x6+yPVIoV646Dhz4VLFmQ/h HKk= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:RtwPrBHqZQfNcwxVw1VFkJ1GYnF86YWxBRYc798ds5kLTJ76ps64bnLW6fgltlLVR4KTs6sC17OJ9fy6EjVbuN6oizMrSNR0TRgLiMEbzUQLIfWuLgnFFsPsdDEwB89YVVVorDmROElRH9viNRWJ+iXhpTEdFQ/iOgVrO+/7BpDdj9it1+C15pbffxhEiCCybL9vLhi6twrcutcZjYd/JKs91wbCr2dVdehR2W5mP0+YkQzm5se38p5j8iBQtOwk+sVdT6j0fLk2QKJBAjg+PG87+MPktR/YTQuS/XQcSXkZkgBJAwfe8h73WIr6vzbguep83CmaOtD2TawxVD+/4apnVAPkhSEaPDM/7WrZiNF/jLhDrRyhuRJx3oDaboKSOvVxca3QZs8WSGlbU8pNTSFNHp+wYo0SBOQBJ+ZYqIz9qkMOoxSkHgasBfngyjlVjXH2x601zfkuHh/c3AwhA90Os2nfodL7NKgISu+1wrLFzS7Ab/JW3zfy9pTIfgo6rv6SRL99d9faxkYzGQ3flFqQtZDlMC2P1uQLq2WV4eltWOavhWMmqwx9vDaiyMcxh4XVm44Z1lHJ+yp2zosoK9C1VlN2bN6mHZZOuC+WK4V4TMwmTm9ouCg21LkLtJimdyYJ0JQq3xrSZ+Gdf4SV4R/vSvydLSp5iX9lYr6zmhe//E69wePmTMa0ykxFri9dn9nJsXACygLc59CcSvt44kehwTGP1x3P6u1cIUA7i67bK5k5z740kZocrV7MHiv2mEXxl6+Wal8o+uyv6+v7eLrmooKTN4hxig7kM6QunNSzAeU+MgcQQ2iW4eCx2KD58UHkQ7hGkOc6nrTYvZ3aP8gXu6+0DxdQ0ok56ha/Czmm0M4fnXkCNF9FdgiIgJPnO1zVO/D4Dve+g1Kynzd33fzJJaPuDo3XLnffiLfhYap960lExQUu199f+YxbCrQaLf3uQEDxqsLXDho9MwyzzebnFM9x1oUAVmKTGqWZKr/dsUeU5uIzJOmBfIwVuCvmJPc//PPujmE2mUUbfaa32Zsbcne4Hu5pI0+Be3rjns8BEXsWvgo5VOHqjkONUSJOaHmsQaIx/S87CI24AofZXIytg6KO3D29HpJIYmBKEFeMEW3nd4+cQfcDdDqSItN9kjwDTbWhUJMh2g+gtA/01bVnKPDY+i4ctZ35z9h1/PPclQsu9TFvFMSSzX2CT3xynmwWWz86xrxwoUt4yl2by6h3n+RYFcBP5/NOSgo6NYDTz/ZhBN/sQALBYsyESFmhQtWgHD4xScgxz8UUbEZlAdqiiArM0zCtA78PmLyHHoY78r/E1XjrO8l902rG1LUmj1Q+TMtAL3aphqBk+gjIBI7Ik0OZmLi2dagGxyHC6jTL8W3bsEhGXQtYXazbUHUbYUXK69L0+geKTKKkAJwkPxFHxMrELbFFLpXvgElKSenLJtvTeSSyln22CBLOwamDP6TwfGBI8izXCUEC2y4J8HqLLwk1BW/1rWvUAhR1FkPpbl+q++Qo+yDzdVM90wzfNx4p7LGy4BNA3fE= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:37:06 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: steffen.klassert@secunet.com, herbert@gondor.apana.org.au, Fabian Frederick Subject: [PATCH 7/9 net-next] xfrm: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:36:34 +0200 Message-Id: <20201005203634.55435-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick Acked-by: Herbert Xu --- net/xfrm/xfrm_interface.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index eb8181987620d..8f8631eafe784 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -210,7 +210,6 @@ static void xfrmi_scrub_packet(struct sk_buff *skb, bool xnet) static int xfrmi_rcv_cb(struct sk_buff *skb, int err) { const struct xfrm_mode *inner_mode; - struct pcpu_sw_netstats *tstats; struct net_device *dev; struct xfrm_state *x; struct xfrm_if *xi; @@ -255,13 +254,7 @@ static int xfrmi_rcv_cb(struct sk_buff *skb, int err) } xfrmi_scrub_packet(skb, xnet); - - tstats = this_cpu_ptr(dev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->rx_packets++; - tstats->rx_bytes += skb->len; - u64_stats_update_end(&tstats->syncp); + dev_sw_netstats_rx_add(dev, skb->len); return 0; } From patchwork Mon Oct 5 20:37:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376959 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v3F0BXjzB44F for ; Tue, 6 Oct 2020 08:33:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729514AbgJEUh2 (ORCPT ); Mon, 5 Oct 2020 16:37:28 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49578 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725901AbgJEUh1 (ORCPT ); Mon, 5 Oct 2020 16:37:27 -0400 IronPort-SDR: pwmTBCu8aSaf+0kSqpblu/lBRbNuKrIXyMglNFuzICA16yGKyDQhInT7S49cFe+SRAgc+AP3IK zYokAUdUGiRL3xJs6vaTnsCh33ABRUGwd5754OwB9Gmd9vF6S2GS/kWyKbi9XOX4R01KdmV6pe PUUqbCMXY2g/IcFRHnnu0M9bccJH2QLjEojWbbXPBHRVWE9OCLtRKhN/7eSeWZ9AQiaNihUshh WSjndpAXkBr+fEtitS/qnL4vFbbswR9sYSccXgfxU1gICmjY8VCJHk6/L1zoWK2Wx6OXa2SZx1 YWY= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:GMhliB2wYg8yoBGYsmDT+DRfVm0co7zxezQtwd8ZsesWIvzxwZ3uMQTl6Ol3ixeRBMOHsq0C17Cd6vu5EUU7or+5+EgYd5JNUxJXwe43pCcHRPC/NEvgMfTxZDY7FskRHHVs/nW8LFQHUJ2mPw6arXK99yMdFQviPgRpOOv1BpTSj8Oq3Oyu5pHfeQpFiCe/bL9oIxi6swrdutQYjId/N6081gbHrnxUdupM2GhmP0iTnxHy5sex+J5s7SFdsO8/+sBDTKv3Yb02QaRXAzo6PW814tbrtQTYQguU+nQcSGQWnQFWDAXD8Rr3Q43+sir+tup6xSmaIcj7Rq06VDi+86tmTgLjhSEaPDA77W7XkNR9gqJFrhy8qRJxwInab46aOvdlYq/QfskXSXZbU8pNSyBMBJ63YYsVD+oGOOZVt4nzqEEVohu/HwasAv7kxD9ShnDowKI1zf4hEQDa0wwjAtkDt3rUo8/uO6ccSu2116rIzDXFb/xIxTfx8pPHfQ44rPyKQLl/ftbfx1M1GAPZklWft5blPzWN2+oDsGWW6+puWOOvhmI5pQx/oiWiytsxhoXVh48bxV/K+Dh3zYsrONC1SEx2bMCrHpdMuS+UOI97TMMiTW12vCs3zKANt52jfCUSzJkr2gTTZ+GEfoSW+B7vSeecLDdiiH54eb+ygQu5/1K6xe3mTMa01U5Hri9CktbRqH8AzwfT6s2bSvtl+UehxCqP2xjT6u5aJUA0krLWK5omwrEsjJUTtUTDHijtmEXqlqOWckIk9fSy5OTjf7rmoZqcOJV1igH4Kqgum8q/DvokMgUWW2WX5P6w2KDg8EHnWrlGk/w7n6nDvJzHJMkXvqu5DBVU0oYn5Ra/FTCm0NEAkHkJNl1KYxyHgpPyO1HNIPH4C+mwg0i2nDhw2f/KJqfhDYnVLnjfjLfheq5w5FNGxwot099f4olZBawbL/LtREDxsdjYDhg3Mwyo2ernDsty1p8GU2KVHqCZKL/SsUOP5u83IOmMeZQatyzmJvgm+fHul3k5lkEZfaWz2psXcn+4FOx8I0qFeXrsnssBEWASswo4UuPqlECNXiBNZ3upQaI86S80CJi8AYfAWI+tmrqB0zm/HpFMYWBGEF+MG2/yd4qYQ/cMdD6SIsh5nzwcTrihS5Eu1RW0uw/g0LdnKfTU+isCuZLkzth16PXZlQsu+jxsE8Sdz2aNQnlpkWwWWT87x6d/oVRjxVeFz6h4mPJZFd1P5/xVUgc2L5ncz/Z1C9rqQALOYs+JSEq6QtWhGTwxQMg+zMQAY0tmANWijRDC3yy0DL8JjbCEH4I7oerg2C39Lthwzl7K3bcsil0hTNcJM2C6wuZ86gLaL43EiUOUk+Ctb6tYlCjA6GuO00KQs0xCFg19S6PIWTYYfESFg87+4xbsRrWvALJvHBFMxcOYK6BJIonnhF9IbOzgKdLTfyS7ljHjVl6z2rqQYd+yKC0m1yLHBR1cng== X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnoimBek0gGIMkUBkNjisXjiZCMDcCBgoBAQMJVwE9AY0yAQE Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:37:25 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: pshelar@ovn.org, dev@openvswitch.org, Fabian Frederick Subject: [PATCH 8/9 net-next] net: openvswitch: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:37:03 +0200 Message-Id: <20201005203703.55486-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- net/openvswitch/vport-internal_dev.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 58a7b8312c289..d8fe66eea206b 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -225,7 +225,6 @@ static void internal_dev_destroy(struct vport *vport) static netdev_tx_t internal_dev_recv(struct sk_buff *skb) { struct net_device *netdev = skb->dev; - struct pcpu_sw_netstats *stats; if (unlikely(!(netdev->flags & IFF_UP))) { kfree_skb(skb); @@ -240,12 +239,7 @@ static netdev_tx_t internal_dev_recv(struct sk_buff *skb) skb->pkt_type = PACKET_HOST; skb->protocol = eth_type_trans(skb, netdev); skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN); - - stats = this_cpu_ptr(netdev->tstats); - u64_stats_update_begin(&stats->syncp); - stats->rx_packets++; - stats->rx_bytes += skb->len; - u64_stats_update_end(&stats->syncp); + dev_sw_netstats_rx_add(netdev, skb->len); netif_rx(skb); return NETDEV_TX_OK; From patchwork Mon Oct 5 20:37:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabian Frederick X-Patchwork-Id: 1376960 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=skynet.be Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4C4v3H2PLFzB44J for ; Tue, 6 Oct 2020 08:33:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729759AbgJEUhk (ORCPT ); Mon, 5 Oct 2020 16:37:40 -0400 Received: from mailrelay115.isp.belgacom.be ([195.238.20.142]:49596 "EHLO mailrelay115.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729196AbgJEUhg (ORCPT ); Mon, 5 Oct 2020 16:37:36 -0400 IronPort-SDR: DQn/VuBLWbmY4Yd6AWf+uzwcqiqOtycB78dLm4NmlWG+I7FXD+WqIdqsv7ZyPShlGsYaQpZMLN WJkBpMv6OicPgqCpT+jS+z/gZkZZYf6QLY8KbLVzIw4nWqekZgS3xsw5/hw6hShuu4qLkft/Li KvRhuUsFY06+eyTGRbRLx5weCuH+aClqcO0IAL5ITloKFnvg2Q6vCWAV+UHrX3oY8x2Bc6WM+8 YYzZCAqjJ9nfX84ipM40EVJTgSOwS1S073K5kUgTZz2gv8umaOJzWCYsLylU6swQa2kaLS5nQc Bcc= X-Belgacom-Dynamic: yes IronPort-PHdr: 9a23:Uaa8Xx9VWQEocf9uRHKM819IXTAuvvDOBiVQ1KB+0+MeIJqq85mqBkHD//Il1AaPAdyEra4ewLON6ujJYi8p2d65qncMcZhBBVcuqP49uEgeOvODElDxN/XwbiY3T4xoXV5h+GynYwAOQJ6tL1LdrWev4jEMBx7xKRR6JvjvGo7Vks+7y/2+94fcbglVhjexe7x/IAu5oQnMuMQanJZpJ7osxBfOvnZGYfldy3lyJVKUkRb858Ow84Bm/i9Npf8v9NNOXLvjcaggQrNWEDopM2Yu5M32rhbDVheA5mEdUmoNjBVFBRXO4QzgUZfwtiv6sfd92DWfMMbrQ704RSiu4qF2QxLulSwJNSM28HvPh8JwkqxVvRyvqR94zYHbb4+YL+Zyc6DHcN8GX2dNQtpdWipcCY28dYsPCO8BMP5YoYbnvFQOrAGxBQ+xD+3v0D9HmGL50rMg0+QgDQ7G3xErEtUAsHvOt9r1OrwfUfu2zKjIyzXMce9W1S3m54fWax0sp+yHUr1sf8TL00YvCx/FgUuKqYzjJz6b2OcAvmyb4edhVe+jlWAqpQFsrzSz28sglojEiI0axF3Z+yh03ps4KN26RUNlbtCoDJVeuS6eOoV2Qs0uXWVltSAnwbMFoZ62ZCwHxIk9yxLCaPGLbZKE7g/iWeuROzt0mXNodbSijBio60eg0PfzVsys3VZPqSpKj8fDu2gW1xzW9siHUvx9/lq92TqX1wDc9OVEIUcsmKrfLJ4u3qQ/lp4TsUTEBS/2hF/6jKuRdko44Oeo7/noYrLjppCGNo90jBnyMqUomsOhHeQ1KgwDU3WB9eih17Dv41f1TKhLg/A2iKXVrZHXKdwepqGjAg9V1ogj6wy4DzejyNkYk2MII0lLeB+clIjpOFHPIPbmAvejmVijiylky+jcPrL9GpXNMmTDkLD5cLlg8UFc1hQ8zdVE6p1JEL4BPuz8Wkr1tNzfAB85Lxa4w+D5B9VhzokeQ36AAreFMKPOtl+F/uEvI/SXa4APozv9KOYq5+TojXAnnV8RZ66p3YEYaHqgBPRpP12ZYWbwgtcGCWoKuBQxTPD3h1KcTz5efGiyX60i6TEhEo6mDpnMRpqrgLOf2Ce3BJpWZnpJClqUC3fna52EW+sQaCKVOsJgkjsEVaOhS48vyBGutg76xqFjLurV/C0YqJ3i2MF05+3LixE/9CZ4D8OH02GCV2t0hH8HRycq3KBjpkxw0lSD0bV5gvxeC9NT++hEUgIhNZLC1eB6CtbyWhjbctiTVFmqWM+mASwpRNIr39AOe1p9G8mljh3b0SqlGaQal7KQCZwv8aLd337xKNhhy3rcz6YukQpufswaOWS4i6tX+wHNCovNlEuF0aCnaeBU3zPH/U+AwHCIsUUeVxR/Fe3DUGwTa1X+s9v0/AXBQqWoBLBhNRFOmuCYLa4fRNTjjFxADNn5NdjTeWO6mC/kCx+CyJuXb5vsdnlb1iiLWxtMqBwa4XvTbVt2PSymuW+LVDE= X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnm2KGR4F6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0BjTIBAQ X-IPAS-Result: A2DgAgDggntf/xCltltgHAEBAQEBAQcBARIBAQQEAQFHgUiBHoJRX40/klaKWYctCwEBAQEBAQEBATUBAgQBAYRKgjsmOBMCAwEBAQMCBQEBBgEBAQEBAQUEAYYPRYI3IoNHCwEjI4E/EoMmglgpqhczhBCBRINHgUKBOIgyhRqBQT+EX4o0BLdNgnGDE4RrklQPIqEfLZJnm2KGR4F6TSAYgyRQGQ2caEIwNwIGCgEBAwlXAT0BjTIBAQ Received: from 16.165-182-91.adsl-dyn.isp.belgacom.be (HELO localhost.localdomain) ([91.182.165.16]) by relay.skynet.be with ESMTP; 05 Oct 2020 22:37:34 +0200 From: Fabian Frederick To: davem@davemloft.net, kuba@kernel.org, netdev@vger.kernel.org Cc: yoshfuji@linux-ipv6.org, kuznet@ms2.inr.ac.ru, Fabian Frederick Subject: [PATCH 9/9 net-next] ipv4: use dev_sw_netstats_rx_add() Date: Mon, 5 Oct 2020 22:37:12 +0200 Message-Id: <20201005203712.55537-1-fabf@skynet.be> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use new helper for netstats settings Signed-off-by: Fabian Frederick --- net/ipv4/ip_tunnel.c | 8 +------- net/ipv4/ip_vti.c | 9 +-------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 0c1f364044715..8b04d1dcfec4e 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -360,7 +360,6 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, const struct tnl_ptk_info *tpi, struct metadata_dst *tun_dst, bool log_ecn_error) { - struct pcpu_sw_netstats *tstats; const struct iphdr *iph = ip_hdr(skb); int err; @@ -402,12 +401,7 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, } } - tstats = this_cpu_ptr(tunnel->dev->tstats); - u64_stats_update_begin(&tstats->syncp); - tstats->rx_packets++; - tstats->rx_bytes += skb->len; - u64_stats_update_end(&tstats->syncp); - + dev_sw_netstats_rx_add(tunnel->dev, skb->len); skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(tunnel->dev))); if (tunnel->dev->type == ARPHRD_ETHER) { diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c index 49daaed897649..6500e8bce8bd4 100644 --- a/net/ipv4/ip_vti.c +++ b/net/ipv4/ip_vti.c @@ -95,7 +95,6 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) { unsigned short family; struct net_device *dev; - struct pcpu_sw_netstats *tstats; struct xfrm_state *x; const struct xfrm_mode *inner_mode; struct ip_tunnel *tunnel = XFRM_TUNNEL_SKB_CB(skb)->tunnel.ip4; @@ -138,13 +137,7 @@ static int vti_rcv_cb(struct sk_buff *skb, int err) skb_scrub_packet(skb, !net_eq(tunnel->net, dev_net(skb->dev))); skb->dev = dev; - - tstats = this_cpu_ptr(dev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->rx_packets++; - tstats->rx_bytes += skb->len; - u64_stats_update_end(&tstats->syncp); + dev_sw_netstats_rx_add(dev, skb->len); return 0; }