Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/668276/?format=api
{ "id": 668276, "url": "http://patchwork.ozlabs.org/api/patches/668276/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160909212938.4001.40540.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": "<20160909212938.4001.40540.stgit@john-Precision-Tower-5810>", "list_archive_url": null, "date": "2016-09-09T21:29:38", "name": "[net-next,v2,2/2] e1000: bundle xdp xmit routines", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": false, "hash": "55c71021e9b3b895bf3a70cdf85362a56afb5fee", "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/20160909212938.4001.40540.stgit@john-Precision-Tower-5810/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/668276/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/668276/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 fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 3sW9Mr02y3z9s1h\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 10 Sep 2016 07:29:59 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 53A8B896A7;\n\tFri, 9 Sep 2016 21:29:58 +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 Kkp3F5pmA7k0; Fri, 9 Sep 2016 21:29:56 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 06B828931E;\n\tFri, 9 Sep 2016 21:29:56 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id AF9781C2B2B\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 9 Sep 2016 21:29:55 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A7AA33146C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 9 Sep 2016 21:29:55 +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 4IEckypbVYq7 for <intel-wired-lan@lists.osuosl.org>;\n\tFri, 9 Sep 2016 21:29:55 +0000 (UTC)", "from mail-pa0-f66.google.com (mail-pa0-f66.google.com\n\t[209.85.220.66])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E3CE22E6CB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 9 Sep 2016 21:29:54 +0000 (UTC)", "by mail-pa0-f66.google.com with SMTP id h5so4331304pao.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tFri, 09 Sep 2016 14:29:54 -0700 (PDT)", "from [127.0.1.1] ([72.168.145.240])\n\tby smtp.gmail.com with ESMTPSA id\n\te72sm7384679pfb.49.2016.09.09.14.29.44\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tFri, 09 Sep 2016 14:29:54 -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=1Gd9YMhY;\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=TNMgx1MJxPsUzMLx61d6dK/Njlq0CTY5QzcBr4F/zeA=;\n\tb=1Gd9YMhYsCgWzvAEnI3b5kygLAlChmV5GlpxpjgUP3emLSrVL91orS9rtDAGiZYwY9\n\tiTBM5rrwGpnd2GjCH8TC/MmofcQGlHHze1EhSr8YrsjeUN1Uey9wQ9Ku9PPKMxtNG5+O\n\tdreMjw/41Q7oysiObAPZMUcXug4ybRQRs+jdDZSyMSm7n4lHF9tt23oVA/Qf0OnZwtkD\n\t1OurShKnqOQLcE6HtydA0w6w0g4phQ2HHhXZHSfd16aH/nc2EI4GqMGoomP69wdYVscV\n\tZZWbtzEq/cX+UesChyyCwjG9byCnQXm/jPcG1P3hQzdvu8SxvC47qmtw32CRKhqhO2uj\n\tPMTA==", "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=TNMgx1MJxPsUzMLx61d6dK/Njlq0CTY5QzcBr4F/zeA=;\n\tb=gsqAm64+3m3qVxZLIHetafdjOy4tLIoU+QFb2hUlZuZDKGFXxALMeEqjMZQ6bzI2Vv\n\t9wWRMox5Uo3je97kcA7MnOJQDFs1vbcTf2r9PrM8rRPfFPIEFCuiWbWRTO2tHC8caw4h\n\tnvMoCT+Le4DDvDyaj2tnivDUWo0CvxR+13IDvux9n63aIEJsSUZQepuCaHWXJp5a9ROZ\n\t6+qR0DdeNaEN1fIsXCSxMU27cp165Bw7Gzt71MCvVEoKMd71rKS4GslqCmjl8t0UVO84\n\tCTv41cDFNTZZOp6m121duybeAvHuUAEG2N/NWbg1uBx5b4jk+Py4wLWLzHHDWEYMufVd\n\tehRw==", "X-Gm-Message-State": "AE9vXwNUzILt0lZhsvJn3lYDiu913muWMUKKaEpqvaGD5GoXTYIfu9k2fhuUuF8TTuMr7w==", "X-Received": "by 10.66.228.2 with SMTP id se2mr10097165pac.93.1473456594554;\n\tFri, 09 Sep 2016 14:29:54 -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": "Fri, 09 Sep 2016 14:29:38 -0700", "Message-ID": "<20160909212938.4001.40540.stgit@john-Precision-Tower-5810>", "In-Reply-To": "<20160909212915.4001.25504.stgit@john-Precision-Tower-5810>", "References": "<20160909212915.4001.25504.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 v2 2/2] 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 | 81 +++++++++++++++++++------\n 2 files changed, 71 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 91d5c87..b985271 100644\n--- a/drivers/net/ethernet/intel/e1000/e1000_main.c\n+++ b/drivers/net/ethernet/intel/e1000/e1000_main.c\n@@ -1738,10 +1738,18 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,\n \tstruct pci_dev *pdev = adapter->pdev;\n \tint size, desc_len;\n \n+\tsize = sizeof(struct e1000_rx_buffer_bundle) *\n+\t\t\tE1000_XDP_XMIT_BUNDLE_MAX;\n+\trxdr->xdp_buffer = vzalloc(size);\n+\tif (!rxdr->xdp_buffer)\n+\t\treturn -ENOMEM;\n+\n \tsize = sizeof(struct e1000_rx_buffer) * rxdr->count;\n \trxdr->buffer_info = vzalloc(size);\n-\tif (!rxdr->buffer_info)\n+\tif (!rxdr->buffer_info) {\n+\t\tvfree(rxdr->xdp_buffer);\n \t\treturn -ENOMEM;\n+\t}\n \n \tdesc_len = sizeof(struct e1000_rx_desc);\n \n@@ -1754,6 +1762,7 @@ static int e1000_setup_rx_resources(struct e1000_adapter *adapter,\n \t\t\t\t\tGFP_KERNEL);\n \tif (!rxdr->desc) {\n setup_rx_desc_die:\n+\t\tvfree(rxdr->xdp_buffer);\n \t\tvfree(rxdr->buffer_info);\n \t\treturn -ENOMEM;\n \t}\n@@ -2087,6 +2096,9 @@ static void e1000_free_rx_resources(struct e1000_adapter *adapter,\n \n \te1000_clean_rx_ring(adapter, rx_ring);\n \n+\tvfree(rx_ring->xdp_buffer);\n+\trx_ring->xdp_buffer = NULL;\n+\n \tvfree(rx_ring->buffer_info);\n \trx_ring->buffer_info = NULL;\n \n@@ -3369,33 +3381,52 @@ static void e1000_tx_map_rxpage(struct e1000_tx_ring *tx_ring,\n }\n \n static void e1000_xmit_raw_frame(struct e1000_rx_buffer *rx_buffer_info,\n-\t\t\t\t unsigned int len,\n-\t\t\t\t struct net_device *netdev,\n-\t\t\t\t struct e1000_adapter *adapter)\n+\t\t\t\t __u32 len,\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-\n \tif (len > E1000_MAX_DATA_PER_TXD)\n \t\treturn;\n \n+\tif (E1000_DESC_UNUSED(tx_ring) < 2)\n+\t\treturn;\n+\n+\te1000_tx_map_rxpage(tx_ring, rx_buffer_info, 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 sends as\n+\t * many as possible until either running out of descriptors or failing.\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-\t\treturn;\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, tx_ring);\n+\t\tbuffer_info[i].buffer->rxbuf.page = NULL;\n+\t\tbuffer_info[i].buffer = NULL;\n+\t\tbuffer_info[i].length = 0;\n+\t\ti++;\n \t}\n \n-\te1000_tx_map_rxpage(tx_ring, rx_buffer_info, len);\n-\te1000_tx_queue(adapter, tx_ring, 0/*tx_flags*/, 1);\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 \twritel(tx_ring->next_to_use, hw->hw_addr + tx_ring->tdt);\n \tmmiowb();\n@@ -4281,9 +4312,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@@ -4338,13 +4370,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\tbuffer_info->rxbuf.page = NULL;\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@@ -4486,8 +4518,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@@ -4498,8 +4536,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", "v2", "2/2" ] }