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; }