From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40082.outbound.protection.outlook.com [40.107.4.82]) by dpdk.org (Postfix) with ESMTP id 40A2611D4 for ; Tue, 22 May 2018 10:59:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=h7JGJPmD8ldpvL+okXpi11F2ecPPZTGH9NdHJGenNlI=; b=rvuXkTfNLFXdeDIxHr25Gz9tG3EtzGX3WS8EMPRy1KWMM+CzvoNMoaIvHHqPPw/9+GyC+YuQEkeS/DhmcBRqBNqVEsVqQ33MMfN87gjwMFmUU8hRVsOlRQ/hm6ZHHDFcYF3s/NFwTHnpLu6sal34tbQyaRiJiOirH1lLSzZKos8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2046.eurprd05.prod.outlook.com (2603:10a6:800:36::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Tue, 22 May 2018 08:59:56 +0000 From: Yongseok Koh To: shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh Date: Tue, 22 May 2018 01:59:42 -0700 Message-Id: <20180522085943.15574-1-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BYAPR07CA0018.namprd07.prod.outlook.com (2603:10b6:a02:bc::31) To VI1PR0501MB2046.eurprd05.prod.outlook.com (2603:10a6:800:36::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(48565401081)(2017052603328)(7153060)(7193020); SRVR:VI1PR0501MB2046; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 3:F4cgW4QrXvzzaTE+xqgSugWX/3bSVwX6dByh2bfFW1LMYRzTDCRHvedxy6L9ds3fKaz/ei2ZlIe2HVacBpckiaTpElpxYhEC4EV7VLqi+3sL+5xxbsk6xtGZ/fmYmv+Z+kVMOuMXtic2BgLpcgqmc65TtaM9sHQyFOdbeyUcDEOduUaByfc3T5XNz2eRFkaNVWJVS3N4vy7ENVTB0DYQ2dW7uzV7mhcZlYSl4P1XG4M/kyRY3QHP22iWUfig1ZSz; 25:RZEULMoeyvW/bWf++5pi2UFVqHafk21g/00RZ6qiD2WloavvTmPsx1cIY4nZ5Q6LL9wMbqT6oxCagHl1EY8ZqGWe63pfobc3Gj5SImoQlm4nHV1yfq8Z/dVKBvWCfuAbVgHakgc4aAy9VJPCL5hXRdjhORr+eWpCG3zT+0M3JgRH9Rs7jMSzqgW4KUzbrwRJ2UYN73xbbmFHRIP/mokGEXQdMjuA90HzR5JqCCS/M+tZOemYcZqPvtCb8aYDgp/e4O+d6130ixHXIIFryL5t/h4P/xm4JGTUiHIHxNJ8+GyTPMDZUaGH5KEmNH0edYOORfQmvChtxqJbxrU8eQPNeQ==; 31:3YDaXWYR305Ir/pPFXbnE4iSPH2yE263J//wrhezd6eP2zU1VKBJn56IZSIJ14yc/ruvgPJAYLZ4Fzs7h87ohPMKfNbcQtoQ4Z2jo93tXxEsdZTUcAacprwhfeqyrMXrn7Id7buO0yQbETLcIItlAHdinZc7Bsmgjzya0dPmPxFht/3WLusAp/i3sBa5XlpLZr4P7Gb83C4LO9WTeJXqS6Lv7iRPNGw64tkNy04nb6M= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2046: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 20:K9Cu1uWJNTLuIUTixAWscgCc5ie5RiQi0VUUkKi8vcPh8dcjF7bBVekfbxhD71r+4HEXP9IjMOiZSaRNyklszoWR0B/Tf5DSMyb7F7H4Abrw5FA3Kv2yo9ua2WGB/STKbylQmZNy1F8PGx648gl66ZnFcBWSSlWQhVRt1fXmKmWD66pUvLkXinbXub1Ro8CbOU53gmxV7v+xA3lglZGB7LEji3n8wqdUCJdgA7Vfirobsdd/IEOkhzeIKjAPb1ZLaqXc8lABdyeAHOCjm84Efary7E92TJ1LFJlczHx/y+115lD3ic4MJPmoVgL8Txg3OuFo/HwSsx2VbYKo8xD/rknrix7oMbOdDqUHV73UtxIAH6hlFWWqsghKL+7/XzY7YB5AknjXbfIiK7o1XgyvHhDE+yPK7JZT4RDHFNJ34pFtpmqPQyq2wiJi12L06xeEPi6rRC8e7bQu8E3rgMQXPIF5Wxer/SN+/TL37viPYnrTB4qgOlaTXiMlsHQEu1tL; 4:xWmgkBXJggUmOvxpe/1rXe2BiiyEcQ99fTeGLVvxqaTY+trOlof9MI2BmM3UB/63JjCI14pGw185hdUk4Xiw/Is26WDe1L+7I9B53CHpGlHnGYNQGv7KPi6HlIyvwirpOLJgQrNUQc2L+xcJZ0RWWU+2mqDbqbHY8kpZ++QcvXndh8ZvMsIoJuTpiU14Om9p9c+ngPCxyDoOzxOSyQmq+x8rmpskLk9ZXqtK0RQcH8JQDI3Jahfm4ElDt+c3HVWHbpMgnzUJSe1NFqKRgsSw5w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2046; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2046; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(39860400002)(396003)(189003)(199004)(478600001)(107886003)(69596002)(52116002)(7696005)(51416003)(50466002)(68736007)(386003)(26005)(16526019)(97736004)(86362001)(575784001)(21086003)(53936002)(55016002)(36756003)(6116002)(1076002)(16586007)(6666003)(3846002)(106356001)(105586002)(316002)(4326008)(66066001)(8676002)(2906002)(48376002)(47776003)(50226002)(305945005)(8936002)(81166006)(81156014)(7736002)(476003)(956004)(5660300001)(2616005)(25786009)(486006); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2046; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0501MB2046; 23:IkK7wMsTcFPON9+vcH5R9bXbpm2S2MHQDxj0llg?= =?us-ascii?Q?dLokdPuG0shmLFY7fXnbt2qPqHLu/g+KsbrozNsEfb59tYugevQhwK8SJvG0?= =?us-ascii?Q?V8nw6aR/963juZ3zOMLX1DUegHW2tLD4tzBNMutrkbmV5XMqUaUD3Gq2zkpY?= =?us-ascii?Q?9YROigIjMXUyHmwvzZgyvgfzIGTPTtgp/2rU1A9GKNj98UbdlK4fy9EwLyDc?= =?us-ascii?Q?3PwbSA81D/P/t/ioc3TPciLC/s7zOXVlfvMokbek4C7plAr8OfxAza9Qn1iC?= =?us-ascii?Q?wmz5yBM3kygeAtdZ7pORLN0ne9ezmRyas2UsVvk+1nh3PD2l6BVUuVZmiANo?= =?us-ascii?Q?/E6daIciXzVaA5Zihx7njnFFLDnLn2Jd94uShvim03kJ3gzs++uNDII1kWAX?= =?us-ascii?Q?nGLgbLDrbIfDl9yq9YfvVtfH4Rdj+CmE6qMBEz1Ys4Vrl/S6lk+I1vhcXeiu?= =?us-ascii?Q?XuoEHJfMFD0uG8izCO2F6krHSNIcODGDfPWh5jLj0ROPKEDYm6blAw3tEMP/?= =?us-ascii?Q?6j8oFQLyQXLrbHQmWhQlDhuh+wqQ4/HrfiqCAu1yhBoeRrrF6sCIzRxjBvOf?= =?us-ascii?Q?raMMGLDd6Vix9NBUjV7OtqJvvN30us70BuEIsEarLHJOGIn8J/dpSF7ulcO4?= =?us-ascii?Q?Fe8dEqDddsQ4dM9y5H0HzL2sCOBy5tX21bZ6xrlH0f9MbU/hKHZFPAcFFxC9?= =?us-ascii?Q?7P5rWbl1mNpFyKDp6JvjQgCfpGpAHiDrsKd6cOormISEypzwB1oS0UXY/fhC?= =?us-ascii?Q?AF8lepI0Mta1edh4sR3GGAKzER2q4xbhSvYz/Ih9BgkJDqiODYiL8NXKIkAj?= =?us-ascii?Q?YId1fbksrwewJgwh4qDNWq9pgeZCL6m39iMPQXXa0PjJpuBPMLz8mMUVGWbJ?= =?us-ascii?Q?wXNTmWDGRDi4dSZ3cfe7hYAGO8B0KpJOYXQCNQD3/UTX6K1uNm5pLJNFMp5G?= =?us-ascii?Q?FVHkt+DITd9QtB+7PuyZxA9I9SPQH4qGVfCQs4uAyateEFW3DLCvdppHXOR4?= =?us-ascii?Q?xCdkffTupPEX1a9X/+C8XpQGu+Bo+yo9xGvxe889uX1OVR1P9HLfUtiSgruA?= =?us-ascii?Q?ybrrOprIEfZ6537+MD+JkNKH2lIpTzrbQ8hiYqxE+bC9lm57tX+Vn6+RNT44?= =?us-ascii?Q?hxWELEkFbj4bZa99Bm9wu0gkFL/fuSJP8a6eHzKRq9fgMamBxy2RtkY85aWO?= =?us-ascii?Q?5y2T6JkQq2CFyYUo=3D?= X-Microsoft-Antispam-Message-Info: MjtwL3EnKuuhugLbOiPcjNXLg1IpLb4QyhBqHke0YXC5527Sw6DsdjgWrK2O0ACBguOISI/w6qxllTEu4eyNEeEKyjwKzSdNGPswpmTTQN9ZB3ZoLALPR0WHLa0cOIcjYVhXYEWQR/frffK2UpEp7vwJoic+n2bJudFO8TBsqK6f+Fa7tq4zcZfSHsBMjs4w X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 6:+6KS0x0NfgCHuzC5OGgFcizpkfZey0ko/mz+8byrLZrVgLmevXCwoJnjLu5ocUSVOpe/guBScEO0R8B/GEeFIAhq4bm20Bt6x88Ejg+y0C60rYt3iLh6se68Zl6uwVpKHfvHz+zFQQCNRqUQiKcIP/0DQCQEolXOe21qpMG3EC6P6JRncRCnW+Q17WoRgkq2m7YwFo07R63TWUsurHKN27r2fXiUv/E7Nb7OrPuzO55h7AoFVFuQ9zrpHAYCli+QPUUcfuTglwG7M6kIyG8wpItId7/4hkWc1Zc0oDubLHCOFDR3IG2LEfM+Cp8YJSp+KWQeK+/yLEJLnKhpJ38P3kCV07CeiehwpEbcWcPg90RaLXZI1Lbe1q4FEpF4qjQilWIGa8Ang2knjyYtLxoa6dAF+xYwWGIpQ/6R1XzWPWmLVVfCmews8AKc+7qvbwZqjBOszyFuDBPFiIQTs0p/sQ==; 5:WA811pvxPg6zPBA7Av/jkBddnXc/DgLlJjWnvHZ5b6BYDI2TzOp1DoWpmjEhJL1Qy7DTZrGop0kL9gSAvp7wy7264fl/noH1QsIdaQQsdgyQkyC/yXMGV1dm/PWoTAsscvaRGnJZoAFRRKh/VEVef9QJnfuMDRXVnRfAO37jRgY=; 24:5m256UKd4BjFpQmtJerMEyUtWTNRTX7WD6xfunsKDXH70TbViMJSomYKMNw4ZvyudW82DhPXvgas6AusIwo1XJvWftC1a8+zCYcj3EhC+ZQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 7:IOptzvzXcdD0K+/is0mX7sJHqiiZGR+0gB4OxJKPMqyBC4sBpoQPNBTG/qT/o/Ph6US7yntH1qwMCvEZrpzEZfGKkw190EKSwbHuCjvnsC7JUsFnxs1EupAR2OrEE2mNSmmezHjSeFWzw1Zre+l+idtLxWcxH+5wDSrTRwk0HwHkI0nAzcd+0bJFyxoASnw5uxuhqClscP3eN8FlSNpyWAPGI+GM/XigPpwCfw8m4fbLkQK3SJgXIHu8R0HGn/24 X-MS-Office365-Filtering-Correlation-Id: 40bcbe10-8e83-4168-eff1-08d5bfc264bb X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 08:59:56.5672 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40bcbe10-8e83-4168-eff1-08d5bfc264bb X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2046 Subject: [dpdk-dev] [PATCH v3 1/2] net/mlx5: fix setting offsets for SW parser X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 May 2018 08:59:59 -0000 Since ConnectX-5, SW parser just complements HW parser. SW parser starts to engage only if HW parser can't reach a header. For the older devices, HW parser will not kick in if any of SWP offsets is set. Therefore, all of the L3 offsets should be set regardless of HW offload. As IPv6 doesn't have header checksum, the mbuf can't have PKT_TX_[OUTER_]IP_CKSUM if outer or inner L3 is IPv6. And if inner packet isn't IP, the inner offsets shouldn't be set. Fixes: 5f8ba81c4228 ("net/mlx5: support generic tunnel offloading") Signed-off-by: Yongseok Koh Acked-by: Xueming Li --- drivers/net/mlx5/mlx5_rxtx.h | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index a6017f0dd..1e4b2fdb9 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -655,10 +655,13 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, uint8_t *offsets, uint8_t *swp_types) { uint64_t tunnel = buf->ol_flags & PKT_TX_TUNNEL_MASK; - uint16_t idx; - uint16_t off; + const uint64_t csum_flags = buf->ol_flags & PKT_TX_L4_MASK; + const uint64_t inner_ip = + buf->ol_flags & (PKT_TX_IPV4 | PKT_TX_IPV6); const uint64_t ol_flags_mask = PKT_TX_L4_MASK | PKT_TX_IPV6 | PKT_TX_OUTER_IPV6; + uint16_t idx; + uint16_t off; if (likely(!tunnel || !txq->swp_en || (tunnel != PKT_TX_TUNNEL_UDP && tunnel != PKT_TX_TUNNEL_IP))) @@ -674,20 +677,28 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, if (tunnel == PKT_TX_TUNNEL_UDP) idx |= 1 << 9; *swp_types = mlx5_swp_types_table[idx]; - /* swp offsets. */ - off = buf->outer_l2_len + (vlan ? 4 : 0); /* Outer L3 offset. */ - if (tso || (buf->ol_flags & PKT_TX_OUTER_IP_CKSUM)) - offsets[1] = off >> 1; - off += buf->outer_l3_len; /* Outer L4 offset. */ - if (tunnel == PKT_TX_TUNNEL_UDP) - offsets[0] = off >> 1; - off += buf->l2_len; /* Inner L3 offset. */ - if (tso || (buf->ol_flags & PKT_TX_IP_CKSUM)) - offsets[3] = off >> 1; - off += buf->l3_len; /* Inner L4 offset. */ - if (tso || ((buf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_TCP_CKSUM) || - ((buf->ol_flags & PKT_TX_L4_MASK) == PKT_TX_UDP_CKSUM)) - offsets[2] = off >> 1; + /* + * Set offsets for SW parser. Since ConnectX-5, SW parser just + * complements HW parser. SW parser starts to engage only if HW parser + * can't reach a header. For the older devices, HW parser will not kick + * in if any of SWP offsets is set. Therefore, all of the L3 offsets + * should be set regardless of HW offload. + */ + off = buf->outer_l2_len + (vlan ? 4 : 0); + offsets[1] = off >> 1; /* Outer L3 offset. */ + if (tunnel == PKT_TX_TUNNEL_UDP) { + off += buf->outer_l3_len; + offsets[0] = off >> 1; /* Outer L4 offset. */ + } + if (inner_ip) { + off += buf->l2_len; + offsets[3] = off >> 1; /* Inner L3 offset. */ + if (csum_flags == PKT_TX_TCP_CKSUM || tso || + csum_flags == PKT_TX_UDP_CKSUM) { + off += buf->l3_len; + offsets[2] = off >> 1; /* Inner L4 offset. */ + } + } } /** -- 2.11.0