From patchwork Fri Jan 22 09:47:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiawen Wu X-Patchwork-Id: 87058 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 2461AA0A0A; Fri, 22 Jan 2021 10:48:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AA132140E28; Fri, 22 Jan 2021 10:48:02 +0100 (CET) Received: from smtpbgeu1.qq.com (smtpbgeu1.qq.com [52.59.177.22]) by mails.dpdk.org (Postfix) with ESMTP id 24407140E1D for ; Fri, 22 Jan 2021 10:47:59 +0100 (CET) X-QQ-mid: bizesmtp9t1611308874tb9inzyqx Received: from wxdbg.localdomain.com (unknown [183.129.236.74]) by esmtp6.qq.com (ESMTP) with id ; Fri, 22 Jan 2021 17:47:54 +0800 (CST) X-QQ-SSF: 01400000002000C0D000B00A0000000 X-QQ-FEAT: fYJ0eR3mMJ139c1hbxm3xldVao8MLtMQUyaDwK1iDDs8KQ6SzZ/pQnFSzhU4u eifyo/ctSBrgt4LXYTxvqjjwG82cCB6RJxrghvFKF6sAjz2EbcD3WjdGWnA5T5oj7fbaNFW Jv+RR4PGIv/rnT1OrjdXBMLu5EoENCNbD0FMDLxPdyqlK8mOmnCA39i/DqORkoeicJLlcgp TaTrrS7UygAoUar8dD+hgJMXupWDYZVTnCxBIMhbC3FfU0WbqBvePSA3MKb/WAJlMyOzEF3 isRVfCXqyBKPlL1lopHtpxD3QARJ5xkoTSvs+EdWtP3ao567zf4EJrGY7y0EYpv8GyL2LFg NsOhisqO/6elhIJ5mjCg2lZ2cS36w== X-QQ-GoodBg: 2 From: Jiawen Wu To: dev@dpdk.org Cc: Jiawen Wu Date: Fri, 22 Jan 2021 17:47:41 +0800 Message-Id: <20210122094800.197748-2-jiawenwu@trustnetic.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210122094800.197748-1-jiawenwu@trustnetic.com> References: <20210122094800.197748-1-jiawenwu@trustnetic.com> MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:trustnetic.com:qybgforeign:qybgforeign7 X-QQ-Bgrelay: 1 Subject: [dpdk-dev] [PATCH v1 01/20] net/txgbe: add ethdev probe and remove for VF device 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 Sender: "dev" Introduce virtual function driver in txgbe PMD, add simple init and uninit function to probe and remove the device. Signed-off-by: Jiawen Wu --- doc/guides/nics/features/txgbe_vf.ini | 12 +++ drivers/net/txgbe/meson.build | 1 + drivers/net/txgbe/txgbe_ethdev_vf.c | 137 ++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 doc/guides/nics/features/txgbe_vf.ini create mode 100644 drivers/net/txgbe/txgbe_ethdev_vf.c diff --git a/doc/guides/nics/features/txgbe_vf.ini b/doc/guides/nics/features/txgbe_vf.ini new file mode 100644 index 000000000..d2f3e5e61 --- /dev/null +++ b/doc/guides/nics/features/txgbe_vf.ini @@ -0,0 +1,12 @@ +; +; Supported features of the 'txgbe_vf' network poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +[Features] +Multiprocess aware = Y +Linux UIO = Y +Linux VFIO = Y +ARMv8 = Y +x86-32 = Y +x86-64 = Y diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build index 60505e211..3b9994aa9 100644 --- a/drivers/net/txgbe/meson.build +++ b/drivers/net/txgbe/meson.build @@ -12,6 +12,7 @@ objs = [base_objs] sources = files( 'txgbe_ethdev.c', + 'txgbe_ethdev_vf.c', 'txgbe_fdir.c', 'txgbe_flow.c', 'txgbe_ipsec.c', diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c new file mode 100644 index 000000000..e5d0e1adf --- /dev/null +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c @@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2015-2020 + */ + +#include +#include +#include +#include +#include +#include +#include + +#include "txgbe_logs.h" +#include "base/txgbe.h" +#include "txgbe_ethdev.h" +#include "txgbe_rxtx.h" + +#define TXGBEVF_PMD_NAME "rte_txgbevf_pmd" /* PMD name */ +static int txgbevf_dev_close(struct rte_eth_dev *dev); + +/* + * The set of PCI devices this driver supports (for VF) + */ +static const struct rte_pci_id pci_id_txgbevf_map[] = { + { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, TXGBE_DEV_ID_RAPTOR_VF) }, + { RTE_PCI_DEVICE(PCI_VENDOR_ID_WANGXUN, TXGBE_DEV_ID_RAPTOR_VF_HV) }, + { .vendor_id = 0, /* sentinel */ }, +}; + +static const struct eth_dev_ops txgbevf_eth_dev_ops; + +/* + * Virtual Function device init + */ +static int +eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev) +{ + struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); + struct txgbe_hw *hw = TXGBE_DEV_HW(eth_dev); + PMD_INIT_FUNC_TRACE(); + + eth_dev->dev_ops = &txgbevf_eth_dev_ops; + + /* for secondary processes, we don't initialise any further as primary + * has already done this work. Only check we don't need a different + * RX function + */ + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + struct txgbe_tx_queue *txq; + uint16_t nb_tx_queues = eth_dev->data->nb_tx_queues; + /* TX queue function in primary, set by last queue initialized + * Tx queue may not initialized by primary process + */ + if (eth_dev->data->tx_queues) { + txq = eth_dev->data->tx_queues[nb_tx_queues - 1]; + txgbe_set_tx_function(eth_dev, txq); + } else { + /* Use default TX function if we get here */ + PMD_INIT_LOG(NOTICE, + "No TX queues configured yet. Using default TX function."); + } + + txgbe_set_rx_function(eth_dev); + + return 0; + } + + rte_eth_copy_pci_info(eth_dev, pci_dev); + + hw->device_id = pci_dev->id.device_id; + hw->vendor_id = pci_dev->id.vendor_id; + hw->subsystem_device_id = pci_dev->id.subsystem_device_id; + hw->subsystem_vendor_id = pci_dev->id.subsystem_vendor_id; + hw->hw_addr = (void *)pci_dev->mem_resource[0].addr; + + return 0; +} + +/* Virtual Function device uninit */ + +static int +eth_txgbevf_dev_uninit(struct rte_eth_dev *eth_dev) +{ + PMD_INIT_FUNC_TRACE(); + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + txgbevf_dev_close(eth_dev); + + return 0; +} + +static int eth_txgbevf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, + struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_probe(pci_dev, + sizeof(struct txgbe_adapter), eth_txgbevf_dev_init); +} + +static int eth_txgbevf_pci_remove(struct rte_pci_device *pci_dev) +{ + return rte_eth_dev_pci_generic_remove(pci_dev, eth_txgbevf_dev_uninit); +} + +/* + * virtual function driver struct + */ +static struct rte_pci_driver rte_txgbevf_pmd = { + .id_table = pci_id_txgbevf_map, + .drv_flags = RTE_PCI_DRV_NEED_MAPPING, + .probe = eth_txgbevf_pci_probe, + .remove = eth_txgbevf_pci_remove, +}; + +static int +txgbevf_dev_close(struct rte_eth_dev *dev) +{ + PMD_INIT_FUNC_TRACE(); + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + dev->dev_ops = NULL; + + return 0; +} + +/* + * dev_ops for virtual function, bare necessities for basic vf + * operation have been implemented + */ +static const struct eth_dev_ops txgbevf_eth_dev_ops = { +}; + +RTE_PMD_REGISTER_PCI(net_txgbe_vf, rte_txgbevf_pmd); +RTE_PMD_REGISTER_PCI_TABLE(net_txgbe_vf, pci_id_txgbevf_map); +RTE_PMD_REGISTER_KMOD_DEP(net_txgbe_vf, "* igb_uio | vfio-pci");