From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0056.outbound.protection.outlook.com [104.47.2.56]) by dpdk.org (Postfix) with ESMTP id 041D0968 for ; Tue, 28 Aug 2018 20:45:39 +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=Nne0yWG/MHv2pXB1NsekpKOBM8r40FuIO8Jl7XfMEsg=; b=fmSguP1TzSTdOtdJRoEv9dpthMGJ20MDILOYq/w7j0AMasB3CqaYVQqmaSX8qBrIA/xxIcP3t4KUjhVuuFjm9CmbyZR9HhFpt7/mO6/Qksh8cJLQHo94jVBv5slIwOe8QVQTle1ZW/meNDZOKn+T58S68Ogvc80sib2FtUErwNA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by AM6PR0502MB3976.eurprd05.prod.outlook.com (2603:10a6:209:1c::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Tue, 28 Aug 2018 18:45:36 +0000 From: Yongseok Koh To: shahafs@mellanox.com Cc: stable@dpdk.org, Yongseok Koh , Nelio Laranjeiro Date: Tue, 28 Aug 2018 11:45:24 -0700 Message-Id: <20180828184524.31457-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: BN6PR11CA0004.namprd11.prod.outlook.com (2603:10b6:405:2::14) To AM6PR0502MB3976.eurprd05.prod.outlook.com (2603:10a6:209:1c::31) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85db0990-1a1a-4d3d-25c4-08d60d167246 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:AM6PR0502MB3976; X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3976; 3:VlEsKeqpE8Ra+MB2lwEvc8wyfffJk4EzOJPral8ZuWbmyQc4B0ZnZQouWRMlsVZYaoN7Uu3jOjJYP9uxrII7nhF50n5U8eGOzGpoJ05FPqXYDXZq1Tq1ng1AMFWpiUMbTMkjqm7boX2FxKXMgYYlXISWj4yTfFwB4LGUMuDYVu/7Vmd/gHcRn/+bMRjpoM9rOHV4Sht2+7+nl24NVJTM3AIHfScbsvKZexGfrJUBpTXSE5hDSthjGIFAJWfqHefq; 25:Fq0oHz4LpIrq1F9zlgYSSohfDRK6y4KtggNjRti6Ru6+nZxsKVriplh1nT+HVKmDqCD6YI4yFWE0d3qoEttI6gnwcTEoFJPMz0w2X4vSpiPXQ5M7sjbq2Z8yosw8PBjcmYZix04HKEkS2Ih3MWbsE5GYuWWktG3MYqew+xRVVngKdXHbMcyg6DgCJUPzl7RaaXiMRa7w5ckmDvRDaFuXRRehWgFQgy981CcjlUIpW+mhwTifXHhZyWNRZ2nbMPEXNAaToccxuPonEfFrylpzXEbWTQu8Uv1f4MwzOSgMKNNypQGvcA7Fj6EjFECfAuaL0rp1XbpuQKS16WfnKWOdoA==; 31:G6NWzO15tYnzFaDkotYAcCTIv68O3wZxWOT3KcHEbf8p3yo11h4D2QdRJyjXmCYe3mnlS60IstpF5+WFT3+GW+Ivf2P/0Nx+4lj08J01Qa+Hlqv9NCPJJafTu+i3BrJO5gCDGgnosb7RcYR+hnWmlKdvjOgh84YS39dtvcIW/1e3t3fJWBXGF5GnuE0iogJgXwy+CdAkS4H4CXOWprbUk6jnVsnnMFoSRugmMVepBcA= X-MS-TrafficTypeDiagnostic: AM6PR0502MB3976: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3976; 20:oe3ExyDC9dwwmBDtygLLib01vIs09MDbI7OqXRN0/mToWhQv5I22tEr+HFvk5ay4cVLWDtV6ZbPvW0RgMm5Nu4TOfGP97e12cYfCHIyE1jDI1uMahUBJzAd/q8+tsoeYajL1pYNUa7YATVT1N+WxaQ10RJ+miW7oM/XqQILRwBpBk935chG2Bej9cgU2BI6dn42XgTIZP9pyipnIjuMACrXSMu9EzRp4NmyE66VQ4T1P3FxXk5l+JzFiZtSY5SQCUDsXDl0+KfzZPsdbmK0R/wAX3YCRDrfOOZ/hTZTR0bPG6ZOfwiJjmNWrFiXbYP8s2Y6sFw0JNYHFhRWlbbXf216zByyjz46+rExSGpqtW8de9WyYjo/BpAHF1zVB4nzS2HgGG6eUMLYY+r+NloKpZnlyyGoBnywB0YlVYnV5C34cdvKgR01TYVLriklPR6xfiKZC1s7FmDJPridT4sWNwA4/NhGM3PNHcByuCbjqdwae2NMe9cYNLXVyN05ukSum; 4:9/lNV2XMcKERLKk8qSq7+d77jbfhtDBfoydC52IqFk34tFrP882BvuGWZa45/n9+ZBPbOQkBvIYh95rLxoCIXK2bRzAdCDK4mGF96SEI9Y26QfHBC3Cj+nd8J1tU5fiOXJqX+7Qk2iViKu9GnqclOP20Y4ZyN4Dc5atsK2bOIgVlHe2XXoe+elWt+skcrP8hGvcyVC7x4YhWK1BhKGGHdtdZ0Be5Gdg+tOVi9OVaWOWCFc1kfcLRw91Mq5edIEXE+s7NNFxOFN03G2VgcQNbNQ== 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)(8121501046)(5005006)(823301075)(3002001)(93006095)(93001095)(3231311)(944501410)(52105095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(201708071742011)(7699016); SRVR:AM6PR0502MB3976; BCL:0; PCL:0; RULEID:; SRVR:AM6PR0502MB3976; X-Forefront-PRVS: 077884B8B5 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(366004)(39860400002)(376002)(136003)(346002)(199004)(189003)(2616005)(14444005)(956004)(66066001)(6636002)(68736007)(50466002)(386003)(97736004)(476003)(7696005)(51416003)(52116002)(16526019)(2361001)(7736002)(3846002)(305945005)(6666003)(316002)(6116002)(4326008)(69596002)(486006)(16586007)(37006003)(25786009)(47776003)(48376002)(26005)(478600001)(86362001)(50226002)(55016002)(54906003)(2906002)(1076002)(2351001)(106356001)(34206002)(5660300001)(8676002)(53936002)(105586002)(81156014)(81166006)(21086003)(8936002)(36756003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR0502MB3976; H:mellanox.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:3; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR0502MB3976; 23:tLQvUvGpDCu8P379aOUIZ67VQCfQqfxJrs5+CbY?= =?us-ascii?Q?dmNVZtwK1C2YJ0TMiUnTVqOyVW+tB4q402m3f5j+OjjCBjb5/OLeSawEXJUD?= =?us-ascii?Q?rRL7kgg6HPpZIsllW/KA6txq6qHPCd3gO0A+P+ezX8vZI20mI+p+7sRlTjHT?= =?us-ascii?Q?LJQh8bIZA4I3ZTKnII9M4QPSdu5n6SyAetjARJKeK4XrgEab9rcayfeXcsZK?= =?us-ascii?Q?ScsI1XhjsF3Orp9rxko1/Z+zzYSzuCIpYSct/m4/9DJ76nXNFAJFaz0a1qhQ?= =?us-ascii?Q?PEgTjvhKXZ1LxdVnPx0u0xdAJlqm/SK1o8efUSOZ3ItorDHvmEiZxwhavqUn?= =?us-ascii?Q?ayi8lBW6O4n0GU3U17/ephVf/lhutzCL94sw/8xdByHYrXTfPip5KbP2L9gk?= =?us-ascii?Q?PY3+kbzlUCSwZ1W6nGbNqtHrQNgue6F7q1ConwjZnsJKbI/pqe27h0YUDCMo?= =?us-ascii?Q?QqZqHsZF0HYF7gnrQJDITamLywiBqsUpKJ6pD0gjXv83OoAYO7+FfPZz3cXm?= =?us-ascii?Q?3wFsF+fQ6Cp46XMlYfNYBQWG2shu+CC9rzOrbUecDin39/HCuzz5MYjiez03?= =?us-ascii?Q?Zxo9JhhxXJMP8A2y6zp0FK8rHVwdrP6RJubiIQWSCBQgXyBYPXZ0L75fy840?= =?us-ascii?Q?vO8VDWECC6qHtTNeyQxgTnsC6ltdbv8mewbyeh+43HtykOelQxnMtDRz17+L?= =?us-ascii?Q?KgbO4srdIWDN0Vwn4V1AIEP8xA9BFvwxaj/a+eM71Ni3sZcjCdGhwh2pRwIZ?= =?us-ascii?Q?gq3tzLLmgoCU4IWXWMUE9z0zg9o7qcHgSeK5T5fItKYM2qP9k7TxMHDJq+Ha?= =?us-ascii?Q?qVfxfyWYSz+skA333q4Q+/i/hpy3zYaY0FVYUACwJEACkMuRKptRzsPdycO7?= =?us-ascii?Q?/FPLc49a90j81HbyUnCCbLGDCapqNgKehlzeDA7AXElAgnEy1gM5FAxsgxe9?= =?us-ascii?Q?Ye0tBWgqpcYfdF4zeELX69JhyP4CTh8a2Vbf+m1hLTvnrahuY5lcZe6Nyubi?= =?us-ascii?Q?fpxl7kRellvX0P6N6/qZTEOJNmWkINZS5YvvdP4+RhndvlzVVEQQe+B5ZC9Z?= =?us-ascii?Q?M7VuVm73iClpr3YaNgBOSBam9FG9HmIFbfw5FfskMIqPD/7EgLT6RhS/vStN?= =?us-ascii?Q?9Iym9gKAS/CeJGY9j3Bs4jtK4abyp/nfeBjIFsiTD2DS8ZEGP0PVIx6LOyGW?= =?us-ascii?Q?Z7o90mgHhrrmbVUSuClCuS8GPUxTOh4zFbAcrmgJ6KsQD62UezMeks+aR0kF?= =?us-ascii?Q?IrYDjbaohx7BiEeBNs/T+bSnLbvcbEjcfVIjpZHLh?= X-Microsoft-Antispam-Message-Info: RF+cpjE0a6fckvfafsFJkaAkO0iBVjP3QHsQ+cLjP5cIJpRjvWmLCx/fGsPv8PfxjuBKRBO3KtX0gXF15+tJQzAXiY2vPfXAAuSdVV6A/an3ebfTU7O9t1YIWO9rzLW74ToL7K9W2Gnj++w+OvK4cYsezBVblhBAJUKVV89Kv/tcyUcfZUdFNTAS+M0HlXGKWSqI2la9C4r9ToNuMLg0pwgMc+GstN+zNgfd/bTvjWEWarUUbMC3rkMXyrQ8fp1xLinNkYKLBZ0YVb46rxgxlzR0nhKxjAQcWnDuRHo+BRBUIhvagGAKWWNdLv1D8dVCHtXBhRZ9pWqriEFfbpLP+rMNBqOo2z7xDjP0pXKoeyE= X-Microsoft-Exchange-Diagnostics: 1; AM6PR0502MB3976; 6:2GdqA5fxD5vTQZA/C+PzLt4RIRoavEMCyinA7BV4UJknTnFrGC0LemTAh3aXHKW0o2oROc3FeCTA5rxqm6CJokL3LbZAs9ZeQOo1LepeuOJaRSUZ6TQYRRlhYZV+92VVAEwOXucTViaRrtHytaLAmBkZlZj9Okzd/NCu9PtGoaD9amUKhPNJeAK+pZixBkvUyB5bkIbCSRQf4dKqXbNKW3BIj5uMTqZuLxW/x5ONPED1LNqfMHW+2fzn7yqbvexdd79FDoWjQ6jy2Qbpvrr2St+5QcJJQeUFP4zGHVDLxG4c5jb8yxSzijUqiNvV3x3qXEnjHaGR7p+8mzN3tL8QpEPdAm4s39EiyN3g60iI99z8QE7K3RNtsIdAbyC6EFU5wpCXHGuSfMUTxLQXtsrpQgW7vsRz1cCJBchaVTdbEVRNfZADAE4pgdEG+eqywxP4g6an412HLHYVNpYtPD4XIg==; 5:vDyVkHYUMUne1D9cr484rlxJp8cQBrf5DH/WF22YBh4fadtpFjxb5QeYdOmfWNBCed76wI0Ty40s0gYWZoltwbB3BLxpJ4n2kpVCxo9ScgeL42oOV1JmLx0VWbjFfAfkWxLH1WY0ULJAEqsCzZCLJQTgRihciFftUQMsXdvDzwc=; 7:Z5o3AVg9ycGSKIp2ewHbfo2opRLbd8NNC5+7qprq0LsOmJarUGXvb9wAHolRNeTlUX4RZFkxAi0+teCl28QIgsVKBW//guOUN2Jw6xV+ENBIJxsTXOidlywiIQNSJgIeJFUSxy4Xbw9Lus1+1Lh+cETMqUg3TzMRQ9yHSs8T94lZWwdz5M3PdkoZ535E3V5mSXS7Cr+z9tPyvTIgdy9XYUhnEk88IQ3LoTBZFIPtj3nQUNnn/2qf50YeVaIhcDuX SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2018 18:45:36.7258 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85db0990-1a1a-4d3d-25c4-08d60d167246 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR0502MB3976 Subject: [dpdk-stable] [PATCH 17.11] net/mlx5: fix flow search on FDIR deletion 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: Tue, 28 Aug 2018 18:45:40 -0000 When searching for a flow on FDIR deletion, the index for flow Rx queue (flow->frxq[]) isn't referenced correclty by parser.layer. This is a bug in mlx5_flow_convert(). This will have to be addresssed later. For now, this workaround is enough. Fixes: 37e900246c43 ("net/mlx5: fix flow director drop rule deletion crash") Cc: Nelio Laranjeiro Cc: Shahaf Shuler Signed-off-by: Yongseok Koh --- drivers/net/mlx5/mlx5_flow.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 7e69f6aba..1822c2bdb 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -2960,10 +2960,21 @@ mlx5_fdir_filter_delete(struct rte_eth_dev *dev, struct ibv_spec_header *flow_h; void *flow_spec; unsigned int specs_n; - unsigned int queue_id = parser.drop ? HASH_RXQ_ETH : - parser.layer; + unsigned int queue_id; - attr = parser.queue[queue_id].ibv_attr; + /* + * Search for a non-empty ibv_attr. There should be only one + * because no RSS action is allowed for FDIR. This should have + * been referenced directly by parser.layer but due to a bug in + * mlx5_flow_convert() as of v17.11.4, parser.layer isn't + * correct. This bug will have to be addressed later. + */ + for (queue_id = 0; queue_id != hash_rxq_init_n; ++queue_id) { + attr = parser.queue[queue_id].ibv_attr; + if (attr) + break; + } + assert(!parser.drop || queue_id == HASH_RXQ_ETH); flow_attr = flow->frxq[queue_id].ibv_attr; /* Compare first the attributes. */ if (!flow_attr || -- 2.11.0