Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/572591/?format=api
{ "id": 572591, "url": "http://patchwork.ozlabs.org/api/patches/572591/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20160125051710.12004.58962.stgit@localhost.localdomain/", "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": "<20160125051710.12004.58962.stgit@localhost.localdomain>", "list_archive_url": null, "date": "2016-01-25T05:17:10", "name": "[next,v3,09/15] i40e/i40evf: Add exception handling for Tx checksum", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "1bdcfe53feee7de6cadbb6e861cf37a4ba8ae2e2", "submitter": { "id": 67293, "url": "http://patchwork.ozlabs.org/api/people/67293/?format=api", "name": "Alexander Duyck", "email": "aduyck@mirantis.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/20160125051710.12004.58962.stgit@localhost.localdomain/mbox/", "series": [], "comments": "http://patchwork.ozlabs.org/api/patches/572591/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/572591/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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ozlabs.org (Postfix) with ESMTP id 7D6CD1402DD\n\tfor <incoming@patchwork.ozlabs.org>;\n\tMon, 25 Jan 2016 16:17:21 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 5106C8C46E;\n\tMon, 25 Jan 2016 05:17:19 +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 A+yFoLr92xa7; Mon, 25 Jan 2016 05:17:18 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 0B9418C430;\n\tMon, 25 Jan 2016 05:17:18 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 62C671C107C\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 25 Jan 2016 05:17:18 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5D84D8ADCF\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 25 Jan 2016 05:17:18 +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 46KslqmUEblk for <intel-wired-lan@lists.osuosl.org>;\n\tMon, 25 Jan 2016 05:17:17 +0000 (UTC)", "from mail-pa0-f50.google.com (mail-pa0-f50.google.com\n\t[209.85.220.50])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 9E072894BB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tMon, 25 Jan 2016 05:17:17 +0000 (UTC)", "by mail-pa0-f50.google.com with SMTP id cy9so74903983pac.0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSun, 24 Jan 2016 21:17:17 -0800 (PST)", "from localhost.localdomain\n\t(static-50-53-29-36.bvtn.or.frontiernet.net. [50.53.29.36])\n\tby smtp.gmail.com with ESMTPSA id\n\tq27sm24922158pfi.80.2016.01.24.21.17.16\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 24 Jan 2016 21:17:16 -0800 (PST)" ], "Authentication-Results": "ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=mirantis.com header.i=@mirantis.com\n\theader.b=UZDVvNVp; dkim-atps=neutral", "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "from auto-whitelisted by SQLgrey-1.7.6", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=mirantis.com;\n\ts=google; \n\th=subject:from:to:cc:date:message-id:in-reply-to:references\n\t:user-agent:mime-version:content-type:content-transfer-encoding;\n\tbh=bq5XNWR9B7oM93UlvmsyZ+g4efnIDzKn7y2f4Ihwey0=;\n\tb=UZDVvNVpDQLsqPBgt7WgIpObLRQTxTp9mFy8EDXSeScIyNkLBIaa+Q54D7Ob1L0+Mi\n\tXO1ZWjdnCEzqM12zcVhyCu3sHRWGp0TDv47jQEnc7PWT6LPVOkcVt3N/9l/K3wzRbrxU\n\ttf1u2eTsAbrUJ2aWCkLkTXqWbFeLrxsCNQWqI=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20130820;\n\th=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to\n\t:references:user-agent:mime-version:content-type\n\t:content-transfer-encoding;\n\tbh=bq5XNWR9B7oM93UlvmsyZ+g4efnIDzKn7y2f4Ihwey0=;\n\tb=WysEq0I+081yh0YDKVe80HMmwx0MkCE+5fj6BLnR66ONwHF2Pcwm3QgnCPO/FCt+Z1\n\tb+lMM9+tPPoZEVh/A0Rlt7Ma6EVq6oKGncEppjq9ao4ylM7WCJcvoHhARpRJVj1p3uQH\n\tcbZRRkHQvc9VaaTSBdF8doEi2EL12bB4k4Snz0kk/Ee3pGkNiUE7XNkorTDVIgWqwHDF\n\tYij5Z9aoooI88OgnppOPxQ5yIQPpxTOLrdDHwNBphCEGclVHcreThCQ07DRhBZLGkiAE\n\tC404+q34zxL0zh/BTOQqnjTR7ywoZpbTO0Q/C1gxm8DRauX8DJFPtgQGOJrzFU5jdc0g\n\tt15Q==", "X-Gm-Message-State": "AG10YOTFmGD2z3hXLYnv/+PrAdG/nwhOohlMqXtZ/3Ar1q+oUtEHDYFh5SZNnWREZe8KZKNc", "X-Received": "by 10.66.100.163 with SMTP id ez3mr23315066pab.5.1453699037394; \n\tSun, 24 Jan 2016 21:17:17 -0800 (PST)", "From": "Alexander Duyck <aduyck@mirantis.com>", "To": "intel-wired-lan@lists.osuosl.org, jeffrey.t.kirsher@intel.com", "Date": "Sun, 24 Jan 2016 21:17:10 -0800", "Message-ID": "<20160125051710.12004.58962.stgit@localhost.localdomain>", "In-Reply-To": "<20160125050602.12004.38884.stgit@localhost.localdomain>", "References": "<20160125050602.12004.38884.stgit@localhost.localdomain>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH v3 09/15] i40e/i40evf: Add exception\n\thandling for Tx checksum", "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": "Add exception handling to the Tx checksum path so that we can handle cases\nof TSO where the frame is bad, or Tx checksum where we didn't recognize a\nprotocol\n\nDrop I40E_TX_FLAGS_CSUM as it is unused, move the CHECKSUM_PARTIAL check\ninto the function itself so that we can decrease indent.\n\nSigned-off-by: Alexander Duyck <aduyck@mirantis.com>\n---\n drivers/net/ethernet/intel/i40e/i40e_txrx.c | 34 ++++++++++++++++--------\n drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 -\n drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 35 ++++++++++++++++---------\n drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 1 -\n 4 files changed, 45 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\nindex 713b39f4f6f8..094e0153c7c6 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c\n@@ -2387,10 +2387,10 @@ static int i40e_tsyn(struct i40e_ring *tx_ring, struct sk_buff *skb,\n * @tx_ring: Tx descriptor ring\n * @cd_tunneling: ptr to context desc bits\n **/\n-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n-\t\t\t\tu32 *td_cmd, u32 *td_offset,\n-\t\t\t\tstruct i40e_ring *tx_ring,\n-\t\t\t\tu32 *cd_tunneling)\n+static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n+\t\t\t u32 *td_cmd, u32 *td_offset,\n+\t\t\t struct i40e_ring *tx_ring,\n+\t\t\t u32 *cd_tunneling)\n {\n \tunion {\n \t\tstruct iphdr *v4;\n@@ -2407,6 +2407,9 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t__be16 frag_off;\n \tu8 l4_proto = 0;\n \n+\tif (skb->ip_summed != CHECKSUM_PARTIAL)\n+\t\treturn 0;\n+\n \tip.hdr = skb_network_header(skb);\n \tl4.hdr = skb_transport_header(skb);\n \n@@ -2449,7 +2452,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t*tx_flags |= I40E_TX_FLAGS_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\treturn;\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\t\treturn -1;\n+\n+\t\t\tskb_checksum_help(skb);\n+\t\t\treturn 0;\n \t\t}\n \n \t\t/* compute tunnel header size */\n@@ -2513,11 +2520,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;\n \t\tbreak;\n \tdefault:\n-\t\tbreak;\n+\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\treturn -1;\n+\t\tskb_checksum_help(skb);\n+\t\treturn 0;\n \t}\n \n \t*td_cmd |= cmd;\n \t*td_offset |= offset;\n+\n+\treturn 1;\n }\n \n /**\n@@ -2954,12 +2966,10 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \ttd_cmd |= I40E_TX_DESC_CMD_ICRC;\n \n \t/* Always offload the checksum, since it's in the data descriptor */\n-\tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n-\t\ttx_flags |= I40E_TX_FLAGS_CSUM;\n-\n-\t\ti40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n-\t\t\t\t tx_ring, &cd_tunneling);\n-\t}\n+\ttso = i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n+\t\t\t\t tx_ring, &cd_tunneling);\n+\tif (tso < 0)\n+\t\tgoto out_drop;\n \n \ti40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,\n \t\t\t cd_tunneling, cd_l2tag2);\ndiff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.h b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\nindex e1f4dedf6754..837d14f0184e 100644\n--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.h\n@@ -153,7 +153,6 @@ enum i40e_dyn_idx_t {\n #define DESC_NEEDED (MAX_SKB_FRAGS + 4)\n #define I40E_MIN_DESC_PENDING\t4\n \n-#define I40E_TX_FLAGS_CSUM\t\tBIT(0)\n #define I40E_TX_FLAGS_HW_VLAN\t\tBIT(1)\n #define I40E_TX_FLAGS_SW_VLAN\t\tBIT(2)\n #define I40E_TX_FLAGS_TSO\t\tBIT(3)\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\nindex 35aa07f8b9da..b8d7c7a29070 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c\n@@ -1602,12 +1602,13 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,\n * @tx_flags: pointer to Tx flags currently set\n * @td_cmd: Tx descriptor command bits to set\n * @td_offset: Tx descriptor header offsets to set\n+ * @tx_ring: Tx descriptor ring\n * @cd_tunneling: ptr to context desc bits\n **/\n-static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n-\t\t\t\tu32 *td_cmd, u32 *td_offset,\n-\t\t\t\tstruct i40e_ring *tx_ring,\n-\t\t\t\tu32 *cd_tunneling)\n+static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n+\t\t\t u32 *td_cmd, u32 *td_offset,\n+\t\t\t struct i40e_ring *tx_ring,\n+\t\t\t u32 *cd_tunneling)\n {\n \tunion {\n \t\tstruct iphdr *v4;\n@@ -1624,6 +1625,9 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t__be16 frag_off;\n \tu8 l4_proto = 0;\n \n+\tif (skb->ip_summed != CHECKSUM_PARTIAL)\n+\t\treturn 0;\n+\n \tip.hdr = skb_network_header(skb);\n \tl4.hdr = skb_transport_header(skb);\n \n@@ -1666,7 +1670,11 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t*tx_flags |= I40E_TX_FLAGS_TUNNEL;\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\treturn;\n+\t\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\t\treturn -1;\n+\n+\t\t\tskb_checksum_help(skb);\n+\t\t\treturn 0;\n \t\t}\n \n \t\t/* compute tunnel header size */\n@@ -1730,11 +1738,16 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,\n \t\t\t I40E_TX_DESC_LENGTH_L4_FC_LEN_SHIFT;\n \t\tbreak;\n \tdefault:\n-\t\tbreak;\n+\t\tif (*tx_flags & I40E_TX_FLAGS_TSO)\n+\t\t\treturn -1;\n+\t\tskb_checksum_help(skb);\n+\t\treturn 0;\n \t}\n \n \t*td_cmd |= cmd;\n \t*td_offset |= offset;\n+\n+\treturn 1;\n }\n \n /**\n@@ -2150,12 +2163,10 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,\n \ttd_cmd |= I40E_TX_DESC_CMD_ICRC;\n \n \t/* Always offload the checksum, since it's in the data descriptor */\n-\tif (skb->ip_summed == CHECKSUM_PARTIAL) {\n-\t\ttx_flags |= I40E_TX_FLAGS_CSUM;\n-\n-\t\ti40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n-\t\t\t\t tx_ring, &cd_tunneling);\n-\t}\n+\ttso = i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,\n+\t\t\t\t tx_ring, &cd_tunneling);\n+\tif (tso < 0)\n+\t\tgoto out_drop;\n \n \ti40e_create_tx_ctx(tx_ring, cd_type_cmd_tso_mss,\n \t\t\t cd_tunneling, cd_l2tag2);\ndiff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\nindex ce1898fe4094..561ba66d3ba8 100644\n--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.h\n@@ -153,7 +153,6 @@ enum i40e_dyn_idx_t {\n #define DESC_NEEDED (MAX_SKB_FRAGS + 4)\n #define I40E_MIN_DESC_PENDING\t4\n \n-#define I40E_TX_FLAGS_CSUM\t\tBIT(0)\n #define I40E_TX_FLAGS_HW_VLAN\t\tBIT(1)\n #define I40E_TX_FLAGS_SW_VLAN\t\tBIT(2)\n #define I40E_TX_FLAGS_TSO\t\tBIT(3)\n", "prefixes": [ "next", "v3", "09/15" ] }