From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F01A5A04A4 for ; Mon, 31 Jan 2022 15:32:46 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4A9341183; Mon, 31 Jan 2022 15:32:46 +0100 (CET) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mails.dpdk.org (Postfix) with ESMTP id ED7B9411C9; Mon, 31 Jan 2022 15:32:45 +0100 (CET) Received: by mail-pj1-f54.google.com with SMTP id o64so14207992pjo.2; Mon, 31 Jan 2022 06:32:45 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=AO4bCJUBU2tn3z6IUnVpCr+aiKh4XOkxwpc9qbY07cA=; b=CBrmY7hM2Xh/akxOZetGBjscgcyUSYQ6IZhRfCLYTY9B24jjVlDBi2rew0VF7/mXvS nFZkp0vQicZ84uXpsCwkA+FzkUGnHk3YAwzsXquvkohR6npaWMgITIPh8zwIT//BN4ft xePwcflQeWAEoUfwVU+8cApUbrm5NuOLfTVxrEKY5lW/qntESvC1IR9hrPgEzKDbTkJG vK075f68dq6v5BIZDQkCjYVTJeF3rsOLTctewAMW2M8z6cJF2v8uYWJ+eQmNVgBiTSE1 xGuEmJklPiOQsuzbPgLkqf3Dw7YWvoPpa9YxA7/qKW+2ZtDxmDjLK4iricsq5erYL8VP XCqw== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=AO4bCJUBU2tn3z6IUnVpCr+aiKh4XOkxwpc9qbY07cA=; b=josCwPSotroDl8HzjPwfLmsCtqy20ZPJs7/s7SiCdFaXBsJfTIvc5eksgagaH1JdRZ NwzdjFxbjPVU3PDzKw2zM2hUd1823Fw1d1AAsDuSalcF0XAAXiZf5zJBw1PZ13W2otnw m6i2APgWDDOxyfLu13tl0OGmUJj20jGHHdYQe8exhUJeARiLBGgFKFtjQBIQNkwXe7YH J407xNqwC1tORJiZrWKW1LophMiBzp+OWNFmV8nI6u+sfgurHGBteUZUKtHfFlLXRgg8 PB8i7Wr6xPKxqIgEXNWnTsY09IrmhAxro7jG8zPa6HIfDAKSc7SDMbciSIDO8jScUbW2 BgPA== X-Gm-Message-State: AOAM532qqmdrKB1kYlYeTDdZiNyM2EKNhB+37+3rb55C7gEyZ4VDII/P rY5klSud8svv5Ldnwguhwp/JiHbqbQVXYg== X-Google-Smtp-Source: ABdhPJycP67eeV/0dsgJLZMAMIoVTmsuOi4p7QJB8Kp9cOAjsVXsws1sMFfV5rWnHhAfFdm2e+Zw6w== X-Received: by 2002:a17:902:70ca:: with SMTP id l10mr17462054plt.174.1643639564853; Mon, 31 Jan 2022 06:32:44 -0800 (PST) Received: from kparameshwa-a01.vmware.com.com ([49.206.11.18]) by smtp.gmail.com with ESMTPSA id n22sm18602571pfu.77.2022.01.31.06.32.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jan 2022 06:32:44 -0800 (PST) From: Kumara Parameshwaran To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Kumara Parameshwaran , stable@dpdk.org Subject: [PATCH v3 2/2] net/tap: fix to populate fds in secondary process Date: Mon, 31 Jan 2022 20:02:34 +0530 Message-Id: <20220131143234.17945-2-kumaraparamesh92@gmail.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) In-Reply-To: <20220131143234.17945-1-kumaraparamesh92@gmail.com> References: <20220121042944.23929-1-kumaraparamesh92@gmail.com> <20220131143234.17945-1-kumaraparamesh92@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org From: Kumara Parameshwaran 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 Fixes: 4852aa8f6e21 ("drivers/net: enable hotplug on secondary process") Cc: stable@dpdk.org Signed-off-by: Kumara Parameshwaran --- v3: * Retain tap_sync_queues to retain the attach of secondary process * Fix coding convention for a function definition * Renamed rte_get_eth_dev_by_name to rte_eth_dev_get_by_name in sorted in version.map * Remove uninteded blank line 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..d13baadbe7 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,49 @@ 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)); + strlcpy(msg.name, TAP_MP_REQ_START_RXTX, sizeof(msg.name)); + 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++; + } + + 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; + if (rte_eal_process_type() == RTE_PROC_PRIMARY) + tap_mp_req_on_rxtx(dev); + err = tap_intr_handle_set(dev, 1); if (err) return err; @@ -901,6 +940,34 @@ 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; + const struct ipc_queues *request_param = + (const struct ipc_queues *)request->param; + int fd_iterator; + int queue; + struct pmd_process_private *process_private; + + dev = rte_eth_dev_get_by_name(request_param->port_name); + if (!dev) { + TAP_LOG(ERR, "Failed to get dev for %s", + request_param->port_name); + return -1; + } + process_private = dev->process_private; + fd_iterator = 0; + TAP_LOG(DEBUG, "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 @@ -1084,6 +1151,9 @@ tap_dev_close(struct rte_eth_dev *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) { rte_free(dev->process_private); + if (tap_devices_count == 1) + rte_mp_action_unregister(TAP_MP_REQ_START_RXTX); + tap_devices_count--; return 0; } @@ -2445,6 +2515,16 @@ rte_pmd_tap_probe(struct rte_vdev_device *dev) ret = tap_mp_attach_queues(name, eth_dev); if (ret != 0) return -1; + + if (!tap_devices_count) { + 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)); + return -1; + } + } + tap_devices_count++; rte_eth_dev_probing_finish(eth_dev); return 0; } -- 2.17.1