Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp3660658pxu; Sun, 11 Oct 2020 19:12:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxBczPEIgpm1fLIZOz3XWaotIGT8Y29iZSjo4Wjgjvh5aEdYJWIgzjhAfIyeiAjGiZGJh/1 X-Received: by 2002:a17:906:7e47:: with SMTP id z7mr25240101ejr.418.1602468728317; Sun, 11 Oct 2020 19:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602468728; cv=none; d=google.com; s=arc-20160816; b=mSYG80ooMDDUtm8GxGTJMQPUwuU/3VdQWra5tNsQ5Hc1AEzxEFV8fPUkA1iiEjIWt/ 5y4/qT/QT9y1s+NmrDjMPHQiroWpBHz8QmgFrQ+PyUYl9S4u5nXzHezq1pLGOwSR5/g1 mchKHqNOmcVX5lu/fV6h1EmuhWi18VoUtfkI4eB1TY+A/LuvX4oEeUhWdj02css25UUI RYLRXpMncfcMx2QI3Pj2gp9Sah5zbwRbJBOdAQdhXVzejxwhh3q2CReygkcmcuN4UbY+ WFmCI8StQ+GiTRx6oYEChh5KadlBvgZQYp9YFQ7NA2A54jYKlcKcXUxZzsM8bbhDMGCJ ElPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:references:cc :to:from:subject:dkim-signature; bh=/FTD4WRUg6u2eGbYzuvRNRJ/sh1gmUaaKBFsN/NH+4I=; b=tipX2mTUWqFxZrG88/WgIeG0fLOCN5bh+71P1LsmP2BsKIevEemctZl6ONraLcvHhk 3nEg6zRBaDIJlCs9OS6N5k8It545TJrqOIjstKQZVMjzF+mlzpaGgkSoKvyzET1DJupH WUy4y748ydZDejSP2TlGRjRUrfnYq3uVvpJp7bbZIqTGqWSCksoGJEE1QtEs1KdLQ3Bf VBDUbCz1jsPWmC6RbM9RTl4XD81JwL1vFV9A+vO1iMLBz7uYXGKjx7adlxHqrl2Jh1Wc hyGesoaZkNPX3n2rDRwWr5pO9u2CUcGoneHkdDh02FmWXOUyqhBs+VuAWEC60Zmq2lAW 7lQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PyzuGbgQ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p10si11317681ejx.708.2020.10.11.19.11.44; Sun, 11 Oct 2020 19:12:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=PyzuGbgQ; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728992AbgJKTpE (ORCPT + 99 others); Sun, 11 Oct 2020 15:45:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34930 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726974AbgJKTol (ORCPT ); Sun, 11 Oct 2020 15:44:41 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F03A9C0613D0; Sun, 11 Oct 2020 12:44:40 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id t25so20264810ejd.13; Sun, 11 Oct 2020 12:44:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:cc:references:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/FTD4WRUg6u2eGbYzuvRNRJ/sh1gmUaaKBFsN/NH+4I=; b=PyzuGbgQ/T5WAYNOiE7/Fc7mim7ijDf/I6hDizxzEYTF8/HfbbmzP42R+dk/Tf7t3L r3rTgfmciTFkPugJUIfFan4lA3UxjLBGZrSeWGa98iK7WgUsSZZMK6jaqsVusLDc7OKt ducIl5gXoe3bagOoU/aBG55E0qjsy2CDzRWixI5g8O4pMkDRMn10OM/pJEYXJUbxUdg8 wEvIdZn0WeXfx8o6AOtjUbp/WHumX4LdXSa/3HL4Zw5+KaHHYXBaDEvDAy4vYOU/JTen aN8KJ1n70tBEf2n56k0U7kdOle+7frjcbMwxo8f8NSK4m1RYQZEu24MxYsLGh4P3It+e TvFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/FTD4WRUg6u2eGbYzuvRNRJ/sh1gmUaaKBFsN/NH+4I=; b=ORE7QyDHLQUSovfqdxuzwCp+XDh0z1dV1aK+rW/mRb6C/W4vZlC/LOOHDWNjNrBIjU Dl7Ko8TqvZ/S9YR7zIaGRDAakaBgsx7hkLhp4No3CK83E/LHR3RlkaN8VL7VIGwcKchR CCEGgJkdizEKr+PbsxpVkQNYi4LE+ZDYrktubx4POQtnVYGuB4Hu/bMQUQ391HKe1POU 7m/bpX1wFH31HPZP5XGlSLIjxAt5MmOEGtm1FeT9auhp152/pSc2GRJ+ZLKXNCSMaFiM TeYnmood8F5sT0yoSM1gkx4VIPsPrbxVtBJUxNAhpxXMsuutIHGY15yqB3EkE3K2MkyH l+sA== X-Gm-Message-State: AOAM533kUTkN5M7yqozY5Tqx3AeZYomForsG3BeEV5v7ehKjHYw9igsr bxZwosquJI+ZJey9GNi+UZ0= X-Received: by 2002:a17:906:f8ca:: with SMTP id lh10mr3843209ejb.528.1602445479587; Sun, 11 Oct 2020 12:44:39 -0700 (PDT) Received: from ?IPv6:2003:ea:8f00:6a00:51b7:bf4f:604:7d3d? (p200300ea8f006a0051b7bf4f06047d3d.dip0.t-ipconnect.de. [2003:ea:8f00:6a00:51b7:bf4f:604:7d3d]) by smtp.googlemail.com with ESMTPSA id qq10sm9621759ejb.31.2020.10.11.12.44.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 11 Oct 2020 12:44:39 -0700 (PDT) Subject: [PATCH net-next 09/12] iptunnel: use new function dev_fetch_sw_netstats From: Heiner Kallweit To: David Miller , Jakub Kicinski , =?UTF-8?Q?Bj=c3=b8rn_Mork?= , Oliver Neukum , Igor Mitsyanko , Sergey Matyukevich , Kalle Valo , Roopa Prabhu , Nikolay Aleksandrov , Andrew Lunn , Vivien Didelot , Florian Fainelli , Vladimir Oltean , Alexey Kuznetsov , Hideaki YOSHIFUJI , Johannes Berg , Pravin B Shelar , Steffen Klassert , Herbert Xu Cc: "netdev@vger.kernel.org" , linux-rdma@vger.kernel.org, Linux USB Mailing List , linux-wireless , bridge@lists.linux-foundation.org References: Message-ID: <3b1116c4-4cc4-2aac-fd66-7ffd2d3705bc@gmail.com> Date: Sun, 11 Oct 2020 21:42:04 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Simplify the code by using new function dev_fetch_sw_netstats(). Signed-off-by: Heiner Kallweit --- net/ipv4/ip_tunnel_core.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index b2ea1a8c5..25f1caf5a 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -433,29 +433,8 @@ EXPORT_SYMBOL(skb_tunnel_check_pmtu); void ip_tunnel_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *tot) { - int i; - netdev_stats_to_stats64(tot, &dev->stats); - - for_each_possible_cpu(i) { - const struct pcpu_sw_netstats *tstats = - per_cpu_ptr(dev->tstats, i); - u64 rx_packets, rx_bytes, tx_packets, tx_bytes; - unsigned int start; - - do { - start = u64_stats_fetch_begin_irq(&tstats->syncp); - rx_packets = tstats->rx_packets; - tx_packets = tstats->tx_packets; - rx_bytes = tstats->rx_bytes; - tx_bytes = tstats->tx_bytes; - } while (u64_stats_fetch_retry_irq(&tstats->syncp, start)); - - tot->rx_packets += rx_packets; - tot->tx_packets += tx_packets; - tot->rx_bytes += rx_bytes; - tot->tx_bytes += tx_bytes; - } + dev_fetch_sw_netstats(tot, dev->tstats); } EXPORT_SYMBOL_GPL(ip_tunnel_get_stats64); -- 2.28.0