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 01C2E45E79; Wed, 11 Dec 2024 17:29:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB01C40655; Wed, 11 Dec 2024 17:29:22 +0100 (CET) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mails.dpdk.org (Postfix) with ESMTP id 15D8D402F0 for ; Wed, 11 Dec 2024 17:29:18 +0100 (CET) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21675fd60feso25710325ad.2 for ; Wed, 11 Dec 2024 08:29:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1733934557; x=1734539357; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CWXmByB4L66Uu9FEgEMjHKvfHUiK3k4Z04IDAW45dzE=; b=jDy0Wy4uN3XNKFyHKlTMEG6IisfRB4ErUydVLSt5ENiUOy6R3twocXnn+SrbkzopCw B2yJEmN4C3hW/DR1IcGOzwdBfhdwIJ74sc/FLCZ3ZLByVqtSix6my9Mb2NfNn83I6MAc CiFJZIYyEBBzwhSyU/L02UeS+vu0g6V2qpUu5dHmRVw4k35qaSAkjjYt0zOjBYkQhTOJ u36e0kUqawtxYH9sOJf5ZxPe6iW5N6Sdz+OK5JdDDkClJwPelWJUjNZHoLPmdSedpDss 1TBumX5wahIysZL8OQUv7rsrgFLUoQ0V2XONEEenebpvFrh7bpjJ6abk4CDYxLyHkEy0 zWWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733934557; x=1734539357; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CWXmByB4L66Uu9FEgEMjHKvfHUiK3k4Z04IDAW45dzE=; b=aEiJRU82jGQYofVQNjAFka2M3yirE12Zei64Qo0nOH11n6bFpony9b+qYH3GjD7stD yBO+6pdDlL6ifp++4vfiirBXwzniIxmox8KaYR4cYVc0u/zZhk87VsxVlDXoSObkQZjF 6pPSTQqk1taXxR9VVhwQTcjw7J1Yg4bRjCGQXgW3MLBPeQ4vJD+W36yk0WcMrQ1GfXfR miKbBdpk2zl6+yKd0I+vHgfTakG8NhkYKqE2he7fVnPF0tghhGraMsQFIXltS8eAebqv aIQkGdQpcXgZ993DqByQWuCp5tU3aiqz3vLEkJ/8NJFI1+9fqZ+pMUZcCvstHPWF9i2+ /cmw== X-Gm-Message-State: AOJu0YxckZemXIne93EoW8IwclFt93zQ3Cs8SHvwWNZXlSIv27jfkfRB 5ZU6Gb1seguZAHf0oJY2uzjFPIiYL1QWfMEBFpVpgzjrjgQkeRNhXEX5/9kS5zvOspruCwPqWz5 g X-Gm-Gg: ASbGncsCQw8z9fTyTYvO/WAX4NO5XgT231Be3Q9ilMsnx/jPzqPhCSCAW9oG75NiYLv /GgHoPNKUIZlA/Y4VdV2svboVvBgXbVhXzw+J4GYYQwwYUoF0Fq6Zgw24KRgDSlfcdoKC+jF4fh UUC904Ii+OSKObSWP/Z+mragnhsVsINBxBkj3tR/qDgsKvc4EPdtknABmj5yeafjTRlr7B0dTRF LAK2yif1Go7WhUC95ETZJNoYTmQgo3kRNkPpir1Hs4qc+j39HQgiOeVdgihh8NIEKHrzVufIo/O a+DKAId3cpBSsozokU4kRjLRIjyzgyc= X-Google-Smtp-Source: AGHT+IF7R4h4SY3jtdcEqq0Wj3RXCNU2WrHKueEWX/DqJ3rRdwwZmeKtWK8pKJxOlhgscoWthVwuyA== X-Received: by 2002:a17:903:987:b0:216:50c6:6b50 with SMTP id d9443c01a7336-2178ae842dbmr6207745ad.30.1733934557259; Wed, 11 Dec 2024 08:29:17 -0800 (PST) Received: from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21632c4fc62sm71989895ad.194.2024.12.11.08.29.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Dec 2024 08:29:16 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v2 5/8] net/ioring: implement primary secondary fd passing Date: Wed, 11 Dec 2024 08:28:06 -0800 Message-ID: <20241211162904.121695-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241211162904.121695-1-stephen@networkplumber.org> References: <20241210212757.83490-1-stephen@networkplumber.org> <20241211162904.121695-1-stephen@networkplumber.org> 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add support for communicating fd's from primary to secondary. Signed-off-by: Stephen Hemminger --- doc/guides/nics/features/ioring.ini | 1 + drivers/net/ioring/rte_eth_ioring.c | 136 +++++++++++++++++++++++++++- 2 files changed, 135 insertions(+), 2 deletions(-) diff --git a/doc/guides/nics/features/ioring.ini b/doc/guides/nics/features/ioring.ini index 199c7cd31c..da47062adb 100644 --- a/doc/guides/nics/features/ioring.ini +++ b/doc/guides/nics/features/ioring.ini @@ -8,6 +8,7 @@ Link status = Y MTU update = Y Promiscuous mode = Y Allmulticast mode = Y +Multiprocess aware = Y Linux = Y x86-64 = Y Usage doc = Y diff --git a/drivers/net/ioring/rte_eth_ioring.c b/drivers/net/ioring/rte_eth_ioring.c index b5d9c12bdf..ddef57adfb 100644 --- a/drivers/net/ioring/rte_eth_ioring.c +++ b/drivers/net/ioring/rte_eth_ioring.c @@ -28,6 +28,7 @@ #include #define IORING_DEFAULT_IFNAME "enio%d" +#define IORING_MP_KEY "ioring_mp_send_fds" RTE_LOG_REGISTER_DEFAULT(ioring_logtype, NOTICE); #define RTE_LOGTYPE_IORING ioring_logtype @@ -400,6 +401,84 @@ parse_iface_arg(const char *key __rte_unused, const char *value, void *extra_arg return 0; } +/* Secondary process requests rxq fds from primary. */ +static int +ioring_request_fds(const char *name, struct rte_eth_dev *dev) +{ + struct rte_mp_msg request = { }; + + strlcpy(request.name, IORING_MP_KEY, sizeof(request.name)); + strlcpy((char *)request.param, name, RTE_MP_MAX_PARAM_LEN); + request.len_param = strlen(name); + + /* Send the request and receive the reply */ + PMD_LOG(DEBUG, "Sending multi-process IPC request for %s", name); + + struct timespec timeout = {.tv_sec = 1, .tv_nsec = 0}; + struct rte_mp_reply replies; + int ret = rte_mp_request_sync(&request, &replies, &timeout); + if (ret < 0 || replies.nb_received != 1) { + PMD_LOG(ERR, "Failed to request fds from primary: %s", + rte_strerror(rte_errno)); + return -1; + } + + struct rte_mp_msg *reply = replies.msgs; + PMD_LOG(DEBUG, "Received multi-process IPC reply for %s", name); + if (dev->data->nb_rx_queues != reply->num_fds) { + PMD_LOG(ERR, "Incorrect number of fds received: %d != %d", + reply->num_fds, dev->data->nb_rx_queues); + return -EINVAL; + } + + int *fds = dev->process_private; + for (int i = 0; i < reply->num_fds; i++) + fds[i] = reply->fds[i]; + + free(reply); + return 0; +} + +/* Primary process sends rxq fds to secondary. */ +static int +ioring_mp_send_fds(const struct rte_mp_msg *request, const void *peer) +{ + const char *request_name = (const char *)request->param; + + PMD_LOG(DEBUG, "Received multi-process IPC request for %s", request_name); + + /* Find the requested port */ + struct rte_eth_dev *dev = rte_eth_dev_get_by_name(request_name); + if (!dev) { + PMD_LOG(ERR, "Failed to get port id for %s", request_name); + return -1; + } + + /* Populate the reply with the xsk fd for each queue */ + struct rte_mp_msg reply = { }; + if (dev->data->nb_rx_queues > RTE_MP_MAX_FD_NUM) { + PMD_LOG(ERR, "Number of rx queues (%d) exceeds max number of fds (%d)", + dev->data->nb_rx_queues, RTE_MP_MAX_FD_NUM); + return -EINVAL; + } + + int *fds = dev->process_private; + for (uint16_t i = 0; i < dev->data->nb_rx_queues; i++) + reply.fds[reply.num_fds++] = fds[i]; + + /* Send the reply */ + strlcpy(reply.name, request->name, sizeof(reply.name)); + strlcpy((char *)reply.param, request_name, RTE_MP_MAX_PARAM_LEN); + reply.len_param = strlen(request_name); + + PMD_LOG(DEBUG, "Sending multi-process IPC reply for %s", request_name); + if (rte_mp_reply(&reply, peer) < 0) { + PMD_LOG(ERR, "Failed to reply to multi-process IPC request"); + return -1; + } + return 0; +} + static int ioring_probe(struct rte_vdev_device *vdev) { @@ -407,14 +486,43 @@ ioring_probe(struct rte_vdev_device *vdev) const char *params = rte_vdev_device_args(vdev); struct rte_kvargs *kvlist = NULL; struct rte_eth_dev *eth_dev = NULL; + int *fds = NULL; char tap_name[IFNAMSIZ] = IORING_DEFAULT_IFNAME; uint8_t persist = 0; int ret; PMD_LOG(INFO, "Initializing %s", name); - if (rte_eal_process_type() == RTE_PROC_SECONDARY) - return -1; /* TODO */ + if (rte_eal_process_type() == RTE_PROC_SECONDARY) { + struct rte_eth_dev *eth_dev; + + eth_dev = rte_eth_dev_attach_secondary(name); + if (!eth_dev) { + PMD_LOG(ERR, "Failed to probe %s", name); + return -1; + } + eth_dev->dev_ops = &ops; + eth_dev->device = &vdev->device; + + if (!rte_eal_primary_proc_alive(NULL)) { + PMD_LOG(ERR, "Primary process is missing"); + return -1; + } + + fds = calloc(RTE_MAX_QUEUES_PER_PORT, sizeof(int)); + if (fds == NULL) { + PMD_LOG(ERR, "Failed to alloc memory for process private"); + return -1; + } + + eth_dev->process_private = fds; + + if (ioring_request_fds(name, eth_dev)) + return -1; + + rte_eth_dev_probing_finish(eth_dev); + return 0; + } if (params != NULL) { kvlist = rte_kvargs_parse(params, valid_arguments); @@ -432,21 +540,45 @@ ioring_probe(struct rte_vdev_device *vdev) persist = 1; } + /* Per-queue tap fd's (for primary process) */ + fds = calloc(RTE_MAX_QUEUES_PER_PORT, sizeof(int)); + if (fds == NULL) { + PMD_LOG(ERR, "Unable to allocate fd array"); + return -1; + } + for (unsigned int i = 0; i < RTE_MAX_QUEUES_PER_PORT; i++) + fds[i] = -1; + eth_dev = rte_eth_vdev_allocate(vdev, sizeof(struct pmd_internals)); if (eth_dev == NULL) { PMD_LOG(ERR, "%s Unable to allocate device struct", tap_name); goto error; } + eth_dev->data->dev_flags = RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS; + eth_dev->dev_ops = &ops; + eth_dev->process_private = fds; + if (ioring_create(eth_dev, tap_name, persist) < 0) goto error; + /* register the MP server on the first device */ + static unsigned int ioring_dev_count; + if (ioring_dev_count == 0) { + if (rte_mp_action_register(IORING_MP_KEY, ioring_mp_send_fds) < 0) { + PMD_LOG(ERR, "Failed to register multi-process callback: %s", + rte_strerror(rte_errno)); + goto error; + } + } + ++ioring_dev_count; rte_eth_dev_probing_finish(eth_dev); return 0; error: if (eth_dev != NULL) rte_eth_dev_release_port(eth_dev); + free(fds); rte_kvargs_free(kvlist); return -1; } -- 2.45.2