Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/669042/?format=api
{ "id": 669042, "url": "http://patchwork.ozlabs.org/api/patches/669042/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160912221417.5610.37355.stgit@john-Precision-Tower-5810/", "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": "<20160912221417.5610.37355.stgit@john-Precision-Tower-5810>", "list_archive_url": null, "date": "2016-09-12T22:14:17", "name": "[net-next,v3,3/3] e1000: bundle xdp xmit routines", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "1e1e37d4a05f7e500e6d5e660661c89b951d1f25", "submitter": { "id": 20028, "url": "http://patchwork.ozlabs.org/api/people/20028/?format=api", "name": "John Fastabend", "email": "john.fastabend@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/20160912221417.5610.37355.stgit@john-Precision-Tower-5810/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/669042/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/669042/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@lists.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" ], "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 3sY2D33Sgrz9sdn\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 13 Sep 2016 08:14:43 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 0E49789A02;\n\tMon, 12 Sep 2016 22:14:42 +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 E0PrZEMLH7PH; Mon, 12 Sep 2016 22:14:40 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1A34789936;\n\tMon, 12 Sep 2016 22:14:40 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 570A21C2D29\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 22:14:39 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 52C2188897\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 22:14:39 +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 NPyB94J1AxMa for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 22:14:38 +0000 (UTC)", "from mail-oi0-f68.google.com (mail-oi0-f68.google.com\n\t[209.85.218.68])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 38534869C9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 22:14:38 +0000 (UTC)", "by mail-oi0-f68.google.com with SMTP id y2so20262076oie.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 12 Sep 2016 15:14:38 -0700 (PDT)", "from [127.0.1.1] ([72.168.145.204])\n\tby smtp.gmail.com with ESMTPSA id\n\tj10sm6709941ote.37.2016.09.12.15.14.26\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tMon, 12 Sep 2016 15:14:36 -0700 (PDT)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com header.b=LH1LIyy1;\n\tdkim-atps=neutral", "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=20120113;\n\th=from:subject:to:cc:date:message-id:in-reply-to:references\n\t:user-agent:mime-version:content-transfer-encoding;\n\tbh=AuPhzT65Mjh0LNWaDCcwPXIjHysbj9M73mfLrgkoqWw=;\n\tb=LH1LIyy1IjcdM1SE5Iop6HRKtmDRF9KytNHv7tq11CQ5IunB0rhPvPz5+JLN+iScNb\n\tpwH1RIaAPcK/XbEMzUAuVszhJ2rEcD4y7wR1AeFpEaVhPozMlPbxYVKAcai4PADRdP8l\n\tpo6RWAI/YN6mbVg3InddgGqNKZPR7fZpdQSylgdGFJNijI++J/6xSrZHUO+ma6vxb/C5\n\tnnU7kAHpD+Nvj7OuqFqoIAvU4K8AduCMiZ8hBg9xS69SUiHRAa18OAQtx73P351Kla3L\n\tKLq9nOGbsstdNmscf/OCZ4qvXmx3rvn6qQHFL2T617aU01bzpwTrKlVWEvwAY+FBKfVS\n\tIwgw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:from:subject:to:cc:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-transfer-encoding;\n\tbh=AuPhzT65Mjh0LNWaDCcwPXIjHysbj9M73mfLrgkoqWw=;\n\tb=NTBafXKPEjQ7ETZ2tXpQ7zx04eQG4feENUJCyiAVLqz3euHSdvPpLyeT12IqnbOohR\n\td1AZ5unQbSFYjxcaFspZF/Kh8IMqlnjOl8wyDZuLsPpDwf1ebCHx1UrR0CK8J+V0fpu0\n\tmDtIUxn86C6SV7t0R/NyGk2mYoa2/cZbp+An/b1zYg6gY+TiaduHt/sXQpPfEK1R6XAB\n\tzNQW+Fkx2OitKYQEEd60fDk9HRNzIpL+iJIWhpMPYJ6oso8FoaMMaSrGaxfvvNewE9Yh\n\tGyAO5Gx48OQ0y35LAztcG9mlxb2VnyKGRtKO5iI86XbsBgF8umy8baUOB+QSTOTtloE5\n\tDbTA==", "X-Gm-Message-State": "AE9vXwM70iPxS552MaenGkIXz6BhqcqbykRxDFMvmgiJ8hkvlmIbNkJrYmJ/kLAWVCFCCw==", "X-Received": "by 10.202.216.8 with SMTP id p8mr1944131oig.140.1473718477552;\n\tMon, 12 Sep 2016 15:14:37 -0700 (PDT)", "From": "John Fastabend <john.fastabend@gmail.com>", "X-Google-Original-From": "John Fastabend <john.r.fastabend@intel.com>", "To": "bblanco@plumgrid.com, john.fastabend@gmail.com,\n\talexei.starovoitov@gmail.com, jeffrey.t.kirsher@intel.com,\n\tbrouer@redhat.com, davem@davemloft.net", "Date": "Mon, 12 Sep 2016 15:14:17 -0700", "Message-ID": "<20160912221417.5610.37355.stgit@john-Precision-Tower-5810>", "In-Reply-To": "<20160912220312.5610.77528.stgit@john-Precision-Tower-5810>", "References": "<20160912220312.5610.77528.stgit@john-Precision-Tower-5810>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Cc": "xiyou.wangcong@gmail.com, intel-wired-lan@lists.osuosl.org,\n\tu9012063@gmail.com, netdev@vger.kernel.org", "Subject": "[Intel-wired-lan] [net-next PATCH v3 3/3] e1000: bundle xdp xmit\n\troutines", "X-BeenThere": "intel-wired-lan@lists.osuosl.org", "X-Mailman-Version": "2.1.18-1", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.lists.osuosl.org>", "List-Unsubscribe": "<http://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@lists.osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@lists.osuosl.org?subject=help>", "List-Subscribe": "<http://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@lists.osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@lists.osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@lists.osuosl.org>" }, "content": "e1000 supports a single TX queue so it is being shared with the stack\nwhen XDP runs XDP_TX action. This requires taking the xmit lock to\nensure we don't corrupt the tx ring. To avoid taking and dropping the\nlock per packet this patch adds a bundling implementation to submit\na bundle of packets to the xmit routine.\n\nI tested this patch running e1000 in a VM using KVM over a tap\ndevice using pktgen to generate traffic along with 'ping -f -l 100'.\n\nSuggested-by: Jesper Dangaard Brouer <brouer@redhat.com>\nSigned-off-by: John Fastabend <john.r.fastabend@intel.com>\n---\n drivers/net/ethernet/intel/e1000/e1000.h | 10 +++\n drivers/net/ethernet/intel/e1000/e1000_main.c | 80 +++++++++++++++++++------\n 2 files changed, 70 insertions(+), 20 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/e1000/e1000.h b/drivers/net/ethernet/intel/e1000/e1000.h\nindex 5cf8a0a..877b377 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000.h\n+++ b/drivers/net/ethernet/intel/e1000/e1000.h\n@@ -133,6 +133,8 @@ struct e1000_adapter;\n #define E1000_TX_QUEUE_WAKE\t16\n /* How many Rx Buffers do we bundle into one write to the hardware ? */\n #define E1000_RX_BUFFER_WRITE\t16 /* Must be power of 2 */\n+/* How many XDP XMIT buffers to bundle into one xmit transaction */\n+#define E1000_XDP_XMIT_BUNDLE_MAX E1000_RX_BUFFER_WRITE\n \n #define AUTO_ALL_MODES\t\t0\n #define E1000_EEPROM_82544_APM\t0x0004\n@@ -168,6 +170,11 @@ struct e1000_rx_buffer {\n \tdma_addr_t dma;\n };\n \n+struct e1000_rx_buffer_bundle {\n+\tstruct e1000_rx_buffer *buffer;\n+\tu32 length;\n+};\n+\n struct e1000_tx_ring {\n \t/* pointer to the descriptor ring memory */\n \tvoid *desc;\n@@ -206,6 +213,9 @@ struct e1000_rx_ring {\n \tstruct e1000_rx_buffer *buffer_info;\n \tstruct sk_buff *rx_skb_top;\n \n+\t/* array of XDP buffer information structs */\n+\tstruct e1000_rx_buffer_bundle *xdp_buffer;\n+\n \t/* cpu for rx queue */\n \tint cpu;\n \ndiff --git a/drivers/net/ethernet/intel/e1000/e1000_main.c b/drivers/net/ethernet/intel/e1000/e1000_main.c\nindex 232b927..31489d4 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -848,6 +848,15 @@ static int e1000_xdp_set(struct net_device *netdev, struct bpf_prog *prog)\n \tstruct e1000_adapter *adapter = netdev_priv(netdev);\n \tstruct bpf_prog *old_prog;\n \n+\tif (!adapter->rx_ring[0].xdp_buffer) {\n+\t\tint size = sizeof(struct e1000_rx_buffer_bundle) *\n+\t\t\t\tE1000_XDP_XMIT_BUNDLE_MAX;\n+\n+\t\tadapter->rx_ring[0].xdp_buffer = vzalloc(size);\n+\t\tif (!adapter->rx_ring[0].xdp_buffer)\n+\t\t\treturn -ENOMEM;\n+\t}\n+\n \told_prog = xchg(&adapter->prog, prog);\n \tif (old_prog) {\n \t\tsynchronize_net();\n@@ -1319,6 +1328,9 @@ static void e1000_remove(struct pci_dev *pdev)\n \tif (adapter->prog)\n \t\tbpf_prog_put(adapter->prog);\n \n+\tif (adapter->rx_ring[0].xdp_buffer)\n+\t\tvfree(adapter->rx_ring[0].xdp_buffer);\n+\n \tunregister_netdev(netdev);\n \n \te1000_phy_hw_reset(hw);\n@@ -3372,29 +3384,17 @@ static void e1000_tx_map_rxpage(struct e1000_tx_ring *tx_ring,\n \n static void e1000_xmit_raw_frame(struct e1000_rx_buffer *rx_buffer_info,\n \t\t\t\t u32 len,\n+\t\t\t\t struct e1000_adapter *adapter,\n \t\t\t\t struct net_device *netdev,\n-\t\t\t\t struct e1000_adapter *adapter)\n+\t\t\t\t struct e1000_tx_ring *tx_ring)\n {\n-\tstruct netdev_queue *txq = netdev_get_tx_queue(netdev, 0);\n-\tstruct e1000_hw *hw = &adapter->hw;\n-\tstruct e1000_tx_ring *tx_ring;\n+\tconst struct netdev_queue *txq = netdev_get_tx_queue(netdev, 0);\n \n \tif (len > E1000_MAX_DATA_PER_TXD)\n \t\treturn;\n \n-\t/* e1000 only support a single txq at the moment so the queue is being\n-\t * shared with stack. To support this requires locking to ensure the\n-\t * stack and XDP are not running at the same time. Devices with\n-\t * multiple queues should allocate a separate queue space.\n-\t */\n-\tHARD_TX_LOCK(netdev, txq, smp_processor_id());\n-\n-\ttx_ring = adapter->tx_ring;\n-\n-\tif (E1000_DESC_UNUSED(tx_ring) < 2) {\n-\t\tHARD_TX_UNLOCK(netdev, txq);\n+\tif (E1000_DESC_UNUSED(tx_ring) < 2)\n \t\treturn;\n-\t}\n \n \tif (netif_xmit_frozen_or_stopped(txq))\n \t\treturn;\n@@ -3402,7 +3402,36 @@ static void e1000_xmit_raw_frame(struct e1000_rx_buffer *rx_buffer_info,\n \te1000_tx_map_rxpage(tx_ring, rx_buffer_info, len);\n \tnetdev_sent_queue(netdev, len);\n \te1000_tx_queue(adapter, tx_ring, 0/*tx_flags*/, 1);\n+}\n \n+static void e1000_xdp_xmit_bundle(struct e1000_rx_buffer_bundle *buffer_info,\n+\t\t\t\t struct net_device *netdev,\n+\t\t\t\t struct e1000_adapter *adapter)\n+{\n+\tstruct netdev_queue *txq = netdev_get_tx_queue(netdev, 0);\n+\tstruct e1000_tx_ring *tx_ring = adapter->tx_ring;\n+\tstruct e1000_hw *hw = &adapter->hw;\n+\tint i = 0;\n+\n+\t/* e1000 only support a single txq at the moment so the queue is being\n+\t * shared with stack. To support this requires locking to ensure the\n+\t * stack and XDP are not running at the same time. Devices with\n+\t * multiple queues should allocate a separate queue space.\n+\t *\n+\t * To amortize the locking cost e1000 bundles the xmits and send up to\n+\t * E1000_XDP_XMIT_BUNDLE_MAX.\n+\t */\n+\tHARD_TX_LOCK(netdev, txq, smp_processor_id());\n+\n+\tfor (; i < E1000_XDP_XMIT_BUNDLE_MAX && buffer_info[i].buffer; i++) {\n+\t\te1000_xmit_raw_frame(buffer_info[i].buffer,\n+\t\t\t\t buffer_info[i].length,\n+\t\t\t\t adapter, netdev, tx_ring);\n+\t\tbuffer_info[i].buffer = NULL;\n+\t\tbuffer_info[i].length = 0;\n+\t}\n+\n+\t/* kick hardware to send bundle and return control back to the stack */\n \twritel(tx_ring->next_to_use, hw->hw_addr + tx_ring->tdt);\n \tmmiowb();\n \n@@ -4284,9 +4313,10 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,\n \tstruct bpf_prog *prog;\n \tu32 length;\n \tunsigned int i;\n-\tint cleaned_count = 0;\n+\tint cleaned_count = 0, xdp_xmit = 0;\n \tbool cleaned = false;\n \tunsigned int total_rx_bytes = 0, total_rx_packets = 0;\n+\tstruct e1000_rx_buffer_bundle *xdp_bundle = rx_ring->xdp_buffer;\n \n \trcu_read_lock(); /* rcu lock needed here to protect xdp programs */\n \tprog = READ_ONCE(adapter->prog);\n@@ -4341,12 +4371,13 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter,\n \t\t\tcase XDP_PASS:\n \t\t\t\tbreak;\n \t\t\tcase XDP_TX:\n+\t\t\t\txdp_bundle[xdp_xmit].buffer = buffer_info;\n+\t\t\t\txdp_bundle[xdp_xmit].length = length;\n \t\t\t\tdma_sync_single_for_device(&pdev->dev,\n \t\t\t\t\t\t\t dma,\n \t\t\t\t\t\t\t length,\n \t\t\t\t\t\t\t DMA_TO_DEVICE);\n-\t\t\t\te1000_xmit_raw_frame(buffer_info, length,\n-\t\t\t\t\t\t netdev, adapter);\n+\t\t\t\txdp_xmit++;\n \t\t\tcase XDP_DROP:\n \t\t\tdefault:\n \t\t\t\t/* re-use mapped page. keep buffer_info->dma\n@@ -4488,8 +4519,14 @@ next_desc:\n \n \t\t/* return some buffers to hardware, one at a time is too slow */\n \t\tif (unlikely(cleaned_count >= E1000_RX_BUFFER_WRITE)) {\n+\t\t\tif (xdp_xmit)\n+\t\t\t\te1000_xdp_xmit_bundle(xdp_bundle,\n+\t\t\t\t\t\t netdev,\n+\t\t\t\t\t\t adapter);\n+\n \t\t\tadapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);\n \t\t\tcleaned_count = 0;\n+\t\t\txdp_xmit = 0;\n \t\t}\n \n \t\t/* use prefetched values */\n@@ -4500,8 +4537,11 @@ next_desc:\n \trx_ring->next_to_clean = i;\n \n \tcleaned_count = E1000_DESC_UNUSED(rx_ring);\n-\tif (cleaned_count)\n+\tif (cleaned_count) {\n+\t\tif (xdp_xmit)\n+\t\t\te1000_xdp_xmit_bundle(xdp_bundle, netdev, adapter);\n \t\tadapter->alloc_rx_buf(adapter, rx_ring, cleaned_count);\n+\t}\n \n \tadapter->total_rx_packets += total_rx_packets;\n \tadapter->total_rx_bytes += total_rx_bytes;\n", "prefixes": [ "net-next", "v3", "3/3" ] }