From: longli@linuxonhyperv.com
To: Ferruh Yigit <ferruh.yigit@intel.com>
Cc: dev@dpdk.org, Ajay Sharma <sharmaajay@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Long Li <longli@microsoft.com>
Subject: [PATCH 02/17] net/mana: add device configuration and stop
Date: Fri, 1 Jul 2022 02:02:32 -0700 [thread overview]
Message-ID: <1656666167-26035-3-git-send-email-longli@linuxonhyperv.com> (raw)
In-Reply-To: <1656666167-26035-1-git-send-email-longli@linuxonhyperv.com>
From: Long Li <longli@microsoft.com>
MANA defines its memory allocation functions to override IB layer default
functions to allocate device queues. This patch adds the code for device
configuration and stop.
Signed-off-by: Long Li <longli@microsoft.com>
---
drivers/net/mana/mana.c | 87 ++++++++++++++++++++++++++++++++++++++++-
drivers/net/mana/mana.h | 3 --
2 files changed, 85 insertions(+), 5 deletions(-)
diff --git a/drivers/net/mana/mana.c b/drivers/net/mana/mana.c
index 893e2b1e23..882a38d7df 100644
--- a/drivers/net/mana/mana.c
+++ b/drivers/net/mana/mana.c
@@ -57,7 +57,91 @@ static rte_spinlock_t mana_shared_data_lock = RTE_SPINLOCK_INITIALIZER;
int mana_logtype_driver;
int mana_logtype_init;
+static void *mana_alloc_verbs_buf(size_t size, void *data)
+{
+ void *ret;
+ size_t alignment = rte_mem_page_size();
+ int socket = (int)(uintptr_t)data;
+
+ DRV_LOG(DEBUG, "size=%lu socket=%d", size, socket);
+
+ if (alignment == (size_t)-1) {
+ DRV_LOG(ERR, "Failed to get mem page size");
+ rte_errno = ENOMEM;
+ return NULL;
+ }
+
+ ret = rte_zmalloc_socket("mana_verb_buf", size, alignment, socket);
+ if (!ret && size)
+ rte_errno = ENOMEM;
+ return ret;
+}
+
+static void mana_free_verbs_buf(void *ptr, void *data __rte_unused)
+{
+ rte_free(ptr);
+}
+
+static int mana_dev_configure(struct rte_eth_dev *dev)
+{
+ struct mana_priv *priv = dev->data->dev_private;
+ struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+ const struct rte_eth_rxmode *rxmode = &dev_conf->rxmode;
+ const struct rte_eth_txmode *txmode = &dev_conf->txmode;
+
+ if (dev_conf->rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+ dev_conf->rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+
+ if (txmode->offloads & ~BNIC_DEV_TX_OFFLOAD_SUPPORT) {
+ DRV_LOG(ERR, "Unsupported TX offload: %lx", txmode->offloads);
+ return -EINVAL;
+ }
+
+ if (rxmode->offloads & ~BNIC_DEV_RX_OFFLOAD_SUPPORT) {
+ DRV_LOG(ERR, "Unsupported RX offload: %lx", rxmode->offloads);
+ return -EINVAL;
+ }
+
+ if (dev->data->nb_rx_queues != dev->data->nb_tx_queues) {
+ DRV_LOG(ERR, "Only support equal number of rx/tx queues");
+ return -EINVAL;
+ }
+
+ if (!rte_is_power_of_2(dev->data->nb_rx_queues)) {
+ DRV_LOG(ERR, "number of TX/RX queues must be power of 2");
+ return -EINVAL;
+ }
+
+ priv->num_queues = dev->data->nb_rx_queues;
+
+ manadv_set_context_attr(priv->ib_ctx, MANADV_CTX_ATTR_BUF_ALLOCATORS,
+ (void *)((uintptr_t)&(struct manadv_ctx_allocators){
+ .alloc = &mana_alloc_verbs_buf,
+ .free = &mana_free_verbs_buf,
+ .data = 0,
+ }));
+
+ return 0;
+}
+
+static int
+mana_dev_close(struct rte_eth_dev *dev)
+{
+ struct mana_priv *priv = dev->data->dev_private;
+ int ret;
+
+ ret = ibv_close_device(priv->ib_ctx);
+ if (ret) {
+ ret = errno;
+ return ret;
+ }
+
+ return 0;
+}
+
const struct eth_dev_ops mana_dev_ops = {
+ .dev_configure = mana_dev_configure,
+ .dev_close = mana_dev_close,
};
const struct eth_dev_ops mana_dev_sec_ops = {
@@ -652,8 +736,7 @@ static int mana_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
static int mana_dev_uninit(struct rte_eth_dev *dev)
{
- RTE_SET_USED(dev);
- return 0;
+ return mana_dev_close(dev);
}
static int mana_pci_remove(struct rte_pci_device *pci_dev)
diff --git a/drivers/net/mana/mana.h b/drivers/net/mana/mana.h
index dbef5420ff..9609bee4de 100644
--- a/drivers/net/mana/mana.h
+++ b/drivers/net/mana/mana.h
@@ -177,9 +177,6 @@ uint16_t mana_rx_burst_removed(void *dpdk_rxq, struct rte_mbuf **pkts,
uint16_t mana_tx_burst_removed(void *dpdk_rxq, struct rte_mbuf **pkts,
uint16_t pkts_n);
-void *mana_alloc_verbs_buf(size_t size, void *data);
-void mana_free_verbs_buf(void *ptr, void *data);
-
/** Request timeout for IPC. */
#define MANA_MP_REQ_TIMEOUT_SEC 5
--
2.17.1
next prev parent reply other threads:[~2022-07-01 9:03 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 9:02 [PATCH 00/17] Introduce Microsoft Azure Network Adatper (MANA) PMD longli
2022-07-01 9:02 ` [PATCH 01/17] net/mana: add basic driver, build environment and doc longli
2022-07-01 16:29 ` Stephen Hemminger
2022-07-01 16:44 ` Stephen Hemminger
2022-07-01 16:45 ` Stephen Hemminger
2022-07-01 16:47 ` Stephen Hemminger
2022-07-03 7:56 ` Long Li
2022-07-04 16:35 ` Stephen Hemminger
2022-07-04 16:41 ` Stephen Hemminger
2022-07-05 19:50 ` Long Li
2022-07-01 16:49 ` Stephen Hemminger
2022-07-01 19:40 ` Long Li
2022-07-01 9:02 ` longli [this message]
2022-07-01 16:34 ` [PATCH 02/17] net/mana: add device configuration and stop Stephen Hemminger
2022-07-01 9:02 ` [PATCH 03/17] net/mana: add function to report support ptypes longli
2022-07-01 9:02 ` [PATCH 04/17] net/mana: add link update longli
2022-07-01 9:02 ` [PATCH 05/17] net/mana: add function for device removal interrupts longli
2022-07-01 9:02 ` [PATCH 06/17] net/mana: add device info longli
2022-07-01 9:02 ` [PATCH 07/17] net/mana: add function to configure RSS longli
2022-07-01 9:02 ` [PATCH 08/17] net/mana: add function to configure RX queues longli
2022-07-01 9:02 ` [PATCH 09/17] net/mana: add function to configure TX queues longli
2022-07-01 9:02 ` [PATCH 10/17] net/mana: implement memory registration longli
2022-07-01 16:37 ` Stephen Hemminger
2022-07-01 9:02 ` [PATCH 11/17] net/mana: implement the hardware layer operations longli
2022-07-01 16:38 ` Stephen Hemminger
2022-07-01 9:02 ` [PATCH 12/17] net/mana: add function to start/stop TX queues longli
2022-07-01 16:39 ` Stephen Hemminger
2022-07-01 9:02 ` [PATCH 13/17] net/mana: add function to start/stop RX queues longli
2022-07-01 16:40 ` Stephen Hemminger
2022-07-02 8:42 ` Long Li
2022-07-01 9:02 ` [PATCH 14/17] net/mana: add function to receive packets longli
2022-07-01 9:02 ` [PATCH 15/17] net/mana: add function to send packets longli
2022-07-01 9:02 ` [PATCH 16/17] net/mana: add function to start/stop device longli
2022-07-01 9:02 ` [PATCH 17/17] net/mana: add function to report queue stats longli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1656666167-26035-3-git-send-email-longli@linuxonhyperv.com \
--to=longli@linuxonhyperv.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=longli@microsoft.com \
--cc=sharmaajay@microsoft.com \
--cc=sthemmin@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).