From patchwork Thu Nov 12 11:09:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1398859 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qP+ccKus; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CWzRh29jBz9sRK for ; Thu, 12 Nov 2020 22:10:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728021AbgKLLKu (ORCPT ); Thu, 12 Nov 2020 06:10:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728041AbgKLLKd (ORCPT ); Thu, 12 Nov 2020 06:10:33 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AABC4C0613D1; Thu, 12 Nov 2020 03:10:23 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id j7so5575736wrp.3; Thu, 12 Nov 2020 03:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tv2bEm0sLbKGDjq3ZdSLJlA91Mcgn0WBp+SI+MmrFWo=; b=qP+ccKushbGl1w9gFlfW/TFVWTruI1fOPPvl5CstaEEpOrfSJzvTbTEZFEfXnKKkcR Xmu4Y282dYXykJ7v8WmgPZ51FXcvoq5/da22NmtfmTvjbdhs0P7z/HQHt7ZVuJjZRKql HMtGjRk6g6LItj/7tZiEFYm0p9XofEAZbqKMwf5Nu7k5PobzYGbPpGdrUA6hXNEYlp9O 0KJIFwx2ygIYC98SPkHuFZU6UU0VLkKv8Xz3nzcZZF18ljSs9V7kQNHFJ2I9+4uWlfR6 JykDCe667HtNgblqB9UPdLtXkdR0YaKFrja5gvihKBGFL8X+8AjZr8K7QEIgcj4gopEN Nwvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Tv2bEm0sLbKGDjq3ZdSLJlA91Mcgn0WBp+SI+MmrFWo=; b=pLcoynh8fxS1ZKvFYgv18x25iS/lF0y8XSMgsL24KQlld8FWP9kHQSHZBP3vGDP2H9 ichlo60Sar1XafeJjNHyA0U7m2TAjl+J9gy9vD4Txir8iigANvPe1orpgsLRMCfkekCX eZ1ysfVtyiZFK92GBKIhxxr2fXKmq5zkH2FkGncGSUlWxwCVPp86ghCHH3/9Os8oYC6R iv+9IkVFR66MRpAObkWaKyvcW/iJ+ukfU6a1323wTJx/mNbd54/+OjSqWqlIQxVRItn0 xUFtmZ8LY4I2vU6RfjalC3e5Xx1Mjtj2jpqZ4CwNUvsbVdeYvQPsVbWeJ0mp/0ob6RVL 8F5A== X-Gm-Message-State: AOAM533ikHhu9hExoOeun9+Gb7e0E2px4rUtDJqOVTxS5vVhw8HnArvg l7q61dBXQonBmpOTzNRYdqg= X-Google-Smtp-Source: ABdhPJxGN6E9FoAvVu/8ZH/CM2S5uZc0sFap77Uit1MN2Yku34dNzb315nGIhPSRi4bW8XbI25hQSw== X-Received: by 2002:a5d:514a:: with SMTP id u10mr13153774wrt.312.1605179422360; Thu, 12 Nov 2020 03:10:22 -0800 (PST) Received: from ubux1.panoulu.local ([2a00:1d50:3:0:1cd1:d2e:7b13:dc30]) by smtp.gmail.com with ESMTPSA id v67sm6505315wma.17.2020.11.12.03.10.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 03:10:21 -0800 (PST) From: Lev Stipakov X-Google-Original-From: Lev Stipakov To: Johannes Berg , "David S. Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lev Stipakov Subject: [PATCH 1/3] net: mac80211: use core API for updating TX stats Date: Thu, 12 Nov 2020 13:09:53 +0200 Message-Id: <20201112110953.34055-1-lev@openvpn.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats. Use this function instead of ieee80211_tx_stats(). Signed-off-by: Lev Stipakov --- net/mac80211/tx.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 5f05f4651dd7..7807f8178527 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -38,16 +38,6 @@ /* misc utils */ -static inline void ieee80211_tx_stats(struct net_device *dev, u32 len) -{ - struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->tx_packets++; - tstats->tx_bytes += len; - u64_stats_update_end(&tstats->syncp); -} - static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, struct sk_buff *skb, int group_addr, int next_frag_len) @@ -3403,7 +3393,7 @@ static void ieee80211_xmit_fast_finish(struct ieee80211_sub_if_data *sdata, if (key) info->control.hw_key = &key->conf; - ieee80211_tx_stats(skb->dev, skb->len); + dev_sw_netstats_tx_add(skb->dev, 1, skb->len); if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) { tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; @@ -4021,7 +4011,7 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, goto out; } - ieee80211_tx_stats(dev, skb->len); + dev_sw_netstats_tx_add(dev, 1, skb->len); ieee80211_xmit(sdata, sta, skb); } @@ -4248,7 +4238,7 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, info->hw_queue = sdata->vif.hw_queue[skb_get_queue_mapping(skb)]; - ieee80211_tx_stats(dev, skb->len); + dev_sw_netstats_tx_add(dev, 1, skb->len); sta->tx_stats.bytes[skb_get_queue_mapping(skb)] += skb->len; sta->tx_stats.packets[skb_get_queue_mapping(skb)]++; From patchwork Thu Nov 12 11:11:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1398860 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=XtJAfKg8; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CWzTC3KRwz9sRR for ; Thu, 12 Nov 2020 22:12:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727966AbgKLLML (ORCPT ); Thu, 12 Nov 2020 06:12:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727035AbgKLLMJ (ORCPT ); Thu, 12 Nov 2020 06:12:09 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 908C0C0613D1; Thu, 12 Nov 2020 03:12:09 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id 33so5558941wrl.7; Thu, 12 Nov 2020 03:12:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t1pdCeyp/Dvzku3Y54x16meEdju3+1zInH0bmOMDDL0=; b=XtJAfKg8cmV/weC4CRM0DfyVs6/MmiX/gtIGuFegWgMaPHAg/Sm2ZMgBs6NAlDSxG3 Dk2Wx50IcCLt+PF2mn3CfEaoKMHX+WrMB4oTfihQeXZejwZW9qAsbv/SBJe2dpDPT6vu rnUJcp9+MwooScc7SjIR7+pEWrY63qgM4dRjZcynqwGqHU1FfuEvC9WcsSD6hM2Snxa1 T8Z0HcpLo/mFl0rcT/Qu3j6W/v7Mmujy5ep7ckxehw+2AUHRo7PrA2k+e2h/U/flduSO f5EO9GD+f/EyvK3pfYJZer8yfpzliQKOp77D8ei241UcvngqiCcYdC20Qyp/wzlHobUz YCCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=t1pdCeyp/Dvzku3Y54x16meEdju3+1zInH0bmOMDDL0=; b=t9nBzLoPh1SdwWv6jFQ1IINbjCckmdpL9mK6QKAgpdS1ijVOPjakHUqINiJ5K3Gn+P IQrqXipBXwvpiABssTNpn6lpW36abUQM9/tEBUiAacrTtdrABkpnxO1CUiX77u43IepQ bejO7q5JkAo9LgaWVv1nMU3Q+yTPZQqWR3std6FZjwHnR/o7np/pB7zte0Wx2pKBvmdK nKOe7TR6zGVoo4zIPmKnzdPBTVYOyLKs1HNr5sd/8uuxlMrjd2AW5I3vEv/pFpdMIWQ2 tSPQL+QrTXkYK78fXL5YWPQAZkCM8Ru9n/ZXjbPuMjMgiWZ0kM2MOIf0uXRA4g3d7pZA E0zg== X-Gm-Message-State: AOAM532p/0wQFe6+xWMUO7p1OVDv2R+43bwg9qoo7WlwSMZenJNJwM8j k5QQ34aAshdPJRWFHFWDDIk= X-Google-Smtp-Source: ABdhPJzJDOVpqsF4ZiSXu2YN5wygEyo1lKeDDy737wWNYVM3m1V1uU+4CpHeLusXvUQ0WYX5LKy7Ng== X-Received: by 2002:adf:ea03:: with SMTP id q3mr5462838wrm.141.1605179528311; Thu, 12 Nov 2020 03:12:08 -0800 (PST) Received: from ubux1.panoulu.local ([2a00:1d50:3:0:1cd1:d2e:7b13:dc30]) by smtp.gmail.com with ESMTPSA id g11sm6456484wrq.7.2020.11.12.03.12.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 03:12:07 -0800 (PST) From: Lev Stipakov X-Google-Original-From: Lev Stipakov To: Pravin B Shelar , "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, dev@openvswitch.org, linux-kernel@vger.kernel.org Cc: Lev Stipakov Subject: [PATCH 2/3] net: openvswitch: use core API for updating TX stats Date: Thu, 12 Nov 2020 13:11:50 +0200 Message-Id: <20201112111150.34361-1-lev@openvpn.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats. Use this function instead of own code. While on it, replace "len" variable with "skb->len". Signed-off-by: Lev Stipakov --- net/openvswitch/vport-internal_dev.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/net/openvswitch/vport-internal_dev.c b/net/openvswitch/vport-internal_dev.c index 1e30d8df3ba5..116738d36e02 100644 --- a/net/openvswitch/vport-internal_dev.c +++ b/net/openvswitch/vport-internal_dev.c @@ -33,23 +33,17 @@ static struct internal_dev *internal_dev_priv(struct net_device *netdev) static netdev_tx_t internal_dev_xmit(struct sk_buff *skb, struct net_device *netdev) { - int len, err; + int err; - len = skb->len; rcu_read_lock(); err = ovs_vport_receive(internal_dev_priv(netdev)->vport, skb, NULL); rcu_read_unlock(); - if (likely(!err)) { - struct pcpu_sw_netstats *tstats = this_cpu_ptr(netdev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->tx_bytes += len; - tstats->tx_packets++; - u64_stats_update_end(&tstats->syncp); - } else { + if (likely(!err)) + dev_sw_netstats_tx_add(netdev, 1, skb->len); + else netdev->stats.tx_errors++; - } + return NETDEV_TX_OK; } From patchwork Thu Nov 12 11:13:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 1398863 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=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=CWvGy/v/; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CWzXb4tQYz9sS8 for ; Thu, 12 Nov 2020 22:15:11 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727995AbgKLLPD (ORCPT ); Thu, 12 Nov 2020 06:15:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725902AbgKLLO7 (ORCPT ); Thu, 12 Nov 2020 06:14:59 -0500 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98FA9C0613D1; Thu, 12 Nov 2020 03:14:59 -0800 (PST) Received: by mail-wr1-x443.google.com with SMTP id o15so5574391wru.6; Thu, 12 Nov 2020 03:14:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BdT6UiNPeuKqH8weoNwVCRBG/yR7CRLpN9ozhwUo2p4=; b=CWvGy/v/GU7OHushkVvX56H3IaS6FKG8pyx/X+YqcOp9oaaezrCjjLasjjH1D35+9m MilQAHvGkyk8HKcOaqWHs3wpfXrSWwyIu/jGGx4wTfYBYMuyII5yyjZpljpe/ro2xM/u W/2M5nxFK/XE38eaU4xPIbHM6IKHJomulVEG94/yKSozBrTUzA1ehI3hrQ3KFs2nnMfk NOcqeqDlX5t41Q9Pso0a+oVTv8b9yrG3SgW7w3XPkI7cy/wD8eGFRhuZKTuGjkbfR37b hhO8WM5LBXDvYV8D0w6hDfxndE9/B+Ct70PGgciubZmT/vi4lSEP+uMIgYj3CZk7tVTG Yt3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=BdT6UiNPeuKqH8weoNwVCRBG/yR7CRLpN9ozhwUo2p4=; b=sfD5rtBCY597MEO5PgJKwZU/sSe3Yjpj0xePrYhD6N/gd1f4HLSEm5p1ySS1N3UCyz AuJnbxmS/FLTVCp9CCq41Fx2Et5+oNtidTgPxEsaN3SapryrD1nUKp88ubd3ia4ahi0q sLdIQHJJZVZhN346qxxYM1CHvKHb3X8Yr4AxbWM3gGXsWfe/eBu7Ip76Uxlw9rzOjBNR F/Arc+XzLf7NglDxKiWDGwvkxV3KT66H8pdRM8A1cKhuLa0uS19zaB5ewFYhQKUkUpcA i3ZBB7DlTKjHNqd7yAAqJyOTX55GX6jI6CTTuSEqaiT5pR779/TRIoGaRbny5AZjgG52 mnzw== X-Gm-Message-State: AOAM5309A0CaelQF8ESQU81HIV/9ktXlAFZHTyrNHVv5YFwlqqgipo0J N02HR6dHYPyDjwuEU7gz3iU= X-Google-Smtp-Source: ABdhPJz9bzrYPVImLOUskADu1QXasfhmiyDcSxG6xGnDivt9jOIZvucLKrnJuRp6aVBlonjaCnUzKg== X-Received: by 2002:adf:fec5:: with SMTP id q5mr22107443wrs.245.1605179698195; Thu, 12 Nov 2020 03:14:58 -0800 (PST) Received: from ubux1.panoulu.local ([2a00:1d50:3:0:1cd1:d2e:7b13:dc30]) by smtp.gmail.com with ESMTPSA id t13sm6563447wru.67.2020.11.12.03.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Nov 2020 03:14:57 -0800 (PST) From: Lev Stipakov X-Google-Original-From: Lev Stipakov To: Steffen Klassert , Herbert Xu , "David S. Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Lev Stipakov Subject: [PATCH 3/3] net: xfrm: use core API for updating TX stats Date: Thu, 12 Nov 2020 13:13:45 +0200 Message-Id: <20201112111345.34625-1-lev@openvpn.net> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit d3fd65484c781 ("net: core: add dev_sw_netstats_tx_add") has added function "dev_sw_netstats_tx_add()" to update net device per-cpu TX stats. Use this function instead of own code. Signed-off-by: Lev Stipakov --- net/xfrm/xfrm_interface.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/net/xfrm/xfrm_interface.c b/net/xfrm/xfrm_interface.c index 9b8e292a7c6a..43ee4c5a6fa9 100644 --- a/net/xfrm/xfrm_interface.c +++ b/net/xfrm/xfrm_interface.c @@ -319,12 +319,7 @@ xfrmi_xmit2(struct sk_buff *skb, struct net_device *dev, struct flowi *fl) err = dst_output(xi->net, skb->sk, skb); if (net_xmit_eval(err) == 0) { - struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); - - u64_stats_update_begin(&tstats->syncp); - tstats->tx_bytes += length; - tstats->tx_packets++; - u64_stats_update_end(&tstats->syncp); + dev_sw_netstats_tx_add(dev, 1, length); } else { stats->tx_errors++; stats->tx_aborted_errors++;