From patchwork Wed Oct 10 14:39:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46506 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CCA531B6CA; Wed, 10 Oct 2018 16:39:25 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0071.outbound.protection.outlook.com [104.47.2.71]) by dpdk.org (Postfix) with ESMTP id 913931B6C8 for ; Wed, 10 Oct 2018 16:39:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=aWw5XYLHvlrlpwC+LoN25qzR6PGaFhSnmXbO08zWC6E=; b=aJJ5YgCWNX8rkSV7IGzSPLXagXhRSh8NXqiDSg+308ZrbGH9LN71FY33L/JhhDVBbRnz5FHP500YOD358X1pvrajVUWMv76BbYlRBklCWwKsj/xiru8Tn+GIbRNhxFVjtBCppgiCE5ofiJUeDZsG2unBe7SPZLac2huRQy8a3Ug= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1670.eurprd05.prod.outlook.com (10.165.6.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Wed, 10 Oct 2018 14:39:23 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1207.029; Wed, 10 Oct 2018 14:39:23 +0000 From: Raslan Darawsheh To: "keith.wiles@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , Ori Kam , "ferruh.yigit@intel.com" Thread-Topic: [PATCH v6 1/3] net/tap: add queue and port ids in Rx/Tx queues structures Thread-Index: AQHUYKcJIEOYjMIh2k+A2HAcOozQww== Date: Wed, 10 Oct 2018 14:39:23 +0000 Message-ID: <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 (2603:10a6:203:51::23) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.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; 6:Pvjc7R3c0CcSBOlkjNrGttCVHKQLLJIXUR6e7+SBrdvmm04A8NtYH66bXD0TEpLxorcyvALg9DFrwhpVLUFdbDzk8mLz0FWNnawI3MeEPY48Cs7/txeY6+b+czSGuPl/XmksWJe7xJ2hY4Cb2PEKAeBZ5O8F2BuLiI8ZvyLGQdggfqP266LFUoxPguG8zKEsI/QszrXNg+rcvniU968HpYZf3ydhjDfE8ts18JTis5nAHzXlldMzMp/R829uwK7WGz590c/G9n97TGV8udTWn/KYLV14SVb7UtMhXYkFaXE1s5pwlqetnfi3dJIfVxcspSrSnf620+CCKodKhw0bEV8T21FLH1KyZ+Ki8JSGhEsmj8WAsFv1nbso687hKO8AU9I8HDNTT9eoYPabEMSLMS5WhwUEWNqPgoyRTzkPFbD5iyRTayvO5/a90Oyqp6h3AM9mJcV1LxpTE4lzBYslFg==; 5:jyUw0Hpzr4lahB5g+x4+zIdrz5nYHrdhCx3e/BXNuk3J1VMo/y6Ofeb/Vn9VCYSeLCvDg+SLzQLMb+ZEgMoRDn0zC9HpzTMhuTO2ANX7aUsRQ7tllxbPlgqch4RKw5BsladtHYFDPJvGK/BEBY1vDe1DayVRe7HdbaV0xeYtUS4=; 7:PljI/rYoy4FqFzSKyjCuhG+u7DoEvfOLgNFIDY1XNj+afFJEIfxpd7IH6BcCm73WfCWnjFmEyBmc8BOMv8v9v88WzG/OqpZmaV66Ehg25DfzrXV8DP6Ff0tbazHNjJZmvVmsv9bZB1Ah1Hm4adXMVttJrhW5quOCCSfg9Gpth2x2FCNLyLYSE9PWQOKoKpZZOdBPkBGaWZO08KrJbiMH4L/2IghvJiVRqQ8l8xH+Hf8jFBginswDYV2r0ZJhfywd x-ms-office365-filtering-correlation-id: ab0f2e3e-1678-4c78-4632-08d62ebe2b55 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1670; x-ms-traffictypediagnostic: DB5PR05MB1670: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(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); SRVR:DB5PR05MB1670; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1670; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(136003)(39860400002)(346002)(396003)(366004)(376002)(189003)(199004)(6486002)(105586002)(86362001)(52116002)(8936002)(81166006)(6506007)(97736004)(2351001)(26005)(486006)(386003)(186003)(316002)(256004)(106356001)(5640700003)(102836004)(4326008)(36756003)(7736002)(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); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1670; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: +2o1kxRy86jRtonY/lTdsQD3wPLCTqoxzoXkivWgtHE4/iwKIaZ/UZ1iRRxaVsyyzi1NQJ1BZbbGXJ07O8LXU9wcKtoanzOjlnzrof7xLBbyWVCdfVKBACpARNilv0FeehWg/VrVmIDKDUw1UNlGQgliScA8LvpgULAHen8W5qv/ZOopEwHRakcnWOwKVJgNuLOC1n/LO9cj2gJYPSg0bkP0wq3M1P6okwZ8rUAgTmo9QMnHuoT9qexOLbjUQRpNwo8Urr3Wv5V2J2s5LztkkVLwinVg6ix9mEyEU1J9z47DmLmSU4WWnuI208+MlS2n7dJphiu5M2ah1UIQIssuEVZ9GfZN6JNx//uORR21/VI= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab0f2e3e-1678-4c78-4632-08d62ebe2b55 X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 14:39:23.0921 (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 1/3] net/tap: add queue and port ids in Rx/Tx queues structures X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Port and queue ids are added to easily map the file descriptors stored in each process private. --- changes in v6: - reword the commit log ---- Signed-off-by: Raslan Darawsheh --- drivers/net/tap/rte_eth_tap.c | 3 +++ drivers/net/tap/rte_eth_tap.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index ad5ae98..edfb7da 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1293,6 +1293,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, rxq->mp = mp; rxq->trigger_seen = 1; /* force initial burst */ rxq->in_port = dev->data->port_id; + rxq->queue_id = rx_queue_id; rxq->nb_rx_desc = nb_desc; iovecs = rte_zmalloc_socket(dev->device->name, sizeof(*iovecs), 0, socket_id); @@ -1359,6 +1360,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, return -1; dev->data->tx_queues[tx_queue_id] = &internals->txq[tx_queue_id]; txq = dev->data->tx_queues[tx_queue_id]; + txq->out_port = dev->data->port_id; + txq->queue_id = tx_queue_id; offloads = tx_conf->offloads | dev->data->dev_conf.txmode.offloads; txq->csum = !!(offloads & diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index 44e2773..4502e24 100644 --- a/drivers/net/tap/rte_eth_tap.h +++ b/drivers/net/tap/rte_eth_tap.h @@ -46,6 +46,7 @@ struct rx_queue { struct rte_mempool *mp; /* Mempool for RX packets */ uint32_t trigger_seen; /* Last seen Rx trigger value */ uint16_t in_port; /* Port ID */ + uint16_t queue_id; /* queue ID*/ int fd; struct pkt_stats stats; /* Stats for this RX queue */ uint16_t nb_rx_desc; /* max number of mbufs available */ @@ -62,6 +63,8 @@ struct tx_queue { uint16_t csum:1; /* Enable checksum offloading */ struct pkt_stats stats; /* Stats for this TX queue */ struct rte_gso_ctx gso_ctx; /* GSO context */ + uint16_t out_port; /* Port ID */ + uint16_t queue_id; /* queue ID*/ }; struct pmd_internals { From patchwork Wed Oct 10 14:39:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46507 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 80E921B6F7; Wed, 10 Oct 2018 16:39:28 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0076.outbound.protection.outlook.com [104.47.0.76]) by dpdk.org (Postfix) with ESMTP id 9FFD11B6DA for ; Wed, 10 Oct 2018 16:39:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QUNPql+IJ/ZkvfCz3GKwPorIO1esfSMlWFu16gOUl+8=; b=JVYHSpKqX7pSJEU8PUn52T51XX1mWbqMbyjpEdl2yMJYHmRlf0usP80vB9k58UMP/Zz1wJZIkgBIo5FUJAwtHQKZ+rMNA3wX63AvM+WUieh/r6SR/aRBauDBqn2zhWnm/3mFz1HnuMpwr7ILhJH8NQMUpXfOxkPwt/6u5Idy6xo= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1670.eurprd05.prod.outlook.com (10.165.6.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Wed, 10 Oct 2018 14:39:24 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1207.029; Wed, 10 Oct 2018 14:39:24 +0000 From: Raslan Darawsheh To: "keith.wiles@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , Ori Kam , "ferruh.yigit@intel.com" Thread-Topic: [PATCH v6 2/3] net/tap: move fds of Rx/Tx queues to be in process 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 (2603:10a6:203:51::23) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.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; 6:yMiH7g8wdK31ILHFKer5A2jwg1pNYqwnCUY40l5CrF0zMz/C5leua28BgWOA8jpIWyGWmBKPi8TPjL+BrzCrIXTf57gmZ/0vugS0GvtynnmKPJBSEABYcpCGngdoywlnFzlVIVFxHX/SWpY6GXl07VGg+c3WUF0PZVhKV4isjeWMFFtEHYQvvvm8Tm15A6jzMQfLtZ2svNDIjW8DpwR4ak6wpdpWiCaKcjobVeP0fvspQgghnE7zREFYSx2hsbwrd1DMFm7hrUOLPdlmbNoxSsF6GzrzKK27xO+b1X13TfRxkoQUkzvcjgUNyxcmy3FvPmYwsbJkJC5eVcFSU8VhwfGHRcNU7wD0MU6UPBD3Vp2XXi5MpCwlzQ7bURyg0rZKghFMFT3cZgZMvE6G4qKSNbQ1NhZUAWgfQf1WzmSsz7qy3VJwsjEutOKKGLyfiLLdqwyVYa9Dw2e8xy7hHsl3vg==; 5:ARLY67R3s2Udwago7o5oWyWNr8j0KiyFe2hF9pbfJlrKoPOh40HpMUWN2TfiKjfXju1oomWLCnkhgQKYVk3kqUUXg0sTNxxxagkdHeHofk4uuZGhK1mf+Sm/TuGJ/CZxMC+bniFOnKGv7WXhUO/LQlwuO7J8IoTAcpla1lCPWS0=; 7: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; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1670; x-ms-traffictypediagnostic: DB5PR05MB1670: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(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); SRVR:DB5PR05MB1670; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1670; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(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); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1670; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted 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 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 (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 in process private X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" fd's cannot be shared between processes, and each process need to have it's own fd's pointer. Signed-off-by: Raslan Darawsheh --- drivers/net/tap/rte_eth_tap.c | 93 +++++++++++++++++++++++++++++-------------- drivers/net/tap/rte_eth_tap.h | 7 +++- drivers/net/tap/tap_flow.c | 3 +- drivers/net/tap/tap_intr.c | 5 ++- 4 files changed, 73 insertions(+), 35 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index edfb7da..3372d54 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -315,6 +315,7 @@ static uint16_t pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { struct rx_queue *rxq = queue; + struct pmd_process_private *process_private; uint16_t num_rx; unsigned long num_rx_bytes = 0; uint32_t trigger = tap_trigger; @@ -323,6 +324,7 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) return 0; if (trigger) rxq->trigger_seen = trigger; + process_private = rte_eth_devices[rxq->in_port].process_private; rte_compiler_barrier(); for (num_rx = 0; num_rx < nb_pkts; ) { struct rte_mbuf *mbuf = rxq->pool; @@ -331,9 +333,9 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) uint16_t data_off = rte_pktmbuf_headroom(mbuf); int len; - len = readv(rxq->fd, *rxq->iovecs, - 1 + - (rxq->rxmode->offloads & DEV_RX_OFFLOAD_SCATTER ? + len = readv(process_private->rxq_fds[rxq->queue_id], + *rxq->iovecs, + 1 + (rxq->rxmode->offloads & DEV_RX_OFFLOAD_SCATTER ? rxq->nb_rx_desc : 1)); if (len < (int)sizeof(struct tun_pi)) break; @@ -494,6 +496,9 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, { int i; uint16_t l234_hlen; + struct pmd_process_private *process_private; + + process_private = rte_eth_devices[txq->out_port].process_private; for (i = 0; i < num_mbufs; i++) { struct rte_mbuf *mbuf = pmbufs[i]; @@ -595,7 +600,7 @@ tap_write_mbufs(struct tx_queue *txq, uint16_t num_mbufs, tap_tx_l4_cksum(l4_cksum, l4_phdr_cksum, l4_raw_cksum); /* copy the tx frame data */ - n = writev(txq->fd, iovecs, j); + n = writev(process_private->txq_fds[txq->queue_id], iovecs, j); if (n <= 0) break; (*num_packets)++; @@ -970,19 +975,20 @@ tap_dev_close(struct rte_eth_dev *dev) { int i; struct pmd_internals *internals = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; tap_link_set_down(dev); tap_flow_flush(dev, NULL); tap_flow_implicit_flush(internals, NULL); for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { - if (internals->rxq[i].fd != -1) { - close(internals->rxq[i].fd); - internals->rxq[i].fd = -1; + if (process_private->rxq_fds[i] != -1) { + close(process_private->rxq_fds[i]); + process_private->rxq_fds[i] = -1; } - if (internals->txq[i].fd != -1) { - close(internals->txq[i].fd); - internals->txq[i].fd = -1; + if (process_private->txq_fds[i] != -1) { + close(process_private->txq_fds[i]); + process_private->txq_fds[i] = -1; } } @@ -1006,10 +1012,14 @@ static void tap_rx_queue_release(void *queue) { struct rx_queue *rxq = queue; + struct pmd_process_private *process_private; - if (rxq && (rxq->fd > 0)) { - close(rxq->fd); - rxq->fd = -1; + if (!rxq) + return; + process_private = rte_eth_devices[rxq->in_port].process_private; + if (process_private->rxq_fds[rxq->queue_id] > 0) { + close(process_private->rxq_fds[rxq->queue_id]); + process_private->rxq_fds[rxq->queue_id] = -1; rte_pktmbuf_free(rxq->pool); rte_free(rxq->iovecs); rxq->pool = NULL; @@ -1021,10 +1031,15 @@ static void tap_tx_queue_release(void *queue) { struct tx_queue *txq = queue; + struct pmd_process_private *process_private; + + if (!txq) + return; + process_private = rte_eth_devices[txq->out_port].process_private; - if (txq && (txq->fd > 0)) { - close(txq->fd); - txq->fd = -1; + if (process_private->txq_fds[txq->queue_id] > 0) { + close(process_private->txq_fds[txq->queue_id]); + process_private->txq_fds[txq->queue_id] = -1; } } @@ -1209,18 +1224,19 @@ tap_setup_queue(struct rte_eth_dev *dev, int *other_fd; const char *dir; struct pmd_internals *pmd = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; struct rx_queue *rx = &internals->rxq[qid]; struct tx_queue *tx = &internals->txq[qid]; struct rte_gso_ctx *gso_ctx; if (is_rx) { - fd = &rx->fd; - other_fd = &tx->fd; + fd = &process_private->rxq_fds[qid]; + other_fd = &process_private->txq_fds[qid]; dir = "rx"; gso_ctx = NULL; } else { - fd = &tx->fd; - other_fd = &rx->fd; + fd = &process_private->txq_fds[qid]; + other_fd = &process_private->rxq_fds[qid]; dir = "tx"; gso_ctx = &tx->gso_ctx; } @@ -1273,6 +1289,7 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, struct rte_mempool *mp) { struct pmd_internals *internals = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; struct rx_queue *rxq = &internals->rxq[rx_queue_id]; struct rte_mbuf **tmp = &rxq->pool; long iov_max = sysconf(_SC_IOV_MAX); @@ -1332,7 +1349,8 @@ tap_rx_queue_setup(struct rte_eth_dev *dev, } TAP_LOG(DEBUG, " RX TUNTAP device name %s, qid %d on fd %d", - internals->name, rx_queue_id, internals->rxq[rx_queue_id].fd); + internals->name, rx_queue_id, + process_private->rxq_fds[rx_queue_id]); return 0; @@ -1352,6 +1370,7 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, const struct rte_eth_txconf *tx_conf) { struct pmd_internals *internals = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; struct tx_queue *txq; int ret; uint64_t offloads; @@ -1374,7 +1393,8 @@ tap_tx_queue_setup(struct rte_eth_dev *dev, return -1; TAP_LOG(DEBUG, " TX TUNTAP device name %s, qid %d on fd %d csum %s", - internals->name, tx_queue_id, internals->txq[tx_queue_id].fd, + internals->name, tx_queue_id, + process_private->txq_fds[tx_queue_id], txq->csum ? "on" : "off"); return 0; @@ -1622,6 +1642,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, int numa_node = rte_socket_id(); struct rte_eth_dev *dev; struct pmd_internals *pmd; + struct pmd_process_private *process_private; struct rte_eth_dev_data *data; struct ifreq ifr; int i; @@ -1636,7 +1657,16 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, goto error_exit_nodev; } + process_private = (struct pmd_process_private *) + rte_zmalloc_socket(tap_name, sizeof(struct pmd_process_private), + RTE_CACHE_LINE_SIZE, dev->device->numa_node); + + if (process_private == NULL) { + TAP_LOG(ERR, "Failed to alloc memory for process private"); + return -1; + } pmd = dev->data->dev_private; + dev->process_private = process_private; pmd->dev = dev; snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name); pmd->type = type; @@ -1672,8 +1702,8 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, /* Presetup the fds to -1 as being not valid */ pmd->ka_fd = -1; for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { - pmd->rxq[i].fd = -1; - pmd->txq[i].fd = -1; + process_private->rxq_fds[i] = -1; + process_private->txq_fds[i] = -1; } if (pmd->type == ETH_TUNTAP_TYPE_TAP) { @@ -2073,6 +2103,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) { struct rte_eth_dev *eth_dev = NULL; struct pmd_internals *internals; + struct pmd_process_private *process_private; int i; /* find the ethdev entry */ @@ -2081,6 +2112,7 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) return 0; internals = eth_dev->data->dev_private; + process_private = eth_dev->process_private; TAP_LOG(DEBUG, "Closing %s Ethernet device on numa %u", (internals->type == ETH_TUNTAP_TYPE_TAP) ? "TAP" : "TUN", @@ -2092,18 +2124,19 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) tap_nl_final(internals->nlsk_fd); } for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { - if (internals->rxq[i].fd != -1) { - close(internals->rxq[i].fd); - internals->rxq[i].fd = -1; + if (process_private->rxq_fds[i] != -1) { + close(process_private->rxq_fds[i]); + process_private->rxq_fds[i] = -1; } - if (internals->txq[i].fd != -1) { - close(internals->txq[i].fd); - internals->txq[i].fd = -1; + if (process_private->txq_fds[i] != -1) { + close(process_private->txq_fds[i]); + process_private->txq_fds[i] = -1; } } close(internals->ioctl_sock); rte_free(eth_dev->data->dev_private); + rte_free(eth_dev->process_private); rte_eth_dev_release_port(eth_dev); if (internals->ka_fd != -1) { diff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h index 4502e24..dc3579a 100644 --- a/drivers/net/tap/rte_eth_tap.h +++ b/drivers/net/tap/rte_eth_tap.h @@ -47,7 +47,6 @@ struct rx_queue { uint32_t trigger_seen; /* Last seen Rx trigger value */ uint16_t in_port; /* Port ID */ uint16_t queue_id; /* queue ID*/ - int fd; struct pkt_stats stats; /* Stats for this RX queue */ uint16_t nb_rx_desc; /* max number of mbufs available */ struct rte_eth_rxmode *rxmode; /* RX features */ @@ -57,7 +56,6 @@ struct rx_queue { }; struct tx_queue { - int fd; int type; /* Type field - TUN|TAP */ uint16_t *mtu; /* Pointer to MTU from dev_data */ uint16_t csum:1; /* Enable checksum offloading */ @@ -95,6 +93,11 @@ struct pmd_internals { int ka_fd; /* keep-alive file descriptor */ }; +struct pmd_process_private { + int rxq_fds[RTE_PMD_TAP_MAX_QUEUES]; + int txq_fds[RTE_PMD_TAP_MAX_QUEUES]; +}; + /* tap_intr.c */ int tap_rx_intr_vec_set(struct rte_eth_dev *dev, int set); diff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c index 0e01af6..3ba6945 100644 --- a/drivers/net/tap/tap_flow.c +++ b/drivers/net/tap/tap_flow.c @@ -1567,6 +1567,7 @@ tap_flow_isolate(struct rte_eth_dev *dev, struct rte_flow_error *error __rte_unused) { struct pmd_internals *pmd = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; /* normalize 'set' variable to contain 0 or 1 values */ if (set) @@ -1580,7 +1581,7 @@ tap_flow_isolate(struct rte_eth_dev *dev, * If netdevice is there, setup appropriate flow rules immediately. * Otherwise it will be set when bringing up the netdevice (tun_alloc). */ - if (!pmd->rxq[0].fd) + if (!process_private->rxq_fds[0]) return 0; if (set) { struct rte_flow *remote_flow; diff --git a/drivers/net/tap/tap_intr.c b/drivers/net/tap/tap_intr.c index fc59018..7af0010 100644 --- a/drivers/net/tap/tap_intr.c +++ b/drivers/net/tap/tap_intr.c @@ -51,6 +51,7 @@ static int tap_rx_intr_vec_install(struct rte_eth_dev *dev) { struct pmd_internals *pmd = dev->data->dev_private; + struct pmd_process_private *process_private = dev->process_private; unsigned int rxqs_n = pmd->dev->data->nb_rx_queues; struct rte_intr_handle *intr_handle = &pmd->intr_handle; unsigned int n = RTE_MIN(rxqs_n, (uint32_t)RTE_MAX_RXTX_INTR_VEC_ID); @@ -71,7 +72,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev) struct rx_queue *rxq = pmd->dev->data->rx_queues[i]; /* Skip queues that cannot request interrupts. */ - if (!rxq || rxq->fd <= 0) { + if (!rxq || process_private->rxq_fds[i] <= 0) { /* Use invalid intr_vec[] index to disable entry. */ intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + @@ -79,7 +80,7 @@ tap_rx_intr_vec_install(struct rte_eth_dev *dev) continue; } intr_handle->intr_vec[i] = RTE_INTR_VEC_RXTX_OFFSET + count; - intr_handle->efds[count] = rxq->fd; + intr_handle->efds[count] = process_private->rxq_fds[i]; count++; } if (!count) From patchwork Wed Oct 10 14:39:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raslan Darawsheh X-Patchwork-Id: 46508 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B43E91B710; Wed, 10 Oct 2018 16:39:30 +0200 (CEST) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01on0089.outbound.protection.outlook.com [104.47.0.89]) by dpdk.org (Postfix) with ESMTP id 705BA1B6DB for ; Wed, 10 Oct 2018 16:39:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0Bx00+7aT9hOjiMDVKPXTH9zIXMyyfbmkoRkh8H9MFQ=; b=P2dmtZg8Em0kKdSbMjTzCNeqNAi2MQMPl7Zbq3O1DTDEsIepgq1yESIJuVwjU78RjvBy26zXkdq37an3RBgukOWRpRDgfOgDKvOhEN2dMEUOuwXMya17mTKJAi2Ic1w66zwNLYwmed7yZNkpA7U1ONIkKTckFmvI2kDUO6O+1X8= Received: from DB5PR05MB1254.eurprd05.prod.outlook.com (10.162.157.140) by DB5PR05MB1670.eurprd05.prod.outlook.com (10.165.6.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1207.27; Wed, 10 Oct 2018 14:39:26 +0000 Received: from DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5]) by DB5PR05MB1254.eurprd05.prod.outlook.com ([fe80::3516:b329:5c35:51a5%2]) with mapi id 15.20.1207.029; Wed, 10 Oct 2018 14:39:26 +0000 From: Raslan Darawsheh To: "keith.wiles@intel.com" CC: Thomas Monjalon , "dev@dpdk.org" , Shahaf Shuler , Raslan Darawsheh , Ori Kam , "ferruh.yigit@intel.com" Thread-Topic: [PATCH v6 3/3] net/tap: allow secondary process to access primary device queues Thread-Index: AQHUYKcKdx9CJmxuIk6dcyOk9GSUoQ== Date: Wed, 10 Oct 2018 14:39:25 +0000 Message-ID: <1539182356-15496-3-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 (2603:10a6:203:51::23) To DB5PR05MB1254.eurprd05.prod.outlook.com (2a01:111:e400:51cc::12) authentication-results: spf=none (sender IP is ) smtp.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; 6:KipVY5WIjy7w6nQRlBEZm7ljy/lWibDDl3atvaMMTICsdnvoO6q/oOeS0PcHjVZv6zZ54FVmJYF7N7Iv/oCH8jF6xxikP1JzDFekzkXFMjE1/ZN8r1GukJQT753ExV3jGtSAgX/M5ID9IUFmm4RVFiJ1iW4bDvpDqZQXgaDbrRPjhwRPecEh804aoh7Ne6r9jjzobQWyZGW3PLYBPIjazAQsOT+M7JfbE0q8ttWAITSGMwpu6NVgVxxjJ3BItF+40sV/f1Z8GaMHfagyVpawNwXy4JX9pFUiE3ZhImVlcPeBSeY1DU6x0Auw4LFgMXM/dCEy+lTpoY3I+iA4vwQPIWOd+e3NS7P8pX7JumX6478QpiBiRADd5gH3HQyAN5qsBcN/DHCTTwX+l6P8tNtvevtWTesNsBmK7DpJ3krUmTumldnq7U2+WInZoLSygomGm0/4VjNc47DgUF4TQTOfQQ==; 5:4Hb3nXkr8KXABsgCycN6ctTGpl4aSzbsR2TApGMZ6hIJhK5sz9K7/ofBKoNmIpRKJMy2pVRiJutGlIJUuEYwYMCBSe1x2hHicFWi7kMQ9fMyOzsOFyAWC8vnBO+cdz2zJ50cmT8EMGherBgm6AVFTQ9ngFWIrdH3Y8BMYP1fXfI=; 7:6VG/pAjHQRCR3AuPqMIO/JYCy1I+Y2RjZQYCy1COyQMJYHKD0j9p5cUvoo7nx5jjeI8pzUjrPsySwkfKHBQQNVA+zNcHCPt1CNQCmbOuLE4lPdpqacVXPmhysQWQk+V/dYd+xnvZiIjJDcFbL1PEW2NR1C0/nTR0rarO9+Uo8l5EeM50wfpGA2lMYpMIMb5rEq3cxngbUEkSVibYtipu1fDJQHHZ5I9p1+4MVXsdM27eKPs3Xs7pZ1DHI9O3Xujf x-ms-office365-filtering-correlation-id: 6f08fbf0-b332-407d-610c-08d62ebe2d0f x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:DB5PR05MB1670; x-ms-traffictypediagnostic: DB5PR05MB1670: x-ld-processed: a652971c-7d2e-4d9b-a6a4-d149256f461b,ExtAddr x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(72170088055959); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(3231355)(944501410)(4982022)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(149066)(150057)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123562045)(20161123558120)(201708071742011)(7699051); SRVR:DB5PR05MB1670; BCL:0; PCL:0; RULEID:; SRVR:DB5PR05MB1670; x-forefront-prvs: 08213D42D3 x-forefront-antispam-report: SFV:NSPM; SFS:(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)(36756003)(7736002)(14444005)(5024004)(11346002)(446003)(476003)(2616005)(6436002)(6512007)(6306002)(8676002)(66066001)(2906002)(53936002)(68736007)(2501003)(305945005)(25786009)(14454004)(5250100002)(966005)(71200400001)(478600001)(99286004)(5660300001)(50226002)(6916009)(2900100001)(81156014)(54906003)(3846002)(71190400001)(6116002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB5PR05MB1670; H:DB5PR05MB1254.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: zJAtu862JPWyrEwi7SGMQJ/7fBtcFUypp6fq17gaa6oEA0UUCtys0eZ+UHJRtUCTvoMC2spFg/DUz4SfqBJFlBxSHXyqnMz+QqSMG6uEz2/xEKdYwwy+mCM8AkqWPsddLuC9LCcELvtUtPepXldVfX5qCNrAZ/OWlkKyt9mk8LmpJeOW9ktPkBNPu9vT+X3vC6y/LiP/cnNc3L/RT9tJ6Fko7g+/JeF+W39yP8wIBjH3Vviow0JQaFsixBnlaXqN2XYcikf2d4AMqhjzWuUcRNZx2kShx2R+W4K/p02dCoiqXnMQe8fjxGcQNe3jQQPnl+N0q+NUpnLH2QFeo7ZZYZM6GjKhJcDUf2nddSiXP8s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f08fbf0-b332-407d-610c-08d62ebe2d0f X-MS-Exchange-CrossTenant-originalarrivaltime: 10 Oct 2018 14:39:25.9334 (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 3/3] net/tap: allow secondary process to access primary device queues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In the case the device is created by the primary process, the secondary must request some file descriptors to attach the queues. The file descriptors are shared via IPC Unix socket. Thanks to the IPC synchronization, the secondary process is now able to do Rx/Tx on a TAP created by the primary process. Signed-off-by: Raslan Darawsheh Signed-off-by: Thomas Monjalon --- v2: - translate file descriptors via IPC API - add documentation v3: - rabse the commit - use private static array for fd's to be local for each process v4: - removed TODO and FIXME tags - used strlcpy instead of strcpy v5: rebase the commit on top of Alejandro Lucero patch for secondary process private pointer. http://patches.dpdk.org/patch/46185/ v6: reword the commit log --- --- doc/guides/nics/tap.rst | 16 ++++ doc/guides/rel_notes/release_18_11.rst | 5 ++ drivers/net/tap/Makefile | 1 + drivers/net/tap/meson.build | 1 + drivers/net/tap/rte_eth_tap.c | 147 ++++++++++++++++++++++++++++++++- 5 files changed, 169 insertions(+), 1 deletion(-) diff --git a/doc/guides/nics/tap.rst b/doc/guides/nics/tap.rst index 2714868..9a3d7b3 100644 --- a/doc/guides/nics/tap.rst +++ b/doc/guides/nics/tap.rst @@ -152,6 +152,22 @@ Distribute IPv4 TCP packets using RSS to a given MAC address over queues 0-3:: testpmd> flow create 0 priority 4 ingress pattern eth dst is 0a:0b:0c:0d:0e:0f \ / ipv4 / tcp / end actions rss queues 0 1 2 3 end / end +Multi-process sharing +--------------------- + +It is possible to attach an existing TAP device in a secondary process, +by declaring it as a vdev with the same name as in the primary process, +and without any parameter. + +The port attached in a secondary process will give access to the +statistics and the queues. +Therefore it can be used for monitoring or Rx/Tx processing. + +The IPC synchronization of Rx/Tx queues is currently limited: + + - Maximum 8 queues shared + - Synchronized on probing, but not on later port update + Example ------- diff --git a/doc/guides/rel_notes/release_18_11.rst b/doc/guides/rel_notes/release_18_11.rst index 2133a5b..3240b52 100644 --- a/doc/guides/rel_notes/release_18_11.rst +++ b/doc/guides/rel_notes/release_18_11.rst @@ -104,6 +104,11 @@ New Features the specified port. The port must be stopped before the command call in order to reconfigure queues. +* **Added TAP Rx/Tx queues sharing with a secondary process.** + + A secondary process can attach a TAP device created in the primary process, + probe the queues, and process Rx/Tx in a secondary process. + API Changes ----------- diff --git a/drivers/net/tap/Makefile b/drivers/net/tap/Makefile index 3243365..7748283 100644 --- a/drivers/net/tap/Makefile +++ b/drivers/net/tap/Makefile @@ -22,6 +22,7 @@ CFLAGS += -O3 CFLAGS += -I$(SRCDIR) CFLAGS += -I. CFLAGS += $(WERROR_FLAGS) +CFLAGS += -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring LDLIBS += -lrte_ethdev -lrte_net -lrte_kvargs -lrte_hash LDLIBS += -lrte_bus_vdev -lrte_gso diff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build index 37f65b7..f7e8852 100644 --- a/drivers/net/tap/meson.build +++ b/drivers/net/tap/meson.build @@ -35,6 +35,7 @@ args = [ 'TCA_ACT_BPF_FD' ], ] config = configuration_data() +allow_experimental_apis = true foreach arg:args config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) endforeach diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 3372d54..83c9288 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -16,6 +16,8 @@ #include #include #include +#include +#include #include #include @@ -62,6 +64,10 @@ #define TAP_GSO_MBUFS_NUM \ (TAP_GSO_MBUFS_PER_CORE * TAP_GSO_MBUF_CACHE_SIZE) +/* IPC key for queue fds sync */ +#define TAP_MP_KEY "tap_mp_sync_queues" + +static int tap_devices_count; static struct rte_vdev_driver pmd_tap_drv; static struct rte_vdev_driver pmd_tun_drv; @@ -100,6 +106,17 @@ enum ioctl_mode { REMOTE_ONLY, }; +/* Message header to synchronize queues via IPC */ +struct ipc_queues { + char port_name[RTE_DEV_NAME_MAX_LEN]; + int rxq_count; + int txq_count; + /* + * The file descriptors are in the dedicated part + * of the Unix message to be translated by the kernel. + */ +}; + static int tap_intr_handle_set(struct rte_eth_dev *dev, int set); /** @@ -2006,6 +2023,102 @@ rte_pmd_tun_probe(struct rte_vdev_device *dev) return ret; } +/* Request queue file descriptors from secondary to primary. */ +static int +tap_mp_attach_queues(const char *port_name, struct rte_eth_dev *dev) +{ + int ret; + struct timespec timeout = {.tv_sec = 1, .tv_nsec = 0}; + struct rte_mp_msg request, *reply; + struct rte_mp_reply replies; + struct ipc_queues *request_param = (struct ipc_queues *)request.param; + struct ipc_queues *reply_param; + struct pmd_process_private *process_private = dev->process_private; + int queue, fd_iterator; + + /* Prepare the request */ + strlcpy(request.name, TAP_MP_KEY, sizeof(request.name)); + strlcpy(request_param->port_name, port_name, + sizeof(request_param->port_name)); + request.len_param = sizeof(*request_param); + /* Send request and receive reply */ + ret = rte_mp_request_sync(&request, &replies, &timeout); + if (ret < 0) { + TAP_LOG(ERR, "Failed to request queues from primary: %d", + rte_errno); + return -1; + } + reply = &replies.msgs[0]; + reply_param = (struct ipc_queues *)reply->param; + TAP_LOG(DEBUG, "Received IPC reply for %s", reply_param->port_name); + + /* Attach the queues from received file descriptors */ + dev->data->nb_rx_queues = reply_param->rxq_count; + dev->data->nb_tx_queues = reply_param->txq_count; + fd_iterator = 0; + for (queue = 0; queue < reply_param->rxq_count; queue++) + process_private->rxq_fds[queue] = reply->fds[fd_iterator++]; + for (queue = 0; queue < reply_param->txq_count; queue++) + process_private->txq_fds[queue] = reply->fds[fd_iterator++]; + + return 0; +} + +/* Send the queue file descriptors from the primary process to secondary. */ +static int +tap_mp_sync_queues(const struct rte_mp_msg *request, const void *peer) +{ + struct rte_eth_dev *dev; + struct pmd_process_private *process_private; + struct rte_mp_msg reply; + const struct ipc_queues *request_param = + (const struct ipc_queues *)request->param; + struct ipc_queues *reply_param = + (struct ipc_queues *)reply.param; + uint16_t port_id; + int queue; + int ret; + + /* Get requested port */ + TAP_LOG(DEBUG, "Received IPC request for %s", request_param->port_name); + ret = rte_eth_dev_get_port_by_name(request_param->port_name, &port_id); + if (ret) { + TAP_LOG(ERR, "Failed to get port id for %s", + request_param->port_name); + return -1; + } + dev = &rte_eth_devices[port_id]; + process_private = dev->process_private; + + /* Fill file descriptors for all queues */ + reply.num_fds = 0; + reply_param->rxq_count = 0; + for (queue = 0; queue < dev->data->nb_rx_queues; queue++) { + reply.fds[reply.num_fds++] = process_private->rxq_fds[queue]; + reply_param->rxq_count++; + } + RTE_ASSERT(reply_param->rxq_count == dev->data->nb_rx_queues); + RTE_ASSERT(reply_param->txq_count == dev->data->nb_tx_queues); + RTE_ASSERT(reply.num_fds <= RTE_MP_MAX_FD_NUM); + + reply_param->txq_count = 0; + for (queue = 0; queue < dev->data->nb_tx_queues; queue++) { + reply.fds[reply.num_fds++] = process_private->txq_fds[queue]; + reply_param->txq_count++; + } + + /* Send reply */ + strlcpy(reply.name, request->name, sizeof(reply.name)); + strlcpy(reply_param->port_name, request_param->port_name, + sizeof(reply_param->port_name)); + reply.len_param = sizeof(*reply_param); + if (rte_mp_reply(&reply, peer) < 0) { + TAP_LOG(ERR, "Failed to reply an IPC request to sync queues"); + return -1; + } + return 0; +} + /* Open a TAP interface device. */ static int @@ -2032,9 +2145,28 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) TAP_LOG(ERR, "Failed to probe %s", name); return -1; } - /* TODO: request info from primary to set up Rx and Tx */ eth_dev->dev_ops = &ops; eth_dev->device = &dev->device; + eth_dev->rx_pkt_burst = pmd_rx_burst; + eth_dev->tx_pkt_burst = pmd_tx_burst; + if (!rte_eal_primary_proc_alive(NULL)) { + TAP_LOG(ERR, "Primary process is missing"); + return -1; + } + eth_dev->process_private = (struct pmd_process_private *) + rte_zmalloc_socket(name, + sizeof(struct pmd_process_private), + RTE_CACHE_LINE_SIZE, + eth_dev->device->numa_node); + if (eth_dev->process_private == NULL) { + TAP_LOG(ERR, + "Failed to alloc memory for process private"); + return -1; + } + + ret = tap_mp_attach_queues(name, eth_dev); + if (ret != 0) + return -1; rte_eth_dev_probing_finish(eth_dev); return 0; } @@ -2082,6 +2214,14 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) TAP_LOG(NOTICE, "Initializing pmd_tap for %s as %s", name, tap_name); + /* Register IPC feed callback */ + ret = rte_mp_action_register(TAP_MP_KEY, tap_mp_sync_queues); + if (ret < 0 && rte_errno != EEXIST && tap_devices_count) { + TAP_LOG(ERR, "%s: Failed to register IPC callback: %s", + tuntap_name, strerror(rte_errno)); + goto leave; + } + tap_devices_count++; ret = eth_dev_tap_create(dev, tap_name, remote_iface, &user_mac, ETH_TUNTAP_TYPE_TAP); @@ -2089,6 +2229,8 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) if (ret == -1) { TAP_LOG(ERR, "Failed to create pmd for %s as %s", name, tap_name); + if (!tap_devices_count) + rte_mp_action_unregister(TAP_MP_KEY); tap_unit--; /* Restore the unit number */ } rte_kvargs_free(kvlist); @@ -2137,6 +2279,9 @@ rte_pmd_tap_remove(struct rte_vdev_device *dev) close(internals->ioctl_sock); rte_free(eth_dev->data->dev_private); rte_free(eth_dev->process_private); + if (tap_devices_count == 1) + rte_mp_action_unregister(TAP_MP_KEY); + tap_devices_count--; rte_eth_dev_release_port(eth_dev); if (internals->ka_fd != -1) {