From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-eopbgr40048.outbound.protection.outlook.com [40.107.4.48]) by dpdk.org (Postfix) with ESMTP id 750F311D4 for ; Tue, 22 May 2018 11:00:00 +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=49fPJuN1VEJvsvqRC0jBcpnffzcLwiIXkEFhTp26j6k=; b=RpllE6aABg1kWi1EmIHK5Qf7ZcMmKXpy7hueDEdecDCqfzo5ECgaJ3AJMYOmKZEILEi139+VAbB4Tt8WVA8bEqDo4vduaLfmxY8dsf0Lj7jjpn+oK7BfhVsvUc4HglPD5XRSQ62zd+MK9QvHRZfo6Nxq43biplXcF/GnMKAHYKg= 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:58 +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:43 -0700 Message-Id: <20180522085943.15574-2-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180522085943.15574-1-yskoh@mellanox.com> References: <20180522085943.15574-1-yskoh@mellanox.com> 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:BDbVLfQtmwyjndRMm4RVSOAaOXa+QXHNxcnGvhy397PPSB3Suxce6S76fSabalAS3Ahks0uAu8ey7LPuCZrlBwjLuA1MLYwEhQZB9DaYtb4iQq81jWAZATl3pKdBjb5tsZN6Ir9/as6WqxgZzCuDWAMBYRiFFYMKTqNZrgj/oQXsqsfVoFDNumjHp3NuikhX5R5E9wmAl67UXM/JwvDJgvelxyShloOBIFqEmio6Ux/5oc7T94Y4pyKo9UNGnjvG; 25:779hmhkPy4seAEt2C2j/1QXgEoatSQ6SQF3rNhVuxROpVgG6AaaXMU3wGGY8tl5HYIKKHyDHca+tAXHF0I69VQ8ixB32IK3xLQFJwIo5fpIPA2GfKHhpvnGt1bscWPd4dzSR7a5llcT361kjKmGA2HLsnVaOEawXfIjoTJY1TIOlDAFpTvGKVb93mtjn+L0CGjxaeruykYRG+P4yQM/J1Qml+ddi6n5NhN60Ui9dtYOvRs0AotmUFFHlJXq88UN0tjzf39HCHzmzltzR20UvS1CELd6JHVZoM09IIFqi5VUHgjPdNvZMRY5VAzel8uCr/p1DyZKcuDdHKZAkwmVyOw==; 31:5Fu7u67HNLPz5IFDf0UrTCS8yWWApY6+duD7HiTGAx26tA9Zj2yRh0mgp82VzWLH0HWSiLQFvsBgT7MljR9/y9ztQXwdn8wt4tmy9uvtAaDFyLiBlMK1YS6uu1w/R2ig3StUOWfIq6XCBvg3UDOSgQeHyP4D7liYq0LzjOOk2Oq0cTxtWnoqItvuer+cnZ7UYZQUK1YKRnXA0Ywt/k8MKadS8vkrLN+yNDs5UY6yxaw= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2046: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 20:wSZ9oQdCguxlmnW7yXCDhwYLKpVEyvL2USO2GqNPS8LmH6uAUtjoEn9e9I1XzM7OHIQ4cTTlTXltJENCgx3BVrI3vO8k5EzIy4rg0rn+iReYNalLaoxkAtte+trLpR0B+eJastKzkAf7HP0Zyap2dSTz6O7V8Im6z42h/VHRRvq9heZRhikxoiEW0OnC5JHJNk+7KXfZdsd1jp4ZgrTlAr908qzeVyBE1j67Ai5+aO4D8un/Ds+B92y6kMnQdfbjImpeOY340CUCoCLVqBQ2yXlXyhudEUDMSodYDCnlkQsUgQ5rFUqcCGR3x1MivDWDnBx0JlC+RHSm6+pwtfbBhItvy19YI88Ja/4zi+lX+8Exu1HT6RLHwX8rtI4pXEgAyKDNA4SmYejOyPrObkxUzB9ULVYzNAZ/PIINNX06se72gJ3Odf+1BlVg1m9CQbq5S79HVKXmR9ZWXtlh2w9jZlbls9fAYyS6tQ2dJQWgpkYEsQjcszrgy9eXr0ldUZY8; 4:cFvLBImx5eDhfgC5mQqMk/PHUgmMzxzxEooovXI3h3JQws5I5evOnHJWtjeUopX/dEtHVegjH4JiUq6nymLvFlHAXlxm/boiY1gPebHwau0dSB1sC4kTd6o8u79x9aWp3c7NMcaMekqMBQO6NqPOmrb0Hf5vdrALdu7VuGo1YLAB9dIi8pgeZerF9oqhyM2lKqpMCJtb3TMP/hckb0cDLjIbkVDMBdRnLExgwE/wJkql7jVgLwl6yX5Ium1U1Jo5UByG1gs1rvxD1lPuh94NDa5+RuuXClXa4aFIaZXFnbFIVv0iqMnuRkHoWTS/THD1 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)(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)(76176011)(50466002)(68736007)(386003)(26005)(16526019)(97736004)(59450400001)(86362001)(21086003)(53936002)(55016002)(36756003)(6116002)(1076002)(16586007)(6666003)(3846002)(106356001)(105586002)(316002)(4326008)(66066001)(11346002)(8676002)(2906002)(48376002)(47776003)(50226002)(305945005)(8936002)(81166006)(81156014)(7736002)(476003)(956004)(5660300001)(446003)(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:QYzxP0PhPDi+LIKgDx74Ue7phKST2GPnf8OhOov?= =?us-ascii?Q?yw1ZW1f7kMZ4r7YkJJLi/XiDXmGdGoMjBM3GLSYgyPOG8mYZHu/zMjUCHqLn?= =?us-ascii?Q?PzZBOBtbExA9p/YpdrEgCPbVPCyER8jY3o3RlLmPPEb/jAo1KMQXncn377F1?= =?us-ascii?Q?DkH2GrVLstLIYgxZbl2v8eGyhqcDqdxQXqeXQP6N8s+oFftc+tOmFk3bXJwf?= =?us-ascii?Q?hXzmi/d4hVc8y6qO4MzDsmkTnB9oLPggfVBrsawEw4EPtkHmG6//kkpLF3aP?= =?us-ascii?Q?CvqrROq7Y+8trVRXaYV13433RTu+6+QqTypmrfu4DxXLrdrxdFd3kbe3+M2Q?= =?us-ascii?Q?wvwsHg3g/K66WC05uf6W4YIz1usG7F75q6tXiwdlbRGWVvpfbHDr5yRhSfza?= =?us-ascii?Q?Phg4YPEmcsbyPOsozSOVYbZbcvlOPCZjVGjMz6n+54QoMEeGv97NucIJ2nwl?= =?us-ascii?Q?zo6ZLuR3i9EG8z8OaqBAkSucJAewnwLLCvXB9y1a3APabpIhh16azwDEIvmD?= =?us-ascii?Q?L3owDxng3W3HqY/HHwcKQD0v/nNGxukuETGeBpOqB6Lw0k9qiP3ELdLsv/Jj?= =?us-ascii?Q?+DSFdC5VQyymPg/iorCN21Au9T/4FFOxBbRh+tP1yhpcnWoeNy0Ld6SdbqLG?= =?us-ascii?Q?zLx5dFkDCiKn46QoD0jQt+nz7Xt38yCd7CW4r3dycnMaD+UIX9eWTd+7AcSB?= =?us-ascii?Q?vhQrO62nmSm+vxd6k+HhLY2UtNf+vw34n2s6k6mLM2NS0PiG9ILzP2boqOBV?= =?us-ascii?Q?q5PJOQO5TfOEFfOxOnOjxHHsLQAA8zE98QIglTelqPKvTVVqp2dT+SfihZ60?= =?us-ascii?Q?zR90EhJi8dC/Q7FCfCdgDi9B269Dl3IygMDDPnA5lXQauJND56bAHrlfYO+O?= =?us-ascii?Q?FIftV2d+PMzlmZlC4ZzFDJfqH4Ur7PZ/sLBiqIWCloxO+ox1iDjxOt14DsxI?= =?us-ascii?Q?a62s1fJpAXFpWhbPyShxkpKV6pytPMlu36dBhluOhGdvsvoagjK9Lg+XbumK?= =?us-ascii?Q?R21gl3gbCZrlxN1IhkUlVZLsihCGpkJVsMX3ytSxoe69jaZ1ORE5iqgh0qms?= =?us-ascii?Q?NjHjg1pla0kN00hj2xv7FAQElTRFdfQ/POFvJ6kgpddPBk5eJTKVNjPEsREU?= =?us-ascii?Q?0nkVfvAKOtTcs75XEnV2eqfCl/rEgMVsb6BR0MpSWMvROAH5ImPI9AcV1xc+?= =?us-ascii?Q?MMCznBzgRnovFZ2DGidO54+WrvTsjpF0oulcWoMJ1+0lK2Lqc11Tp41vTSg?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Antispam-Message-Info: MBjrOu3mKEAd4k3L5Qv5qRsTQVg2OSxGb4lA1E+iUJDggxYlNOft5zWVVG8jW+cI1lil9YmMQGeJwq3WT2gBPN48f33PvocZvK6GsmaFWdlGoGBYePLSs0ssGEDx01oJytroAyuUG5Mbf5Xi7m9xR4kjFZ5srM9hXnw9wrp6jTqHz2hSnf9zrrE4Knc/JqTO X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 6:Nh5RD2GgAblogIUgQtqHDjpYvCV7g8aqeu15UltnEfPO5R4j8KTD/vgnLcoANtplbkNoySQvJ8osp3iffftCqYB1SSAORi+SjH/5KGqe9mtPV5PNCeoiezxPs3wA+GyXWYxuq0QykGlebM/BY9iBY4OLorvhn9ZuOxCNmWD5OUJb7mOMdgYkbHWqeHBnlXZ3R8qIphhW6UJ/puQAOEuYhJaq+yzshcqmGi2hxTNnROCeIfjoTACkUFepo/Mc6/PdgsRAvKgjfBm4+xgOZCmM7sqcjCGscbmkPg6xaJaiOw4EHWzb0xJuiX8mbkaDLTg9l8Ym5bqfwkTNk8sWMFsJM4jPJZGw/rkKiuWyTabFkCFOPHOyM9K9g6KNe9upqiaBf+7RsAkBcpRSgcoY+yB5GU+s6QuEJv94wqiuQ6AE8KHV0iHRVQMknvB6+zDk5zPKXNOb11VbSRAcpacE/APUUA==; 5:PKyrHz7HRBZ58IPq0DiDY8uMzc0EXwkvfq7C54XYHT4hVzWAuHshfT1nNPF2oWidOHsKD+jFdDGeUE54KNzI+c6e8LXlD1XeAQRP87FfSizqvcAhmWD4QYMhRN9q8MSvFd7EEqjFP5Xu33812yEdXy1u8i1lgoz+JHonXMXgMCc=; 24:K+750bblUO/cAUybm1+hdo2QvoU/fmwj4Hk4dKvNu03bfkakipGy03vL3mEnezL9Qpx+8NB5T6sTrDUBXv0NwZYoy+E31mfOEsuwQS1mFeo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2046; 7:VtpmBAge0wgud+QoBv5q7lfH6Z2BPHMqQWp5uQpyuinMYnrhrnBijyl//83eC1xq8XX9ipTfEEsfShMt6X40njBGWo2gF4yD4rvIZSupBxOpSLBx3N00XOjK+rJQViGrI18z2/XT3aTiFvFRMDR4rrFZqtj/97Foc002Vqlnq4c9gs2HbU7cTKzBEetQC0Z+rtRaC4+k+cIlow/J/YqCKhad37zLQHvfs24s9NaSpV5uGWvwZtZy5B1UWbVjrpko X-MS-Office365-Filtering-Correlation-Id: 67b8ab1c-423e-4c31-7086-08d5bfc265bd X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2018 08:59:58.2704 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67b8ab1c-423e-4c31-7086-08d5bfc265bd 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 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 09:00:00 -0000 Signed-off-by: Yongseok Koh Acked-by: Xueming Li --- v3: * restore checking PKT_TX_TCP_SEG drivers/net/mlx5/mlx5_rxtx.c | 6 ++---- drivers/net/mlx5/mlx5_rxtx.h | 13 +++++++------ 2 files changed, 9 insertions(+), 10 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..d65cd1be8 100644 --- a/drivers/net/mlx5/mlx5_rxtx.h +++ b/drivers/net/mlx5/mlx5_rxtx.h @@ -651,10 +651,11 @@ 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 tso = buf->ol_flags & PKT_TX_TCP_SEG; 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 +664,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 +685,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; -- 2.11.0