From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0072.outbound.protection.outlook.com [104.47.1.72]) by dpdk.org (Postfix) with ESMTP id 9A2FB1D7 for ; Thu, 24 May 2018 00:45:44 +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=i72eyBdhOVwxCByGXHSGN99NXSUcnoNbPls5mk9ua4s=; b=sX5kSjSVuBwpt9SGeSAU0l4OG8lqYe7BXCBjfceoVbte/FtxhBlsie5eIwwzW6xlAZ725wl8rlNI4uFiwhszyrcK5jdf4Otw1onZ7cjW3qJYcyNi364kq6c7dopxuHXzTDGcxQJ1iLORfZ4/VHCoYas8xLFJyotXjEhLHjcOTg4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from yongseok-MBP.local (209.116.155.178) by HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.11; Wed, 23 May 2018 22:45:41 +0000 Date: Wed, 23 May 2018 15:45:25 -0700 From: Yongseok Koh To: Shahaf Shuler Cc: nelio.laranjeiro@6wind.com, adrien.mazarguil@6wind.com, dev@dpdk.org, xuemingl@mellanox.com Message-ID: <20180523224524.GB13339@yongseok-MBP.local> References: <20180523115937.32201-1-shahafs@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180523115937.32201-1-shahafs@mellanox.com> User-Agent: Mutt/1.9.3 (2018-01-21) X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO2PR04CA0115.namprd04.prod.outlook.com (2603:10b6:104:7::17) To HE1PR0501MB2043.eurprd05.prod.outlook.com (2603:10a6:3:35::21) 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:HE1PR0501MB2043; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 3:Y6Bg4a3dswTKCRXM8VAClAUN2oUiId21iSZ+2wYiMjgaAY0zMdhcy77IsQJXR6gXtvUCxh2/dXCPY+qr8OF95LSeG0r1RrEGfMZP4Hdq8hrTINE09KLIvIOV1c1uxZWn8E6NCdg/UCG5yLnLu6zlRRUTqcJ6FCkYaHvpiQfI2Pq20FVOfErA2Iw23apr5kaDloyDkn5Ge/JT0yut5bydKuXH/WEfFawu4UoIQ8CKYzYAwtisjGApSMNy+bhFSmCQ; 25:8cY1SYpmTGo+g3iU2wVc045tTO3DsewmuzA/TGWhKrUt8kji2LVrS/ocOwsAc6ZWZYOFhE+LoqP2FIUzaZK5vqUmsF/ceL6EYQFfVXGArV+m7HadorhyPEj1SNlkwVqFloXYIiVrieTVGTxs68KrFrOwGKjkVs9KLorKd7+xfhdpwQQt9w68YEhzD0DPFL8PfcoaZmJ0dJIFtiWUpuy+p+1MGMw/0gNs56RqXQ7IBYJmmApDYFEMbBd0s7x30PCYQEE4F5W/h+3Js/vPxTnKfAyfJMxNdNNGOwnTWL3+vMG8GzMm2CZZT37sfVdvLSXPPSmN8mSe0cnuzEHbuCMJzQ==; 31:FArTOg/DuzGEJMocrf1tuLy/dU5+2QLMTa1AzA0Rdh/F6uWSXarC/YPptwuzEG9qbRtTUntNCpAPj1BX0JMPNm6yZzMrm/A8H2XtLOGsBOXsDQBeKdNyAIm3Qbrf7SD79kYcf0JbzpzmGRTvyDftJDeo4GvQbS2w0CVp2qI49WjzQ9KXUvu69yCMx32K+4StE56VOw9QgrmCvbUoFsrBP/sLMLvGeIgeOKXG6p9rK44= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2043: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 20:did8vi3dm1sVCByJu83X0VNt3Tu5pe4n33hfzz2jxhOclLdDczLTxIqEsWOZATBJh8+nd6W8LE65C2XGVXFxtu3s16WVsf2W7wVC6MBtmV2oYrqNxXKEKBSNYdNw37zwN9Ef0NTsgncsxkE37jFD/lXlSxGZWmIN4TUtOngapE1+I8Wj6KwKasM0HlNrqSi6fnKc8YFBdNhAexRy/+luNLH/re+tcFPEHDQZr6nuSVehWwg3KtCXRQJbWUeIFAqFBDO0PsFwtaUfLyTd3l/n64Y+SsAvacIsyV5w98FppvNYj3ARmJ1HBeFl5cpb3DfGjQgLWZs7X8gqVVbBFquXdBozPdwtj0lIkicKIi+OxZTGe1kBIIaOR4vxC60PoQGPcDC6Q3Gs7fdZ38z/S12BCl2EgKjePk4LpoZzDYsF5tenO5Oqm5ryG4hwovX0sNu9i2th1UTQXIqmFio3l1tCTGWiFcKsBfCP1+aSARK94Zs9bpI9tluXJOKwQ+vscXq9; 4:6oqMisllaNFZpF8sKUoEFTYnfYXOEn9pZf383Uw+9XzHwI+49vnnkWfqEcAoFSH9yos5dlOcwI+XzOozANmYO9q1d9pBUs4LdS7W2NPIepNd00gZEcPzkdrmMp4EfpFHCxqTxv7wPQrg+74iA98Q8bNOVIhmfc0TOlsbQmb6TNH05HeN0gFkX3vDBEmJkgHzoD/wsmn86QY7k/r5KKHxmA2Hy7P8oq5eP9ZOZpR4Q5/N72pj90o+rocHebMaRNs339bGIxCPgs+GJX1JXkrTLA== 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)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:HE1PR0501MB2043; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0501MB2043; X-Forefront-PRVS: 06818431B9 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(396003)(366004)(39860400002)(346002)(376002)(189003)(199004)(2906002)(53936002)(6862004)(81166006)(476003)(16526019)(9686003)(50466002)(4326008)(59450400001)(5660300001)(55016002)(86362001)(106356001)(47776003)(1076002)(105586002)(305945005)(66066001)(107886003)(7736002)(52116002)(6506007)(956004)(23726003)(7696005)(446003)(81156014)(6636002)(3846002)(6116002)(8936002)(6246003)(11346002)(486006)(6666003)(76176011)(386003)(26005)(33656002)(229853002)(33896004)(97736004)(8676002)(58126008)(478600001)(25786009)(68736007)(16586007)(316002)(98436002)(18370500001)(41533002); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2043; H:yongseok-MBP.local; 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; HE1PR0501MB2043; 23:ymEW8VNoHWP+dalscmGcjvF1zsjQvIa4B989CB/?= =?us-ascii?Q?PBJ9t0ElLNydAlqdFFGfiw2QNI+nWSmro52gafIgCEuAQgEIGGyKstmxsQcw?= =?us-ascii?Q?q2VlO1Ag7OLO/ULNHUI1Tq2zLIaGxlpbzx25LVgYP+VlGMzP3FkroaFjeji4?= =?us-ascii?Q?v8JqrhWbI3Ooz53Dz1jPwCJNLIzflvEphtDCm5wXBnePaENA64kC5x25zU2K?= =?us-ascii?Q?lWr2FSNo3oEXEQ1EJqpUtFrkbjyCIPJrH4f880nziNaX80IJXCqQpjcY0WFF?= =?us-ascii?Q?7uDmZV5oFOeuaUboVQYFRiUrylJrBaS3qCSxRjxFLSKffsJ5Sl+o3MrFIVGL?= =?us-ascii?Q?mZ5dngExlWYx5kwIfTEshN292E/xKr9eEG4PXp99/fjRU0tIXoN74kVK9EEl?= =?us-ascii?Q?WkzNPgZ0ETYhod9aeB7YBnyz7rxrYzFt+MF1wiswv8pmSzm+08rZovFUaliP?= =?us-ascii?Q?TJURevGEoXB/vom3AwqnhsRu3iH+gmd3oFeL1gLVHy9OeJxL6VYWojUkXQuh?= =?us-ascii?Q?yl+yeHAVzfP1hBQJ/fPEIr2fhx/0Er1wGvt8CwX641VnMt9RptvVmBMn1HEx?= =?us-ascii?Q?fZH77dAMxE1MrEfqpy+H9w8T5oQ8WHjmsNRg3EHs4cAUOoUmLhca2rFXjo0D?= =?us-ascii?Q?YBm6i2fDDpPn/VrySSYzZenQ8+ctkGR8aCY+HLxgW0SCA7PS/q6IJYIqTgtq?= =?us-ascii?Q?9jBZ2juAh2JRvJeU4MT3FyRktT5RtJHxZ+huRv/JVUAWDrGLjojwGtVwzOZb?= =?us-ascii?Q?cPS7/am9ZtnzUxABtB4qBzK1xsBROuC8PAE3FZKAkxg3M9S0rXED98ZarI13?= =?us-ascii?Q?YmaxNIbvb+rGzTsXy0/myLUh8Bs2zJ11kjWdt5NL24seu4YHaSgV+HLANc7g?= =?us-ascii?Q?U+hZA0pNB21q0/SUv3qujpAqmWBeT+fD7wVOvgo4lqKTGdU6PkG3nFN7IMIu?= =?us-ascii?Q?p4+RSpDjSyd3219QhDcD78muG0a0F27ZaD8udUJIB4Mpr/Y5vSC6fmWoXAkW?= =?us-ascii?Q?fjbmtLYv8QNJDPy6burld6xFuIGt+AZ7z+BsGaxUpkrm+q/h3dtwSZOmJATf?= =?us-ascii?Q?uL/nG+3gcTuKD1K93nV9DMQ1ymvrFi9N/uyjvNReQFjEo1VZpu60qFi28Aso?= =?us-ascii?Q?VS4rqJfJ/teymTqQ3XygYfCyP9FvV34wWPauPpwNRca28KIOpaFHLJM+E9by?= =?us-ascii?Q?7mpZ5P5OpMT1bA8KAWBEjSXXncl6kdjiCGHcvyXjwdGoW9Znvm9rgBpxQymZ?= =?us-ascii?Q?G6g9dFGySmBNDWKyqSV5wc/SpJzO0bwx7+srFjuzOPxFYXYhaniK3gqg2xGO?= =?us-ascii?Q?fRV6dfioO2mjf+6SjZvPshHyc74D6vCX4y4q3ezySaTyTXQq5NkoDpEKXLI3?= =?us-ascii?Q?X9gPh6Q=3D=3D?= X-Microsoft-Antispam-Message-Info: R4wYTDEhnJYsUAjMTddDpzIapKS3vTEEVAdKeyxkQvgXVzEKQmR7COaF8ehRHtQgafxIbBqHR5IWsiVeUHQBU8w5QNwAJyVDgqR55tTj7yh5syhCzr8SRqpCFrfuoRV2WlKVDo2NjO4YQFgHMx72GXJkAwAR0aGZCbmYJ98qWwemjgqjZvurP6JjY1UQUJ2Q X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 6:2KelLcO2ejhMAaJNWiXnhrdFEFuOkKlcq5vymQYM93WVR4iiFLmUMNalYCkAjDN6x1OdwwqSDQoQ20dtnPgi3WTFoTavfE6xCdrVxCzUZ2rPUJOs/0Wzzn6XH2QjeV7gtMbvcOj+X0aKw7b1jz/eC5YuW8FWotFuDQGI2G3UwTBFf3SuJ5ymVEMxyMlmkSbhluvHL8IL3OYNt/PrYJdH3FQdKwI1jhrSwnlEdjxd7MFGlwPULmkjz3NBFjan9tic2qJJFM2RgcsKjaC8sHCsbhjgvTRt7TF6VdCdtXiEwe9MxHP8yyVnwiYONCkcyxApZqQGPfFK8IkoM2YOYRemhPfPlkOIHV7luE+i0wZ/9VUt2nccNjiAbsvTBfm9v4AgtsOr+e9E71mxtv3qNlppzilfez4rB3f4kv+/Nig+K6LHDn2z8bEBFI+zYHw8FLcH3cdRn1wLqTHM7TIQU1JuHg==; 5:wgOmpBHfoj24U8136HpZ7rPUHY5uFzmi+3nKW38Zd3Q0Qonb4SiZM4jznXf62c/n/ZtMKBiB/RYjk57cxL1yr5sdnRG5X/3L37Zq/3+ZrtrcdavzSmU21Xrv7RKO/fQHsbcVIiFQp/A5hU5Z/Zzt3bQvdysMEK0mPfS6Zjet4j8=; 24:ggv38x8FJkvhBxIYd/+/vw9uwUaPX2zAvnisX2yRzz8SQnt1IAP+/ldP1RzQ2HTc4EeunbShbMWpvWPv/KV1nusf0I1CFc8RffOk8krvyZk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2043; 7:8r1e9umdLedrLn9xbsXtLTPkhYtEVgm0bgj+NcS7XiYN+aM2L+VICCgAyuAD5QYNKeomUXK4KjeUGDEi9Rpuhsw7K+oEzPKDrYCuh/7b5xnh1dz3HUCE9KCAWqvA7gdglsXehPrtN/zPSgSgMWnbNzn9TmS7PaKAYZootbFsoqMUqIkyyjMj0DlSc7FzAxb2IDv4cw+Nr5yQL10LbM770otHvJpuEzV4rajXNDl74d1Ho4X99/48HV74Inr7q9+B X-MS-Office365-Filtering-Correlation-Id: e9d8633f-4304-4433-6362-08d5c0feea84 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 May 2018 22:45:41.7657 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e9d8633f-4304-4433-6362-08d5c0feea84 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2043 Subject: Re: [dpdk-dev] [PATCH] net/mlx5: fix generic tunnel offloading compatibility check 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: Wed, 23 May 2018 22:45:44 -0000 On Wed, May 23, 2018 at 02:59:37PM +0300, Shahaf Shuler wrote: > On some distros, the inbox rdma-core tree can contain the Software > Parser enum while the remaining structs still missing. > > Fixes: 5f8ba81c4228 ("net/mlx5: support generic tunnel offloading") > Cc: xuemingl@mellanox.com > > Signed-off-by: Shahaf Shuler > --- > drivers/net/mlx5/Makefile | 7 ++++++- > drivers/net/mlx5/mlx5.c | 4 ++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile > index 293144e8a0..b09dd785ad 100644 > --- a/drivers/net/mlx5/Makefile > +++ b/drivers/net/mlx5/Makefile > @@ -118,11 +118,16 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh > enum IBV_WQ_FLAG_RX_END_PADDING \ > $(AUTOCONF_OUTPUT) > $Q sh -- '$<' '$@' \ > - HAVE_IBV_MLX5_MOD_SWP \ > + HAVE_IBV_MLX5_MOD_SWP_MASK \ > infiniband/mlx5dv.h \ > enum MLX5DV_CONTEXT_MASK_SWP \ > $(AUTOCONF_OUTPUT) > $Q sh -- '$<' '$@' \ > + HAVE_IBV_MLX5_MOD_SWP_CAPS \ > + infiniband/mlx5dv.h \ > + type 'struct mlx5dv_sw_parsing_caps' \ > + $(AUTOCONF_OUTPUT) > + $Q sh -- '$<' '$@' \ > HAVE_IBV_MLX5_MOD_MPW \ > infiniband/mlx5dv.h \ > enum MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED \ > diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c > index 006665600a..91dafe93ab 100644 > --- a/drivers/net/mlx5/mlx5.c > +++ b/drivers/net/mlx5/mlx5.c > @@ -775,7 +775,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, > } > ibv_dev = list[i]; > DRV_LOG(DEBUG, "device opened"); > -#ifdef HAVE_IBV_MLX5_MOD_SWP > +#ifdef HAVE_IBV_MLX5_MOD_SWP_MASK > attrs_out.comp_mask |= MLX5DV_CONTEXT_MASK_SWP; > #endif > /* > @@ -801,7 +801,7 @@ mlx5_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, > DRV_LOG(DEBUG, "MPW isn't supported"); > mps = MLX5_MPW_DISABLED; > } > -#ifdef HAVE_IBV_MLX5_MOD_SWP > +#if defined(HAVE_IBV_MLX5_MOD_SWP_MASK) && defined(HAVE_IBV_MLX5_MOD_SWP_CAPS) > if (attrs_out.comp_mask & MLX5DV_CONTEXT_MASK_SWP) > swp = attrs_out.sw_parsing_caps.sw_parsing_offloads; > DRV_LOG(DEBUG, "SWP support: %u", swp); You mean, even if the mask is defined, the capability struct might not be defined, right? If the capability struct is defined, is the mask always defined? I guess so. Then, how about just checking the struct instead of enum in order to define HAVE_IBV_MLX5_MOD_SWP, instead of splitting it into two macros? Thanks, Yongseok