Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104660/?format=api
{ "id": 104660, "url": "http://patchwork.dpdk.org/api/patches/104660/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211124094030.3360057-2-dkozlyuk@nvidia.com/", "project": { "id": 1, "url": "http://patchwork.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20211124094030.3360057-2-dkozlyuk@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211124094030.3360057-2-dkozlyuk@nvidia.com", "date": "2021-11-24T09:40:29", "name": "[v3,1/2] net/mlx5: fix indirect RSS creation when port is stopped", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6f2952ab36a96b4620be63bda310e3c5c14b565f", "submitter": { "id": 2248, "url": "http://patchwork.dpdk.org/api/people/2248/?format=api", "name": "Dmitry Kozlyuk", "email": "dkozlyuk@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patchwork.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20211124094030.3360057-2-dkozlyuk@nvidia.com/mbox/", "series": [ { "id": 20741, "url": "http://patchwork.dpdk.org/api/series/20741/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=20741", "date": "2021-11-24T09:40:28", "name": "net/mlx5: fix indirect RSS reference counting", "version": 3, "mbox": "http://patchwork.dpdk.org/series/20741/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104660/comments/", "check": "warning", "checks": "http://patchwork.dpdk.org/api/patches/104660/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 449A3A0C52;\n\tWed, 24 Nov 2021 10:41:01 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 74FFD41176;\n\tWed, 24 Nov 2021 10:40:54 +0100 (CET)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2077.outbound.protection.outlook.com [40.107.244.77])\n by mails.dpdk.org (Postfix) with ESMTP id F3EF34116D\n for <dev@dpdk.org>; Wed, 24 Nov 2021 10:40:51 +0100 (CET)", "from DM5PR10CA0022.namprd10.prod.outlook.com (2603:10b6:4:2::32) by\n DM6PR12MB4011.namprd12.prod.outlook.com (2603:10b6:5:1c5::28) with\n Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.4713.22; Wed, 24 Nov 2021 09:40:49 +0000", "from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com\n (2603:10b6:4:2:cafe::a7) by DM5PR10CA0022.outlook.office365.com\n (2603:10b6:4:2::32) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.21 via Frontend\n Transport; Wed, 24 Nov 2021 09:40:49 +0000", "from mail.nvidia.com (216.228.112.34) by\n DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4713.20 via Frontend Transport; Wed, 24 Nov 2021 09:40:48 +0000", "from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 24 Nov\n 2021 09:40:45 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=HHF8iIaxe0WvRo+HXKdZpbzndy/GIqtxCFVxMNmTmPgAq+Txe4daEQHJP6bb1pNWGivVK83Q79n9L/S8lTpdIsMjyOyc6amXgZW9l1xOoAE7ha4tJNwdcMRU7ajKjinbteu41f6QpoVsFAlAefDHLNzgNiC+k+xD2Wc7Tc6mYFub+qk8obe3Kvmlur1M3YdfznrOOkVyEoy2F2DCnAUCYIUm6NGhKBO176kfrpPrJiTaSpgEsbIElOLwfDyDkJfomUhpP3LW34LHoMjJht9DBLb6RPW46iJkez7qF/e0o35p+SbEbmpp8dQxH7ag9lT51TgPqYb0uIQ/8vqFyFQfYA==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=CFRYjF8f8yOEMLARjKK5vQ1Bxgzctnr6vpKtTBIGxDc=;\n b=b1Bh8ojjV42rHgPY0+aULixVcaxKd9JIn47H8eApeOCtQxS1jXe8BAKvG0wHArb0ttd3+y+jLskYI3f6EvVyQgY7y45I2gRrSL5W66PqF+/lvJbjXhyo0G3sY55JFRoonulTN0/xfPEkVRPA3EYRpbYFfKtmi/KHM9EDskgKosqPlpBrVqJJ1CM9Dd07R/fZLvCK1d/JyxarBgg7G8fnBEslaq1CYJhun809cox+Uk+1ASOTFdoDfly2kFZwSMZoOt7sVtuoIfsVCsqeDZm7mUeIGxu6zpuYbrZP+OxonaFmi6uRzYzsz8zLua0hR9BuDo9oPRHA6e4xp1SRbC0kYQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=quarantine sp=quarantine pct=100) action=none\n header.from=nvidia.com; dkim=none (message not signed); arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=CFRYjF8f8yOEMLARjKK5vQ1Bxgzctnr6vpKtTBIGxDc=;\n b=a4BeuREzEOdVgd/Eqopv1ngTjX9UAnWkeN9Ed3l127EiyLui3m4caARnt6ot2VW4hEj5okwvfZKip8OvGVjjPeHQ9AV2R38DaQ6NTr6J5/63Yku4MpToUCrdMbFmEiGzjeWz/cJITuajFCLA1QfCJxhVeimfU1Syauz9xzqA2XQZCUd1lQ76dHxYDNoggK4v7jlFJrawGXszBXc0YHjZwMbpdFWfrtPK1k5/X2Oon8AqGL0i3G3NjPM8OP+QktOTo/QJvjwsMRC/Nr/g6SdTUIwrqSDlAl72QNNNzziGs96icO4HRg9qHGMnYXSeJeRq1CbdPUPJUnb20qlaIQ2eYA==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.112.34 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.112.34; helo=mail.nvidia.com;", "From": "Dmitry Kozlyuk <dkozlyuk@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "Raslan Darawsheh <rasland@nvidia.com>, Matan Azrad <matan@nvidia.com>,\n Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Subject": "[PATCH v3 1/2] net/mlx5: fix indirect RSS creation when port is\n stopped", "Date": "Wed, 24 Nov 2021 11:40:29 +0200", "Message-ID": "<20211124094030.3360057-2-dkozlyuk@nvidia.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20211124094030.3360057-1-dkozlyuk@nvidia.com>", "References": "<20211123223159.3324247-1-dkozlyuk@nvidia.com>\n <20211124094030.3360057-1-dkozlyuk@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.6]", "X-ClientProxiedBy": "HQMAIL105.nvidia.com (172.20.187.12) To\n HQMAIL107.nvidia.com (172.20.187.13)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "d7b780dd-8c53-4f9b-b37a-08d9af2e7f27", "X-MS-TrafficTypeDiagnostic": "DM6PR12MB4011:", "X-Microsoft-Antispam-PRVS": "\n <DM6PR12MB4011A405D13EF98C14BA2A42B9619@DM6PR12MB4011.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:3513;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n U+VEiKIP8wSfEHxvk11aF6tsSnMLEhFFn8rQK8xy0m3Y3Kh2kM1FxT0g/Oeh2kYeP5Q72fcTY/S4ziAcez9gz5cdLChGjyGVHXtRke1dWHMxDJrkEVqkujQ6Oo7F2QoNx46U9Soukd7mdVMkGpApT05/k1G814wXjZAsnr+D1N0OpknvrL5L4TSKWEJUxZPtzUMdpy51IBCgScUgDG6DHICH8KMxyU55LUe8oreZHrR5P6wkM9JW+zDGxpBPVZk4DfwxgwQ3dZWA0k1Ei0pZSp2taYBgnCBiQ/dkdcI63fPs96wLLzcEtbYyU8Oi+w1KLq4kVhFC+kezTuyF3ysABW/uTk6nmdnUedUM3macZVeKy26cx+EAtAyHSiD927WKJ/ynjwrzL9otX3rXmG87Fvbk6AFF9NZHu1Nv/OwQ/Xy3J6Chv9V6zm0vEBB17luO6sk9lzbbBsegKSAPufqQZ4EwMCWekEMNAgoPWsUlRGxdrahwcx6i307fGoqsVKpp5YKj8UMb9SaJSA4ohL3H31EDW+1t/Mt8y8TL3yxxFAVedKnNK7LOsNtMdQ5UTNsFNHUrj1HFaaKx6OwzNZKX8xUn/PIDOrlSedfM/qXY7HlVPPymgxGcX+ZT/HvFvc/qVBTottNgKekjvqEHs69ELPsFxwyC6Z5r8Sxcmlle1M7XGbSEoPZOS5AE8zGtd25qVGCYpbu2C0GFXyU8AqnAs5BF3seSYK/IIRbx0o454Hs=", "X-Forefront-Antispam-Report": "CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1;\n SRV:;\n IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;\n SFS:(4636009)(46966006)(36840700001)(8936002)(26005)(83380400001)(70586007)(6916009)(7696005)(36860700001)(4326008)(2906002)(70206006)(426003)(1076003)(2616005)(336012)(36756003)(7636003)(6666004)(47076005)(356005)(107886003)(82310400004)(186003)(16526019)(8676002)(316002)(55016003)(86362001)(6286002)(54906003)(508600001)(5660300002)(309714004);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "24 Nov 2021 09:40:48.5131 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n d7b780dd-8c53-4f9b-b37a-08d9af2e7f27", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];\n Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n DM6NAM11FT064.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM6PR12MB4011", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "mlx5_ind_table_obj_setup() was incrementing RxQ reference counters\neven when the port was stopped, which prevented RxQ release\nand triggered an internal assertion.\nOnly increment reference counter when the port is started.\n\nFixes: ec4e11d41d12 (\"net/mlx5: preserve indirect actions on restart\")\n\nSigned-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>\nReviewed-by: Matan Azrad <matan@nvidia.com>\n---\n drivers/net/mlx5/mlx5_flow_dv.c | 3 ++-\n drivers/net/mlx5/mlx5_rx.h | 3 ++-\n drivers/net/mlx5/mlx5_rxq.c | 41 +++++++++++++++++++++------------\n 3 files changed, 30 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c\nindex 9d4bd0560c..a8f63e22c4 100644\n--- a/drivers/net/mlx5/mlx5_flow_dv.c\n+++ b/drivers/net/mlx5/mlx5_flow_dv.c\n@@ -14700,7 +14700,8 @@ __flow_dv_action_rss_setup(struct rte_eth_dev *dev,\n \tsize_t i;\n \tint err;\n \n-\tif (mlx5_ind_table_obj_setup(dev, shared_rss->ind_tbl)) {\n+\tif (mlx5_ind_table_obj_setup(dev, shared_rss->ind_tbl,\n+\t\t\t\t !!dev->data->dev_started)) {\n \t\treturn rte_flow_error_set(error, rte_errno,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_UNSPECIFIED, NULL,\n \t\t\t\t\t \"cannot setup indirection table\");\ndiff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h\nindex b19464bb37..283242f530 100644\n--- a/drivers/net/mlx5/mlx5_rx.h\n+++ b/drivers/net/mlx5/mlx5_rx.h\n@@ -228,7 +228,8 @@ int mlx5_ind_table_obj_release(struct rte_eth_dev *dev,\n \t\t\t bool standalone,\n \t\t\t bool deref_rxqs);\n int mlx5_ind_table_obj_setup(struct rte_eth_dev *dev,\n-\t\t\t struct mlx5_ind_table_obj *ind_tbl);\n+\t\t\t struct mlx5_ind_table_obj *ind_tbl,\n+\t\t\t bool ref_qs);\n int mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,\n \t\t\t struct mlx5_ind_table_obj *ind_tbl,\n \t\t\t uint16_t *queues, const uint32_t queues_n,\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 191f1e483f..2dd9490c36 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -2263,39 +2263,45 @@ mlx5_ind_table_obj_verify(struct rte_eth_dev *dev)\n * Pointer to Ethernet device.\n * @param ind_table\n * Indirection table to modify.\n+ * @param ref_qs\n+ * Whether to increment RxQ reference counters.\n *\n * @return\n * 0 on success, a negative errno value otherwise and rte_errno is set.\n */\n int\n mlx5_ind_table_obj_setup(struct rte_eth_dev *dev,\n-\t\t\t struct mlx5_ind_table_obj *ind_tbl)\n+\t\t\t struct mlx5_ind_table_obj *ind_tbl,\n+\t\t\t bool ref_qs)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tuint32_t queues_n = ind_tbl->queues_n;\n \tuint16_t *queues = ind_tbl->queues;\n-\tunsigned int i, j;\n+\tunsigned int i = 0, j;\n \tint ret = 0, err;\n \tconst unsigned int n = rte_is_power_of_2(queues_n) ?\n \t\t\t log2above(queues_n) :\n \t\t\t log2above(priv->config.ind_table_max_size);\n \n-\tfor (i = 0; i != queues_n; ++i) {\n-\t\tif (mlx5_rxq_ref(dev, queues[i]) == NULL) {\n-\t\t\tret = -rte_errno;\n-\t\t\tgoto error;\n+\tif (ref_qs)\n+\t\tfor (i = 0; i != queues_n; ++i) {\n+\t\t\tif (mlx5_rxq_ref(dev, queues[i]) == NULL) {\n+\t\t\t\tret = -rte_errno;\n+\t\t\t\tgoto error;\n+\t\t\t}\n \t\t}\n-\t}\n \tret = priv->obj_ops.ind_table_new(dev, n, ind_tbl);\n \tif (ret)\n \t\tgoto error;\n \t__atomic_fetch_add(&ind_tbl->refcnt, 1, __ATOMIC_RELAXED);\n \treturn 0;\n error:\n-\terr = rte_errno;\n-\tfor (j = 0; j < i; j++)\n-\t\tmlx5_rxq_deref(dev, ind_tbl->queues[j]);\n-\trte_errno = err;\n+\tif (ref_qs) {\n+\t\terr = rte_errno;\n+\t\tfor (j = 0; j < i; j++)\n+\t\t\tmlx5_rxq_deref(dev, queues[j]);\n+\t\trte_errno = err;\n+\t}\n \tDRV_LOG(DEBUG, \"Port %u cannot setup indirection table.\",\n \t\tdev->data->port_id);\n \treturn ret;\n@@ -2312,13 +2318,15 @@ mlx5_ind_table_obj_setup(struct rte_eth_dev *dev,\n * Number of queues in the array.\n * @param standalone\n * Indirection table for Standalone queue.\n+ * @param ref_qs\n+ * Whether to increment RxQ reference counters.\n *\n * @return\n * The Verbs/DevX object initialized, NULL otherwise and rte_errno is set.\n */\n static struct mlx5_ind_table_obj *\n mlx5_ind_table_obj_new(struct rte_eth_dev *dev, const uint16_t *queues,\n-\t\t uint32_t queues_n, bool standalone)\n+\t\t uint32_t queues_n, bool standalone, bool ref_qs)\n {\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_ind_table_obj *ind_tbl;\n@@ -2333,7 +2341,7 @@ mlx5_ind_table_obj_new(struct rte_eth_dev *dev, const uint16_t *queues,\n \tind_tbl->queues_n = queues_n;\n \tind_tbl->queues = (uint16_t *)(ind_tbl + 1);\n \tmemcpy(ind_tbl->queues, queues, queues_n * sizeof(*queues));\n-\tret = mlx5_ind_table_obj_setup(dev, ind_tbl);\n+\tret = mlx5_ind_table_obj_setup(dev, ind_tbl, ref_qs);\n \tif (ret < 0) {\n \t\tmlx5_free(ind_tbl);\n \t\treturn NULL;\n@@ -2537,6 +2545,7 @@ mlx5_hrxq_modify(struct rte_eth_dev *dev, uint32_t hrxq_idx,\n \tstruct mlx5_priv *priv = dev->data->dev_private;\n \tstruct mlx5_hrxq *hrxq =\n \t\tmlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], hrxq_idx);\n+\tbool dev_started = !!dev->data->dev_started;\n \tint ret;\n \n \tif (!hrxq) {\n@@ -2565,7 +2574,8 @@ mlx5_hrxq_modify(struct rte_eth_dev *dev, uint32_t hrxq_idx,\n \t\tind_tbl = mlx5_ind_table_obj_get(dev, queues, queues_n);\n \t\tif (!ind_tbl)\n \t\t\tind_tbl = mlx5_ind_table_obj_new(dev, queues, queues_n,\n-\t\t\t\t\t\t\t hrxq->standalone);\n+\t\t\t\t\t\t\t hrxq->standalone,\n+\t\t\t\t\t\t\t dev_started);\n \t}\n \tif (!ind_tbl) {\n \t\trte_errno = ENOMEM;\n@@ -2657,7 +2667,8 @@ __mlx5_hrxq_create(struct rte_eth_dev *dev,\n \t\tind_tbl = mlx5_ind_table_obj_get(dev, queues, queues_n);\n \tif (!ind_tbl)\n \t\tind_tbl = mlx5_ind_table_obj_new(dev, queues, queues_n,\n-\t\t\t\t\t\t standalone);\n+\t\t\t\t\t\t standalone,\n+\t\t\t\t\t\t !!dev->data->dev_started);\n \tif (!ind_tbl)\n \t\treturn NULL;\n \thrxq = mlx5_ipool_zmalloc(priv->sh->ipool[MLX5_IPOOL_HRXQ], &hrxq_idx);\n", "prefixes": [ "v3", "1/2" ] }