From patchwork Thu Nov 25 12:23:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kumara Parameshwaran X-Patchwork-Id: 104699 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 55655A0C45; Thu, 25 Nov 2021 13:23:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EE37E40DF5; Thu, 25 Nov 2021 13:23:12 +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 EB88B40140 for ; Thu, 25 Nov 2021 13:23:11 +0100 (CET) Received: by mail-pj1-f54.google.com with SMTP id j6-20020a17090a588600b001a78a5ce46aso7699651pji.0 for ; Thu, 25 Nov 2021 04:23:11 -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=K1dJeqMn7RvVUbbVUjFjwnCyoXPz7FGKOpJEouqox+c=; b=mD9x+gyNs0CSQy/NDw7zwYpNpDJMXFTECT27Ma5rvi9oHNV3slc/LbyI6hAYKIsU/s nTPOo7lxAhaBszTvw2imRRs5UxgvtjvfkvpKvLDuh1oD80vwYaaWFy/lNWMTAguU8NKJ wzZkK0afi7vuWlCQx8PCEQUmymlOZgeocMHnTMrQXsKaK+EtxTIK15I8X3a0T/0yqt8Z B7SY/WwAne2NF8PDzO0z5tFCRcJ0RdpCXjRlDob+/IJQg6DuPrRhXBhmxqsNJZCbdHIB ffDkQwzDX5p2HkJoK0H54mfQwawEH4IEhM89WhAybJGtva4NieaU0COR3ZiwDB/B9Ucb I48w== 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=K1dJeqMn7RvVUbbVUjFjwnCyoXPz7FGKOpJEouqox+c=; b=eCgfDwVF/KWfoyTgl7EM73g9ktab0drLyBuBJACKKwEyOyUBleFttK0dhHJ9J/DBRk qK2+tiL7auYSyUakJbaDGWkRKhK1RBEulBJhvp1mbzFVAmfuyksSGZIeNtVaq8C5UtG5 eucyze0qfm9EErJc1B7Vlx7nszF7nUF7z2OaGgTheiImCISdo2n0DtMfZ4JS/1xfSTih f7angEoZyKxOZCgix3fhr+oKTXEExPZckvYLTK2S7PRdjFw1RWbvUXVBUJaDSCirhhL6 sv33+UhdvB6mE4wRiJSgClGrkEfs57D2OkyuxOeJQG8SX9tjKmr2RineMA6P4D/FmuFF Y7DA== X-Gm-Message-State: AOAM531cBobr2coLklCS7fBVK6U5jl8RD4t8cbcjuLPfiFtKqVG/sgOd vsWzXFsTEuOs3VD/xUv4JxE= X-Google-Smtp-Source: ABdhPJzzbXsa1IQ4eVRLsbgUQEdH4q3YDM5l2DOXacoMxliZOI4F39aO55qxqpc9HlEh1m5JahkMOw== X-Received: by 2002:a17:902:f691:b0:142:2f7a:308e with SMTP id l17-20020a170902f69100b001422f7a308emr29013148plg.19.1637842991051; Thu, 25 Nov 2021 04:23:11 -0800 (PST) Received: from kparameshwa-a01.vmware.com.com ([106.51.27.43]) by smtp.gmail.com with ESMTPSA id d2sm3185037pfu.203.2021.11.25.04.23.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Nov 2021 04:23:10 -0800 (PST) From: Kumara Parameshwaran To: keith.wiles@intel.com Cc: dev@dpdk.org, Kumara Parameshwaran Subject: [PATCH] net/tap: Bug fix to populate fds in secondary process Date: Thu, 25 Nov 2021 17:53:05 +0530 Message-Id: <20211125122305.23439-1-kumaraparamesh92@gmail.com> X-Mailer: git-send-email 2.30.1 (Apple Git-130) MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-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 Signed-off-by: Kumara Parameshwaran --- drivers/net/tap/rte_eth_tap.c | 79 +++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index f1b48cae82..98791f8dbe 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,50 @@ 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; + + 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 (int 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 (int 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 +941,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 +2518,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; }