Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/99691/?format=api
{ "id": 99691, "url": "http://patches.dpdk.org/api/patches/99691/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210926111904.237736-9-xuemingl@nvidia.com/", "project": { "id": 1, "url": "http://patches.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": "<20210926111904.237736-9-xuemingl@nvidia.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210926111904.237736-9-xuemingl@nvidia.com", "date": "2021-09-26T11:19:01", "name": "[08/11] net/mlx5: remove port info from shareable Rx queue", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f16de58e3438add74f0359c263243feee7228de5", "submitter": { "id": 1904, "url": "http://patches.dpdk.org/api/people/1904/?format=api", "name": "Xueming Li", "email": "xuemingl@nvidia.com" }, "delegate": { "id": 3268, "url": "http://patches.dpdk.org/api/users/3268/?format=api", "username": "rasland", "first_name": "Raslan", "last_name": "Darawsheh", "email": "rasland@nvidia.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210926111904.237736-9-xuemingl@nvidia.com/mbox/", "series": [ { "id": 19166, "url": "http://patches.dpdk.org/api/series/19166/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19166", "date": "2021-09-26T11:18:53", "name": "net/mlx5: support shared Rx queue", "version": 1, "mbox": "http://patches.dpdk.org/series/19166/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/99691/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/99691/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 4EF26A0547;\n\tSun, 26 Sep 2021 13:20:23 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9327D41101;\n\tSun, 26 Sep 2021 13:20:13 +0200 (CEST)", "from NAM12-MW2-obe.outbound.protection.outlook.com\n (mail-mw2nam12on2070.outbound.protection.outlook.com [40.107.244.70])\n by mails.dpdk.org (Postfix) with ESMTP id 85844410F7\n for <dev@dpdk.org>; Sun, 26 Sep 2021 13:20:10 +0200 (CEST)", "from BN8PR15CA0067.namprd15.prod.outlook.com (2603:10b6:408:80::44)\n by BY5PR12MB5512.namprd12.prod.outlook.com (2603:10b6:a03:1df::16)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Sun, 26 Sep\n 2021 11:20:09 +0000", "from BN8NAM11FT047.eop-nam11.prod.protection.outlook.com\n (2603:10b6:408:80:cafe::9f) by BN8PR15CA0067.outlook.office365.com\n (2603:10b6:408:80::44) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend\n Transport; Sun, 26 Sep 2021 11:20:09 +0000", "from mail.nvidia.com (216.228.112.34) by\n BN8NAM11FT047.mail.protection.outlook.com (10.13.177.220) with Microsoft SMTP\n Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id\n 15.20.4544.13 via Frontend Transport; Sun, 26 Sep 2021 11:20:08 +0000", "from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL107.nvidia.com\n (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 26 Sep\n 2021 11:20:06 +0000", "from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com\n (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 26 Sep\n 2021 11:20:04 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=LtwAlftt3aAwJZ4JB2vXUA7zj+q5qzXx2H8fNlvP/oq3AG0mLjhKs+NLsKQlaAIjfaAGqq3fqUs7UdKBtOXI5rGCl5WCJl0PXO4/NIdJtxxagPjkn9v9YDORauLhWyo1STNw8UczRjbrrHEJGH4Ov37NDS/2m43KiNwCUqiYGIU5fLtrSl9w99Es8mmao2o5HXrFkNQMsjL8JLczQvNZcVndxBizFWKpZkJaozHMrOttgbS+wni0LbTaZHYmL+rQllKK+Cmh7hVW//ZbMIdS2COWpZ4d9z5bsKOyYMBeBvOLqThfMGr6ejEmfcyx5DFfQ41UXuoC1kaw2LzTxaEVqw==", "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;\n bh=NheNNYbWLQaRH1Z4kIMBbycBa4zHC84BhShVuMAB9Ws=;\n b=fFUByy+M4qMRl8UY0P55t/Q0hDIRtdMTX7sHFdQ/ZFZpDMd+zMi0r0Ko+rFo8d86qgQ94ecwau/J0nMw/UyA6j80EPfOKsUhhAHC5PtnjKMiunYmudr5kqrrwcmVH3NO9fgYGLlUg7SrtReIZZfoQEwcn2G6RV1vldgt6ZyfujQQpWaLHFOrdqWVVcBmBqziIky9isVBWavU1+7Iz/2JOUDGKnwy+JaSjqGnQS0bYlk5vrI3RQRCqTzgDg7uK0ybCnPIkwiLqNSiyBqMTWzFWfF9IHr2jBmM41hAaukfurlwUG0bQhlzPcmCvgaA6wkpIcIjzj1V1/YRz3Lf3+Q0Tw==", "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=none pct=100) action=none header.from=nvidia.com;\n 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=NheNNYbWLQaRH1Z4kIMBbycBa4zHC84BhShVuMAB9Ws=;\n b=oUCgfoGkEnseQP4eg8anOPfXqdA4BaKJAE8nyUgARKg4R0UaXroM/6taopKObn9yrMw13CfIuNOnUjDe4obL3h7xCyauu4A+vmJ9D9cK1ZNgBNbGEXHMK6VbxGYTkcLX0oWMKAUjh50kb2CmCl6dHDz8lUBC+N9bRjrNKMQTWPuzPbJup1AvZs9kauZHNMz7q4pXCkZFmJqpYRlJcE5LymEbhtCGej9+y6jz8BNTlijdnfq9QWy6R/Y4O6E7aKJVMMaI2E9dwH9yrAJc3aYjRkm081RRWbZ6GufePFQhcKOqVxd1oAkXmfVOaw7SuflI4gQV1Nu5d1RQb/VIADxd4Q==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.112.34)\n smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed)\n header.d=none;dpdk.org; 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": "Xueming Li <xuemingl@nvidia.com>", "To": "<dev@dpdk.org>", "CC": "<xuemingl@nvidia.com>, Lior Margalit <lmargalit@nvidia.com>, Matan Azrad\n <matan@nvidia.com>, Viacheslav Ovsiienko <viacheslavo@nvidia.com>", "Date": "Sun, 26 Sep 2021 19:19:01 +0800", "Message-ID": "<20210926111904.237736-9-xuemingl@nvidia.com>", "X-Mailer": "git-send-email 2.33.0", "In-Reply-To": "<20210926111904.237736-1-xuemingl@nvidia.com>", "References": "<20210926111904.237736-1-xuemingl@nvidia.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[172.20.187.5]", "X-ClientProxiedBy": "HQMAIL107.nvidia.com (172.20.187.13) To\n DRHQMAIL107.nvidia.com (10.27.9.16)", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "69d38e07-1b0b-463a-4815-08d980df9978", "X-MS-TrafficTypeDiagnostic": "BY5PR12MB5512:", "X-Microsoft-Antispam-PRVS": "\n <BY5PR12MB5512EDE4D4AB489D7D42E047A1A69@BY5PR12MB5512.namprd12.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:48;", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 0TBu4CIcKzSRPQ5WyPwNeqDtC+bNylk6ejJTtLgYgMrbr2fWn/pPHgzbHeBUkQIOmbqnvIsNb/0RsBQZRiv6+5lDKNjm5QhBai6m+3kFUVBlItf0ZUQ/5Lbe0EWICNTarL5MhB0hvc4HkwDGXemN0sYruwWUpsoWItnqwCRhex973Zps5AQzAUGjCDfy7GG3BttHdz+ZRda/vYwOoDUaw2DH8FzcxlB/pvgBwcfkK24ENONZS4G5dmbLYyS3/XH9lKhtArcFMdKkKKk/71AQy1MOm0sdXhfTV090vuH9IaiSGuIJ23kbdeRaojUw+7P4qleokRnABSElkv5XHihislZ9y/bp7NZSZhQixo7AyZii9Ec8ns0X+2u78Jl2W94XPdL2EffbFMqPF4qiOzBtD29i7FKL1TG/0ADZ6M3NlURb/KEtY6Y6w8CSJ2QGMQsXFVTGXHjkW5GzWEdqx9lAnUxLQ6p8oBVixh+6GU6w/5xnb6VgsbRBcgodowZ4ZcHxz0gaPC0dx4Yewjzo/dn+9CJRbuVFM5mJ8DRZGVJ8miNCnn0XrycxiOfijox6FmWFeQBtH38aVzzGAEZTJE72C8iwq2snt1EnDwbxNPaDhz97wz05momEnpmX+PWsV3XppGdonYxfCaLRvclhvRZcQmk9ZRvqh0A8n12KwFflSV+lbqg8tN05v88d9Ds8QZ0/5fkaEF3LV3qB8N6zBgfDoA==", "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)(36840700001)(46966006)(36756003)(70206006)(316002)(55016002)(70586007)(86362001)(107886003)(4326008)(6286002)(8676002)(36906005)(7696005)(508600001)(26005)(186003)(82310400003)(1076003)(336012)(6666004)(426003)(2906002)(47076005)(54906003)(2616005)(7636003)(356005)(6916009)(83380400001)(5660300002)(8936002)(36860700001)(16526019);\n DIR:OUT; SFP:1101;", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "26 Sep 2021 11:20:08.8785 (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 69d38e07-1b0b-463a-4815-08d980df9978", "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 BN8NAM11FT047.eop-nam11.prod.protection.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "BY5PR12MB5512", "Subject": "[dpdk-dev] [PATCH 08/11] net/mlx5: remove port info from shareable\n Rx queue", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "To prepare for shared Rx queue, removes port info from shareable Rx\nqueue control.\n\nSigned-off-by: Xueming Li <xuemingl@nvidia.com>\n---\n drivers/net/mlx5/mlx5_devx.c | 2 +-\n drivers/net/mlx5/mlx5_mr.c | 7 ++++---\n drivers/net/mlx5/mlx5_rx.c | 15 +++------------\n drivers/net/mlx5/mlx5_rx.h | 5 ++++-\n drivers/net/mlx5/mlx5_rxq.c | 10 ++++------\n drivers/net/mlx5/mlx5_rxtx_vec.c | 2 +-\n 6 files changed, 17 insertions(+), 24 deletions(-)", "diff": "diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c\nindex 4d479c19e6c..71e4bce1588 100644\n--- a/drivers/net/mlx5/mlx5_devx.c\n+++ b/drivers/net/mlx5/mlx5_devx.c\n@@ -916,7 +916,7 @@ mlx5_rxq_devx_obj_drop_create(struct rte_eth_dev *dev)\n \t}\n \trxq->rxq_ctrl = rxq_ctrl;\n \trxq_ctrl->type = MLX5_RXQ_TYPE_STANDARD;\n-\trxq_ctrl->priv = priv;\n+\trxq_ctrl->sh = priv->sh;\n \trxq_ctrl->obj = rxq;\n \trxq_data = &rxq_ctrl->rxq;\n \t/* Create CQ using DevX API. */\ndiff --git a/drivers/net/mlx5/mlx5_mr.c b/drivers/net/mlx5/mlx5_mr.c\nindex 44afda731fc..8d48b4614ee 100644\n--- a/drivers/net/mlx5/mlx5_mr.c\n+++ b/drivers/net/mlx5/mlx5_mr.c\n@@ -82,10 +82,11 @@ mlx5_rx_addr2mr_bh(struct mlx5_rxq_data *rxq, uintptr_t addr)\n \tstruct mlx5_rxq_ctrl *rxq_ctrl =\n \t\tcontainer_of(rxq, struct mlx5_rxq_ctrl, rxq);\n \tstruct mlx5_mr_ctrl *mr_ctrl = &rxq->mr_ctrl;\n-\tstruct mlx5_priv *priv = rxq_ctrl->priv;\n+\tstruct mlx5_priv *priv = RXQ_PORT(rxq_ctrl);\n+\tstruct mlx5_dev_ctx_shared *sh = rxq_ctrl->sh;\n \n-\treturn mlx5_mr_addr2mr_bh(priv->sh->pd, &priv->mp_id,\n-\t\t\t\t &priv->sh->share_cache, mr_ctrl, addr,\n+\treturn mlx5_mr_addr2mr_bh(sh->pd, &priv->mp_id,\n+\t\t\t\t &sh->share_cache, mr_ctrl, addr,\n \t\t\t\t priv->config.mr_ext_memseg_en);\n }\n \ndiff --git a/drivers/net/mlx5/mlx5_rx.c b/drivers/net/mlx5/mlx5_rx.c\nindex e3b1051ba46..09de26c0d39 100644\n--- a/drivers/net/mlx5/mlx5_rx.c\n+++ b/drivers/net/mlx5/mlx5_rx.c\n@@ -118,15 +118,7 @@ int\n mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset)\n {\n \tstruct mlx5_rxq_data *rxq = rx_queue;\n-\tstruct mlx5_rxq_ctrl *rxq_ctrl =\n-\t\t\tcontainer_of(rxq, struct mlx5_rxq_ctrl, rxq);\n-\tstruct rte_eth_dev *dev = ETH_DEV(rxq_ctrl->priv);\n \n-\tif (dev->rx_pkt_burst == NULL ||\n-\t dev->rx_pkt_burst == removed_rx_burst) {\n-\t\trte_errno = ENOTSUP;\n-\t\treturn -rte_errno;\n-\t}\n \tif (offset >= (1 << rxq->cqe_n)) {\n \t\trte_errno = EINVAL;\n \t\treturn -rte_errno;\n@@ -438,10 +430,10 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)\n \t\tsm.is_wq = 1;\n \t\tsm.queue_id = rxq->idx;\n \t\tsm.state = IBV_WQS_RESET;\n-\t\tif (mlx5_queue_state_modify(ETH_DEV(rxq_ctrl->priv), &sm))\n+\t\tif (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm))\n \t\t\treturn -1;\n \t\tif (rxq_ctrl->dump_file_n <\n-\t\t rxq_ctrl->priv->config.max_dump_files_num) {\n+\t\t RXQ_PORT(rxq_ctrl)->config.max_dump_files_num) {\n \t\t\tMKSTR(err_str, \"Unexpected CQE error syndrome \"\n \t\t\t \"0x%02x CQN = %u RQN = %u wqe_counter = %u\"\n \t\t\t \" rq_ci = %u cq_ci = %u\", u.err_cqe->syndrome,\n@@ -478,8 +470,7 @@ mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec)\n \t\t\tsm.is_wq = 1;\n \t\t\tsm.queue_id = rxq->idx;\n \t\t\tsm.state = IBV_WQS_RDY;\n-\t\t\tif (mlx5_queue_state_modify(ETH_DEV(rxq_ctrl->priv),\n-\t\t\t\t\t\t &sm))\n+\t\t\tif (mlx5_queue_state_modify(RXQ_DEV(rxq_ctrl), &sm))\n \t\t\t\treturn -1;\n \t\t\tif (vec) {\n \t\t\t\tconst uint32_t elts_n =\ndiff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h\nindex 2ed544556f5..4eed4176324 100644\n--- a/drivers/net/mlx5/mlx5_rx.h\n+++ b/drivers/net/mlx5/mlx5_rx.h\n@@ -23,6 +23,10 @@\n /* Support tunnel matching. */\n #define MLX5_FLOW_TUNNEL 10\n \n+#define RXQ_PORT(rxq_ctrl) LIST_FIRST(&(rxq_ctrl)->owners)->priv\n+#define RXQ_DEV(rxq_ctrl) ETH_DEV(RXQ_PORT(rxq_ctrl))\n+#define RXQ_PORT_ID(rxq_ctrl) PORT_ID(RXQ_PORT(rxq_ctrl))\n+\n struct mlx5_rxq_stats {\n #ifdef MLX5_PMD_SOFT_COUNTERS\n \tuint64_t ipackets; /**< Total of successfully received packets. */\n@@ -163,7 +167,6 @@ struct mlx5_rxq_ctrl {\n \tLIST_HEAD(priv, mlx5_rxq_priv) owners; /* Owner rxq list. */\n \tstruct mlx5_rxq_obj *obj; /* Verbs/DevX elements. */\n \tstruct mlx5_dev_ctx_shared *sh; /* Shared context. */\n-\tstruct mlx5_priv *priv; /* Back pointer to private data. */\n \tenum mlx5_rxq_type type; /* Rxq type. */\n \tunsigned int socket; /* CPU socket ID for allocations. */\n \tunsigned int irq:1; /* Whether IRQ is enabled. */\ndiff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c\nindex 21cb1000899..3aac7cc20ba 100644\n--- a/drivers/net/mlx5/mlx5_rxq.c\n+++ b/drivers/net/mlx5/mlx5_rxq.c\n@@ -148,7 +148,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)\n \t\tbuf = rte_pktmbuf_alloc(seg->mp);\n \t\tif (buf == NULL) {\n \t\t\tDRV_LOG(ERR, \"port %u empty mbuf pool\",\n-\t\t\t\tPORT_ID(rxq_ctrl->priv));\n+\t\t\t\tRXQ_PORT_ID(rxq_ctrl));\n \t\t\trte_errno = ENOMEM;\n \t\t\tgoto error;\n \t\t}\n@@ -195,7 +195,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)\n \tDRV_LOG(DEBUG,\n \t\t\"port %u SPRQ queue %u allocated and configured %u segments\"\n \t\t\" (max %u packets)\",\n-\t\tPORT_ID(rxq_ctrl->priv), rxq_ctrl->rxq.idx, elts_n,\n+\t\tRXQ_PORT_ID(rxq_ctrl), rxq_ctrl->rxq.idx, elts_n,\n \t\telts_n / (1 << rxq_ctrl->rxq.sges_n));\n \treturn 0;\n error:\n@@ -207,7 +207,7 @@ rxq_alloc_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)\n \t\t(*rxq_ctrl->rxq.elts)[i] = NULL;\n \t}\n \tDRV_LOG(DEBUG, \"port %u SPRQ queue %u failed, freed everything\",\n-\t\tPORT_ID(rxq_ctrl->priv), rxq_ctrl->rxq.idx);\n+\t\tRXQ_PORT_ID(rxq_ctrl), rxq_ctrl->rxq.idx);\n \trte_errno = err; /* Restore rte_errno. */\n \treturn -rte_errno;\n }\n@@ -284,7 +284,7 @@ rxq_free_elts_sprq(struct mlx5_rxq_ctrl *rxq_ctrl)\n \tuint16_t i;\n \n \tDRV_LOG(DEBUG, \"port %u Rx queue %u freeing %d WRs\",\n-\t\tPORT_ID(rxq_ctrl->priv), rxq->idx, q_n);\n+\t\tRXQ_PORT_ID(rxq_ctrl), rxq->idx, q_n);\n \tif (rxq->elts == NULL)\n \t\treturn;\n \t/**\n@@ -1584,7 +1584,6 @@ mlx5_rxq_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,\n \t\t(!!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS));\n \ttmpl->rxq.port_id = dev->data->port_id;\n \ttmpl->sh = priv->sh;\n-\ttmpl->priv = priv;\n \ttmpl->rxq.mp = rx_seg[0].mp;\n \ttmpl->rxq.elts_n = log2above(desc);\n \ttmpl->rxq.rq_repl_thresh =\n@@ -1644,7 +1643,6 @@ mlx5_rxq_hairpin_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,\n \ttmpl->rxq.rss_hash = 0;\n \ttmpl->rxq.port_id = dev->data->port_id;\n \ttmpl->sh = priv->sh;\n-\ttmpl->priv = priv;\n \ttmpl->rxq.mp = NULL;\n \ttmpl->rxq.elts_n = log2above(desc);\n \ttmpl->rxq.elts = NULL;\ndiff --git a/drivers/net/mlx5/mlx5_rxtx_vec.c b/drivers/net/mlx5/mlx5_rxtx_vec.c\nindex ecd273e00a8..511681841ca 100644\n--- a/drivers/net/mlx5/mlx5_rxtx_vec.c\n+++ b/drivers/net/mlx5/mlx5_rxtx_vec.c\n@@ -550,7 +550,7 @@ mlx5_rxq_check_vec_support(struct mlx5_rxq_data *rxq)\n \tstruct mlx5_rxq_ctrl *ctrl =\n \t\tcontainer_of(rxq, struct mlx5_rxq_ctrl, rxq);\n \n-\tif (!ctrl->priv->config.rx_vec_en || rxq->sges_n != 0)\n+\tif (!RXQ_PORT(ctrl)->config.rx_vec_en || rxq->sges_n != 0)\n \t\treturn -ENOTSUP;\n \tif (rxq->lro)\n \t\treturn -ENOTSUP;\n", "prefixes": [ "08/11" ] }