Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/46507/?format=api
{ "id": 46507, "url": "https://patches.dpdk.org/api/patches/46507/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/1539182356-15496-2-git-send-email-rasland@mellanox.com/", "project": { "id": 1, "url": "https://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": "<1539182356-15496-2-git-send-email-rasland@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1539182356-15496-2-git-send-email-rasland@mellanox.com", "date": "2018-10-10T14:39:24", "name": "[v6,2/3] net/tap: move fds of Rx/Tx queues to be in process private", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "59750687afc5cfefb758beacbae07b16294c21c8", "submitter": { "id": 513, "url": "https://patches.dpdk.org/api/people/513/?format=api", "name": "Raslan Darawsheh", "email": "rasland@mellanox.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/1539182356-15496-2-git-send-email-rasland@mellanox.com/mbox/", "series": [ { "id": 1815, "url": "https://patches.dpdk.org/api/series/1815/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=1815", "date": "2018-10-10T14:39:23", "name": "[v6,1/3] net/tap: add queue and port ids in Rx/Tx queues structures", "version": 6, "mbox": "https://patches.dpdk.org/series/1815/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/46507/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/46507/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 80E921B6F7;\n\tWed, 10 Oct 2018 16:39:28 +0200 (CEST)", "from EUR01-HE1-obe.outbound.protection.outlook.com\n\t(mail-he1eur01on0076.outbound.protection.outlook.com [104.47.0.76])\n\tby dpdk.org (Postfix) with ESMTP id 9FFD11B6DA\n\tfor <dev@dpdk.org>; Wed, 10 Oct 2018 16:39:26 +0200 (CEST)", "from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by\n\tDB5PR05MB1670.eurprd05.prod.outlook.com (10.165.6.148) with Microsoft\n\tSMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n\t15.20.1207.27; Wed, 10 Oct 2018 14:39:24 +0000", "from DB5PR05MB1254.eurprd05.prod.outlook.com\n\t([fe80::3516:b329:5c35:51a5]) by\n\tDB5PR05MB1254.eurprd05.prod.outlook.com\n\t([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1207.029;\n\tWed, 10 Oct 2018 14:39:24 +0000" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com;\n\ts=selector1;\n\th=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n\tbh=QUNPql+IJ/ZkvfCz3GKwPorIO1esfSMlWFu16gOUl+8=;\n\tb=JVYHSpKqX7pSJEU8PUn52T51XX1mWbqMbyjpEdl2yMJYHmRlf0usP80vB9k58UMP/Zz1wJZIkgBIo5FUJAwtHQKZ+rMNA3wX63AvM+WUieh/r6SR/aRBauDBqn2zhWnm/3mFz1HnuMpwr7ILhJH8NQMUpXfOxkPwt/6u5Idy6xo=", "From": "Raslan Darawsheh <rasland@mellanox.com>", "To": "\"keith.wiles@intel.com\" <keith.wiles@intel.com>", "CC": "Thomas Monjalon <thomas@monjalon.net>, \"dev@dpdk.org\" <dev@dpdk.org>,\n\tShahaf Shuler <shahafs@mellanox.com>, Raslan Darawsheh\n\t<rasland@mellanox.com>, Ori Kam <orika@mellanox.com>,\n\t\"ferruh.yigit@intel.com\" <ferruh.yigit@intel.com>", "Thread-Topic": "[PATCH v6 2/3] net/tap: move fds of Rx/Tx queues to be in\n\tprocess private", "Thread-Index": "AQHUYKcJAUB1UJQmHEa5uzr7gRBzXg==", "Date": "Wed, 10 Oct 2018 14:39:24 +0000", "Message-ID": "<1539182356-15496-2-git-send-email-rasland@mellanox.com>", "References": "<1539182356-15496-1-git-send-email-rasland@mellanox.com>", "In-Reply-To": "<1539182356-15496-1-git-send-email-rasland@mellanox.com>", "Accept-Language": "en-US", "Content-Language": "en-US", "X-MS-Has-Attach": "", "X-MS-TNEF-Correlator": "", "x-mailer": "git-send-email 2.7.4", "x-clientproxiedby": "AM5PR0701CA0013.eurprd07.prod.outlook.com\n\t(2603:10a6:203:51::23) To DB5PR05MB1254.eurprd05.prod.outlook.com\n\t(2a01:111:e400:51cc::12)", "authentication-results": "spf=none (sender IP is )\n\tsmtp.mailfrom=rasland@mellanox.com; ", "x-ms-exchange-messagesentrepresentingtype": "1", "x-originating-ip": "[37.142.13.130]", "x-ms-publictraffictype": "Email", "x-microsoft-exchange-diagnostics": "1; DB5PR05MB1670;\n\t6:yMiH7g8wdK31ILHFKer5A2jwg1pNYqwnCUY40l5CrF0zMz/C5leua28BgWOA8jpIWyGWmBKPi8TPjL+BrzCrIXTf57gmZ/0vugS0GvtynnmKPJBSEABYcpCGngdoywlnFzlVIVFxHX/SWpY6GXl07VGg+c3WUF0PZVhKV4isjeWMFFtEHYQvvvm8Tm15A6jzMQfLtZ2svNDIjW8DpwR4ak6wpdpWiCaKcjobVeP0fvspQgghnE7zREFYSx2hsbwrd1DMFm7hrUOLPdlmbNoxSsF6GzrzKK27xO+b1X13TfRxkoQUkzvcjgUNyxcmy3FvPmYwsbJkJC5eVcFSU8VhwfGHRcNU7wD0MU6UPBD3Vp2XXi5MpCwlzQ7bURyg0rZKghFMFT3cZgZMvE6G4qKSNbQ1NhZUAWgfQf1WzmSsz7qy3VJwsjEutOKKGLyfiLLdqwyVYa9Dw2e8xy7hHsl3vg==;\n\t5:ARLY67R3s2Udwago7o5oWyWNr8j0KiyFe2hF9pbfJlrKoPOh40HpMUWN2TfiKjfXju1oomWLCnkhgQKYVk3kqUUXg0sTNxxxagkdHeHofk4uuZGhK1mf+Sm/TuGJ/CZxMC+bniFOnKGv7WXhUO/LQlwuO7J8IoTAcpla1lCPWS0=;\n\t7:jsuXAeykR92diuz/r2HlnPmM3fPMadkGAKRqVhyMgtQKV9LDpqDw7/PJjRmE5o4kO5KsBNoaz4/5HoCiLp2Tz7n0xHV71b0/F3Nj6z2QUiivmjtw1QbB3uoeUfI4qqG+RyjgdSvw4dIhLQTo9YxF87sibhtfMhhM9Uw7DV4xBt4fAhMbUkhRc3OpTDSsydtbceAh0DK86FbuN/mVMjrW3PZsIYd0JRg2owqASEFQF4n8JuDowBGF7ZhVXHmnXEQI", "x-ms-office365-filtering-correlation-id": "bc5e4e4c-d5f8-4f87-d8b3-08d62ebe2c34", "x-ms-office365-filtering-ht": "Tenant", "x-microsoft-antispam": "BCL:0; PCL:0;\n\tRULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020);\n\tSRVR:DB5PR05MB1670; ", "x-ms-traffictypediagnostic": "DB5PR05MB1670:", "x-ld-processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "x-microsoft-antispam-prvs": "<DB5PR05MB16703A21DA041CDFBB3EDD90C2E00@DB5PR05MB1670.eurprd05.prod.outlook.com>", "x-exchange-antispam-report-test": "UriScan:;", "x-ms-exchange-senderadcheck": "1", "x-exchange-antispam-report-cfa-test": "BCL:0; PCL:0;\n\tRULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201708071742011)(7699051);\n\tSRVR:DB5PR05MB1670; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1670; ", "x-forefront-prvs": "08213D42D3", "x-forefront-antispam-report": "SFV:NSPM;\n\tSFS:(10009020)(136003)(39860400002)(346002)(396003)(366004)(376002)(189003)(199004)(6486002)(105586002)(86362001)(52116002)(76176011)(8936002)(81166006)(6506007)(97736004)(2351001)(26005)(486006)(386003)(186003)(316002)(256004)(106356001)(5640700003)(102836004)(4326008)(4744004)(36756003)(7736002)(14444005)(11346002)(446003)(476003)(2616005)(6436002)(6512007)(8676002)(66066001)(2906002)(53936002)(68736007)(2501003)(305945005)(25786009)(14454004)(5250100002)(71200400001)(478600001)(99286004)(5660300001)(50226002)(6916009)(2900100001)(81156014)(54906003)(3846002)(71190400001)(6116002);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1670;\n\tH:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en;\n\tPTR:InfoNoRecords; MX:1; A:1; ", "received-spf": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "x-microsoft-antispam-message-info": "Si3HR0W7Kx87fLJLuguoG3Cnh2Zx5Ppq7AGwMZ+SIFGHp7GYXbEO6UAWV2VQFkSQhvNg/YOgMWCiJ86jUvQ6xewfBOlpYvJQI6RiUm4oyNiulRd1AICfI8elJ/r3fwTWAoUHknRY5YcuNk8iSPxwl9kVUukFw/V+94I+tfPAPNetLzZ7BzTd/eFY5K2Q70SpU0TW17NAoaxajC3V5CjhtenMhLp4+zzefeJMpeAgqdp+Q0lTICirp9m/YuIljearXyiic04BNZWIUxtWsgigu3qgMD5XG3s+lchhMjrVD0Mt6GtHsfoWVF5Z0E3wr2SiravwXNokOV8AH6twKLwZ8VdVTfGh44K/RxrPVZeiDsU=", "spamdiagnosticoutput": "1:99", "spamdiagnosticmetadata": "NSPM", "Content-Type": "text/plain; charset=\"iso-8859-1\"", "Content-Transfer-Encoding": "quoted-printable", "MIME-Version": "1.0", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-Network-Message-Id": "bc5e4e4c-d5f8-4f87-d8b3-08d62ebe2c34", "X-MS-Exchange-CrossTenant-originalarrivaltime": "10 Oct 2018 14:39:24.5253\n\t(UTC)", "X-MS-Exchange-CrossTenant-fromentityheader": "Hosted", "X-MS-Exchange-CrossTenant-id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DB5PR05MB1670", "Subject": "[dpdk-dev] [PATCH v6 2/3] net/tap: move fds of Rx/Tx queues to be\n\tin process private", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "fd's cannot be shared between processes, and each process need to have\nit's own fd's pointer.\n\nSigned-off-by: Raslan Darawsheh <rasland@mellanox.com>\n---\n drivers/net/tap/rte_eth_tap.c | 93 +++++++++++++++++++++++++++++--------------\n drivers/net/tap/rte_eth_tap.h | 7 +++-\n drivers/net/tap/tap_flow.c | 3 +-\n drivers/net/tap/tap_intr.c | 5 ++-\n 4 files changed, 73 insertions(+), 35 deletions(-)", "diff": "diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex edfb7da..3372d54 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -315,6 +315,7 @@ static uint16_t\n pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n {\n \tstruct rx_queue *rxq = queue;\n+\tstruct pmd_process_private *process_private;\n \tuint16_t num_rx;\n \tunsigned long num_rx_bytes = 0;\n \tuint32_t trigger = tap_trigger;\n@@ -323,6 +324,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\treturn 0;\n \tif (trigger)\n \t\trxq->trigger_seen = trigger;\n+\tprocess_private = rte_eth_devices[rxq->in_port].process_private;\n \trte_compiler_barrier();\n \tfor (num_rx = 0; num_rx < nb_pkts; ) {\n \t\tstruct rte_mbuf *mbuf = rxq->pool;\n@@ -331,9 +333,9 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)\n \t\tuint16_t data_off = rte_pktmbuf_headroom(mbuf);\n \t\tint len;\n \n-\t\tlen = readv(rxq->fd, *rxq->iovecs,\n-\t\t\t 1 +\n-\t\t\t (rxq->rxmode->offloads & DEV_RX_OFFLOAD_SCATTER ?\n+\t\tlen = readv(process_private->rxq_fds[rxq->queue_id],\n+\t\t\t*rxq->iovecs,\n+\t\t\t1 + (rxq->rxmode->offloads & DEV_RX_OFFLOAD_SCATTER ?\n \t\t\t rxq->nb_rx_desc : 1));\n \t\tif (len < (int)sizeof(struct tun_pi))\n \t\t\tbreak;\n@@ -494,6 +496,9 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,\n {\n \tint i;\n \tuint16_t l234_hlen;\n+\tstruct pmd_process_private *process_private;\n+\n+\tprocess_private = rte_eth_devices[txq->out_port].process_private;\n \n \tfor (i = 0; i < num_mbufs; i++) {\n \t\tstruct rte_mbuf *mbuf = pmbufs[i];\n@@ -595,7 +600,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs,\n \t\t\ttap_tx_l4_cksum(l4_cksum, l4_phdr_cksum, l4_raw_cksum);\n \n \t\t/* copy the tx frame data */\n-\t\tn = writev(txq->fd, iovecs, j);\n+\t\tn = writev(process_private->txq_fds[txq->queue_id], iovecs, j);\n \t\tif (n <= 0)\n \t\t\tbreak;\n \t\t(*num_packets)++;\n@@ -970,19 +975,20 @@ tap_dev_close(struct rte_eth_dev *dev)\n {\n \tint i;\n \tstruct pmd_internals *internals = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \n \ttap_link_set_down(dev);\n \ttap_flow_flush(dev, NULL);\n \ttap_flow_implicit_flush(internals, NULL);\n \n \tfor (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {\n-\t\tif (internals->rxq[i].fd != -1) {\n-\t\t\tclose(internals->rxq[i].fd);\n-\t\t\tinternals->rxq[i].fd = -1;\n+\t\tif (process_private->rxq_fds[i] != -1) {\n+\t\t\tclose(process_private->rxq_fds[i]);\n+\t\t\tprocess_private->rxq_fds[i] = -1;\n \t\t}\n-\t\tif (internals->txq[i].fd != -1) {\n-\t\t\tclose(internals->txq[i].fd);\n-\t\t\tinternals->txq[i].fd = -1;\n+\t\tif (process_private->txq_fds[i] != -1) {\n+\t\t\tclose(process_private->txq_fds[i]);\n+\t\t\tprocess_private->txq_fds[i] = -1;\n \t\t}\n \t}\n \n@@ -1006,10 +1012,14 @@ static void\n tap_rx_queue_release(void *queue)\n {\n \tstruct rx_queue *rxq = queue;\n+\tstruct pmd_process_private *process_private;\n \n-\tif (rxq && (rxq->fd > 0)) {\n-\t\tclose(rxq->fd);\n-\t\trxq->fd = -1;\n+\tif (!rxq)\n+\t\treturn;\n+\tprocess_private = rte_eth_devices[rxq->in_port].process_private;\n+\tif (process_private->rxq_fds[rxq->queue_id] > 0) {\n+\t\tclose(process_private->rxq_fds[rxq->queue_id]);\n+\t\tprocess_private->rxq_fds[rxq->queue_id] = -1;\n \t\trte_pktmbuf_free(rxq->pool);\n \t\trte_free(rxq->iovecs);\n \t\trxq->pool = NULL;\n@@ -1021,10 +1031,15 @@ static void\n tap_tx_queue_release(void *queue)\n {\n \tstruct tx_queue *txq = queue;\n+\tstruct pmd_process_private *process_private;\n+\n+\tif (!txq)\n+\t\treturn;\n+\tprocess_private = rte_eth_devices[txq->out_port].process_private;\n \n-\tif (txq && (txq->fd > 0)) {\n-\t\tclose(txq->fd);\n-\t\ttxq->fd = -1;\n+\tif (process_private->txq_fds[txq->queue_id] > 0) {\n+\t\tclose(process_private->txq_fds[txq->queue_id]);\n+\t\tprocess_private->txq_fds[txq->queue_id] = -1;\n \t}\n }\n \n@@ -1209,18 +1224,19 @@ tap_setup_queue(struct rte_eth_dev *dev,\n \tint *other_fd;\n \tconst char *dir;\n \tstruct pmd_internals *pmd = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \tstruct rx_queue *rx = &internals->rxq[qid];\n \tstruct tx_queue *tx = &internals->txq[qid];\n \tstruct rte_gso_ctx *gso_ctx;\n \n \tif (is_rx) {\n-\t\tfd = &rx->fd;\n-\t\tother_fd = &tx->fd;\n+\t\tfd = &process_private->rxq_fds[qid];\n+\t\tother_fd = &process_private->txq_fds[qid];\n \t\tdir = \"rx\";\n \t\tgso_ctx = NULL;\n \t} else {\n-\t\tfd = &tx->fd;\n-\t\tother_fd = &rx->fd;\n+\t\tfd = &process_private->txq_fds[qid];\n+\t\tother_fd = &process_private->rxq_fds[qid];\n \t\tdir = \"tx\";\n \t\tgso_ctx = &tx->gso_ctx;\n \t}\n@@ -1273,6 +1289,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,\n \t\t struct rte_mempool *mp)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \tstruct rx_queue *rxq = &internals->rxq[rx_queue_id];\n \tstruct rte_mbuf **tmp = &rxq->pool;\n \tlong iov_max = sysconf(_SC_IOV_MAX);\n@@ -1332,7 +1349,8 @@ tap_rx_queue_setup(struct rte_eth_dev *dev,\n \t}\n \n \tTAP_LOG(DEBUG, \" RX TUNTAP device name %s, qid %d on fd %d\",\n-\t\tinternals->name, rx_queue_id, internals->rxq[rx_queue_id].fd);\n+\t\tinternals->name, rx_queue_id,\n+\t\tprocess_private->rxq_fds[rx_queue_id]);\n \n \treturn 0;\n \n@@ -1352,6 +1370,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,\n \t\t const struct rte_eth_txconf *tx_conf)\n {\n \tstruct pmd_internals *internals = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \tstruct tx_queue *txq;\n \tint ret;\n \tuint64_t offloads;\n@@ -1374,7 +1393,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev,\n \t\treturn -1;\n \tTAP_LOG(DEBUG,\n \t\t\" TX TUNTAP device name %s, qid %d on fd %d csum %s\",\n-\t\tinternals->name, tx_queue_id, internals->txq[tx_queue_id].fd,\n+\t\tinternals->name, tx_queue_id,\n+\t\tprocess_private->txq_fds[tx_queue_id],\n \t\ttxq->csum ? \"on\" : \"off\");\n \n \treturn 0;\n@@ -1622,6 +1642,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,\n \tint numa_node = rte_socket_id();\n \tstruct rte_eth_dev *dev;\n \tstruct pmd_internals *pmd;\n+\tstruct pmd_process_private *process_private;\n \tstruct rte_eth_dev_data *data;\n \tstruct ifreq ifr;\n \tint i;\n@@ -1636,7 +1657,16 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,\n \t\tgoto error_exit_nodev;\n \t}\n \n+\tprocess_private = (struct pmd_process_private *)\n+\t\trte_zmalloc_socket(tap_name, sizeof(struct pmd_process_private),\n+\t\t\tRTE_CACHE_LINE_SIZE, dev->device->numa_node);\n+\n+\tif (process_private == NULL) {\n+\t\tTAP_LOG(ERR, \"Failed to alloc memory for process private\");\n+\t\treturn -1;\n+\t}\n \tpmd = dev->data->dev_private;\n+\tdev->process_private = process_private;\n \tpmd->dev = dev;\n \tsnprintf(pmd->name, sizeof(pmd->name), \"%s\", tap_name);\n \tpmd->type = type;\n@@ -1672,8 +1702,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name,\n \t/* Presetup the fds to -1 as being not valid */\n \tpmd->ka_fd = -1;\n \tfor (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {\n-\t\tpmd->rxq[i].fd = -1;\n-\t\tpmd->txq[i].fd = -1;\n+\t\tprocess_private->rxq_fds[i] = -1;\n+\t\tprocess_private->txq_fds[i] = -1;\n \t}\n \n \tif (pmd->type == ETH_TUNTAP_TYPE_TAP) {\n@@ -2073,6 +2103,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)\n {\n \tstruct rte_eth_dev *eth_dev = NULL;\n \tstruct pmd_internals *internals;\n+\tstruct pmd_process_private *process_private;\n \tint i;\n \n \t/* find the ethdev entry */\n@@ -2081,6 +2112,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)\n \t\treturn 0;\n \n \tinternals = eth_dev->data->dev_private;\n+\tprocess_private = eth_dev->process_private;\n \n \tTAP_LOG(DEBUG, \"Closing %s Ethernet device on numa %u\",\n \t\t(internals->type == ETH_TUNTAP_TYPE_TAP) ? \"TAP\" : \"TUN\",\n@@ -2092,18 +2124,19 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev)\n \t\ttap_nl_final(internals->nlsk_fd);\n \t}\n \tfor (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {\n-\t\tif (internals->rxq[i].fd != -1) {\n-\t\t\tclose(internals->rxq[i].fd);\n-\t\t\tinternals->rxq[i].fd = -1;\n+\t\tif (process_private->rxq_fds[i] != -1) {\n+\t\t\tclose(process_private->rxq_fds[i]);\n+\t\t\tprocess_private->rxq_fds[i] = -1;\n \t\t}\n-\t\tif (internals->txq[i].fd != -1) {\n-\t\t\tclose(internals->txq[i].fd);\n-\t\t\tinternals->txq[i].fd = -1;\n+\t\tif (process_private->txq_fds[i] != -1) {\n+\t\t\tclose(process_private->txq_fds[i]);\n+\t\t\tprocess_private->txq_fds[i] = -1;\n \t\t}\n \t}\n \n \tclose(internals->ioctl_sock);\n \trte_free(eth_dev->data->dev_private);\n+\trte_free(eth_dev->process_private);\n \trte_eth_dev_release_port(eth_dev);\n \n \tif (internals->ka_fd != -1) {\ndiff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h\nindex 4502e24..dc3579a 100644\n--- a/drivers/net/tap/rte_eth_tap.h\n+++ b/drivers/net/tap/rte_eth_tap.h\n@@ -47,7 +47,6 @@ struct rx_queue {\n \tuint32_t trigger_seen; /* Last seen Rx trigger value */\n \tuint16_t in_port; /* Port ID */\n \tuint16_t queue_id;\t\t/* queue ID*/\n-\tint fd;\n \tstruct pkt_stats stats; /* Stats for this RX queue */\n \tuint16_t nb_rx_desc; /* max number of mbufs available */\n \tstruct rte_eth_rxmode *rxmode; /* RX features */\n@@ -57,7 +56,6 @@ struct rx_queue {\n };\n \n struct tx_queue {\n-\tint fd;\n \tint type; /* Type field - TUN|TAP */\n \tuint16_t *mtu; /* Pointer to MTU from dev_data */\n \tuint16_t csum:1; /* Enable checksum offloading */\n@@ -95,6 +93,11 @@ struct pmd_internals {\n \tint ka_fd; /* keep-alive file descriptor */\n };\n \n+struct pmd_process_private {\n+\tint rxq_fds[RTE_PMD_TAP_MAX_QUEUES];\n+\tint txq_fds[RTE_PMD_TAP_MAX_QUEUES];\n+};\n+\n /* tap_intr.c */\n \n int tap_rx_intr_vec_set(struct rte_eth_dev *dev, int set);\ndiff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c\nindex 0e01af6..3ba6945 100644\n--- a/drivers/net/tap/tap_flow.c\n+++ b/drivers/net/tap/tap_flow.c\n@@ -1567,6 +1567,7 @@ tap_flow_isolate(struct rte_eth_dev *dev,\n \t\t struct rte_flow_error *error __rte_unused)\n {\n \tstruct pmd_internals *pmd = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \n \t/* normalize 'set' variable to contain 0 or 1 values */\n \tif (set)\n@@ -1580,7 +1581,7 @@ tap_flow_isolate(struct rte_eth_dev *dev,\n \t * If netdevice is there, setup appropriate flow rules immediately.\n \t * Otherwise it will be set when bringing up the netdevice (tun_alloc).\n \t */\n-\tif (!pmd->rxq[0].fd)\n+\tif (!process_private->rxq_fds[0])\n \t\treturn 0;\n \tif (set) {\n \t\tstruct rte_flow *remote_flow;\ndiff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c\nindex fc59018..7af0010 100644\n--- a/drivers/net/tap/tap_intr.c\n+++ b/drivers/net/tap/tap_intr.c\n@@ -51,6 +51,7 @@ static int\n tap_rx_intr_vec_install(struct rte_eth_dev *dev)\n {\n \tstruct pmd_internals *pmd = dev->data->dev_private;\n+\tstruct pmd_process_private *process_private = dev->process_private;\n \tunsigned int rxqs_n = pmd->dev->data->nb_rx_queues;\n \tstruct rte_intr_handle *intr_handle = &pmd->intr_handle;\n \tunsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID);\n@@ -71,7 +72,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev)\n \t\tstruct rx_queue *rxq = pmd->dev->data->rx_queues[i];\n \n \t\t/* Skip queues that cannot request interrupts. */\n-\t\tif (!rxq || rxq->fd <= 0) {\n+\t\tif (!rxq || process_private->rxq_fds[i] <= 0) {\n \t\t\t/* Use invalid intr_vec[] index to disable entry. */\n \t\t\tintr_handle->intr_vec[i] =\n \t\t\t\tRTE_INTR_VEC_RXTX_OFFSET +\n@@ -79,7 +80,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev)\n \t\t\tcontinue;\n \t\t}\n \t\tintr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + count;\n-\t\tintr_handle->efds[count] = rxq->fd;\n+\t\tintr_handle->efds[count] = process_private->rxq_fds[i];\n \t\tcount++;\n \t}\n \tif (!count)\n", "prefixes": [ "v6", "2/3" ] }