From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20080.outbound.protection.outlook.com [40.107.2.80]) by dpdk.org (Postfix) with ESMTP id 577F0C254 for ; Tue, 5 Jun 2018 02:40:02 +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=Ga5nyDs7HI119StkmNflqCCHrHnkmn85CP7Xrp7wPftleG8WreIwFQ2q9DVD+PSkBSUolPSqdgGq9ImdbqakVB8j79jnXUAjn+ETx0KdLHqUTPUh/OfjI93/J15dSWnlQK/DMsUmcF6xz6IehdUiOsDczRtSmGciX8qXjvCj6l8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=yskoh@mellanox.com; Received: from mellanox.com (209.116.155.178) by VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.12; Tue, 5 Jun 2018 00:39:55 +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:39:28 -0700 Message-Id: <20180605003932.14517-6-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180605003932.14517-1-yskoh@mellanox.com> References: <20180605002732.13866-1-yskoh@mellanox.com> <20180605003932.14517-1-yskoh@mellanox.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [209.116.155.178] X-ClientProxiedBy: BYAPR03CA0026.namprd03.prod.outlook.com (2603:10b6:a02:a8::39) To VI1PR0501MB2048.eurprd05.prod.outlook.com (2603:10a6:800:36::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:VI1PR0501MB2048; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 3:KfqBs4YMIE7diIQcsLrKokksUwJ3unOcy1lUWuEZuBfaHboM4UwIXvi0nKFswiNZ0VQhLz5ZWYj4/6FWbjvZN0LE91eAuZ5ae3Z/h6IFsZR/xB5YxZNsfvplz1SEVaZN9XxCN+qWDzaj64MffpCjExUQnOYhlC8zOMhOVgByZk5tz5031JBx93VCOUgz3IPyJtJqnuWjuQgPS8rkMD3Y/sfpFYbtAYrq9OWtAsu+5CAWenyekxvnSsmhAKOdYy08; 25:uJrJXtdtI8ZtRSLO8hgZ9WCzuzsTjeW1mTNBGw62uzyZFX0WkjgQNsUNH/aT9LaA7e2DW+CB2HDwy+zmCvhxf3ooGvuBdCvPc9A7Pcgfd9vetNHB0b9dVvyakuAgnXn1kLarUut/TwzPPzkpkQtlArl0oOYtph0rGgBK43YenGVTnJvWx0ZW9ye/vUkQ6+khbolzHPPsufIVLzbz2eAkpdCHdLzWm28WbO6dnvCiWq8m4p4n8XhbrRvibZfLRam4an7a5HJk7f7BpDsvgJGtKS32qvRYCBV+Z1pbU1Nn7A49MQkYVxeuZPjGoOk2zW7iDq0k4zaBCYQrUu62Yh1e/g==; 31:kahuAuAnRGgkw3pCUCXgI+xgI7sWe77dWcPo8LMb1frQXqjNQn1TpdvkmCWy3T0AVh2NyEMKc00nOcJDU2DQ5d2dtsIaTcEBRKl563XSTuWfNL4sRkSamNIEQSPN5TJxTkaUdloJfEAOiLM92wRwyyb0GkaH4/cHh7+qU10naU2GlEoMje8pr8ypAAeHTcHDWUkHBmJ1chIpV77mirt6t9CN1g22r50wViJE0PNFVyc= X-MS-TrafficTypeDiagnostic: VI1PR0501MB2048: X-LD-Processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 20:K09vGF4GLCANK2D6FChJ5ZqguULak6Ewhdsc4vansOfc5tYj5jEAw3v/IOaDaSe7/Ld2fu/kntw1gIhHAGhuOQ1wFYRGL0BQ7ech+sZuzfiBXRqpPd2Hsh1DIoeglELAtK5Et061MrnHkXKHkgaIdgwcOfYi9Sye+zb2VTDAy3xuY5+AQ3bqVi4aCGCJZE8WjPX+8Yokvv5ZpeGi6Qb3+DdpsLZOkXmUwMBPtD80x14Agisg/q6ZU2j/4uCyzQHYIYiwvjR00gC8pjsuWAUi8ZUi7nZtT7DcA7n0mJ3ShRHwZpQDBk1U6REdTjmX/o7lG7OiTls7pvbnRr2GUfFwVDnGzgPisZV5mocxmi9dmUmugJIbeBVrXZOF3zCbFidXJPySHvUe2+9m7HzCAHNSvhb95nx8kXd3WmKOhpSQ0Qc616seoq7WCnfvVQf0qtgSfXxDpOQtti7CHQbGqbEtZYzC3EVtcgZlVF9XSmh7UyreOk1cvZ4moB0/m1GhM4YI; 4:Pd/zC2IalIduPvy0BdMq+86vj6QdJGSUbtK5hUmI0WwJjLzUhW9vvHNb/LQCRxiKCMtrCUQ6ZcLHVIlULRmEzE2Mw+xWUETT5pkvDXks3M7yNRCaLXiVJxX0ngLUSzTHlEpyc/C6CGZdRL7G/nTMK0zxPeeVrfNRABzOZXTbWF2ZtfMNm/+O7Zf2O/K/bJoUL4ZvPYzEbnN1K5l35HN4/ybVXxbyb5XHefG9LHIp+xplig+NTVwHpkeu8QAGlZEt6BChYnGeYlKUo9FXzutWG4G14YEPb6ybRbbMa450byQ3sq5esMdbQFUs+/T4vAvX 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)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:VI1PR0501MB2048; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0501MB2048; X-Forefront-PRVS: 0694C54398 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(346002)(396003)(376002)(39860400002)(39380400002)(199004)(189003)(3846002)(6666003)(2351001)(1076002)(6116002)(316002)(386003)(59450400001)(26005)(52116002)(186003)(2361001)(16526019)(68736007)(51416003)(7696005)(76176011)(48376002)(446003)(16586007)(55016002)(305945005)(956004)(11346002)(476003)(2616005)(486006)(50466002)(21086003)(69596002)(47776003)(53936002)(81156014)(81166006)(8676002)(86362001)(106356001)(8936002)(25786009)(50226002)(7736002)(478600001)(4326008)(5660300001)(36756003)(6916009)(97736004)(66066001)(2906002)(105586002); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0501MB2048; 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; VI1PR0501MB2048; 23:d/YONwKwV0QXS9qxJO410zPNoCuDvJSACHYPJxs?= =?us-ascii?Q?qwhzFZOOZVaMF/z3Qei3LFaSwuNSgmI4ZErEGvbxJw/sYHROAKZq0CkmcvCN?= =?us-ascii?Q?efVBnuFqdUJLpChVYrbUYtLKzcoOChhNv+n0kkmYwx82s+xnm5uPJXj67L+T?= =?us-ascii?Q?7ivo1exBXJSulw0bA7TvnN+PNxU0FpsaHcudBd259i2Wxd2sbGdNvdTHfvvr?= =?us-ascii?Q?CppCvMxP5HT1tQh/s62t5TmdMBGRK6ywomabJU1jLnK+pK9z1fEJgWBqNeRq?= =?us-ascii?Q?yGGcDLBIV0wG7lE7yoVt0AG75ryTzQZrMBiYlYFdGbCg/vwOnhL17H3rHPEe?= =?us-ascii?Q?sMW4tSJ9ZBjUR2EdwY7ITGFFNJEiQolHiDElPmCOc+TOuoH3v8OXXjqwm0dp?= =?us-ascii?Q?n/1JStNGXkxBggS0DD6CaQOMUlpqbYkzkBHOsn9dvqkrDeSJnUL1+aom+0kp?= =?us-ascii?Q?1NFCwYzTiH1xH+xQZX6scTFAAKf2U0CfEKjT19AXCQDO2xSiNXek8M8ObBw1?= =?us-ascii?Q?XJhKIXSFS0OUgb38P2N8uRyrmquFpLYLiJgyZQ9/+/7rSS9lp7PBblFFu4oL?= =?us-ascii?Q?Z51UbBSQTrF8NMzlb2zG3dC698H2FwZiN+bK3WLoEl1oTqGk9Q1Rd4BBahGl?= =?us-ascii?Q?Pto6yz/0IdNUFsMCynVJLOzWANFoE/teJQLu3vZQMv9Rbk3mtwzepJBkuAB3?= =?us-ascii?Q?aQnkz31XlFRQ0nddeRPytuklBgfQP9eqfOZ+VISUx7tPXupBjWEjwznCvbDR?= =?us-ascii?Q?7XVuNzVb+Zfk/E2V/tOYb8TonJ7QxYWwECbHmRt5kenPmEEYcWgbZBKKtvIp?= =?us-ascii?Q?CCIFj8tJFaXYtDz9ATGdaTnwYhjsVbNqkUw/R73i94/acG8Q+n0ubopssHle?= =?us-ascii?Q?33f5QJTXugOX0j0z7NZhnKBoXZK96B9UtEMHvsW/d3jVmkwnQbN0dzYvvIyT?= =?us-ascii?Q?dzU9C4kKkZ6upcDJEhay4jyDITHgcbDoMmQpY6wQXCRm0B/tti/UR3BBOPWU?= =?us-ascii?Q?LaltCmfv4X+0dlmQGKR2fZsJTwq57F6kP4yGD0yxCqHrS8fIKGbGfGLNrwY/?= =?us-ascii?Q?Rm/lvyr3NtRLFxRwTuGb6xQPda9Ga5pNFh8XwIg4eSJ5HS88eNK78xqiEqSK?= =?us-ascii?Q?5T8DVbIIvMY9dQfyO2PFArA9VRZP3JkVBNELDPPFvNC+M8w1atwD846T4Xi2?= =?us-ascii?Q?PjyWN3C3yNdPI3G4xIjXx8BiRzeTdh4JlhSaZlaou6DUNJ4nO+Dm+8XAysXX?= =?us-ascii?Q?d7+Ptj35iIGJgkkwPw5FFABX5G0rBwC4KigqKNXHd9A0FVzaGFgSEy+95j/q?= =?us-ascii?Q?46g=3D=3D?= X-Microsoft-Antispam-Message-Info: xB3kBy0SK/iOcwlBsPDwlVQbPHW2sHmF7zXeNOvbiX6pMzyB645OYBjKDK1fUQS/PHgwxsw9Tu2sV9/lRuAN4wrhXo4EDXO6Tpr8tVxV5BZskptUlhNMSkp/x/kjCQSY4mXp4LJWpi8Ryxrw1SFhru5lbJpqX/vbSzlUq1OPkaQZ6PhlavQdp5TqRxI6PgnE X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 6:Q9fA1AMkTQekosZmnRIedEzBG20n2Dl+0ojjKohWe456ZYM9uofANTStcs1L1EUo6uo7gA94XKOMYF56hTQWDDjaBt4qcR7GZ661Vs1ZYpiFuNKWkYDxkm50sGi8wzAhltSzZLHMtVyAWgZUK4tf2E9jHDM1PjyKExQ1dTSVId61IvSB2x0WpjC4lmwdHjN9AucksOUe+kZI2X25XcrS8jc+dxNwqqsGGu0/bA7X7yUyITfW/4r+5qNIActkxxwTzavi+daeiwlOSuw2uZwgf+RItabdRsAPgs399MNWRKyrW6lIX5fQOWtbUdeE9roKO0TFM88uepwyZPxFMG65ET8y8WlDpcJbMy3Sn++ROgIaj2AOKRKuG0EyhhKRL+CyYzbtuCFiGfBzc6vU6Rycgvs/z0+v3fXkMBGOumY67DMKxORfZ8A//cSjYfMEk/4VMN4++9tc0DSKHg1Nv2m5VQ==; 5:o0pXjKmhrw6jt/yXOBcF/4+2bcfnPx/EPKSsaVAPQigyS0LJ0m2p5ZHVzbJR8yQJ8Id+FUz1skje4JWgR0unCldX+BYCzbU41OU8Ii/pqZFP4Dv6KnwiBazsPUrPJyjYG+/7U4O2JLZRrlXB9gbyKshOPLmfAw+Pg56DXP4sex0=; 24:qg0n436URgG3D7bMCabmZ7SAB2dYhEzzDcYtUjf7+LlpNzorR/n0XaIadnr2xIFowtU/lii4SpPuDOYNT9niLLMWAouJ8fz3kjbgjeRW4lY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0501MB2048; 7:w7+GWggwFJkd4nxhWT7haqD3K3ySmB1TYb5AlD8lFh1ig45/Ne5pH6g1fi2HH5jhuN14i5czgqfISWE23ErZLyD1ldqfa0JY6aLOzRhdfXtAWuaURtsNAH8iwkBGxPsb+O+rFTVOx7Gi7S+JRaswmHQanMd5SUgxit3y6T0Wi39cCghFk7S5clHeOz6xto1YPqXFMvQSotfrRBi1mBnp5/343sZYLvjbdWoNCckBE+uth2qN4QekQpe1BBd163/I X-MS-Office365-Filtering-Correlation-Id: a10b9b55-bded-4745-7fb2-08d5ca7cdcc0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 00:39:55.8025 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a10b9b55-bded-4745-7fb2-08d5ca7cdcc0 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0501MB2048 Subject: [dpdk-stable] [PATCH v2 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:40:02 -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