From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0081.outbound.protection.outlook.com [104.47.0.81]) by dpdk.org (Postfix) with ESMTP id A5A9E1D9E for ; Tue, 22 May 2018 08:51:31 +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=1gkIwd3UByEMiFMbmV8jOs+78FyrYHNFbdQdrpp0UU4=; b=qfN4YAU5fERf0yuXbetldd0gJptVfSlXcxMD6/bgvMNYDKuZSEy5ylDn5Ut09Jl+r5uWKawL+2LoIHwOob1/n9HFts1u63wysmxSKDivGT2mWd9JJsv6r/bNvSCbcfpqHqGjuInuZY7UDdFzZxggScKyy7VCiYRwZ5tZJIGuftg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) 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 06:51:28 +0000 From: Yongseok Koh To: shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Cc: dev@dpdk.org, Yongseok Koh Date: Mon, 21 May 2018 23:50:58 -0700 Message-Id: <20180522065058.21969-2-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180522065058.21969-1-yskoh@mellanox.com> References: <20180522065058.21969-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO2PR07CA0045.namprd07.prod.outlook.com (2603:10b6:100::13) To VI1PR0501MB2045.eurprd05.prod.outlook.com (2603:10a6:800:36::19) 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:VI1PR0501MB2045; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 3:rp+RlRDlhhnkgs8rZq6CUEMBAUd7MIkqeFuBWbcIE2hzW7i1dUEXnWtTcICf9s3ACIiN2jMrWqfS0ZD8GeMO3UXdNreSU0rMvNZOkubOnMOZTxd2INIcXGlMOj0/PyhSGdb1saIqZFauW3VANb93QAIx7J5D9WR9MzGAldGdyKzWhtLCmyXxmyNtWGhr8EmJkDFmd5lfu/YCP0R/RncAMPAtaQMCy8VAkwoE0vYpkklLXPQBMn7V81EfKQp8rTVV; 25:FoV1IL453gm5IMpLC0+bGhSSggK+SiDXdVQ4KzTyVMTw3TPVgfISS/gqsjjz3NTgKYmg47v4Wc3Fmuc8Lc7vwqCCJJT3ebvyAxXGV93ccXixeEWTf8lqvU43MWnnliZ1SkTfjYgoP4M6pVrrFq3dtjpvLbMEbxCruuS8bgfYW5HAs48/P5f42/912YmA+S+Yzl0DFO5v1mv/Bt1MgsC11sykwrEYXSXZ6gnp5m4JvvrsumpzI6fX5xuNsn7pSQ7xhF1MTRxrgmMg87lp56Wq2jg3dM8gTCzlwDD/LgNZe1xx00crepolar7esY5g7AKXEG72aax3BSJ/gGXXirqdIQ==; 31:ww2Djff6fMsPQKzPFDO+B5KYWTeDuEvhQTM55+SXRfg81ntZLCqreG+50t73csYO0kpUMuehu8wCXTP6V9O7AQylcZTMtPfyVPr9lYMFMlQj5T8phIwgnq092NUowbV7hPDpJUi7ctkTxpjHP9d3lXbj+CUQ1RNIyFm6kCKlcJX5WIHBsAmD4UJzR+FKhhs4JmjZ5VaXbe0pv87C6jSN2I6+j4kzFaCWhxD9Lg97AVA= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2045: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 20:qkKrpjaqzSMu8MmqNe2hJhN8o9Y3CeNvTkdGT4QYoEdmQvHJU57fye4R3gWDi6r5XEjdW9w+0aT47gkO3+kqUFvh6arC4k9pkdnFIOqsaA0PIJHeuKMCmQgVUtCjQxdRpCebfFdeX//fNLDCUCzyh69tOw4eFeBMOV/qZE+jcgZNCEPNSXuXjK3dmhuiWdDIPwlmD3de3mqo/FjceYyGsMykw5KqSipNry9mqDzBe0vweWFCDVSGptkZ7pjh7ihYCMVGpYN1AgWUsRwWM21Vw3RG2f6p7+i0Zo4dPxg7WtQbkptEGcHhjnVwIDkNAsChY7qTdGw69nvSm1xKARYjYPOsaR7xSuG0+7+lHDo6yayMoDQCrEu4YT39loLJE1cdy2kIkctfjZfPguM4asnLLQ3f4Jc6q2PuaO5El6zr2Iwr3HWLwpa6iPLAV78BUKyPVhItfkRwfFbJydPr+h4FlgcZBpWMWXinZeQ6mhvA0Udc1W67fO8c9EI4/LjlrGUO; 4:+8yaV0oqxullcmcZhBNnYHns2zIbLHbEG21xVG8T+0LlqATXToMvl15BVD6ymLGYGBhj12dcCtSe/bwaUi7gDnqzr9oBdxjE8snKi/b0GJtBKKIx0/NsBzp68eTXTBfYV2GXXm7nIC+34D1JfoE4ACPD6HBwaS6Aj42Nj0H6H1SCf8Vw6Ml8WcQgrXx6VwwBfY5RR10GigSoCgqhO9Z16YIHRoUwxf7JIkXvF2rAJkf0rZobFQFLEUdxSU0rWoZzmv+TJ4qzIADjMriw2/TxHuK+EXIg4I0ucFT4F+k/9RkA2BSDHi/X08TghbL6i8x8 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2045; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2045; X-Forefront-PRVS: 0680FADD48 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(366004)(346002)(39860400002)(396003)(39380400002)(199004)(189003)(5660300001)(51416003)(52116002)(3846002)(86362001)(81166006)(76176011)(478600001)(446003)(16526019)(26005)(6116002)(81156014)(68736007)(21086003)(55016002)(386003)(8936002)(107886003)(53936002)(50226002)(25786009)(1076002)(4326008)(7696005)(105586002)(6666003)(97736004)(69596002)(106356001)(486006)(47776003)(66066001)(48376002)(11346002)(476003)(50466002)(305945005)(7736002)(36756003)(316002)(2906002)(8676002)(2616005)(16586007)(956004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2045; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; VI1PR0501MB2045; 23:gPsLBJyQbkjW3fn8nXLvSw6Bb2Kf2DsBdgt0/fG?= =?us-ascii?Q?kZceuHXAXNo1kVZvPP5ihBMR/28ot25K+ztsEeGe8czTRMQhK4f310DAMpOY?= =?us-ascii?Q?8i8YRwR77vN4MrP1moQ1GCqlsSqkcQ0quEGtMwo2nSQ1+Bq8sbApVwaiMYVK?= =?us-ascii?Q?2k5guavHr+4Ry1WrMH7ZrVDEecvH7NByfklG0GBMYoTkYYdZGh1gOX5FkRVj?= =?us-ascii?Q?Q4bKri/zTGqP7Ct0znzZD/DMGHPJ1NEJydMLlfStERS0Yyb7DRFCIiW0Y1Ah?= =?us-ascii?Q?aEWFVMMW9xVoM3K1HUNb3BY/V7BeiXb5ZTjiRaGGT65u8pzcValtOkg3fSbQ?= =?us-ascii?Q?iWCR7Knzcwv2NhaBhI382gwXyn3OIgYWRZm0flQT7VaPnfd0sFYHmIzv/tDj?= =?us-ascii?Q?xrIY8v8b4gdYXmX5GzP9ssjgFzwkEiJsfrFWd7cTRW3A1v/JyS20PClYugAc?= =?us-ascii?Q?n5f4w1mvEHJcUdJ40778IzYD7JmPhcIPll/JNghrQa+PZF8Aasip8SK6U0gC?= =?us-ascii?Q?v2svqYorVoCgjzqNzyVAWNuGmFqHaXeGZsrnuo+tgb0gW58xaFRKD0dFEPYb?= =?us-ascii?Q?3Tv45CKCyJwbHw7aWT7eM3855YKQ6Jile6b39z3oFMG+onkb2yQcHXL2Dl/I?= =?us-ascii?Q?HwivbZJzDUzurPEKBl1gz5bnqUrGY/LLV91R20NFi5CansQ1ax25WmgQ7lgv?= =?us-ascii?Q?IF0mqTAAz3HjHtbuxVxN8tE1ap0aEoSAV227RGSjLVGcVjdr+5mbpJhiiZhS?= =?us-ascii?Q?XfBHRAi5mEM2SZ/6tMzVAXSoUG/HFTRkYeg/iIsJAgycDGOB6hO1++AcpYGD?= =?us-ascii?Q?F4is+AAD+0X3yEoa3S6Vn/ay8ax1zpC11UnT9/a4U970sz3h8b9pmGwEhzzG?= =?us-ascii?Q?iNvprwhZggILP0ZaWF6CAry8MyruzLAqMyWYlV6pnjsdZfSdrDBiuUANvn8t?= =?us-ascii?Q?p5supdoGBvyjFZ2jPfCbWHxwDlxBQq2RuTPmMQylyeJE13q8NQbbEsBIjGG3?= =?us-ascii?Q?jS6aUmjAULRadLlifDBvOHUvr0GKidiY8edBfDM/kGc2o1oSrWzBawHNHi1g?= =?us-ascii?Q?vxH9F4OjPGUp/3pvKji0OUvKwCDHUBIQ2duUxTTeBUAS4wx9uzAch0nm9Dqn?= =?us-ascii?Q?JB776sjhl2dXLZegIz4krm++1U9a7SIFY9Z3JoCFr/czg36/psT1VKDuzBaM?= =?us-ascii?Q?msie3TNf1DoKxKicMu+nZZPbI+7PggeIGXyx/?= X-Microsoft-Antispam-Message-Info: SzzCaYXfHorw7j4iCRnJ62+GFfEWCVMURIyXWR+WCg/h2CwFtKwVWURHZTX99BxDIkJawkDUcrpDNC/tjEGQO3zq13iHzWhsIC5ipCZDt5sMOKskJAw05BiBOzpLSLRrSwA89FdEmIGwdAfu0kNTIKRi/CNHYn0yZY1LlaBCRV5qiRnkdAF0oHw/MxVE9V92 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 6:iYigGls5vUBY1szjHfcfWNStT2BndXPksxuTcqurIuG/BFrJCvPJoBHGtMDQsubwpuCgHbSy+iO2AEnzqLY9+FVSG/SHzBZo+eFQzIjohU8m3gEMxvtI0Ztf+Ulj+hTjUTqGgMWY3urTulXFIiuq+FVDITgP/6s3/qowg86fdPAYGY/iUdn8uw5nRihkz2u8nF6roLz73ZLRUkIsvT+IQ+0FR3mkRWTgBV2iEZYoZtawZYBBx8+k7USgJXRPG8lR5OW3bv/iYg+SndPdyYLzmOQx1ZjZMcnvMK3dUpmB7XaSz/oMa1Y5mbnsWj2l0KStmlYgJufy+CQPQ8zf+86PkATk7qV6OLLnr34WGp2X7Fzd9rFskUQAcXDHl0LYl06VZTBvdSCmjJRvj4+/1tjLFsTYaZ1JbNhN61dc2pEhdh9D7x5+hUELKDAp3i1zAaA0/GP1Wohv/WV06N4YFuWVcw==; 5:xCmcVTVw+we+ysMeMnbPLcGjir/G5CmMXKpmdDcd0jAEXWmLKuzojqmlkmbEKquU7LLzWtP/886mgAUTgKPamVUNLWSMpYbJBQy7G8QBHSrtMARIMl/TMVRhOJSueqqDlR7178kc/ndQGxYsecY7IQ8qBmhtaXOaYRGut7Dc26s=; 24:BgHS51ZLLEJceBJZfSxI0Z8wIa1ck5fIOcc0u3Jyshly3F+Q8VxZVPxvD9fXFDnT1gQqi/gQn1AejoI6SmsJzpJjcuv+9s3TDdlAUB4roO4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2045; 7:HntdU57UoDz3qZNju9Tr4Y3m3EZIaa416BWGTMWrb2ekIu2wYHkctcqWljjj8BsULdnBfe6oN8pW/VsQ9ex5XCmWdvCl5+t7WHz1ujgHlSk7A2/WncBT5ANUwQqdymVk1UiROi5UqUMMY2gOlyxY/vCweod/70982PD7oMEizLemmoxxEK/kDKHYBIH/RGcIrxDrQD/2aqpqrs+d8yEc2sWLFy4vY609xb8mFUIUO1P1JviEg/r+mqNN6SOjVOaY X-MS-Office365-Filtering-Correlation-Id: 403c04d2-d042-4dc8-f79c-08d5bfb07293 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 06:51:28.7116 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 403c04d2-d042-4dc8-f79c-08d5bfb07293 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2045 Subject: [dpdk-dev] [PATCH 2/2] net/mlx5: remove redundant checks 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 06:51:31 -0000 Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_rxtx.c | 6 ++---- drivers/net/mlx5/mlx5_rxtx.h | 14 +++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c index cdd373e3e..527859461 100644 --- a/drivers/net/mlx5/mlx5_rxtx.c +++ b/drivers/net/mlx5/mlx5_rxtx.c @@ -522,7 +522,6 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) uint16_t ehdr; uint8_t cs_flags; uint8_t tso = txq->tso_en && (buf->ol_flags & PKT_TX_TCP_SEG); - uint8_t is_vlan = !!(buf->ol_flags & PKT_TX_VLAN_PKT); uint32_t swp_offsets = 0; uint8_t swp_types = 0; uint16_t tso_segsz = 0; @@ -566,11 +565,10 @@ mlx5_tx_burst(void *dpdk_txq, struct rte_mbuf **pkts, uint16_t pkts_n) rte_prefetch0( rte_pktmbuf_mtod(*(pkts + 1), volatile void *)); cs_flags = txq_ol_cksum_to_cs(buf); - txq_mbuf_to_swp(txq, buf, tso, is_vlan, - (uint8_t *)&swp_offsets, &swp_types); + txq_mbuf_to_swp(txq, buf, (uint8_t *)&swp_offsets, &swp_types); raw = ((uint8_t *)(uintptr_t)wqe) + 2 * MLX5_WQE_DWORD_SIZE; /* Replace the Ethernet type by the VLAN if necessary. */ - if (is_vlan) { + if (buf->ol_flags & PKT_TX_VLAN_PKT) { uint32_t vlan = rte_cpu_to_be_32(0x81000000 | buf->vlan_tci); unsigned int len = 2 * ETHER_ADDR_LEN - 2; diff --git a/drivers/net/mlx5/mlx5_rxtx.h b/drivers/net/mlx5/mlx5_rxtx.h index 1e4b2fdb9..5d9a7dffd 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -651,10 +651,10 @@ mlx5_tx_dbrec(struct mlx5_txq_data *txq, volatile struct mlx5_wqe *wqe) */ static __rte_always_inline void txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, - uint8_t tso, uint64_t vlan, - uint8_t *offsets, uint8_t *swp_types) + uint8_t *offsets, uint8_t *swp_types) { - uint64_t tunnel = buf->ol_flags & PKT_TX_TUNNEL_MASK; + const uint64_t vlan = buf->ol_flags & PKT_TX_VLAN_PKT; + const uint64_t tunnel = buf->ol_flags & PKT_TX_TUNNEL_MASK; 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); @@ -663,8 +663,8 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, uint16_t idx; uint16_t off; - if (likely(!tunnel || !txq->swp_en || - (tunnel != PKT_TX_TUNNEL_UDP && tunnel != PKT_TX_TUNNEL_IP))) + if (likely(!txq->swp_en || (tunnel != PKT_TX_TUNNEL_UDP && + tunnel != PKT_TX_TUNNEL_IP))) return; /* * The index should have: @@ -684,7 +684,7 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, * 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); + off = buf->outer_l2_len + (vlan ? sizeof(struct vlan_hdr) : 0); offsets[1] = off >> 1; /* Outer L3 offset. */ if (tunnel == PKT_TX_TUNNEL_UDP) { off += buf->outer_l3_len; @@ -693,7 +693,7 @@ txq_mbuf_to_swp(struct mlx5_txq_data *txq, struct rte_mbuf *buf, if (inner_ip) { off += buf->l2_len; offsets[3] = off >> 1; /* Inner L3 offset. */ - if (csum_flags == PKT_TX_TCP_CKSUM || tso || + if (csum_flags == PKT_TX_TCP_CKSUM || csum_flags == PKT_TX_UDP_CKSUM) { off += buf->l3_len; offsets[2] = off >> 1; /* Inner L4 offset. */ -- 2.11.0