Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1033028/?format=api
{ "id": 1033028, "url": "http://patchwork.ozlabs.org/api/patches/1033028/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/1548770597-16141-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": "<1548770597-16141-1-git-send-email-magnus.karlsson@intel.com>", "list_archive_url": null, "date": "2019-01-29T14:03:17", "name": "[net] i40e: fix potential RX buffer starvation for AF_XDP", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6e3c58de87608589ee8127e41684de127f272436", "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/1548770597-16141-1-git-send-email-magnus.karlsson@intel.com/mbox/", "series": [ { "id": 88931, "url": "http://patchwork.ozlabs.org/api/series/88931/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=88931", "date": "2019-01-29T14:03:17", "name": "[net] i40e: fix potential RX buffer starvation for AF_XDP", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/88931/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1033028/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1033028/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=intel.com" ], "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 43q1P45skDz9s9h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 30 Jan 2019 09:28:40 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id EA09587B3D;\n\tTue, 29 Jan 2019 22:28:38 +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 cGY9fzOlv26B; Tue, 29 Jan 2019 22:28:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 6C43587B41;\n\tTue, 29 Jan 2019 22:28:38 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id D3A4D1BF86D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:42 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id D0464854D8\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:42 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id ToMkNquN-Pij for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:42 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 2F4CB85044\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 29 Jan 2019 14:03:42 +0000 (UTC)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t29 Jan 2019 06:03:41 -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:38 -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=\"270823444\"", "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:17 +0100", "Message-Id": "<1548770597-16141-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] i40e: 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\nso that packets can be received. Usually these are kernel buffers,\nbut for AF_XDP in zero-copy mode, these are user-space buffers and\nin this case the application might not have sent down any buffers\nto the driver at this point. And if no buffers are allocated at ring\ncreation time, no packets can be received and no interupts will be\ngenerated so the napi poll function that allocates buffers to the\nrings will never get executed.\n\nTo rectify this, we kick the NAPI context of any queue with an\nattached AF_XDP zero-copy socket in two places in the code. Once\nafter an XDP program has loaded and once after the umem is registered.\nThis take 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: 0a714186d3c0 (\"i40e: add AF_XDP zero-copy Rx support\")\nSigned-off-by: Magnus Karlsson <magnus.karlsson@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 13 ++++++++++++-\n drivers/net/ethernet/intel/i40e/i40e_xsk.c | 5 +++++\n 2 files changed, 17 insertions(+), 1 deletion(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex f52e2c4..3a0990d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -3289,8 +3289,11 @@ static int i40e_configure_rx_ring(struct i40e_ring *ring)\n \t i40e_alloc_rx_buffers_zc(ring, I40E_DESC_UNUSED(ring)) :\n \t !i40e_alloc_rx_buffers(ring, I40E_DESC_UNUSED(ring));\n \tif (!ok) {\n+\t\t/* Log this in case the user has forgotten to give the kernel\n+\t\t * any buffers, even later in the application.\n+\t\t */\n \t\tdev_info(&vsi->back->pdev->dev,\n-\t\t\t \"Failed allocate some buffers on %sRx ring %d (pf_q %d)\\n\",\n+\t\t\t \"Failed to allocate some buffers on %sRx ring %d (pf_q %d)\\n\",\n \t\t\t ring->xsk_umem ? \"UMEM enabled \" : \"\",\n \t\t\t ring->queue_index, pf_q);\n \t}\n@@ -11895,6 +11898,14 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi,\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 < vsi->num_queue_pairs; i++)\n+\t\t\tif (vsi->xdp_rings[i]->xsk_umem)\n+\t\t\t\t(void)i40e_xsk_async_xmit(vsi->netdev, i);\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\nindex 870cf654..3827f16 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n@@ -183,6 +183,11 @@ static int i40e_xsk_umem_enable(struct i40e_vsi *vsi, struct xdp_umem *umem,\n \t\terr = i40e_queue_pair_enable(vsi, qid);\n \t\tif (err)\n \t\t\treturn err;\n+\n+\t\t/* Kick start the NAPI context so that receiving will start */\n+\t\terr = i40e_xsk_async_xmit(vsi->netdev, qid);\n+\t\tif (err)\n+\t\t\treturn err;\n \t}\n \n \treturn 0;\n", "prefixes": [ "net" ] }