Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1007770/?format=api
{ "id": 1007770, "url": "http://patchwork.ozlabs.org/api/patches/1007770/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/d1719aa5baadcab54eaf822ed519934ab34ea5a5.1543944510.git.mirq-linux@rere.qmqm.pl/", "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": "<d1719aa5baadcab54eaf822ed519934ab34ea5a5.1543944510.git.mirq-linux@rere.qmqm.pl>", "list_archive_url": null, "date": "2018-12-04T17:31:15", "name": "[v3,2/2] i40e: DRY rx_ptype handling code", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3fe1f5465f26de4f220d3fc1fb0377819a8231b3", "submitter": { "id": 524, "url": "http://patchwork.ozlabs.org/api/people/524/?format=api", "name": "Michał Mirosław", "email": "mirq-linux@rere.qmqm.pl" }, "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/d1719aa5baadcab54eaf822ed519934ab34ea5a5.1543944510.git.mirq-linux@rere.qmqm.pl/mbox/", "series": [ { "id": 79724, "url": "http://patchwork.ozlabs.org/api/series/79724/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=79724", "date": "2018-12-04T17:31:15", "name": "[v3,1/2] i40e: fix VLAN.TCI == 0 RX HW offload", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/79724/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1007770/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1007770/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.137; helo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dmarc=none (p=none dis=none)\n\theader.from=rere.qmqm.pl", "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=rere.qmqm.pl header.i=@rere.qmqm.pl\n\theader.b=\"dlha1yYj\"; dkim-atps=neutral" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\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 438TS05y5vz9s0t\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 5 Dec 2018 04:31:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 232BF86931;\n\tTue, 4 Dec 2018 17:31:25 +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 KRYKbWiaXL7P; Tue, 4 Dec 2018 17:31:24 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 67645868D1;\n\tTue, 4 Dec 2018 17:31:24 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 208B81BF28D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Dec 2018 17:31:23 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 1DAD187BEE\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Dec 2018 17:31:23 +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 K+ttZ2XN4ABl for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Dec 2018 17:31:21 +0000 (UTC)", "from rere.qmqm.pl (rere.qmqm.pl [91.227.64.183])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 7D01487BCA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 4 Dec 2018 17:31:21 +0000 (UTC)", "from remote.user (localhost [127.0.0.1])\n\tby rere.qmqm.pl (Postfix) with ESMTPSA id 438TQG34CPzLD;\n\tTue, 4 Dec 2018 18:29:58 +0100 (CET)" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org", "clamav-milter 0.100.2 at mail" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=rere.qmqm.pl; s=1;\n\tt=1543944598; bh=Fq5ry9dZGjE5gJA+qhvNJ5ouD+n2nmON7B+NEEmBVL0=;\n\th=Date:In-Reply-To:References:From:Subject:To:Cc:From;\n\tb=dlha1yYjfF/yvQyeewPNk+0jw7TbbjybzchV5QQ1X0QRH12AoaQXJvmGuQBKqYXOY\n\tN/z+sLQO5885Jw1Nsvx4JSX9mknrLP95cmJiPs0ZTw7PB/EgYV53T1pUTYfV2Q3EB7\n\t9CbTSABunbtFpYxxzCEdsmu4rWnXocGuG16kO//qnUcbN63X+e5V0EsETsRb8HPCxM\n\tfsSfxLRrmTpO0efFrMvIUlUzHrX4CcDlVB3vV5ltSNnDFlcQ5bF7wjxMPhQi04SVwL\n\t0J8BVJtNwlR6W31BcpeEWHONG3UOnEo+nUjJFrDZ9W9dHJBUvBMsQUITGcSvExJxOJ\n\tnSZUzN0HzCZDA==", "X-Virus-Status": "Clean", "Date": "Tue, 04 Dec 2018 18:31:15 +0100", "Message-Id": "<d1719aa5baadcab54eaf822ed519934ab34ea5a5.1543944510.git.mirq-linux@rere.qmqm.pl>", "In-Reply-To": "<6a993b48a235e7a65d522642a74a28a7391ad964.1543944510.git.mirq-linux@rere.qmqm.pl>", "References": "<6a993b48a235e7a65d522642a74a28a7391ad964.1543944510.git.mirq-linux@rere.qmqm.pl>", "From": "=?utf-8?b?TWljaGHFgiBNaXJvc8WCYXc=?= <mirq-linux@rere.qmqm.pl>", "MIME-Version": "1.0", "To": "netdev@vger.kernel.org, intel-wired-lan@lists.osuosl.org", "Subject": "[Intel-wired-lan] [PATCH v3 2/2] i40e: DRY rx_ptype handling code", "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=\"utf-8\"", "Content-Transfer-Encoding": "base64", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "Move rx_ptype extracting to i40e_process_skb_fields() to avoid\nduplicating the code.\n\nSigned-off-by: Michał Mirosław <michal.miroslaw@atendesoftware.pl>\nSigned-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>\n---\nv3:\n * no changes\nv2:\n * fix prototype in i40e_txrx_common.h\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 12 ++++--------\n drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 3 +--\n drivers/net/ethernet/intel/i40e/i40e_xsk.c | 6 +-----\n 3 files changed, 6 insertions(+), 15 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex bc6a873ec574..d0a95424ce58 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -1775,8 +1775,7 @@ static inline void i40e_rx_hash(struct i40e_ring *ring,\n * other fields within the skb.\n **/\n void i40e_process_skb_fields(struct i40e_ring *rx_ring,\n-\t\t\t union i40e_rx_desc *rx_desc, struct sk_buff *skb,\n-\t\t\t u8 rx_ptype)\n+\t\t\t union i40e_rx_desc *rx_desc, struct sk_buff *skb)\n {\n \tu64 qword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);\n \tu32 rx_status = (qword & I40E_RXD_QW1_STATUS_MASK) >>\n@@ -1784,6 +1783,8 @@ void i40e_process_skb_fields(struct i40e_ring *rx_ring,\n \tu32 tsynvalid = rx_status & I40E_RXD_QW1_STATUS_TSYNVALID_MASK;\n \tu32 tsyn = (rx_status & I40E_RXD_QW1_STATUS_TSYNINDX_MASK) >>\n \t\t I40E_RXD_QW1_STATUS_TSYNINDX_SHIFT;\n+\tu8 rx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>\n+\t\t I40E_RXD_QW1_PTYPE_SHIFT;\n \n \tif (unlikely(tsynvalid))\n \t\ti40e_ptp_rx_hwtstamp(rx_ring->vsi->back, skb, tsyn);\n@@ -2339,7 +2340,6 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)\n \t\tstruct i40e_rx_buffer *rx_buffer;\n \t\tunion i40e_rx_desc *rx_desc;\n \t\tunsigned int size;\n-\t\tu8 rx_ptype;\n \t\tu64 qword;\n \n \t\t/* return some buffers to hardware, one at a time is too slow */\n@@ -2432,12 +2432,8 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)\n \t\t/* probably a little skewed due to removing CRC */\n \t\ttotal_rx_bytes += skb->len;\n \n-\t\tqword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);\n-\t\trx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>\n-\t\t\t I40E_RXD_QW1_PTYPE_SHIFT;\n-\n \t\t/* populate checksum, VLAN, and protocol */\n-\t\ti40e_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);\n+\t\ti40e_process_skb_fields(rx_ring, rx_desc, skb);\n \n \t\ti40e_trace(clean_rx_irq_rx, rx_ring, rx_desc, skb);\n \t\tnapi_gro_receive(&rx_ring->q_vector->napi, skb);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\nindex 2c077f1c4eca..8af0e99c6c0d 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx_common.h\n@@ -12,8 +12,7 @@ struct i40e_rx_buffer *i40e_clean_programming_status(\n \tunion i40e_rx_desc *rx_desc,\n \tu64 qw);\n void i40e_process_skb_fields(struct i40e_ring *rx_ring,\n-\t\t\t union i40e_rx_desc *rx_desc, struct sk_buff *skb,\n-\t\t\t u8 rx_ptype);\n+\t\t\t union i40e_rx_desc *rx_desc, struct sk_buff *skb);\n void i40e_xdp_ring_update_tail(struct i40e_ring *xdp_ring);\n void i40e_update_rx_stats(struct i40e_ring *rx_ring,\n \t\t\t unsigned int total_rx_bytes,\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\nindex a6ea2b249471..870cf654e436 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c\n@@ -634,7 +634,6 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)\n \t\tstruct i40e_rx_buffer *bi;\n \t\tunion i40e_rx_desc *rx_desc;\n \t\tunsigned int size;\n-\t\tu8 rx_ptype;\n \t\tu64 qword;\n \n \t\tif (cleaned_count >= I40E_RX_BUFFER_WRITE) {\n@@ -712,10 +711,7 @@ int i40e_clean_rx_irq_zc(struct i40e_ring *rx_ring, int budget)\n \t\ttotal_rx_bytes += skb->len;\n \t\ttotal_rx_packets++;\n \n-\t\tqword = le64_to_cpu(rx_desc->wb.qword1.status_error_len);\n-\t\trx_ptype = (qword & I40E_RXD_QW1_PTYPE_MASK) >>\n-\t\t\t I40E_RXD_QW1_PTYPE_SHIFT;\n-\t\ti40e_process_skb_fields(rx_ring, rx_desc, skb, rx_ptype);\n+\t\ti40e_process_skb_fields(rx_ring, rx_desc, skb);\n \t\tnapi_gro_receive(&rx_ring->q_vector->napi, skb);\n \t}\n \n", "prefixes": [ "v3", "2/2" ] }