From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-eopbgr00076.outbound.protection.outlook.com [40.107.0.76]) by dpdk.org (Postfix) with ESMTP id 2CAEA288C for ; Fri, 27 Jul 2018 04:33:58 +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=Kr+abvuhRAjiVrV+tsjPPpVp4h67a3qbD8LKrVhWPFM=; b=kwYCUOMTyWpZoKkKjkJh9hrBtluM/jlUGB7BQUIIzrwdsiI+TiMVodaYVsTGmrW27vTlmDvs+3dSI5/AnavfFpDsDQ9ec80KWsfLbkLzs76gqgwg6GjfHLn6vEAwI3JgUkwo2uovhx4MUVxeLlr9oJl4Qkie1JylVsXSKLV4f8s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by DB6PR0501MB2039.eurprd05.prod.outlook.com (2603:10a6:4:6::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.16; Fri, 27 Jul 2018 02:33:55 +0000 From: Yongseok Koh To: Shahaf Shuler Cc: Stephen Hemminger , Ferruh Yigit , Ori Kam , dpdk stable Date: Thu, 26 Jul 2018 19:33:39 -0700 Message-Id: <20180727023339.38855-4-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180727023339.38855-1-yskoh@mellanox.com> References: <20180727023339.38855-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BL0PR02CA0083.namprd02.prod.outlook.com (2603:10b6:208:51::24) To DB6PR0501MB2039.eurprd05.prod.outlook.com (2603:10a6:4:6::21) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cc20e7c-5da3-446c-568e-08d5f36966f6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989117)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB6PR0501MB2039; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2039; 3:VNxDHhAvfuBEPYo3aoqwsU0GTICvyrBxMhtgtP5QiiRgW/15odCb3TuRhlqpEeGr99HOunig9Sgf/IFk7GlG9jFpzliVk20NAojqH5Ldvo/hb3XQV8ng6vZtiX15Tn0olRE+oE1q3qVUQQShJNNHzIx9AH/JmmNnj3Mnmv4tfS8T/wc4zDcigUfLR684OCyfySmNSvhx0ltcz3smV90iFM1xo+ALVDWZz0DnONLEdXIG750q6Uj5IbNls0zTtvAK; 25:ZpofNRT256HcQ9EZNWWlbBRFHzY4aYV813arBmCqApeq50YaR8JnfGzh1mh2pWlEIORyzV2CxByyqgjtCW2l5QOPy5K9opYf/7ZhaxzB3vrP2pHkl0kRGBuCnjZYE7TM4ktAkMgSyFsuQbWclLpVp43kbO86jkdPtcHN4NmfcoeTeT7ciBuOJ3pPoWCvqNHY6UeDQuOtLnGF0wIIHVIwRYQeDs0UOcdMSULa3FpcW1dbXHL18SIjXWIzjSkWXXDevuafrQerghIT0HvimiYeIIXUxNtpX/AHhQZArPbZbeiq8J5ONPod4Aa2ZmuYnFNtee7VGRpzxcr7nMHjCVVWDw==; 31:DTHBzpDS+kWfXdokBECJWky3Bp0EtHI5XEf2Fg22/DXkM1I7geEILYI5QwsagC9jSqplWzmezO0EQwaYQGUslysW88f2sZ0mliSWAC3yzOmQp/fSGW92lCMqbNHSBJdrQQPwbppeSoXQ/dq3hm2F8yDZY5tVkB40byGA2iQxFO4K2erlGqRaDx/JFLlhPkAKRLkIC4WjRZR65b4Fdv2qIKllvUizj6AT+OxscDSpuRY= X-MS-TrafficTypeDiagnostic: DB6PR0501MB2039: X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2039; 20:0SCPF9HF48mPD0/OmhJ3MfX2zLWYKrvr17x8PTJ9ofxmwCL6M8+InJMwhhWnyixuC0ZdJyT8IeQRzZHQnRZSrYT3QCMgahl6as3Md4si0iebcibkDT254spSednhaWcpashTvSYHNhp9VK1nephlO6xliqZfuJ7kOv+Aa6IItxH7uTYDaN3j1oniitZndukDqNJ5WcAvFn4Uj0soQluHBJ2gkpJMvrDnacEasBEBUsvE9TBT4LK/zvyfMQEGvZRKPoVVpTiMLzRMqNo1+5Sl3Wf6J6NuOv9Ea8hgHCkwRWpPFJR7z09bhCmIl1aTKlioSB21LNaJTjBfODqvUU8O3VoidePC2PsEa7XvCDus+ZsO8iVTFtCYdJFDapF3I8AiZtp65/qQFqOavXllz04gZDE3+vEc1VNLI5bODb+pftfB2rlnyGhv8CZ85LQv+k72cx723OlcR5RNit26gUnDotqSOM4wfcTlyvDlG8hUK08LRUzxRRCyuQpkWxhTrJQV; 4:FjdkrnCF2BVFXfCUA7n7LxuSKIYyiQNupDhH0wYnq2gPYNpUaksVv8Y6RNb0hjaLCanMZcH95Ix98iQPy9vjeKfM6FpeHKQOcXhmkI3SV9pdFx9T8T+ee8ofJ8xMJgvVM1qxiQ0Tl+YMnc3bRAiBpTrEhHvTOMXByAM8ljsM16Yn6v3SJdtQmf21I3K+zBVlyQn1rtRIiXB3HNlsyJjXmLk2NuH8wQbuhboEQfCXgRhuAUXjKQ34IcDsGs3c+XeazKZGTfNnxchMN8MYBcGldYEQ0Ud5WQplj6JED9zwd0rOI/iqSjSXfrrmd3idptIO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(228905959029699); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011)(7699016); SRVR:DB6PR0501MB2039; BCL:0; PCL:0; RULEID:; SRVR:DB6PR0501MB2039; X-Forefront-PRVS: 07467C4D33 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(396003)(366004)(136003)(376002)(346002)(199004)(189003)(69234005)(28163001)(386003)(69596002)(2906002)(53376002)(14444005)(6862004)(53936002)(3846002)(6116002)(966005)(21086003)(81166006)(81156014)(8936002)(76176011)(105586002)(54906003)(106356001)(53546011)(316002)(16586007)(486006)(51416003)(7696005)(55016002)(52116002)(8676002)(6306002)(1720100001)(37006003)(11346002)(50226002)(5660300001)(47776003)(575784001)(86362001)(6636002)(305945005)(68736007)(446003)(7736002)(6666003)(476003)(25786009)(97736004)(4326008)(1076002)(66066001)(48376002)(16526019)(50466002)(478600001)(956004)(2616005)(26005)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0501MB2039; 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; DB6PR0501MB2039; 23:SLnFfgUojjchL+bUUf9/UnDdmxTk9zFlk9yMm0H?= =?us-ascii?Q?WQWHlxMdN/qrNkqbqvdfRPpqLOC9QsJGV4MlTCSj32wUJNvzndYYRACthyaA?= =?us-ascii?Q?HbN7O+6hMvf80IAsPUi1QkVp0hWw2MR94mHkLhN0Jngh9H1+b4Vd8LV/5RE6?= =?us-ascii?Q?ewbMR5umChWgGiFjKlLBzyN+RnVZbL4hyi3uMFG+X15tXas6swMtm6/bTbbF?= =?us-ascii?Q?gudh067Ka4SvcCU+k6NVtVSS7VDVMxaIe6R67PlOB2f+yz2Rm0BzgkegqvQX?= =?us-ascii?Q?70o405FDYTHSfXFLLDNSuoysfTH+k51ERq+zW5ghcOK3ZH4weUAH/3rkaBH2?= =?us-ascii?Q?5EYbAI9UvbAposNFErQZbXPbSr3zh+sVLixuGPZKGOwCdv4uYlWmoAkjYhWl?= =?us-ascii?Q?HjJdLHZmbVwEsoPSEJdiQ7eWo44jlwHBEPx3PhAgsCBID7S6gkre7ey7vRpd?= =?us-ascii?Q?jVMQ3hWab3K62ec/ZfR6to7Y/mXNGZNRzoUcEz8pNvS3v4J+E+NvpnbryjkK?= =?us-ascii?Q?YFGxqnY/so++s3RUglKTr9Lsvj9N1lttSVcCN0K3VOQ4l2OZNP/y7q0ORE8o?= =?us-ascii?Q?CJ26+bmmitN6oLx4IlOeMNfjJHb31Siz+KDHGkxHnKg9v7IWqRRihUITZcRX?= =?us-ascii?Q?od8+ee+ockIX5JpW+1ymwDon9FBmEZRRYLd+TDeevBxMYJ2+469Nq/T6uuA9?= =?us-ascii?Q?bctE+imp5cX5xrvjA3ZE2LXdYHXUA1D8OoUCsfJhodqmIsXq321yMAZjqwZr?= =?us-ascii?Q?2KRkjdOzkphn104dv0jRRmw/GLRHXSdRbCEF95lzKLEc2EtpiX+/T/uqwSp0?= =?us-ascii?Q?HIHiTap/sO1xqTrz0frY1+bsFMziGHBcvqyavkJbHc/FLFnNZAStZUpnqBUR?= =?us-ascii?Q?dv8eXOzjUUvDoOTYu8dhZm/3bwSh4wvJC7IOlo+sYH4KrBCTaN3f+k5oXQY4?= =?us-ascii?Q?fP3QX7RZvilghD5EuEWghlfWxk6ZV1UFmPEg+PV7WWHBfK3y1IU5kOXMSxt+?= =?us-ascii?Q?xqWXDHhVjAxPKn/JMkrXNmTSbBl/27SKsBCmWV7Frl24axaNY+kx0oH6NOHL?= =?us-ascii?Q?kNbVUFt9QfYf5yMkvjh40kggYHy0Uswg5RQYCUeu2FbI6OTkmbCUf/jn/4ti?= =?us-ascii?Q?fjoskWrXM7btyTxnPP9dYiUiTdBq41LQGq3a44iNSgyQAgEavVloljhjmGYx?= =?us-ascii?Q?QH4QsWnQU4fE8uf8A0+BqUqX9BsiDsSOmvKnyKnhTv5fyyTVhswsb2ovrvw6?= =?us-ascii?Q?Qfyw9fp+/4yipbNxP228LJYLXlOprmw0uhGX0ao+lT1KiGzOxlJ60BD+YXrh?= =?us-ascii?Q?yIJt4aUxeI/Bs3L15ltpHHLgeoJevlAkFMkdCip67oqMjqoFCcJsTFOoOxcv?= =?us-ascii?Q?do5X03bqXtjCmMxfBP97W3YyzOAME6XMUHtpqxjZ6VIZyjLpVrQ0E5OBLL0D?= =?us-ascii?Q?aBjPBcUSh2oE+n2oDvESx03L1X4Th3hg=3D?= X-Microsoft-Antispam-Message-Info: jspUUgmibiT+3pqAxZr1J0Xf7CCZscuOkauFRfNWfFMBbRhYTyCBfdtZcjSL7o9tg+JCKQrMz+VP7suiw1swJWgNptmtl+ZnCcegjStH/POHo/fO/DWHAe/AsMTI4Vd2sBcxfIDT3pr6bVhc5Lqr0knbbNql7KvJCPy0n286mZVYJu4ylRMWRkpWdv1vF++08Kdaqag2feG6r4fyCplLCXw37GDdU8/X59mJG+p/ycc62OjHe36D3lRN/o2LiDst7y6ICOQDudX6xE2mEkogX/fXQybQTbLFM5QRzOdQmchjkKkg5z3tukLBGeypbxWmd+BiMM3t+W930iE8TPxPGN8BgDN7+N7Zh+ThyuJO0tg= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0501MB2039; 6:If6m9q5UafA9Hm4J6h0AUPYojplmr6RHR23BtxSEmvjQ92XiLNA4IvmMcXlGWZyTeHFIFuEkVtJJkZASSQIWVPoHmo8MAg+VbkAORYbzXnZlbCir0Iig7lmIpCp1xPaA2haHE/0MH/y9sR9dl/3TSiTl0mAbeqZhmst6gYsxGOt10IqYFcYXpWE/n4Sf3h04nP4jgMnhrLncmmfmxzHr3RAktHHJdF7rPGD6Tmnh3f+ZoWCpgMslSVi7dqqyX8vFLY6RuNeOBHlLlWboPgvPx02BhUwplCOsf/b765m5VWf+gnnNLeenb2BZbWieU7nLh9wL6Mq3ajUXARG3/eV3MbVk4Ox9DKihg5wGJDo87BeOh2wGpIKaQ5ZGJQh9p2935/CKLq075rutInGDQgPYo2AhdEACS6ceKAgKl9ppo3Nvwq701bXAMRvjcYBH3KwMEUst+z8OnvBnoHtJ0rynCQ==; 5:OZvb8ewHBmgqBctTH7xQGdhGGFXi6kNUoac/4jqilL1ZtiproC2K92B/YKWpb8+zkBdz4lNmto59yOthL7FdA7AGCk5qp/tSMyswaIOFZ58aOWuThLnL7odjqktI2ZHq3AZ4CDNnFqE+RnXJuNXB1KLKPV2ny0qDnRiXXhUNo7A=; 7:idTFm1+fUVtUnL28Tk0bRxhyJErtChIHD/Pn5ISyNHK3tFeJ/vOGirZtHb11x8o0zGAeIiINX/byUrEJOqXhzm6balqX+w+VtKhgFD+4VT+oKQSvZkucuON5YU99VbjDNSplyno2DRxYI47XQDjqYwd6HoNJG5Bh1Rf2fpyU3KXJDP4XwAPjRFCcRanduWJTsnw/hR9zZg7DcBp9hMwqyfB6cxmrjVWmXTPPDOp/U5EAcXSYDTTcKmRrKONUhV+T SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jul 2018 02:33:55.4667 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9cc20e7c-5da3-446c-568e-08d5f36966f6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2039 Subject: [dpdk-stable] patch 'net/mlx5: fix compilation for rdma-core v19' has been queued to LTS release 17.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 02:33:58 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/18. So please shout if anyone has objections. Thanks. Yongseok --- >>From c815929830ee0947563da3260bc9f5d62da80d9a Mon Sep 17 00:00:00 2001 From: Shahaf Shuler Date: Thu, 26 Jul 2018 09:00:02 +0300 Subject: [PATCH] net/mlx5: fix compilation for rdma-core v19 [ backported from upstream commit 06b1fe3f6d2121009b3b879e92b8cca25d4c0c42 ] The flow counter support introduced by commit 9a761de8ea14 ("net/mlx5: flow counter support") was intend to work only with MLNX_OFED_4.2 as the upstream rdma-core libraries were lack such support. On rdma-core v19 the support for the flow counters was added but with different user APIs, hence causing compilation issues on the PMD. This patch fix the compilation errors by forcing the flow counters to be enabled only with MLNX_OFED APIs. Once MLNX_OFED and rdma-core APIs will be aligned, a proper patch to support the new API will be submitted. Fixes: 9a761de8ea14 ("net/mlx5: flow counter support") Reported-by: Stephen Hemminger Reported-by: Ferruh Yigit Signed-off-by: Shahaf Shuler Acked-by: Ori Kam --- drivers/net/mlx5/Makefile | 2 +- drivers/net/mlx5/mlx5_flow.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index a3984eb9f..6f0d51a29 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -145,7 +145,7 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh $Q sh -- '$<' '$@' \ HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT \ infiniband/verbs.h \ - enum IBV_FLOW_SPEC_ACTION_COUNT \ + type 'struct ibv_counter_set_init_attr' \ $(AUTOCONF_OUTPUT) # Create mlx5_autoconf.h or update it in case it differs from the new one. diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index d261ba13b..7e4b84292 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -63,12 +63,6 @@ #define MLX5_IPV6 6 #ifndef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT -struct ibv_counter_set_init_attr { - int dummy; -}; -struct ibv_flow_spec_counter_action { - int dummy; -}; struct ibv_counter_set { int dummy; }; @@ -885,10 +879,17 @@ mlx5_flow_convert_items_validate(const struct rte_flow_item items[], sizeof(struct ibv_flow_spec_action_tag); } if (parser->count) { +#ifdef HAVE_IBV_DEVICE_COUNTERS_SET_SUPPORT unsigned int size = sizeof(struct ibv_flow_spec_counter_action); for (i = 0; i != hash_rxq_init_n; ++i) parser->queue[i].offset += size; +#else + rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, + items, + "Count action supported only on " + "MLNX_OFED_4.2 and above"); +#endif } return 0; exit_item_not_supported: -- 2.11.0