From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on0073.outbound.protection.outlook.com [104.47.1.73]) by dpdk.org (Postfix) with ESMTP id 55370AA8D for ; Tue, 5 Jun 2018 02:13:22 +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=DrWXgwrZ8hikbhqtoDvjRmUiYQ/I3WfPiMGxNGPH4AA=; b=GRImH8H3b57RcnsbiBlMkEIQm/GlcNvTy6Zv0BmbTh26JDG2bxlcc54u5w3ZQ+HxqnKQgyUwuZWPQOirw4NX6O874rsdxDRO5WMp0Gziwz5Jr/yg9lsgR1Bw8qEUAKzN/pkrFCI/vZ4L+6Oxm3kL7LBY0/j2m9+ZWsLPxzkwj8o= Received: from mellanox.com (209.116.155.178) by AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.11; Tue, 5 Jun 2018 00:13:19 +0000 From: Yongseok Koh To: yliu@fridaylinux.org Cc: stable@dpdk.org, shahafs@mellanox.com, adrien.mazarguil@6wind.com, nelio.laranjeiro@6wind.com Date: Mon, 4 Jun 2018 17:11:07 -0700 Message-Id: <20180605001129.13184-46-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605001129.13184-1-yskoh@mellanox.com> References: <20180605001129.13184-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: CO1PR15CA0060.namprd15.prod.outlook.com (2603:10b6:101:1f::28) To AM5PR0501MB2036.eurprd05.prod.outlook.com (2603:10a6:203:1a::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2036; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 3:G6lWyiBkJ3ok+3jr2FLv2ax+8StzkNranqGNXt14cU6SRBjdt+UgnJGHoGi1Tlwu3cv3GWQ2SHeMBq9m9YJ8XAs0g67EHZpdC0cfhP2AV9Hb0dU7RBwSNe/yaiXsG0bhlviwgpCYd66Py3LWs56BPS1WxRqcMsNCG3TjKNyd8UH5kXohf7t+HpLaNJ7y3YKEw+fLaL53+mvubFu0oPjF9TTbvN+CVnznqxikDnFhXLCZ0qkvyF89QOdPuKr4Nmy1; 25:f030icaJmCNOJkZsRyI/oVgP42ILMj12srro8MSf41XDz9ZlkPNfUz5MOcDvNZ6OBKi2rzZzvnnsecXky3nYljlH8x2HhSMeJHpLCMNmIXuF3vgDiDC2muMs0p5Sro1iZtwNPSJVCVMgqD5tWOTv1ANSAatA7sW8p49mpkCn9iSmkuRki/KDW1e9sRuFPMuhhbijkfV8MebJpjRI7mg7Vtnx7lbmBdPoQERbuuAmXfUxiMjcZ3sfafu4Dcp5ufTQtBM81d+JOq1vMSJGGPY40G9aa+mc6jASylJrodujVdQh73eZGTqRHQEMsKgGNaWDEAnoYpkFhxGa7PgFtflqJw==; 31:S2mJ0V3yFpjzPUP8V7wubuiF9NL830ltPlcaKFPNlNu0gCzgqs8O+b2gzh2nq82CDtaqPv3Dnuy0zjvvxbUFqlB0oJDilp5sDn1RHCK+rK+5lqk7+3AIYpvFP5LO5jn47PAZET5LS1D9kpNKokfqfP/WnwQZiZlAm5R+3jFmu7bkGuQCdboyeFgBnJsjjCmF9K6/uVpihE15VgImdLJz6EZ/1/DZem0fQkOvnfieekA= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2036: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 20:MP+wcURWxF8lVvQxGHDNy343x/MVkdNvdJOoVtEOfW8AFv2/L+6rX2PgQNGwWiYtXDy8W74QL7kosVZB04BNQLqBX/4PIWKAPZRmZ9PruVOFbGtWnELqFcLZnhpwqwqxTH3QKkhBkNzu/huQga3V1Md6tvS/c1azbFsqK6ANA8FqnVvVy1jwFrjuSbYCtG0uB+3D3abW0HKuK1PRla0xJ7AVFpy2b2kaPG5Dz6DMijNrA9xt+rwM25FwMcxYFDmYhxRd/TJbE7CzZIusbnZi94lQZfxDm7jAqYwerYIzHsYMGYv58ebEcIgLh1FXnj+eePzB03V9mVQEOF2tjmdrJ8TgPZqcMYoHBcBSrv4g7KVHsljoNMnsKAjLsjIUFBqc7/j+zHlbjg29pgtVwoZlwDKkxubn4DO93WSV0IBVbKh188DIKPxIVYIygec8940tdDjx46sXncHrn/oSibDiLLDC6+9226QtRTP00qV9jVDHWzSYEZLBbFadNV/f6Vrg; 4:8Wg9sOJ3hgeyHOXuhllmjs3Cst/KWdFdhTkTz7BxvPV0cZ1oC8QQahdIhoPsOzKlQhE2GiImbReJv2dXfRsJ/DLBzSDBrFv80GjaBw1mREN7lBVTnlTfe5YgyLFx6aQaBBcwsVeb5f+QpmNQs+jFzFJ89iNeqA71DJlwPqPd0eAaIgLidY5rRIj4wLzB2wD3Pv5FW9zk7T6jSIMZg39X5YhfvHeMP7s+6X35iVSAdHLem3vm1I/ZrzvFFfYKq0OyhHII54gOL56eq6nFuiKkXja3UpoDGoRB4NIFdiqtrsdXKeZLI+O6a1AGDV7XuAF5 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)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123560045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:AM5PR0501MB2036; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2036; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(1496009)(39380400002)(366004)(396003)(39860400002)(346002)(376002)(189003)(199004)(478600001)(81156014)(76176011)(51416003)(7696005)(956004)(2361001)(50226002)(305945005)(2616005)(50466002)(47776003)(486006)(97736004)(5660300001)(6666003)(2351001)(106356001)(8936002)(186003)(81166006)(52116002)(6116002)(476003)(6916009)(386003)(446003)(11346002)(59450400001)(66066001)(26005)(3846002)(8676002)(16526019)(1076002)(25786009)(21086003)(86362001)(53936002)(4326008)(2906002)(316002)(55016002)(36756003)(48376002)(105586002)(69596002)(68736007)(7736002)(16586007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2036; 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; AM5PR0501MB2036; 23:r1sXwHYQeucuiyLpP798kSqf0I3t2sGZOq5i8yr?= =?us-ascii?Q?zV9PYzRBKIvWoBZQHlOWKswS27kx+8ShQxqsebpDpJbz9A8mw9T83j6ms2xg?= =?us-ascii?Q?vWCOIuE1DpsJSmoTWLgg4E55dh56YxjwK2G/8GWC0FgLYuPymUWKjz1t7w9x?= =?us-ascii?Q?/RL+fWkeE0tCEQ+7d2gYnY37nuOwXLqfqYnmIL+MPREFreBOwG6ZiQHfgB+n?= =?us-ascii?Q?pMZ7L6F+vV9lIfh89QP5Ac/l31I3r5KXBaguWW00bFr+q7sVc9vdvJ9TQnjy?= =?us-ascii?Q?vFaxM2fZT8cWIEstREs7gxPNnZrpBiBd/AUoX9CWCyqCbyn+J1hX244bSqTE?= =?us-ascii?Q?beTmLd0fxViibmBw47G+Dfgerzv70aCEA3MqBc01M8pssQA6JWuFmlLVXUId?= =?us-ascii?Q?2SNG6r4gLwVzP/jNBlU11hEqMAT/OWJ7jipWfATBYO8GhY+J2dW1gJon26WT?= =?us-ascii?Q?wrrBYaQ37OpfGkIt4QV3AX5lIlKd8TW0uDbAGtFbiAHecKA7ZCS6cTvZUMJe?= =?us-ascii?Q?ABMkpd5VxMrSNzVOi3r04W5C5A4VfI+FAg6hOx8shvOcU4iVdw2AfuYsRqk9?= =?us-ascii?Q?NDjWvS76oCuAOy6mYsCJ6MxUJOYfcZpXxTSFp5UQENSPd1aVM3MKq0L+XLu6?= =?us-ascii?Q?nui4QkQ9e5fRdF0iNge9Latu8HNE3RfRNE+O7eQycXNJDeOJiE7hlJe/1A+H?= =?us-ascii?Q?JgeXci/r7bdo4nuEVGxjY4dt+HxLooiDedhyKcdU/5WBnc43a9HU793GqZmc?= =?us-ascii?Q?dcTvMoxz+2pKuws+UFyqktIuK2gPPx1pD18K1Lxc+5XYtvO//q4CNw070nkU?= =?us-ascii?Q?6apdEyO/hICHJwyp134+1Xsy5+UySBRewIa6z6hX8k2hE83JuxF/v7kLFBgJ?= =?us-ascii?Q?n8cUDhww+i4KVKynwZfuMEBlnPOiCVIcnM9RkAJtY+WFWypRXkpY9oJUYaFr?= =?us-ascii?Q?xGlqZXsOUGvG/Se5V4F6rYlEyGIqUXpl9H2Z5m4YxF+A5J6+o1C4wyeR6PBV?= =?us-ascii?Q?cOIjjoleXnbe4Wz9j859vp3+59oBVl2gnylQQ5LZd71KNK5mARVeGJWD0UqQ?= =?us-ascii?Q?m8O/7PgYUJZsyFWbOpEKpXfppGXFlVp7j2/R5bp+nffWOsFBvRtp4Ym9zf3n?= =?us-ascii?Q?CP7ADcQx9Y4AteVcF/G8gD6onSryfI9DiHcq59scm87jjGUb6g1sCqDUQshJ?= =?us-ascii?Q?5R/OsN62zpif1R8SnAHJmvGZB8Z3uH8B+27Sw9BLRz7efyrKp9u93oq50SWv?= =?us-ascii?Q?8ecvNbM6l5u8b6Txtw+HwWAs1azGtBhRmo9ahvYbDFdrpT1FB4LE+b4KE5IU?= =?us-ascii?Q?7p8qyXpBZdUAB53FJbyDaJ3w=3D?= X-Microsoft-Antispam-Message-Info: MEY2Ke59cVyT10dGCAAkJsIKOfNs0qvLWhPy9/8cwMBURIBwagIDY78++MFzq/6Jlmecj7iM9nEIMCFijldaAhmF2fXrKC4ESGN2r03JZdHTZi5Zdcmi5sng0sSff2SCdSwEKwyjGXV06z1FP82DTryvatZ8xeTRZLQIjdmemWErQBC4O2Dlu8IcBk13sgKz X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 6:hKQUY3Wd+zzSns+ILRIZGksTXTIwiHV813C+k+VTOzYecuqeZENNkgoFO/nsdxmC8A3S3AtR2kTGoogvnBI0quXRWiNhedV3AimXlRs5u07f4hrrdGJb2ZNpXp8AcnHKVSB0Zj8tdH0HxFMZUgfGxoziNQObKhhASXMIgU8OY86dTEaYjREiVsnzxzkcm+le1IcSSon4qE6yipR0uBfKLLiXchS/G+sNZ008PcBwh9wv4BduoZzh/P2ONeHOvjSKnJDHo9Ua5EMYblMgaSMw2X4ArCJ5F/wAanIT4jAs8AVjvx2enGTzcaG7qe2y4w4zfrbNRF5UziyATfOG+/hk1GASWzzyTZDYZ/F5FB690N2P6h7gQzH1bBhCWy7AAETMgqxjJuxFlusy4sRySzhXfLV8i3LU8P4HPBNpqMcihiknHfiOj3fBKVhAuH5ZXzCTdZ0saFOykL55ruigl59Adw==; 5:s4ODdAFGznRiDEGaFvkxyJgXx5etGP94IOtAPd1RbAblstn65iR6bMAmsqDqBIghXXAbyiyQI6nh3TwcbQfuoNNwrlzUqNabl9+xNS6DisaXf4Q9xKtQ0T8swle4lyglcNMGeMbLPzbUfiDadb8Ki9wNBkhFhA/7E05aqHyiegQ=; 24:IZVUpcwphl3XhmBXpqDF8MkmL7NJCqT6jGOApOcTK0+cOaGIvJuwaA94cPrRHgwh8LJ18gck+d3qLsAT3pWYreSLKN/KfbSFck3d/xOMBOo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2036; 7:0WzDamhn5ot4Sc5wX1zzNJ2veQyiUvpRLUKJleD1V5UmdAiNfQWsJPaX+oBzpFMH2uK6Tl0XpGdZYMhkbGargsh1BAWOKoHQElwcGkZv06ZfbZg99Dv5Yoav9wBjiVG65vDWUgwAeqvgDYSXagCeqyoadXp7bGsN8CeCo+DOfG/tDbFHbtGiu8B/O0l1dZ1ixKDKdH83M8joBGnhSWA1RSfwKVYgGsyV15PqIcfnXFC9AtOMZQ18LXmj60+xHcVm X-MS-Office365-Filtering-Correlation-Id: 83d30178-6503-4c9d-f5a7-08d5ca792593 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:13:19.6068 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 83d30178-6503-4c9d-f5a7-08d5ca792593 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2036 Subject: [dpdk-stable] [PATCH 45/67] net/mlx4: fix RSS resource leak in case of error 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, 05 Jun 2018 00:13:22 -0000 From: Adrien Mazarguil [ upstream commit cb43322fbd00c7f7c13ad2095fb0331bf8a5f262 ] When memory cannot be allocated for a flow rule, its RSS context reference is not dropped. Fixes: 078b8b452e6b ("net/mlx4: add RSS flow rule action support") Cc: stable@dpdk.org Signed-off-by: Adrien Mazarguil Acked-by: Nelio Laranjeiro Acked-by: Ferruh Yigit --- drivers/net/mlx4/mlx4_flow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx4/mlx4_flow.c b/drivers/net/mlx4/mlx4_flow.c index e8ebeebe3..daa44eba9 100644 --- a/drivers/net/mlx4/mlx4_flow.c +++ b/drivers/net/mlx4/mlx4_flow.c @@ -839,11 +839,14 @@ mlx4_flow_prepare(struct priv *priv, }, }; - if (!mlx4_zmallocv(__func__, vec, RTE_DIM(vec))) + if (!mlx4_zmallocv(__func__, vec, RTE_DIM(vec))) { + if (temp.rss) + mlx4_rss_put(temp.rss); return rte_flow_error_set (error, -rte_errno, RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL, "flow rule handle allocation failure"); + } /* Most fields will be updated by second pass. */ *flow = (struct rte_flow){ .ibv_attr = temp.ibv_attr, -- 2.11.0