Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1041522/?format=api
{ "id": 1041522, "url": "http://patchwork.ozlabs.org/api/patches/1041522/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190213185115.25877-3-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-3-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-13T18:51:02", "name": "[S14,02/15] ice: Pull out page reuse checks onto separate function", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "20fd24d3c12b4f4d369e9eebc260dd9b580d26ce", "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-3-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/1041522/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1041522/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=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 4407vg3yj2z9s2P\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 14 Feb 2019 05:53:18 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id DE44882186;\n\tWed, 13 Feb 2019 18:53:15 +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 EYDID4yBHl5P; Wed, 13 Feb 2019 18:53:15 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 30BC586A14;\n\tWed, 13 Feb 2019 18:53:14 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 616991BF984\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 5E76122DC7\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 RoDTBLkqpw-i 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 18F17227FA\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:16 -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=\"138354234\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 13 Feb 2019 10:51:02 -0800", "Message-Id": "<20190213185115.25877-3-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 02/15] ice: Pull out page reuse checks\n\tonto separate function", "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\nIntroduce ice_can_reuse_rx_page which will verify whether the page can\nbe reused and return the boolean result to caller.\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 | 80 +++++++++++++++++--------------\n 1 file changed, 45 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 8c0a8b63670b..d1f4aef9bcc2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -496,6 +496,48 @@ 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_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+{\n+\tstruct page *page = rx_buf->page;\n+\n+\t/* avoid re-using remote pages */\n+\tif (unlikely(ice_page_is_reserved(page)))\n+\t\treturn false;\n+\n+#if (PAGE_SIZE < 8192)\n+\t/* if we are only owner of page we can reuse it */\n+\tif (unlikely(page_count(page) != 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+\t\treturn false;\n+#endif /* PAGE_SIZE < 8192) */\n+\n+\t/* Even if we own the page, we are not allowed to use atomic_set()\n+\t * This would break get_page_unless_zero() users.\n+\t */\n+\tget_page(page);\n+\n+\treturn true;\n+}\n+\n /**\n * ice_add_rx_frag - Add contents of Rx buffer to sk_buff\n * @rx_buf: buffer containing page to add\n@@ -517,17 +559,9 @@ ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,\n #if (PAGE_SIZE < 8192)\n \tunsigned int truesize = ICE_RXBUF_2048;\n #else\n-\tunsigned int last_offset = PAGE_SIZE - ICE_RXBUF_2048;\n-\tunsigned int truesize;\n+\tunsigned int truesize = ALIGN(size, L1_CACHE_BYTES);\n #endif /* PAGE_SIZE < 8192) */\n-\n-\tstruct page *page;\n-\n-\tpage = rx_buf->page;\n-\n-#if (PAGE_SIZE >= 8192)\n-\ttruesize = ALIGN(size, L1_CACHE_BYTES);\n-#endif /* PAGE_SIZE >= 8192) */\n+\tstruct page *page = rx_buf->page;\n \n \t/* will the data fit in the skb we allocated? if so, just\n \t * copy it as it is pretty small anyway\n@@ -549,31 +583,7 @@ ice_add_rx_frag(struct ice_rx_buf *rx_buf, struct sk_buff *skb,\n \tskb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page,\n \t\t\trx_buf->page_offset, size, truesize);\n \n-\t/* avoid re-using remote pages */\n-\tif (unlikely(ice_page_is_reserved(page)))\n-\t\treturn false;\n-\n-#if (PAGE_SIZE < 8192)\n-\t/* if we are only owner of page we can reuse it */\n-\tif (unlikely(page_count(page) != 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 > last_offset)\n-\t\treturn false;\n-#endif /* PAGE_SIZE < 8192) */\n-\n-\t/* Even if we own the page, we are not allowed to use atomic_set()\n-\t * This would break get_page_unless_zero() users.\n-\t */\n-\tget_page(rx_buf->page);\n-\n-\treturn true;\n+\treturn ice_can_reuse_rx_page(rx_buf, truesize);\n }\n \n /**\n", "prefixes": [ "S14", "02/15" ] }