Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1042124/?format=api
{ "id": 1042124, "url": "http://patchwork.ozlabs.org/api/patches/1042124/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190214130302.29434-1-bjorn.topel@gmail.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": "<20190214130302.29434-1-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2019-02-14T13:03:02", "name": "[net] i40e: fix XDP_REDIRECT/XDP xmit ring cleanup race", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "12754fca93d4706abf58012fae583b6b123b67f9", "submitter": { "id": 70569, "url": "http://patchwork.ozlabs.org/api/people/70569/?format=api", "name": "Björn Töpel", "email": "bjorn.topel@gmail.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/20190214130302.29434-1-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 91991, "url": "http://patchwork.ozlabs.org/api/series/91991/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=91991", "date": "2019-02-14T13:03:02", "name": "[net] i40e: fix XDP_REDIRECT/XDP xmit ring cleanup race", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/91991/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1042124/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1042124/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.133; helo=hemlock.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=gmail.com", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"n+wTNx+q\"; dkim-atps=neutral" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 440c5c6yC4z9sML\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 15 Feb 2019 00:03:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id BA5E3875B3;\n\tThu, 14 Feb 2019 13:03:29 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 6JpnPsqe9Aoa; Thu, 14 Feb 2019 13:03:26 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 742A187527;\n\tThu, 14 Feb 2019 13:03:26 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 4868A1BF42D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Feb 2019 13:03:25 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 43DBA2341A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Feb 2019 13:03:25 +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 TwG-0TkV-oZY for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Feb 2019 13:03:24 +0000 (UTC)", "from mail-pf1-f195.google.com (mail-pf1-f195.google.com\n\t[209.85.210.195])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 8C703227E1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Feb 2019 13:03:24 +0000 (UTC)", "by mail-pf1-f195.google.com with SMTP id j18so3098510pfe.1\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 14 Feb 2019 05:03:24 -0800 (PST)", "from btopel-mobl.ger.intel.com ([192.55.54.45])\n\tby smtp.gmail.com with ESMTPSA id\n\to85sm5735428pfi.105.2019.02.14.05.03.19\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 14 Feb 2019 05:03:22 -0800 (PST)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=lDy1DCHBXZRItP1ANKUY8Bib2ggcM7hedgaiPMyrEnk=;\n\tb=n+wTNx+qa/z93rfgCqzwVRbB4MO36EdIylTPxmd7Yg3wCa8mSR9U4oTDtiEIYpRXF+\n\tzLZDkXA1bg2/t54JAV0Qzm6PKeI4+ps3uQ2LkJih9GSg+Q7fXK7kgrnRA1+34ncyVOyy\n\tbUf/3ZeAC5wTO4HLmNHe7JRmWJu2FpBaRQfpIouYTstZZTk45D5CHjMJ980W8Q9wtncl\n\tTB5g4lP9OJ0sZd/CBGQldVB3UNJN+RScOwjrWfaDs/7bdUg6qvvjZfLYQXh98QWyAq50\n\th1w/DrN6AaQHqYwcR6KzVEL+9Lv+NIoltNMUV2VfjsKmNaLetxvKkudnPK6vn8wPWRmh\n\tayYA==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=lDy1DCHBXZRItP1ANKUY8Bib2ggcM7hedgaiPMyrEnk=;\n\tb=XoHiUwpofOlhKUM3emlLnk47EO8nTwbfrFkoVGCSf6bNNbxFrqL5GtA0FNchU9LIDE\n\tZQ3J55A8KYX/7iO7RHbcIN+VJJIAcDaYunQARw5ZDU4eh4qYqUgLvnzlfuREU9ZvYkxD\n\t7ujIvuOy5rnMxmvwFgNWc7rj9wJsXLwyP87v1Q+3ULydDbwMd+bCGhNFXCePo0FhiYEp\n\t4w/rIUd0NGp6vN5l2vJyOYkuylQsqw/tdwe3Bcc3lw4knNeYEAQyxsIUEugMu9aqyAQn\n\tbxqLT/vKNH66N0grh4MYZ4CU+2HxX/Bo++BFxrP7xWn5RnbmpILKtD+92vhdOFoq72lg\n\tjtJQ==", "X-Gm-Message-State": "AHQUAuZmBYtJQG11Yt3bjAyn5oTxWRgyd8xkHp2GYNnrvFOuet/0c3pA\n\t6LNp9QSS2HbDZKUBkYBCl0WuYkoFLDTtZQ==", "X-Google-Smtp-Source": "AHgI3IZaMTb8XJsquYeu8AlJdGeBfl/wgW0y5ymloXk7eKIxZjqaUue9x0kMEgcaCCTQBpqE3A+36A==", "X-Received": "by 2002:a62:ee13:: with SMTP id\n\te19mr3926345pfi.224.1550149403547; \n\tThu, 14 Feb 2019 05:03:23 -0800 (PST)", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 14 Feb 2019 14:03:02 +0100", "Message-Id": "<20190214130302.29434-1-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.19.1", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH net] i40e: fix XDP_REDIRECT/XDP xmit ring\n\tcleanup race", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "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": "maciej.fijalkowski@intel.com, netdev@vger.kernel.org, brouer@redhat.com, \n\t=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.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": "From: Björn Töpel <bjorn.topel@intel.com>\n\nWhen the driver clears the XDP xmit ring due to re-configuration or\nteardown, in-progress ndo_xdp_xmit must be taken into consideration.\n\nThe ndo_xdp_xmit function is typically called from a napi context that\nthe driver does not control. Therefore, we must be careful not to\nclear the XDP ring, while the call is on-going. This patch adds a\nsynchronize_rcu() to wait for napi(s) (preempt-disable regions and\nsoftirqs), prior clearing the queue. Further, the __I40E_CONFIG_BUSY\nflag is checked in the ndo_xdp_xmit implementation to avoid touching\nthe XDP xmit queue during re-configuration.\n\nFixes: d9314c474d4f (\"i40e: add support for XDP_REDIRECT\")\nFixes: 123cecd427b6 (\"i40e: added queue pair disable/enable functions\")\nReported-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 14 ++++++++++++--\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +++-\n 2 files changed, 15 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f52e2c46e6a7..6a54a1e2f4ae 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -6725,8 +6725,13 @@ void i40e_down(struct i40e_vsi *vsi)\n \n \tfor (i = 0; i < vsi->num_queue_pairs; i++) {\n \t\ti40e_clean_tx_ring(vsi->tx_rings[i]);\n-\t\tif (i40e_enabled_xdp_vsi(vsi))\n+\t\tif (i40e_enabled_xdp_vsi(vsi)) {\n+\t\t\t/* Make sure that in-progress ndo_xdp_xmit\n+\t\t\t * calls are completed.\n+\t\t\t */\n+\t\t\tsynchronize_rcu();\n \t\t\ti40e_clean_tx_ring(vsi->xdp_rings[i]);\n+\t\t}\n \t\ti40e_clean_rx_ring(vsi->rx_rings[i]);\n \t}\n \n@@ -11955,8 +11960,13 @@ static void i40e_queue_pair_reset_stats(struct i40e_vsi *vsi, int queue_pair)\n static void i40e_queue_pair_clean_rings(struct i40e_vsi *vsi, int queue_pair)\n {\n \ti40e_clean_tx_ring(vsi->tx_rings[queue_pair]);\n-\tif (i40e_enabled_xdp_vsi(vsi))\n+\tif (i40e_enabled_xdp_vsi(vsi)) {\n+\t\t/* Make sure that in-progress ndo_xdp_xmit calls are\n+\t\t * completed.\n+\t\t */\n+\t\tsynchronize_rcu();\n \t\ti40e_clean_tx_ring(vsi->xdp_rings[queue_pair]);\n+\t}\n \ti40e_clean_rx_ring(vsi->rx_rings[queue_pair]);\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex a7e14e98889f..6c97667d20ef 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -3709,6 +3709,7 @@ int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,\n \tstruct i40e_netdev_priv *np = netdev_priv(dev);\n \tunsigned int queue_index = smp_processor_id();\n \tstruct i40e_vsi *vsi = np->vsi;\n+\tstruct i40e_pf *pf = vsi->back;\n \tstruct i40e_ring *xdp_ring;\n \tint drops = 0;\n \tint i;\n@@ -3716,7 +3717,8 @@ int i40e_xdp_xmit(struct net_device *dev, int n, struct xdp_frame **frames,\n \tif (test_bit(__I40E_VSI_DOWN, vsi->state))\n \t\treturn -ENETDOWN;\n \n-\tif (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs)\n+\tif (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs ||\n+\t test_bit(__I40E_CONFIG_BUSY, pf->state))\n \t\treturn -ENXIO;\n \n \tif (unlikely(flags & ~XDP_XMIT_FLAGS_MASK))\n", "prefixes": [ "net" ] }