Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/47030/?format=api
{ "id": 47030, "url": "http://patches.dpdk.org/api/patches/47030/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1539850509-9332-2-git-send-email-rasland@mellanox.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": "<1539850509-9332-2-git-send-email-rasland@mellanox.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1539850509-9332-2-git-send-email-rasland@mellanox.com", "date": "2018-10-18T08:15:08", "name": "[v9,2/3] net/tap: move fds of Rx/Tx queues to be in process private", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "59750687afc5cfefb758beacbae07b16294c21c8", "submitter": { "id": 513, "url": "http://patches.dpdk.org/api/people/513/?format=api", "name": "Raslan Darawsheh", "email": "rasland@mellanox.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1539850509-9332-2-git-send-email-rasland@mellanox.com/mbox/", "series": [ { "id": 1969, "url": "http://patches.dpdk.org/api/series/1969/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1969", "date": "2018-10-18T08:15:07", "name": "[v9,1/3] net/tap: add queue and port ids in Rx/Tx queues structures", "version": 9, "mbox": "http://patches.dpdk.org/series/1969/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/47030/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/47030/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 E77201B10E;\n\tThu, 18 Oct 2018 10:15:29 +0200 (CEST)", "from EUR03-DB5-obe.outbound.protection.outlook.com\n\t(mail-eopbgr40060.outbound.protection.outlook.com [40.107.4.60])\n\tby dpdk.org (Postfix) with ESMTP id 4CE225F72\n\tfor <dev@dpdk.org>; Thu, 18 Oct 2018 10:15:24 +0200 (CEST)", "from mellanox.com (37.142.13.130) by\n\tAM3PR05MB1250.eurprd05.prod.outlook.com (2a01:111:e400:586f::12) with\n\tMicrosoft SMTP Server (version=TLS1_2,\n\tcipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1228.26;\n\tThu, 18 Oct 2018 08:15:21 +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=ef1IfKFMTXEQQo08lT+eoqc9pchV6xlA0LG6MudgLgg=;\n\tb=I0pfgdUmzheT69+udRSy79ADGo71PXBpsusCEASZB0UoYoXK3tfSosxY6x9g1NPQvCYlJ4nzt7bC8qj9UJFQiikknOP5S3l9zVRZBrBM1/AkyvXy98Jw9a/sRO762gbWk3fdqxXap2/0nuA1rrb1ms1mAC9uRj/trwrV4gUMPyI=", "Authentication-Results": "spf=none (sender IP is )\n\tsmtp.mailfrom=rasland@mellanox.com; ", "From": "Raslan Darawsheh <rasland@mellanox.com>", "To": "keith.wiles@intel.com", "Cc": "thomas@monjalon.net, dev@dpdk.org, shahafs@mellanox.com,\n\trasland@mellanox.com, orika@mellanox.com, ferruh.yigit@intel.com", "Date": "Thu, 18 Oct 2018 11:15:08 +0300", "Message-Id": "<1539850509-9332-2-git-send-email-rasland@mellanox.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1539850509-9332-1-git-send-email-rasland@mellanox.com>", "References": "<1539182356-15496-2-git-send-email-rasland@mellanox.com>\n\t<1539850509-9332-1-git-send-email-rasland@mellanox.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Originating-IP": "[37.142.13.130]", "X-ClientProxiedBy": "CWLP265CA0376.GBRP265.PROD.OUTLOOK.COM\n\t(2603:10a6:401:5e::28) To AM3PR05MB1250.eurprd05.prod.outlook.com\n\t(2a01:111:e400:586f::12)", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "07d89356-0294-4802-3e58-08d634d1d9c9", "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:AM3PR05MB1250; ", "X-Microsoft-Exchange-Diagnostics": [ "1; AM3PR05MB1250;\n\t3:Rn90fE5Aca2zltmOeFnSeVYPR1v209mRF5qY4V8vNakeU+5pYw20v6bURYBzoqXP5RLoyCB5S54caBIyj+9gqLHPGoF0zJoQ3SafZdRVrBCSWD0QOBp4dPZdrei38C61PoT28JC36sVKJlPe9iqMUarkzdRjIScSag8KEn3NtNhfbEkTDF6DwUGCwYnGrDX1aen+rbI30UlD1C928XruOnPhMx5+EbTl2gJvMeuOmi9vr6PolyslMgoXi0FWaVWc;\n\t25:cVIIE5boDUXagk88gn8eiv6DUGgkoW8MBcBGelvJYBCsJBnFX2/XQVhwbVvxlJJbgBvxfLptc5bLhcuvQK1Z0Yi1WdOEtVmL3+6xQy6kiHIhG5Uaz6pry7O6bAkeh5rr8Vl7LCypRlgNOgfK8wtML+fI3NU2W4UZYmNVjnbI1Qp+IlQzBrAXf0cbFtS3f+aV3REdnX1FbELt67FHT/nSL+xrc4tM45Q/6xgzt9Rk6gpESaTeJv3IZ6F01mfOq1bIpwyZjbtA9CH5lZHy3DlbfibCN8zjJGcBtEihpUEukCbpmqQVbD05GVNEFI5NxWhg+bHnShi4wTcf2CnONkuUmg==;\n\t31:Wg2ZKir3V7awHXaQ5IYL67CFOp4VrNEvlu5h0OhT/KLVLFXXc+O4XIQu444oQbpfzUtPlj3kDOSxA5anIH+7uFUxjQdK1ZlxmLEnZtfK2SJpyTTCtgCQG3P5CwBeQygAZBoF5ZdB7SM+gp/3oT8nMYPEB8XY05VecDUOM7H+yZJiOoQ4FgMct9hdFG7V6bgPUq39XfznzVgz7MDJj32QFRDZcfkl9VKSpNy206kNPF8=", "1; AM3PR05MB1250;\n\t20:m2oUVyT84X9zKHVsY0x04/XRKAUugNX/NuLzI5mkdk8ewNYkIqS7OZTQrKylHvfS+eQEe+VF4AGJschEFzh7PenvovuZaV2vm0JdjQJxZkLT4J27WoN5Ym2IoVv5wXcmIfvIV1a2vOlm/Hk1wvWfIhopC35UTxYWr4l7eN9yyGxNzBhqQVor99d2EDRtwpghSks0PopPjXxTObJvrVXUnDtrnmm/t1cgUB8x6kzvB9iY2c7o5Cw1rhghtdM721XWZyVhrVOHO93d9/BJgLdTmsEdC8Px43nHwJ6CvfArvyj2ILj+L9x7gclLK2FDc6FBuNtcO5Z74V3DdolVseXEKSq1rRtGDsHxDCWaVVIh0iJbK7zjczvHlU0nqQmEzd0L8Z1HmjoqjHYbzqc41+0ybQOM2STCSXgsWSbvyUrpgaijFH2kyumVJlzW0LqRAY27TnMdVivLdMUgDbjZjOLF9KqOm0INjkGMXcd/zVeRxffcmL1CDhN1bOXNIs9YJd2x;\n\t4:qw/MwLFi26PAPNMefY4nVVgC28x8dxPwwqutE48eWSrk9D3O9EzJ8YQoYzm7lyYdTc2fz+UB6si/G0qeXwZDKyh8cl3Gq0LiBPfXRHZEksL7adFOs4LJsmdZFld0BLJCZeIRwiWVOh6QpP0xMKV1oS9KqvOS8fx0M+zBulrAgxr3aKilPdWfSNOs7ZZ2Z3THrEfze4RDj/itOrCdD6qiiljA+dbXqmHIL67wwNyw87kO78OOhWYgMRm0qMNeHOgr0h5CZROfsUuD26q33I6lLQ==", "=?us-ascii?Q?1; AM3PR05MB1250;\n\t23:Vk8CZGLscesmpPQDkQwnEkRyIcOQPG0SCkT8BLvBN?=\n\tZOS6jtBMEVvzd9BZCv0gWFXpW+BX0aro2PxB1Cr7CF3C634iKsSnfJ5IUnkaG4jYmXY9GiB7Ew66PEARaQVOkoG26ZElZfx/6i5dZNDyNom17qTEnPZeLNuccL0p42zMp2OGqhS4s6L0nrwguv5hCFm/h8yJN5vKEuuMZRjHqXbsMyr5wgexFycHbAFAl3tFWqgHntgru4dT9MiD0LIq1ksaPC6fjFB6U2IReQErTI+rjTmhnmHHZowUTVm0OTRn514P9SP+v6IfB6KRk5TebOs1wqkMXq/HKMMf7+LsxiZl+ouNOxHwCUPOP1cUThTGwTjkx3oq6HqB1vQ8UM6yf5ende1HdSPxPwkdFUVOXZ8hBTtcacVHt0schnH4h7EEjCgKccFI6LeriYc4wGul+XEWKtBiC8o9vvhBH5OdCCRO80dNIIeA2gPC1jUg6OXg4zYd9CmRaRaWoUblDt4yledvihDislGfmbmv3svw8o0N2YEZjIOk+yucgYlHHQn7vlYOS8mJ+wPnBVZwsdLmqyqzYlh8SZu+nQUEIt36Uqov9cD+Mo6E+HJGgdrBCUOYpcjdRdtVBgswS216YsgDWMx0oDpgrMB0xUy+Tcuc4nPCbqKu/gmql2ij5rd/4a151y7bw/eV1yG4/fNFiLhcAJzPq0nIP4tDaBgZEuAa8f87ha2Xl/dBAQJ0PbgvEv1vFeFA8EWgjaBHgtKKCATt5NCYLZTkyMENzqqekk9VMry81XMLJ0H5J9c+Df5f2sT1Nyw2cKPLSl2byFnDALaVEAdFdTHBmZjQpLNvDKpmks0ryB5hDveUujxJxwo2dTdly9LF32LSbbPkRJYTIKMMnt0u9eN0UcK98g//urcNzlV6UEft9Wp4YJ/3ITs973xHhciPkHqApmZGt8uB2Pfb0v+d9XT2J9qqaGP49y/TLe/b/XI1isXMEPKAia58pSn3IZJVkM9DVM/0rMfEiM51rkzvcY/ElNpSkqCmo7aHtUPbY64e5AgjUGrwOMsB5v876OIBY9pwS1am16z5MvyKhJyQg8Pkd1YR5M2ZWpOCAJYIy7I8z7Txxt835dCtDcJyZJ+2Ggzkq+U4X2Lj8YBLrCOt2NAvcLMjKfRQnRh5jgDFhIr9bOgZ5TzzYMOy9vDHpAnw0/82Mgyq5/rshdNAbK5qzQ2sIC31z0uK/wcfGFphRwb+yOagKe+RXzI2qCUUMxtBi5tbg9LiQijHyiJW8HqBdhGfmwdvG1RX9LyEziJMoKi7UeojsYoMsWWMctK6qC5Mh0Wl8ZR77CQm5iMHpNa", "1; AM3PR05MB1250;\n\t6:iuCpH2eMUYM5GCCXwEtcdScQUHJXfTDjN12PYFFb4L3/EuShsB8Yvi/w6xntcDDeEKccXzBxcJ+XXerxqtbdfB+EuH62mVjPDb/HWL8+BfwTGZJ3UznOdIJRqD2Kn700s6yJWf3H6hKtVIBdRAOweaHM3rarw2AfVxoVLzb/VpolfGUFVSO8sPGUdTt2fogQYs59uLIQu1px15W3z+lxRmGdKvX2Vrc9hn7tLnGBVej/QUHIkYmjEIe5/Lxdral7PVlqwWLd1RS1ApbAQB+XSFLOpH5NB6CK/yVoRS246oPkZ60f24y0a2SrWeJ5iZU9+3cxboWRf6GwUdJD2NalefxkOvdQhHzj+o9XNclvRONPsiYRZfqkCnNkuRsNi11qhgI8MjtwvWqChlmIkq6Yn8gcF8P946tPjp4cblig2vobLaQWQybyCmjYSq+RaKiL5Ubb4vq/KuR3/TjZFZCkBA==;\n\t5:mExP35BqCguPD1YcnLFsVVf7zK4rOEv03k+wVGfZflM6SNObcrCeQDvuWltL/BmfDYZt80RQcREJI2CauoM/lBdjpxP6PTFMqCkGeAIyCuDVBUjBoL+wZmB/HesBhGA2Ei3IjqsagbP+TT6/gRwDpqQeKomj7HRw+t4FnINvfIw=;\n\t7:a7+rVQjAT5i2KTlOaJGCPdNrrvw/8NwJG3LNRgnVzTqkt/eOe+rry0TM+ux6P1qK7Xoe1VmiXSKL2nCuSADarQoacrPjnYLAiJQkdbiFs7JTYr3++iH4FYmT3UsZXZSCOP5SbSx19CdFTXMqNf8NSDku8zkSm9R4nAh00t14roSbNQ/ly4g1U5I/+qbE/ZCf8UUQ9VfcE5IB15tjOaSHO+OzEQCYuvVnyQedmkWGvsjBpD81h6BxONl6lEEka31Z" ], "X-MS-TrafficTypeDiagnostic": "AM3PR05MB1250:", "X-LD-Processed": "a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr", "X-Microsoft-Antispam-PRVS": "<AM3PR05MB1250B8F5832B9C78B6DB6968C2F80@AM3PR05MB1250.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)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231355)(944501410)(4982022)(52105095)(6055026)(149066)(150057)(6041310)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(201708071742011)(7699051)(76991095);\n\tSRVR:AM3PR05MB1250; BCL:0; PCL:0; RULEID:; SRVR:AM3PR05MB1250; ", "X-Forefront-PRVS": "08296C9B35", "X-Forefront-Antispam-Report": "SFV:NSPM;\n\tSFS:(10009020)(376002)(396003)(136003)(346002)(39860400002)(366004)(199004)(189003)(7736002)(16586007)(966005)(2361001)(6306002)(26005)(8886007)(305945005)(4326008)(6916009)(186003)(68736007)(55016002)(5660300001)(53936002)(2616005)(16526019)(478600001)(25786009)(14444005)(2351001)(50466002)(105586002)(106356001)(69596002)(956004)(2906002)(33026002)(316002)(47776003)(476003)(76176011)(21086003)(48376002)(8936002)(11346002)(81156014)(50226002)(446003)(52116002)(66066001)(4744004)(36756003)(7696005)(6666004)(8676002)(6116002)(486006)(3846002)(51416003)(97736004)(86362001)(81166006)(386003);\n\tDIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR05MB1250; H:mellanox.com; FPR:;\n\tSPF:None; \n\tLANG:en; PTR:InfoNoRecords; A:1; MX:1; ", "Received-SPF": "None (protection.outlook.com: mellanox.com does not designate\n\tpermitted sender hosts)", "X-Microsoft-Antispam-Message-Info": "edfaioTlUcwr2uqfii6TkyHaViIADL1vf+9ywyAtbCse4gq5K5HUZ/0W7fldj2tSqDwWcguJ5W3r/9Sr/omSHMyTq++dW8Zx+bAlyEFneFEUnKIX2fk5ouDywqEPz9sXFEfFLCqHlWOB4Hy3KSedi4NFK8/f7N+BzPlQF151zGhahDdQux9FM0wHKWe+WO4K5Fp4FStoBgvf1Qhhs1YJekH+UDkrc+SXDHe85LNhk9xoDBqjz3mm6XV+9R91cMYZ/qPf2EiiISIK5FUo8jw6rtzOCj1+sgxgiHULkpu/H36IEZjY6pYet0r7GUu1efZ85cFnqZr6sqj0NnM5WXrRvW9PYtzLWyFuU+IrTYPa7K4=", "SpamDiagnosticOutput": "1:99", "SpamDiagnosticMetadata": "NSPM", "X-OriginatorOrg": "Mellanox.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "18 Oct 2018 08:15:21.8561\n\t(UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "07d89356-0294-4802-3e58-08d634d1d9c9", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "a652971c-7d2e-4d9b-a6a4-d149256f461b", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "AM3PR05MB1250", "Subject": "[dpdk-dev] [PATCH v9 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---\n This patch has dependancy on the following patch\n http://patches.dpdk.org/patch/46185/\n---\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": [ "v9", "2/3" ] }