Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1099621/?format=api
{ "id": 1099621, "url": "http://patchwork.ozlabs.org/api/patches/1099621/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190514173709.62431-11-alice.michael@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": "<20190514173709.62431-11-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-05-14T17:37:09", "name": "[next,S5,iavf,11/11] iavf: allow null RXdescriptors", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "49ab4b7f5bbb8d20e2d1c4a624225ef7e5ff1d3c", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190514173709.62431-11-alice.michael@intel.com/mbox/", "series": [ { "id": 107823, "url": "http://patchwork.ozlabs.org/api/series/107823/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=107823", "date": "2019-05-14T17:37:00", "name": "[next,S5,iavf,01/11] iavf: Create VLAN tagelements starting from the first element", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/107823/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1099621/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1099621/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 453Pyt0wQ9z9sD4\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 15 May 2019 03:37:41 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 900E330048;\n\tTue, 14 May 2019 17:37:40 +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 HyaY+GQcFZCk; Tue, 14 May 2019 17:37:38 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 5AE0D30A33;\n\tTue, 14 May 2019 17:37:38 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 226131BF8C7\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:35 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 0FA2E3019D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:34 +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 ss7EZLngOGFf for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:33 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id E1EFD30048\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 14 May 2019 17:37:32 +0000 (UTC)", "from orsmga003.jf.intel.com ([10.7.209.27])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 May 2019 10:37:31 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga003.jf.intel.com with ESMTP; 14 May 2019 10:37:30 -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", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Tue, 14 May 2019 10:37:09 -0700", "Message-Id": "<20190514173709.62431-11-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190514173709.62431-1-alice.michael@intel.com>", "References": "<20190514173709.62431-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S5 iavf 11/11] iavf: allow null RX\n\tdescriptors", "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>", "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": "From: Mitch Williams <mitch.a.williams@intel.com>\n\nIn some circumstances, the hardware can hand us a null receive\ndescriptor, with no data attached but otherwise valid. Unfortunately,\nthe driver was ill-equipped to handle such an event, and would stop\nprocessing packets at that point.\n\nTo fix this, use the Descriptor Done bit instead of the size to\ndetermine whether or not a descriptor is ready to be processed. Add some\nchecks to allow for unused buffers.\n\nSigned-off-by: Mitch Williams <mitch.a.williams@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_txrx.c | 21 ++++++++++++++++++---\n 1 file changed, 18 insertions(+), 3 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\nindex d28b57937245..1cde1601bc32 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c\n@@ -1236,6 +1236,9 @@ static void iavf_add_rx_frag(struct iavf_ring *rx_ring,\n \tunsigned int truesize = SKB_DATA_ALIGN(size + iavf_rx_offset(rx_ring));\n #endif\n \n+\tif (!size)\n+\t\treturn;\n+\n \tskb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, rx_buffer->page,\n \t\t\trx_buffer->page_offset, size, truesize);\n \n@@ -1260,6 +1263,9 @@ static struct iavf_rx_buffer *iavf_get_rx_buffer(struct iavf_ring *rx_ring,\n {\n \tstruct iavf_rx_buffer *rx_buffer;\n \n+\tif (!size)\n+\t\treturn NULL;\n+\n \trx_buffer = &rx_ring->rx_bi[rx_ring->next_to_clean];\n \tprefetchw(rx_buffer->page);\n \n@@ -1299,6 +1305,8 @@ static struct sk_buff *iavf_construct_skb(struct iavf_ring *rx_ring,\n \tunsigned int headlen;\n \tstruct sk_buff *skb;\n \n+\tif (!rx_buffer)\n+\t\treturn NULL;\n \t/* prefetch first cache line of first page */\n \tprefetch(va);\n #if L1_CACHE_BYTES < 128\n@@ -1363,6 +1371,8 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring,\n #endif\n \tstruct sk_buff *skb;\n \n+\tif (!rx_buffer)\n+\t\treturn NULL;\n \t/* prefetch first cache line of first page */\n \tprefetch(va);\n #if L1_CACHE_BYTES < 128\n@@ -1398,6 +1408,9 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring,\n static void iavf_put_rx_buffer(struct iavf_ring *rx_ring,\n \t\t\t struct iavf_rx_buffer *rx_buffer)\n {\n+\tif (!rx_buffer)\n+\t\treturn;\n+\n \tif (iavf_can_reuse_rx_page(rx_buffer)) {\n \t\t/* hand second half of page back to the ring */\n \t\tiavf_reuse_rx_page(rx_ring, rx_buffer);\n@@ -1496,11 +1509,12 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget)\n \t\t * verified the descriptor has been written back.\n \t\t */\n \t\tdma_rmb();\n+#define IAVF_RXD_DD BIT(IAVF_RX_DESC_STATUS_DD_SHIFT)\n+\t\tif (!iavf_test_staterr(rx_desc, IAVF_RXD_DD))\n+\t\t\tbreak;\n \n \t\tsize = (qword & IAVF_RXD_QW1_LENGTH_PBUF_MASK) >>\n \t\t IAVF_RXD_QW1_LENGTH_PBUF_SHIFT;\n-\t\tif (!size)\n-\t\t\tbreak;\n \n \t\tiavf_trace(clean_rx_irq, rx_ring, rx_desc, skb);\n \t\trx_buffer = iavf_get_rx_buffer(rx_ring, size);\n@@ -1516,7 +1530,8 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget)\n \t\t/* exit if we failed to retrieve a buffer */\n \t\tif (!skb) {\n \t\t\trx_ring->rx_stats.alloc_buff_failed++;\n-\t\t\trx_buffer->pagecnt_bias++;\n+\t\t\tif (rx_buffer)\n+\t\t\t\trx_buffer->pagecnt_bias++;\n \t\t\tbreak;\n \t\t}\n \n", "prefixes": [ "next", "S5", "iavf", "11/11" ] }