Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1041524/?format=api
{ "id": 1041524, "url": "http://patchwork.ozlabs.org/api/patches/1041524/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190213185115.25877-6-anirudh.venkataramanan@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": "<20190213185115.25877-6-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-13T18:51:05", "name": "[S14,05/15] ice: Gather the rx buf clean-up logic for better reuse", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0c098d4f3c2bfaf257479eb31fe76756eb9b2403", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190213185115.25877-6-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 91786, "url": "http://patchwork.ozlabs.org/api/series/91786/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=91786", "date": "2019-02-13T18:51:02", "name": "Implementation updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/91786/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1041524/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1041524/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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 4407vv6CjRz9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Feb 2019 05:53:31 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 35435856B7;\n\tWed, 13 Feb 2019 18:53:30 +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 wY375aU81g6r; Wed, 13 Feb 2019 18:53:28 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id EC95685682;\n\tWed, 13 Feb 2019 18:53:28 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id A709F1BF987\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:18 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id A01E122DD3\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:18 +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 keSz-V9t+i95 for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:17 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 7CB2A22C44\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 13 Feb 2019 18:51:17 +0000 (UTC)", "from orsmga001.jf.intel.com ([10.7.209.18])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Feb 2019 10:51:17 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby orsmga001.jf.intel.com with ESMTP; 13 Feb 2019 10:51:16 -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.58,366,1544515200\"; d=\"scan'208\";a=\"138354237\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 13 Feb 2019 10:51:05 -0800", "Message-Id": "<20190213185115.25877-6-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190213185115.25877-1-anirudh.venkataramanan@intel.com>", "References": "<20190213185115.25877-1-anirudh.venkataramanan@intel.com>", "Subject": "[Intel-wired-lan] [PATCH S14 05/15] ice: Gather the rx buf clean-up\n\tlogic for better reuse", "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>", "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": "From: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\n\nPull out the code responsible for page counting and buffer recycling so\nthat it will be possible to clean up the rx buffers in cases where we\nwon't allocate skb (ex. XDP)\n\nSigned-off-by: Maciej Fijalkowski <maciej.fijalkowski@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n[Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> cleaned up commit message]\n---\n drivers/net/ethernet/intel/ice/ice_txrx.c | 76 ++++++++++++++++++++-----------\n 1 file changed, 50 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 1c49d245d889..0eb594abe6ef 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -498,19 +498,42 @@ static bool ice_page_is_reserved(struct page *page)\n \treturn (page_to_nid(page) != numa_mem_id()) || page_is_pfmemalloc(page);\n }\n \n+/**\n+ * ice_rx_buf_adjust_pg_offset - Prepare rx buffer for reuse\n+ * @rx_buf: Rx buffer to adjust\n+ * @size: Size of adjustment\n+ *\n+ * Update the offset within page so that rx buf will be ready to be reused.\n+ * For systems with PAGE_SIZE < 8192 this function will flip the page offset\n+ * so the second half of page assigned to rx buffer will be used, otherwise\n+ * the offset is moved by the @size bytes\n+ */\n+static void\n+ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size)\n+{\n+#if (PAGE_SIZE < 8192)\n+\t/* flip page offset to other buffer */\n+\trx_buf->page_offset ^= size;\n+#else\n+\t/* move offset up to the next cache line */\n+\trx_buf->page_offset += size;\n+#endif\n+}\n+\n /**\n * ice_can_reuse_rx_page - Determine if page can be reused for another rx\n * @rx_buf: buffer containing the page\n- * @truesize: the offset that needs to be applied to page\n *\n * If page is reusable, we have a green light for calling ice_reuse_rx_page,\n * which will assign the current buffer to the buffer that next_to_alloc is\n * pointing to; otherwise, the dma mapping needs to be destroyed and\n * page freed\n */\n-static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf,\n-\t\t\t\t unsigned int truesize)\n+static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf)\n {\n+#if (PAGE_SIZE >= 8192)\n+\tunsigned int last_offset = PAGE_SIZE - ICE_RXBUF_2048;\n+#endif\n \tunsigned int pagecnt_bias = rx_buf->pagecnt_bias;\n \tstruct page *page = rx_buf->page;\n \n@@ -522,14 +545,8 @@ static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf,\n \t/* if we are only owner of page we can reuse it */\n \tif (unlikely((page_count(page) - pagecnt_bias) > 1))\n \t\treturn false;\n-\n-\t/* flip page offset to other buffer */\n-\trx_buf->page_offset ^= truesize;\n #else\n-\t/* move offset up to the next cache line */\n-\trx_buf->page_offset += truesize;\n-\n-\tif (rx_buf->page_offset > PAGE_SIZE - ICE_RXBUF_2048)\n+\tif (rx_buf->page_offset > last_offset)\n \t\treturn false;\n #endif /* PAGE_SIZE < 8192) */\n \n@@ -556,10 +573,9 @@ static bool ice_can_reuse_rx_page(struct ice_rx_buf *rx_buf,\n * less than the skb header size, otherwise it will just attach the page as\n * a frag to the skb.\n *\n- * The function will then update the page offset if necessary and return\n- * true if the buffer can be reused by the adapter.\n+ * The function will then update the page offset\n */\n-static bool\n+static void\n ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,\n \t\tunsigned int size)\n {\n@@ -582,14 +598,8 @@ ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,\n \tif (size <= ICE_RX_HDR_SIZE) {\n \t\tmemcpy(__skb_put(skb, size), va, ALIGN(size, sizeof(long)));\n \n-\t\t/* page is not reserved, we can reuse buffer as-is */\n-\t\tif (likely(!ice_page_is_reserved(page))) {\n-\t\t\trx_buf->pagecnt_bias++;\n-\t\t\treturn true;\n-\t\t}\n-\n-\t\t/* this page cannot be reused so discard it */\n-\t\treturn false;\n+\t\trx_buf->pagecnt_bias++;\n+\t\treturn;\n \t}\n \n \t/* we need the header to contain the greater of either ETH_HLEN or\n@@ -610,8 +620,7 @@ ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,\n add_tail_frag:\n \tskb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,\n \t\t\t(unsigned long)va & ~PAGE_MASK, size, truesize);\n-\n-\treturn ice_can_reuse_rx_page(rx_buf, truesize);\n+\tice_rx_buf_adjust_pg_offset(rx_buf, truesize);\n }\n \n /**\n@@ -697,6 +706,7 @@ ice_fetch_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,\n \t\t\t\t GFP_ATOMIC | __GFP_NOWARN);\n \t\tif (unlikely(!skb)) {\n \t\t\trx_ring->rx_stats.alloc_buf_failed++;\n+\t\t\trx_buf->pagecnt_bias++;\n \t\t\treturn NULL;\n \t\t}\n \n@@ -706,8 +716,23 @@ ice_fetch_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,\n \t}\n \n \t/* pull page into skb */\n-\tif (ice_add_rx_frag(rx_buf, skb, size)) {\n+\tice_add_rx_frag(rx_buf, skb, size);\n+\n+\treturn skb;\n+}\n+\n+/**\n+ * ice_put_rx_buf - Clean up used buffer and either recycle or free\n+ * @rx_ring: Rx descriptor ring to transact packets on\n+ * @rx_buf: Rx buffer to pull data from\n+ *\n+ * This function will clean up the contents of the rx_buf. It will\n+ * either recycle the buffer or unmap it and free the associated resources.\n+ */\n+static void ice_put_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf)\n+{\n \t\t/* hand second half of page back to the ring */\n+\tif (ice_can_reuse_rx_page(rx_buf)) {\n \t\tice_reuse_rx_page(rx_ring, rx_buf);\n \t\trx_ring->rx_stats.page_reuse_count++;\n \t} else {\n@@ -719,8 +744,6 @@ ice_fetch_rx_buf(struct ice_ring *rx_ring, struct ice_rx_buf *rx_buf,\n \n \t/* clear contents of buffer_info */\n \trx_buf->page = NULL;\n-\n-\treturn skb;\n }\n \n /**\n@@ -1007,6 +1030,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)\n \t\tif (!skb)\n \t\t\tbreak;\n \n+\t\tice_put_rx_buf(rx_ring, rx_buf);\n \t\tcleaned_count++;\n \n \t\t/* skip if it is NOP desc */\n", "prefixes": [ "S14", "05/15" ] }