Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1033029/?format=api
{ "id": 1033029, "url": "http://patchwork.ozlabs.org/api/patches/1033029/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1548770630-16189-1-git-send-email-magnus.karlsson@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": "<1548770630-16189-1-git-send-email-magnus.karlsson@intel.com>", "list_archive_url": null, "date": "2019-01-29T14:03:50", "name": "[net] ixgbe: fix potential RX buffer starvation for AF_XDP", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d17f6d321cdde3ab837ac8cdc3becd117fa7b122", "submitter": { "id": 72726, "url": "http://patchwork.ozlabs.org/api/people/72726/?format=api", "name": "Magnus Karlsson", "email": "magnus.karlsson@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/1548770630-16189-1-git-send-email-magnus.karlsson@intel.com/mbox/", "series": [ { "id": 88932, "url": "http://patchwork.ozlabs.org/api/series/88932/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=88932", "date": "2019-01-29T14:03:50", "name": "[net] ixgbe: fix potential RX buffer starvation for AF_XDP", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/88932/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1033029/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1033029/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 ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 43q1P60rzgz9sC7\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Jan 2019 09:28:41 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2C1F08608D;\n\tTue, 29 Jan 2019 22:28:40 +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 vqM1TWp6cn3l; Tue, 29 Jan 2019 22:28:39 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id AA6A4860AD;\n\tTue, 29 Jan 2019 22:28:38 +0000 (UTC)", "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\tby ash.osuosl.org (Postfix) with ESMTP id 01C751BF2A0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:04:00 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id F31B185F8C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:59 +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 6HHPu_HwxyLj for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:59 +0000 (UTC)", "from mga18.intel.com (mga18.intel.com [134.134.136.126])\n\tby fraxinus.osuosl.org (Postfix) with ESMTPS id 307BD84DFD\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:59 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Jan 2019 06:03:58 -0800", "from mkarlsso-mobl.ger.corp.intel.com (HELO VM.isw.intel.com)\n\t([10.103.211.42])\n\tby orsmga004.jf.intel.com with ESMTP; 29 Jan 2019 06:03:57 -0800" ], "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.56,537,1539673200\"; d=\"scan'208\";a=\"270823493\"", "From": "Magnus Karlsson <magnus.karlsson@intel.com>", "To": "magnus.karlsson@intel.com, bjorn.topel@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 29 Jan 2019 15:03:50 +0100", "Message-Id": "<1548770630-16189-1-git-send-email-magnus.karlsson@intel.com>", "X-Mailer": "git-send-email 2.7.4", "X-Mailman-Approved-At": "Tue, 29 Jan 2019 22:28:37 +0000", "Subject": "[Intel-wired-lan] [PATCH net] ixgbe: fix potential RX buffer\n\tstarvation for AF_XDP", "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": "netdev@vger.kernel.org", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "When the RX rings are created they are also populated with buffers so\nthat packets can be received. Usually these are kernel buffers, but\nfor AF_XDP in zero-copy mode, these are user-space buffers and in this\ncase the application might not have sent down any buffers to the\ndriver at this point. And if no buffers are allocated at ring creation\ntime, no packets can be received and no interupts will be generated so\nthe napi poll function that allocates buffers to the rings will never\nget executed.\n\nTo recitfy this, we kick the NAPI context of any queue with an\nattached AF_XDP zero-copy socket in two places in the code. Once after\nan XDP program has loaded and once after the umem is registered. This\ntake care of both cases: XDP program gets loaded first then AF_XDP\nsocket is created, and the reverse, AF_XDP socket is created first,\nthen XDP program is loaded.\n\nFixes: d0bcacd0a130 (\"ixgbe: add AF_XDP zero-copy Rx support\")\nSigned-off-by: Magnus Karlsson <magnus.karlsson@intel.com>\n---\n drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 12 +++++++++++-\n drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 12 ++++++++++--\n 2 files changed, 21 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\nindex daff818..017c930 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c\n@@ -10225,6 +10225,7 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)\n \tint i, frame_size = dev->mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN;\n \tstruct ixgbe_adapter *adapter = netdev_priv(dev);\n \tstruct bpf_prog *old_prog;\n+\tbool need_reset;\n \n \tif (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)\n \t\treturn -EINVAL;\n@@ -10247,9 +10248,10 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)\n \t\treturn -ENOMEM;\n \n \told_prog = xchg(&adapter->xdp_prog, prog);\n+\tneed_reset = (!!prog != !!old_prog);\n \n \t/* If transitioning XDP modes reconfigure rings */\n-\tif (!!prog != !!old_prog) {\n+\tif (need_reset) {\n \t\tint err = ixgbe_setup_tc(dev, adapter->hw_tcs);\n \n \t\tif (err) {\n@@ -10265,6 +10267,14 @@ static int ixgbe_xdp_setup(struct net_device *dev, struct bpf_prog *prog)\n \tif (old_prog)\n \t\tbpf_prog_put(old_prog);\n \n+\t/* Kick start the NAPI context if there is an AF_XDP socket open\n+\t * on that queue id. This so that receiving will start.\n+\t */\n+\tif (need_reset && prog)\n+\t\tfor (i = 0; i < adapter->num_rx_queues; i++)\n+\t\t\tif (adapter->xdp_ring[i]->xsk_umem)\n+\t\t\t\t(void)ixgbe_xsk_async_xmit(adapter->netdev, i);\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\nindex 65c3e2c..654ae92 100644\n--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c\n@@ -144,11 +144,19 @@ static int ixgbe_xsk_umem_enable(struct ixgbe_adapter *adapter,\n \t\tixgbe_txrx_ring_disable(adapter, qid);\n \n \terr = ixgbe_add_xsk_umem(adapter, umem, qid);\n+\tif (err)\n+\t\treturn err;\n \n-\tif (if_running)\n+\tif (if_running) {\n \t\tixgbe_txrx_ring_enable(adapter, qid);\n \n-\treturn err;\n+\t\t/* Kick start the NAPI context so that receiving will start */\n+\t\terr = ixgbe_xsk_async_xmit(adapter->netdev, qid);\n+\t\tif (err)\n+\t\t\treturn err;\n+\t}\n+\n+\treturn 0;\n }\n \n static int ixgbe_xsk_umem_disable(struct ixgbe_adapter *adapter, u16 qid)\n", "prefixes": [ "net" ] }