Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/138483/?format=api
{ "id": 138483, "url": "http://patchwork.dpdk.org/api/patches/138483/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/PA4PR83MB0526053A870E8358B7CB3643972C2@PA4PR83MB0526.EURPRD83.prod.outlook.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": "<PA4PR83MB0526053A870E8358B7CB3643972C2@PA4PR83MB0526.EURPRD83.prod.outlook.com>", "list_archive_url": "https://inbox.dpdk.org/dev/PA4PR83MB0526053A870E8358B7CB3643972C2@PA4PR83MB0526.EURPRD83.prod.outlook.com", "date": "2024-03-19T14:16:46", "name": "[v3] net/netvsc: fix number Tx queues > Rx queues", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b6c637a76715771365d5664211c3e2bec2a4e923", "submitter": { "id": 3272, "url": "http://patchwork.dpdk.org/api/people/3272/?format=api", "name": "Alan Elder", "email": "alan.elder@microsoft.com" }, "delegate": { "id": 319, "url": "http://patchwork.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/PA4PR83MB0526053A870E8358B7CB3643972C2@PA4PR83MB0526.EURPRD83.prod.outlook.com/mbox/", "series": [ { "id": 31558, "url": "http://patchwork.dpdk.org/api/series/31558/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=31558", "date": "2024-03-19T14:16:46", "name": "[v3] net/netvsc: fix number Tx queues > Rx queues", "version": 3, "mbox": "http://patchwork.dpdk.org/series/31558/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/138483/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/138483/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 192A843CED;\n\tTue, 19 Mar 2024 15:16:54 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A857C40298;\n\tTue, 19 Mar 2024 15:16:53 +0100 (CET)", "from EUR05-DB8-obe.outbound.protection.outlook.com\n (mail-db8eur05on2129.outbound.protection.outlook.com [40.107.20.129])\n by mails.dpdk.org (Postfix) with ESMTP id 8230740041\n for <dev@dpdk.org>; Tue, 19 Mar 2024 15:16:51 +0100 (CET)", "from PA4PR83MB0526.EURPRD83.prod.outlook.com (2603:10a6:102:26b::17)\n by AM7PR83MB0401.EURPRD83.prod.outlook.com (2603:10a6:20b:1be::9)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.12; Tue, 19 Mar\n 2024 14:16:46 +0000", "from PA4PR83MB0526.EURPRD83.prod.outlook.com\n ([fe80::f0b:6b7f:eef8:2bcc]) by PA4PR83MB0526.EURPRD83.prod.outlook.com\n ([fe80::f0b:6b7f:eef8:2bcc%2]) with mapi id 15.20.7409.010; Tue, 19 Mar 2024\n 14:16:46 +0000" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=LUDDoJVEh1gXEDECv+FP+pscjHc5xb78cKSo9FZ1GTicsrV2gPiidNwwkxHyxZAq7gBy7tWlpE7tEMgQ6dyxEnb/4gb9Vl04+KqyCRnh97J/5T//d3c4O06P7WUvFHiRP204xIKp9sUnYE7YSyktvLsDdbUWqCfsEdnggxhmdkwYx5mVL3+nXzYOF0ujlkCgL6AvULMwNzfXU0N5iGdanXDrMyGM1Iu5ddYOg/cSWKVs0ocVKOH+VZynVlmB+eTDuou2IDAIXc4vJgVKtOv6Po2DY3F1V40Xfn4KQg+wJNoAUWeoyn+ZYX/+3jQ2oqkisqaIK6cnTgdmDm6wA0dhQQ==", "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=YendMzuVWEnoLuMtF3E5ZkC551L+cQkVb3+aIdnBheg=;\n b=CY9HdfNlureb2FE/XoIQI5wZY7JxL8kfnADXURz76hu1JaRyHNhl5HwgOFxORT+d0TN64LwW3Ebk13cRcATEOF3yDL/O/k40IBw2as8BHFLpAnPJquuvoLOxMjGVInXhlpayZMuJBNP5BNu5yfMJGrxTVHq0KxrcMfkpznbqQPUDSdPNk/Uij9fe4z8qcalXMcCqv5sBGvWTtr1qiUW0pUKHq5MSik3xvZLPEW/n52+1S4oF9mcFXt20nOm8fqOZJvVekHgyX9fUoOu0TkrZShFZh77UAdECYUKSbGbnhpBLw+VVLM0L2Gf8aqS5JNZ40++LECTldDI/t6vDCc/M1A==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=microsoft.com; dmarc=pass action=none\n header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=YendMzuVWEnoLuMtF3E5ZkC551L+cQkVb3+aIdnBheg=;\n b=FC0tyBL8U473b1QRYf1dh7MzpgkOs/r1nCDxMLBOIe44sYiZj9euyECPa81b6Gja7tV5Smg5y8IwZzFy16bczOYeDRV/R9OqjBi+KJ9F3jJCYqxQobBvvgMgeXMZG16wZJYMGB9nZU5itAvx9R3DkZSfM9NG70Ei/m+WtS8f08M=", "From": "Alan Elder <alan.elder@microsoft.com>", "To": "Long Li <longli@microsoft.com>, Ferruh Yigit <ferruh.yigit@amd.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "CC": "\"dev@dpdk.org\" <dev@dpdk.org>, stephen <stephen@networkplumber.org>", "Subject": "[PATCH v3] net/netvsc: fix number Tx queues > Rx queues", "Thread-Topic": "[PATCH v3] net/netvsc: fix number Tx queues > Rx queues", "Thread-Index": "AQHaeggTqFpeoId2+UWfevTY136nBg==", "Date": "Tue, 19 Mar 2024 14:16:46 +0000", "Message-ID": "\n <PA4PR83MB0526053A870E8358B7CB3643972C2@PA4PR83MB0526.EURPRD83.prod.outlook.com>", "References": "\n <PA4PR83MB0526128CDADC4DCC27FAF491975F2@PA4PR83MB0526.EURPRD83.prod.outlook.com>\n <DU0PR83MB05321DB2ADBEDAE7687773DF97272@DU0PR83MB0532.EURPRD83.prod.outlook.com>\n <SJ1PR21MB3457C3F4261C263951DE9F4BCE2B2@SJ1PR21MB3457.namprd21.prod.outlook.com>", "In-Reply-To": "\n <SJ1PR21MB3457C3F4261C263951DE9F4BCE2B2@SJ1PR21MB3457.namprd21.prod.outlook.com>", "Accept-Language": "en-US", "Content-Language": "en-US", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "msip_labels": "\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=979ac031-206c-4225-b627-540697dac625;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2024-02-29T19:11:26Z;\n MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47;", "x-ms-publictraffictype": "Email", "x-ms-traffictypediagnostic": "PA4PR83MB0526:EE_|AM7PR83MB0401:EE_", "x-ld-processed": "72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr", "x-ms-exchange-senderadcheck": "1", "x-ms-exchange-antispam-relay": "0", "x-microsoft-antispam": "BCL:0;", "x-microsoft-antispam-message-info": "\n 2tz5PnoysicaCvrGyWbdVXa6gl5tEH3frPRUPj5WMP2Ar2chLvRfPf5rorXG4/tCDfPi5As0IvDN6vEjtWL7jyJGYEdJmEPLHWlfPRcime7APJyuQNvSU/H7eh1aJ9pnKrNbpXOvkMxkX+K8HiwHZtTwxdjfhAYAihDzpAZdZJcA8TrAOrY+3Uv5Vh1t0To4eaE0mcrDNrVgo6byFFd5qYgjOb9VDYDUluieU81DprXWMeq84NEEceleVdWV2x2e0Ovt3OJqu9hMfKZRG7iCBnfzZb9QHZOtcZRXqEmwvZCX1+6+4DRkrZ+C5Mg/U/HjuQYP/eix/ldS1+wfN3f+1LCZET8521l7FTnPdqzlix74JLxV+b4h/LWT9MPmbnfoVwMciU99KPZmsc6TtWT0wrzAx7Eisb0XLV+Xx7AtILaOlGg2GHhDeClUQaCo4Zaq5hRaYyQRnyrczhCJK7CnXpNWeNwKnmAGrrgBrJrvXI+DkUfqOjVCIb6Ye4Z+/Z5/e3DbCHjOucp9TW6Vib3OIYXubem6LMH8eJ0yupAF/3KwrwIQo7Wvr72q5L5D0cd8LeO44xfhQ8lZwMVuWYnCm1b+Ic4JtUAozTDrumuDZQtWkrxU1JiZab5o6NZJA0VeyoWoXJK8NIZovpIEQB6N9a6hkTj4lD8Vn0XHZMPpG5w=", "x-forefront-antispam-report": "CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;\n IPV:NLI; SFV:NSPM; H:PA4PR83MB0526.EURPRD83.prod.outlook.com; PTR:; CAT:NONE;\n SFS:(13230031)(1800799015)(366007)(376005); DIR:OUT; SFP:1102;", "x-ms-exchange-antispam-messagedata-chunkcount": "1", "x-ms-exchange-antispam-messagedata-0": "\n 4anX2cCDZpQ3B1PkKd+AWiymjsjFt+mdYfk+N0rS8UjrXsMpSNgxW113RFKKqCDbJMTDTwU9vqPvLL8AOcN3/HLPWhsTj8u6fgERAIPccaKp98msbp1xlJiCDh6/POV8ITjEGPKinDtjdke4yv4VdBirxISyCduy6LR5EWuVcP50XhIKVCzLBd+i7pZn+5ni2VZS3s296QCpg84it7irXWBJDnoqlubaUErMPXntzIXAZkzGK/0VyRP16tPvuocRs1bkaqOfLq5DGxNFonJw4T7JUlZyFiMR9k7fGuU+FD1CpQMtotOH+HODyBknlT7xammczm/bnMuchWyIwOvJyHpDFiboDZVQ4x5Ea7ZfG/rbtz/wmYeHFQ9NEdzcgyX8XKahOkf7Qj2sLiT9oRV7te01/4nhiLqDytpsVfFz195Rm1DyobtWNZMOUSR3UW68dMi5U+JcBSAlJxTJA3lUXXp/Yktc+Y/klOZVQ3o5RQOnSgMlKqORXXJbGiUKR+kEqFlNGexsiHfrrLzc1ubjxjKpPeg0/JZS7PoA/GdrwrsmBlw5jRxggGjrrcVTDjKSa9yhkJlxbdp2bSGM7edyLuwJ/I2L9PjfG1kf0tsdbKgCVtLQ27NAorNM4MFOM9xz0CgWHLk3753MhyeCG6b8EPMrag2BEiEafUiMKRA6AXUFOgTpubkV8ms69NtnXIAwWQrtyXfzUnQl8752O9GBaE0HMHDkWm7aATAELTpsramKkCMVydaoTuK1LBE1Al2JCwB5OSSQUtxVv3NocwO6rvkJITKfI/TkM+/XiOTDX3+3xiXS12MtT+5QULqQ9/3rxH1q5x3oB3/dBDRnu0wMDfx9L/Mwh0z3i8FoXJghCjmhbjOSmqj5CMK/d7WUA+mL0spr0RYY71vAmgQl7cCOta3ERiw9uEJLtsFdu8o/0+BXOBD3ld7N6E1Mpevyu0qBzUbSdM7uketARwFvrWHzSMKGcYiWfXxUD3fgcbAdvY692ip8sCsDLgzoYM3Dal8Ou5a+37JyCh+/uh4jApmWE6DFQNvepwp/rTUkka5mdd8Y5yX98WKHm38mgIFjf3gEE0BmVn9jo4IqyYRv01lt9RxeF0988o83fl0gLThwuRvO8A5astC3olukZU8bNhUwDyxcGSiaBY6+dNLNb1D4Max5mTf9gyBeaQRoAwWCCfxbt1nVlWPo294tCbDRPyWr6WUF50Sz6G16ANzirpkNzTp7RPHPMkhqfjYbPBVLJPWGLO2ZqdOw70U0IeFKkbtoZr4eddebr7mRwpilA5iCqludlfoEL4ZSlO3lePUx6jvOJc4Nc6zNr3yM9jYjihpF4CN3QAdLrl1cUmgUqf7r/LeWkLo2fuiec7mzK/ku5SovcW4qDCVt/xT93MPs9lXLK+C+ilIVK3FH+EwdjmAJMOYUXGfxsNbQmVELLLjH26eKW6V2rrw7YLC3P1K+SRVkbNKbsEVVfpO4urupYHmUO+2oDfUTMQsMhPa+K1qWyGm5UQYEzLgdKENmRe3g32Tm", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "quoted-printable", "MIME-Version": "1.0", "X-OriginatorOrg": "microsoft.com", "X-MS-Exchange-CrossTenant-AuthAs": "Internal", "X-MS-Exchange-CrossTenant-AuthSource": "PA4PR83MB0526.EURPRD83.prod.outlook.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 2df7f4a0-3f15-4c61-b35c-08dc481f35e9", "X-MS-Exchange-CrossTenant-originalarrivaltime": "19 Mar 2024 14:16:46.4991 (UTC)", "X-MS-Exchange-CrossTenant-fromentityheader": "Hosted", "X-MS-Exchange-CrossTenant-id": "72f988bf-86f1-41af-91ab-2d7cd011db47", "X-MS-Exchange-CrossTenant-mailboxtype": "HOSTED", "X-MS-Exchange-CrossTenant-userprincipalname": "\n t6AM08LU70NfkJjkMQtxEnpELV8ooAUmNKuj2iIbXM0m8vL+OBD4EiPVV0zJTynUr02ZY1rJe8+gCe3BXDCkrQ==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM7PR83MB0401", "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": "The previous code allowed the number of Tx queues to be set higher than\nthe number of Rx queues. If a packet was sent on a Tx queue with index\n>= number Rx queues there was a segfault.\n\nThis commit fixes the issue by creating an Rx queue for every Tx queue\nmeaning that an event buffer is allocated to handle receiving Tx\ncompletion messages.\n\nmbuf pool and Rx ring are not allocated for these additional Rx queues\nand RSS configuration ensures that no packets are received on them.\n\nFixes: 4e9c73e96e83 (\"net/netvsc: add Hyper-V network device\")\nCc: sthemmin@microsoft.com\nCc: stable@dpdk.org\n\nSigned-off-by: Alan Elder <alan.elder@microsoft.com>\n---\nv3:\n* Handle case of Rx queue creation failure in hn_dev_tx_queue_setup.\n* Re-use rx queue if it has already been allocated.\n* Don't allocate an mbuf if pool is NULL. This avoids segfault if RSS\n configuration is incorrect.\n\nv2:\n* Remove function declaration for static non-member function\n\n---\n drivers/net/netvsc/hn_ethdev.c | 9 +++++\n drivers/net/netvsc/hn_rxtx.c | 70 +++++++++++++++++++++++++++++-----\n 2 files changed, 70 insertions(+), 9 deletions(-)", "diff": "diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c\nindex b8a32832d7..d7e3f12346 100644\n--- a/drivers/net/netvsc/hn_ethdev.c\n+++ b/drivers/net/netvsc/hn_ethdev.c\n@@ -313,6 +313,15 @@ static int hn_rss_reta_update(struct rte_eth_dev *dev,\n \n \t\tif (reta_conf[idx].mask & mask)\n \t\t\thv->rss_ind[i] = reta_conf[idx].reta[shift];\n+\n+\t\t/*\n+\t\t * Ensure we don't allow config that directs traffic to an Rx\n+\t\t * queue that we aren't going to poll\n+\t\t */\n+\t\tif (hv->rss_ind[i] >= dev->data->nb_rx_queues) {\n+\t\t\tPMD_DRV_LOG(ERR, \"RSS distributing traffic to invalid Rx queue\");\n+\t\t\treturn -EINVAL;\n+\t\t}\n \t}\n \n \terr = hn_rndis_conf_rss(hv, NDIS_RSS_FLAG_DISABLE);\ndiff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c\nindex 9bf1ec5509..e23880c176 100644\n--- a/drivers/net/netvsc/hn_rxtx.c\n+++ b/drivers/net/netvsc/hn_rxtx.c\n@@ -234,6 +234,17 @@ static void hn_reset_txagg(struct hn_tx_queue *txq)\n \ttxq->agg_prevpkt = NULL;\n }\n \n+static void\n+hn_rx_queue_free_common(struct hn_rx_queue *rxq)\n+{\n+\tif (!rxq)\n+\t\treturn;\n+\n+\trte_free(rxq->rxbuf_info);\n+\trte_free(rxq->event_buf);\n+\trte_free(rxq);\n+}\n+\n int\n hn_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t uint16_t queue_idx, uint16_t nb_desc,\n@@ -243,6 +254,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,\n {\n \tstruct hn_data *hv = dev->data->dev_private;\n \tstruct hn_tx_queue *txq;\n+\tstruct hn_rx_queue *rxq = NULL;\n \tchar name[RTE_MEMPOOL_NAMESIZE];\n \tuint32_t tx_free_thresh;\n \tint err = -ENOMEM;\n@@ -301,6 +313,27 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\tgoto error;\n \t}\n \n+\t/*\n+\t * If there are more Tx queues than Rx queues, allocate rx_queues\n+\t * with event buffer so that Tx completion messages can still be\n+\t * received\n+\t */\n+\tif (queue_idx >= dev->data->nb_rx_queues) {\n+\t\trxq = hn_rx_queue_alloc(hv, queue_idx, socket_id);\n+\n+\t\tif (!rxq) {\n+\t\t\terr = -ENOMEM;\n+\t\t\tgoto error;\n+\t\t}\n+\n+\t\t/*\n+\t\t * Don't allocate mbuf pool or rx ring. RSS is always configured\n+\t\t * to ensure packets aren't received by this Rx queue.\n+\t\t */\n+\t\trxq->mb_pool = NULL;\n+\t\trxq->rx_ring = NULL;\n+\t}\n+\n \ttxq->agg_szmax = RTE_MIN(hv->chim_szmax, hv->rndis_agg_size);\n \ttxq->agg_pktmax = hv->rndis_agg_pkts;\n \ttxq->agg_align = hv->rndis_agg_align;\n@@ -311,12 +344,15 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t\t\t socket_id, tx_conf);\n \tif (err == 0) {\n \t\tdev->data->tx_queues[queue_idx] = txq;\n+\t\tif (rxq != NULL)\n+\t\t\tdev->data->rx_queues[queue_idx] = rxq;\n \t\treturn 0;\n \t}\n \n error:\n \trte_mempool_free(txq->txdesc_pool);\n \trte_memzone_free(txq->tx_rndis_mz);\n+\thn_rx_queue_free_common(rxq);\n \trte_free(txq);\n \treturn err;\n }\n@@ -364,6 +400,13 @@ hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid)\n \tif (!txq)\n \t\treturn;\n \n+\t/*\n+\t * Free any Rx queues allocated for a Tx queue without a corresponding\n+\t * Rx queue\n+\t */\n+\tif (qid >= dev->data->nb_rx_queues)\n+\t\thn_rx_queue_free_common(dev->data->rx_queues[qid]);\n+\n \trte_mempool_free(txq->txdesc_pool);\n \n \trte_memzone_free(txq->tx_rndis_mz);\n@@ -552,10 +595,12 @@ static void hn_rxpkt(struct hn_rx_queue *rxq, struct hn_rx_bufinfo *rxb,\n \t\t const struct hn_rxinfo *info)\n {\n \tstruct hn_data *hv = rxq->hv;\n-\tstruct rte_mbuf *m;\n+\tstruct rte_mbuf *m = NULL;\n \tbool use_extbuf = false;\n \n-\tm = rte_pktmbuf_alloc(rxq->mb_pool);\n+\tif (likely(rxq->mb_pool != NULL))\n+\t\tm = rte_pktmbuf_alloc(rxq->mb_pool);\n+\n \tif (unlikely(!m)) {\n \t\tstruct rte_eth_dev *dev =\n \t\t\t&rte_eth_devices[rxq->port_id];\n@@ -942,7 +987,15 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \tif (queue_idx == 0) {\n \t\trxq = hv->primary;\n \t} else {\n-\t\trxq = hn_rx_queue_alloc(hv, queue_idx, socket_id);\n+\t\t/*\n+\t\t * If the number of Tx queues was previously greater than the\n+\t\t * number of Rx queues, we may already have allocated an rxq.\n+\t\t */\n+\t\tif (!dev->data->rx_queues[queue_idx])\n+\t\t\trxq = hn_rx_queue_alloc(hv, queue_idx, socket_id);\n+\t\telse\n+\t\t\trxq = dev->data->rx_queues[queue_idx];\n+\n \t\tif (!rxq)\n \t\t\treturn -ENOMEM;\n \t}\n@@ -975,9 +1028,10 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev,\n \n fail:\n \trte_ring_free(rxq->rx_ring);\n-\trte_free(rxq->rxbuf_info);\n-\trte_free(rxq->event_buf);\n-\trte_free(rxq);\n+\t/* Only free rxq if it was created in this function. */\n+\tif (!dev->data->rx_queues[queue_idx])\n+\t\thn_rx_queue_free_common(rxq);\n+\n \treturn error;\n }\n \n@@ -998,9 +1052,7 @@ hn_rx_queue_free(struct hn_rx_queue *rxq, bool keep_primary)\n \tif (keep_primary && rxq == rxq->hv->primary)\n \t\treturn;\n \n-\trte_free(rxq->rxbuf_info);\n-\trte_free(rxq->event_buf);\n-\trte_free(rxq);\n+\thn_rx_queue_free_common(rxq);\n }\n \n void\n", "prefixes": [ "v3" ] }