Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/961895/?format=api
{ "id": 961895, "url": "http://patchwork.ozlabs.org/api/patches/961895/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180824112159.32298-1-bjorn.topel@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20180824112159.32298-1-bjorn.topel@intel.com>", "list_archive_url": null, "date": "2018-08-24T11:21:59", "name": "i40e: report correct statistics when XDP is enabled", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "283913d4092cd0e6a3a52162572c4028cd84ebdc", "submitter": { "id": 74684, "url": "http://patchwork.ozlabs.org/api/people/74684/?format=api", "name": "Björn Töpel", "email": "bjorn.topel@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180824112159.32298-1-bjorn.topel@intel.com/mbox/", "series": [ { "id": 62369, "url": "http://patchwork.ozlabs.org/api/series/62369/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=62369", "date": "2018-08-24T11:21:59", "name": "i40e: report correct statistics when XDP is enabled", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/62369/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/961895/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/961895/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41xlNb4b0pz9s4V\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 25 Aug 2018 01:21:02 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 125238695E;\n\tFri, 24 Aug 2018 15:21:01 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id DZrcP9hvn5Kw; Fri, 24 Aug 2018 15:21:00 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 817E986940;\n\tFri, 24 Aug 2018 15:21:00 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id BFCAA1BF8B3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 24 Aug 2018 11:22:16 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id BA6A722629\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 24 Aug 2018 11:22:16 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id RixpOk6AuLpo for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 24 Aug 2018 11:22:16 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 190BF22671\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 24 Aug 2018 11:22:16 +0000 (UTC)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t24 Aug 2018 04:22:14 -0700", "from abazhenx-mobl1.ccr.corp.intel.com (HELO\n\tbtopel-mobl1.isw.intel.com) ([10.252.35.184])\n\tby orsmga008.jf.intel.com with ESMTP; 24 Aug 2018 04:22:10 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.53,281,1531810800\"; d=\"scan'208\";a=\"67807085\"", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>", "To": "jeffrey.t.kirsher@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 24 Aug 2018 13:21:59 +0200", "Message-Id": "<20180824112159.32298-1-bjorn.topel@intel.com>", "X-Mailer": "git-send-email 2.17.1", "MIME-Version": "1.0", "X-Mailman-Approved-At": "Fri, 24 Aug 2018 15:20:59 +0000", "Subject": "[Intel-wired-lan] [PATCH] i40e: report correct statistics when XDP\n\tis enabled", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Cc": "brouer@redhat.com, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?=\n\t<bjorn.topel@intel.com>, magnus.karlsson@gmail.com,\n\tmagnus.karlsson@intel.com", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "When XDP is enabled, the driver will report incorrect\nstatistics. Received frames will reported as transmitted frames.\n\nThis commits fixes the i40e implementation of ndo_get_stats64 (struct\nnet_device_ops), so that iproute2 will report correct statistics\n(e.g. when running \"ip -stats link show dev eth0\") even when XDP is\nenabled.\n\nReported-by: Jesper Dangaard Brouer <brouer@redhat.com>\nFixes: 74608d17fe29 (\"i40e: add support for XDP_TX action\")\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 24 +++++++++++----------\n 1 file changed, 13 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex e40c023cc7b6..7c122dd3faa1 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -425,9 +425,9 @@ static void i40e_get_netdev_stats_struct(struct net_device *netdev,\n \t\t\t\t struct rtnl_link_stats64 *stats)\n {\n \tstruct i40e_netdev_priv *np = netdev_priv(netdev);\n-\tstruct i40e_ring *tx_ring, *rx_ring;\n \tstruct i40e_vsi *vsi = np->vsi;\n \tstruct rtnl_link_stats64 *vsi_stats = i40e_get_vsi_stats_struct(vsi);\n+\tstruct i40e_ring *ring;\n \tint i;\n \n \tif (test_bit(__I40E_VSI_DOWN, vsi->state))\n@@ -441,24 +441,26 @@ static void i40e_get_netdev_stats_struct(struct net_device *netdev,\n \t\tu64 bytes, packets;\n \t\tunsigned int start;\n \n-\t\ttx_ring = READ_ONCE(vsi->tx_rings[i]);\n-\t\tif (!tx_ring)\n+\t\tring = READ_ONCE(vsi->tx_rings[i]);\n+\t\tif (!ring)\n \t\t\tcontinue;\n-\t\ti40e_get_netdev_stats_struct_tx(tx_ring, stats);\n+\t\ti40e_get_netdev_stats_struct_tx(ring, stats);\n \n-\t\trx_ring = &tx_ring[1];\n+\t\tif (i40e_enabled_xdp_vsi(vsi)) {\n+\t\t\tring++;\n+\t\t\ti40e_get_netdev_stats_struct_tx(ring, stats);\n+\t\t}\n \n+\t\tring++;\n \t\tdo {\n-\t\t\tstart = u64_stats_fetch_begin_irq(&rx_ring->syncp);\n-\t\t\tpackets = rx_ring->stats.packets;\n-\t\t\tbytes = rx_ring->stats.bytes;\n-\t\t} while (u64_stats_fetch_retry_irq(&rx_ring->syncp, start));\n+\t\t\tstart = u64_stats_fetch_begin_irq(&ring->syncp);\n+\t\t\tpackets = ring->stats.packets;\n+\t\t\tbytes = ring->stats.bytes;\n+\t\t} while (u64_stats_fetch_retry_irq(&ring->syncp, start));\n \n \t\tstats->rx_packets += packets;\n \t\tstats->rx_bytes += bytes;\n \n-\t\tif (i40e_enabled_xdp_vsi(vsi))\n-\t\t\ti40e_get_netdev_stats_struct_tx(&rx_ring[1], stats);\n \t}\n \trcu_read_unlock();\n \n", "prefixes": [] }