From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 340F2A0C5B;
Fri, 26 Nov 2021 05:15:24 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A9CB7406FF;
Fri, 26 Nov 2021 05:15:23 +0100 (CET)
Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com
[209.85.216.47]) by mails.dpdk.org (Postfix) with ESMTP id 17BEF40140
for <dev@dpdk.org>; Fri, 26 Nov 2021 05:15:23 +0100 (CET)
Received: by mail-pj1-f47.google.com with SMTP id
gx15-20020a17090b124f00b001a695f3734aso7163922pjb.0
for <dev@dpdk.org>; Thu, 25 Nov 2021 20:15:23 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;
h=from:to:cc:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=ne0Oty26MJWj+ayOlYn4+/NDIgC5hVe+UcvO7BpWOQI=;
b=Ar50ZLmFSUpw7bKfNZOcxUMm6JL9ERXU9iKYf0G6UdJQfzfTtw3DXdntRntLqWdOXl
xaWRjEAA1jFKTxQiH9zWjO9LQl5RCyx/mgObyk8yy73BL4pxgWhS0HLRbacq5Ygh67yU
2FA8Qdxjzc886PP5Oada/fdYFtDI3xY0Gk40V0Sym4dmPRP65u0Kt4+ezgfCzsJp7eS6
NAxg0hpxnlXArJs/CXHP6qfgkkAz6pGW6fezfdO3mAAlRQC9G1JD8cYWA3DCeo9idCu4
a0DEIc6lhtoi4oBopRHxX38bfrYV8ag34koOFPVvRKBkRPJAIOBv/Q+4bLLnYEnkzyCH
wyVg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version
:content-transfer-encoding;
bh=ne0Oty26MJWj+ayOlYn4+/NDIgC5hVe+UcvO7BpWOQI=;
b=lhSlbW8pksze8xPbSq/5JUkZlPEsZvB+uG8r9yIKLAmRilkutXjK1kTF3aMexBX9vN
MqlBusEfH5YzD8T3PxxdW+KMRIOrF4tCwDlsg3vsFw0pSLty4oWGsd6UdO/MDriPRtk3
9RppXS4jTmJ8h+/NylrvQjXUnsTcMRJ8h+0/X2tuhFKCE5KlDokZVpI3LhB3Oj34iiI0
ZFeeDmwPPO8wy96on+wdB2SN5O/he/2On15uQbUEjb05gGCum7S94tQLHcIpA5lNR8JD
3vIZZa9t5EkGVlLpZlHN1AUuHPZ0Io0bkz3NXebsnY+sbFioQvpkKjowEb0RsF8dCTYZ
+arA==
X-Gm-Message-State: AOAM5316ZBhuQNejgt4qxYjiRtObp7aX5svA1nIED1ZWgi81wcxWmgNu
6Vy9CyCm+sEPwNBMcMAMWwbbCYu8rZoPLA==
X-Google-Smtp-Source: ABdhPJzH5ZFZK9HNToNxjQhpGC9GXvlNAesMLdR+vpJGa4L5SA7EgHeUkiWp38qWQldI9NuWet97Dw==
X-Received: by 2002:a17:90a:e40f:: with SMTP id
hv15mr12590819pjb.5.1637900122178;
Thu, 25 Nov 2021 20:15:22 -0800 (PST)
Received: from kparameshwa-a01.vmware.com.com ([106.51.27.43])
by smtp.gmail.com with ESMTPSA id y130sm4669418pfg.202.2021.11.25.20.15.20
(version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128);
Thu, 25 Nov 2021 20:15:21 -0800 (PST)
From: Kumara Parameshwaran <kumaraparamesh92@gmail.com>
To: keith.wiles@intel.com
Cc: dev@dpdk.org,
Kumara Parameshwaran <kparameshwar@vmware.com>
Subject: [PATCH] net/tap: Bug fix to populate fds in secondary process
Date: Fri, 26 Nov 2021 09:45:15 +0530
Message-Id: <20211126041515.96259-1-kumaraparamesh92@gmail.com>
X-Mailer: git-send-email 2.30.1 (Apple Git-130)
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
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>,
<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>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
From: Kumara Parameshwaran <kparameshwar@vmware.com>
When a tap device is hotplugged to primary process which in turn
adds the device to all secondary process, the secondary process
does a tap_mp_attach_queues, but the fds are not populated in
the primary during the probe they are populated during the queue_setup,
added a fix to sync the queues during rte_eth_dev_start
Signed-off-by: Kumara Parameshwaran <kparameshwar@vmware.com>
---
drivers/net/tap/rte_eth_tap.c | 80 +++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c
index f1b48cae82..8e7915656b 100644
--- a/drivers/net/tap/rte_eth_tap.c
+++ b/drivers/net/tap/rte_eth_tap.c
@@ -67,6 +67,7 @@
/* IPC key for queue fds sync */
#define TAP_MP_KEY "tap_mp_sync_queues"
+#define TAP_MP_REQ_START_RXTX "tap_mp_req_start_rxtx"
#define TAP_IOV_DEFAULT_MAX 1024
@@ -880,11 +881,51 @@ tap_link_set_up(struct rte_eth_dev *dev)
return tap_ioctl(pmd, SIOCSIFFLAGS, &ifr, 1, LOCAL_AND_REMOTE);
}
+static int tap_mp_req_on_rxtx(struct rte_eth_dev *dev)
+{
+ struct rte_mp_msg msg;
+ struct ipc_queues *request_param = (struct ipc_queues *)msg.param;
+ int err;
+ int fd_iterator = 0;
+ struct pmd_process_private *process_private = dev->process_private;
+ int i;
+
+ memset(&msg, 0, sizeof(msg));
+ strcpy(msg.name, TAP_MP_REQ_START_RXTX);
+ strlcpy(request_param->port_name, dev->data->name,
+ sizeof(request_param->port_name));
+ msg.len_param = sizeof(*request_param);
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ msg.fds[fd_iterator++] = process_private->txq_fds[i];
+ msg.num_fds++;
+ request_param->txq_count++;
+ }
+ for (i = 0; i < dev->data->nb_rx_queues; i++) {
+ msg.fds[fd_iterator++] = process_private->rxq_fds[i];
+ msg.num_fds++;
+ request_param->rxq_count++;
+ }
+
+ RTE_ASSERT(request_param->txq_count == dev->data->nb_tx_queues);
+ RTE_ASSERT(request_param->rxq_count == dev->data->nb_rx_queues);
+
+ err = rte_mp_sendmsg(&msg);
+ if (err < 0) {
+ TAP_LOG(ERR, "Failed to send start req to secondary %d",
+ rte_errno);
+ return -1;
+ }
+
+ return 0;
+}
+
static int
tap_dev_start(struct rte_eth_dev *dev)
{
int err, i;
+ tap_mp_req_on_rxtx(dev);
+
err = tap_intr_handle_set(dev, 1);
if (err)
return err;
@@ -901,6 +942,39 @@ tap_dev_start(struct rte_eth_dev *dev)
return err;
}
+static int
+tap_mp_req_start_rxtx(const struct rte_mp_msg *request, __rte_unused const void *peer)
+{
+ struct rte_eth_dev *dev;
+ int ret;
+ uint16_t port_id;
+ const struct ipc_queues *request_param =
+ (const struct ipc_queues *)request->param;
+ int fd_iterator;
+ int queue;
+ struct pmd_process_private *process_private;
+
+ 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;
+ dev->data->nb_rx_queues = request_param->rxq_count;
+ dev->data->nb_tx_queues = request_param->txq_count;
+ fd_iterator = 0;
+ RTE_LOG(DEBUG, PMD, "tap_attach rx_q:%d tx_q:%d\n", request_param->rxq_count,
+ request_param->txq_count);
+ for (queue = 0; queue < request_param->txq_count; queue++)
+ process_private->txq_fds[queue] = request->fds[fd_iterator++];
+ for (queue = 0; queue < request_param->rxq_count; queue++)
+ process_private->rxq_fds[queue] = request->fds[fd_iterator++];
+
+ return 0;
+}
+
/* This function gets called when the current port gets stopped.
*/
static int
@@ -2445,6 +2519,12 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev)
ret = tap_mp_attach_queues(name, eth_dev);
if (ret != 0)
return -1;
+
+ ret = rte_mp_action_register(TAP_MP_REQ_START_RXTX, tap_mp_req_start_rxtx);
+ if (ret < 0 && rte_errno != ENOTSUP)
+ TAP_LOG(ERR, "tap: Failed to register IPC callback: %s",
+ strerror(rte_errno));
+
rte_eth_dev_probing_finish(eth_dev);
return 0;
}
--
2.17.1