Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/889420/?format=api
{ "id": 889420, "url": "http://patchwork.ozlabs.org/api/patches/889420/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180322151434.24338-2-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": "<20180322151434.24338-2-bjorn.topel@gmail.com>", "list_archive_url": null, "date": "2018-03-22T15:14:34", "name": "[v3,2/2] i40e: add support for XDP_REDIRECT", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e8499bb8c2fee5909793cb8da9928b282e89ae4c", "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/20180322151434.24338-2-bjorn.topel@gmail.com/mbox/", "series": [ { "id": 35268, "url": "http://patchwork.ozlabs.org/api/series/35268/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=35268", "date": "2018-03-22T15:14:34", "name": "[v3,1/2] i40e: tweak page counting for XDP_REDIRECT", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/35268/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/889420/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/889420/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" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 406VZw5hV8z9s12\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 23 Mar 2018 02:14:48 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A43D48A160;\n\tThu, 22 Mar 2018 15:14:46 +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 46G2c0ouWGKj; Thu, 22 Mar 2018 15:14:45 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DE6AA8A11E;\n\tThu, 22 Mar 2018 15:14:45 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 58FCD1C0496\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 15:14:44 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 560548A11E\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 15:14:44 +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 QaVvFpNCDplW for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 15:14:43 +0000 (UTC)", "from mga12.intel.com (mga12.intel.com [192.55.52.136])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id B334189F93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 22 Mar 2018 15:14:43 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t22 Mar 2018 08:14:43 -0700", "from alinassi-mobl1.ger.corp.intel.com (HELO\n\tbtopel-mobl1.isw.intel.com) ([10.252.51.52])\n\tby fmsmga001.fm.intel.com with ESMTP; 22 Mar 2018 08:14:41 -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.48,345,1517904000\"; d=\"scan'208\";a=\"40296615\"", "From": "=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@gmail.com>", "To": "jeffrey.t.kirsher@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Thu, 22 Mar 2018 16:14:34 +0100", "Message-Id": "<20180322151434.24338-2-bjorn.topel@gmail.com>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<20180322151434.24338-1-bjorn.topel@gmail.com>", "References": "<20180322151434.24338-1-bjorn.topel@gmail.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH v3 2/2] i40e: add support for XDP_REDIRECT", "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": "netdev@vger.kernel.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?=\n\t<bjorn.topel@intel.com>, magnus.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\nThe driver now acts upon the XDP_REDIRECT return action. Two new ndos\nare implemented, ndo_xdp_xmit and ndo_xdp_flush.\n\nXDP_REDIRECT action enables XDP program to redirect frames to other\nnetdevs.\n\nSigned-off-by: Björn Töpel <bjorn.topel@intel.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 74 +++++++++++++++++++++++++----\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +\n 3 files changed, 68 insertions(+), 10 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c\nindex 79ab52276d12..2fb4261b4fd9 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_main.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c\n@@ -11815,6 +11815,8 @@ static const struct net_device_ops i40e_netdev_ops = {\n \t.ndo_bridge_getlink\t= i40e_ndo_bridge_getlink,\n \t.ndo_bridge_setlink\t= i40e_ndo_bridge_setlink,\n \t.ndo_bpf\t\t= i40e_xdp,\n+\t.ndo_xdp_xmit\t\t= i40e_xdp_xmit,\n+\t.ndo_xdp_flush\t\t= i40e_xdp_flush,\n };\n \n /**\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 2f817d1466eb..53dc74d4d1db 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2214,7 +2214,7 @@ static int i40e_xmit_xdp_ring(struct xdp_buff *xdp,\n static struct sk_buff *i40e_run_xdp(struct i40e_ring *rx_ring,\n \t\t\t\t struct xdp_buff *xdp)\n {\n-\tint result = I40E_XDP_PASS;\n+\tint err, result = I40E_XDP_PASS;\n \tstruct i40e_ring *xdp_ring;\n \tstruct bpf_prog *xdp_prog;\n \tu32 act;\n@@ -2233,6 +2233,10 @@ static struct sk_buff *i40e_run_xdp(struct i40e_ring *rx_ring,\n \t\txdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];\n \t\tresult = i40e_xmit_xdp_ring(xdp, xdp_ring);\n \t\tbreak;\n+\tcase XDP_REDIRECT:\n+\t\terr = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);\n+\t\tresult = !err ? I40E_XDP_TX : I40E_XDP_CONSUMED;\n+\t\tbreak;\n \tdefault:\n \t\tbpf_warn_invalid_xdp_action(act);\n \tcase XDP_ABORTED:\n@@ -2268,6 +2272,15 @@ static void i40e_rx_buffer_flip(struct i40e_ring *rx_ring,\n #endif\n }\n \n+static inline void i40e_xdp_ring_update_tail(struct i40e_ring *xdp_ring)\n+{\n+\t/* Force memory writes to complete before letting h/w\n+\t * know there are new descriptors to fetch.\n+\t */\n+\twmb();\n+\twritel_relaxed(xdp_ring->next_to_use, xdp_ring->tail);\n+}\n+\n /**\n * i40e_clean_rx_irq - Clean completed descriptors from Rx ring - bounce buf\n * @rx_ring: rx descriptor ring to transact packets on\n@@ -2402,16 +2415,11 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)\n \t}\n \n \tif (xdp_xmit) {\n-\t\tstruct i40e_ring *xdp_ring;\n-\n-\t\txdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];\n+\t\tstruct i40e_ring *xdp_ring =\n+\t\t\trx_ring->vsi->xdp_rings[rx_ring->queue_index];\n \n-\t\t/* Force memory writes to complete before letting h/w\n-\t\t * know there are new descriptors to fetch.\n-\t\t */\n-\t\twmb();\n-\n-\t\twritel_relaxed(xdp_ring->next_to_use, xdp_ring->tail);\n+\t\ti40e_xdp_ring_update_tail(xdp_ring);\n+\t\txdp_do_flush_map();\n \t}\n \n \trx_ring->skb = skb;\n@@ -3659,3 +3667,49 @@ netdev_tx_t i40e_lan_xmit_frame(struct sk_buff *skb, struct net_device *netdev)\n \n \treturn i40e_xmit_frame_ring(skb, tx_ring);\n }\n+\n+/**\n+ * i40e_xdp_xmit - Implements ndo_xdp_xmit\n+ * @dev: netdev\n+ * @xdp: XDP buffer\n+ *\n+ * Returns Zero if sent, else an error code\n+ **/\n+int i40e_xdp_xmit(struct net_device *dev, struct xdp_buff *xdp)\n+{\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+\tint err;\n+\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+\t\treturn -ENXIO;\n+\n+\terr = i40e_xmit_xdp_ring(xdp, vsi->xdp_rings[queue_index]);\n+\tif (err != I40E_XDP_TX)\n+\t\treturn -ENOSPC;\n+\n+\treturn 0;\n+}\n+\n+/**\n+ * i40e_xdp_flush - Implements ndo_xdp_flush\n+ * @dev: netdev\n+ **/\n+void i40e_xdp_flush(struct net_device *dev)\n+{\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+\n+\tif (test_bit(__I40E_VSI_DOWN, vsi->state))\n+\t\treturn;\n+\n+\tif (!i40e_enabled_xdp_vsi(vsi) || queue_index >= vsi->num_queue_pairs)\n+\t\treturn;\n+\n+\ti40e_xdp_ring_update_tail(vsi->xdp_rings[queue_index]);\n+}\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex 2444f338bb0c..a97e59721393 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -510,6 +510,8 @@ u32 i40e_get_tx_pending(struct i40e_ring *ring, bool in_sw);\n void i40e_detect_recover_hung(struct i40e_vsi *vsi);\n int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size);\n bool __i40e_chk_linearize(struct sk_buff *skb);\n+int i40e_xdp_xmit(struct net_device *dev, struct xdp_buff *xdp);\n+void i40e_xdp_flush(struct net_device *dev);\n \n /**\n * i40e_get_head - Retrieve head from head writeback\n", "prefixes": [ "v3", "2/2" ] }