From patchwork Wed Apr 12 16:26:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronak Doshi X-Patchwork-Id: 126161 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 E65744296B; Mon, 17 Apr 2023 10:15:20 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1E8342D0B; Mon, 17 Apr 2023 10:15:06 +0200 (CEST) Received: from EX-PRD-EDGE01.vmware.com (EX-PRD-EDGE01.vmware.com [208.91.3.33]) by mails.dpdk.org (Postfix) with ESMTP id 73B60410F2 for ; Wed, 12 Apr 2023 18:26:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=s1024; d=vmware.com; h=from:to:cc:subject:date:message-id:in-reply-to:mime-version: content-type; bh=XZZ2FY3ZCRNrYqhZqaxZcr32wp2dZswBJGEHeChKeLY=; b=UmIZXB4jfUJKzpXLTfGonSk4F5ec8iV1oAZVRVTtaUkR81O37TIRIaeT6qnA2Z ehnr0rVu3vBAWNFyyGFEWOYo1yT5C/oCtEyCKDbVmLg9RnYWIs0J8onfLNOqmB E9qpc6/SaMW/saw4u4QJ422x4db8s/d8l0xbjxamEH9rbNg= Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX-PRD-EDGE01.vmware.com (10.188.245.6) with Microsoft SMTP Server id 15.1.2375.34; Wed, 12 Apr 2023 09:26:32 -0700 Received: from htb-1n-eng-dhcp122.eng.vmware.com (unknown [10.20.114.216]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 1B0282025D; Wed, 12 Apr 2023 09:26:39 -0700 (PDT) Received: by htb-1n-eng-dhcp122.eng.vmware.com (Postfix, from userid 0) id 16209A8385; Wed, 12 Apr 2023 09:26:39 -0700 (PDT) From: Ronak Doshi To: Jochen Behrens CC: , Ronak Doshi Subject: [PATCH next 4/7] vmxnet3: add command to set ring buffer sizes Date: Wed, 12 Apr 2023 09:26:33 -0700 Message-ID: <20230412162636.30843-5-doshir@vmware.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20230412162636.30843-1-doshir@vmware.com> References: <20230412162636.30843-1-doshir@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX-PRD-EDGE01.vmware.com: doshir@vmware.com does not designate permitted sender hosts) X-Mailman-Approved-At: Mon, 17 Apr 2023 10:15:01 +0200 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 This patch adds a new command to set ring buffer sizes. This is required to pass the buffer size information to passthrough devices. Also, ring sizes are round down to power of 2. Signed-off-by: Ronak Doshi Acked-by: Jochen Behrens --- drivers/net/vmxnet3/base/vmxnet3_defs.h | 15 +++++++++++++++ drivers/net/vmxnet3/vmxnet3_ethdev.c | 18 ++++++++++++++++++ drivers/net/vmxnet3/vmxnet3_ethdev.h | 1 + drivers/net/vmxnet3/vmxnet3_rxtx.c | 7 +++++++ 4 files changed, 41 insertions(+) diff --git a/drivers/net/vmxnet3/base/vmxnet3_defs.h b/drivers/net/vmxnet3/base/vmxnet3_defs.h index 27f35a0062..d8cc295b08 100644 --- a/drivers/net/vmxnet3/base/vmxnet3_defs.h +++ b/drivers/net/vmxnet3/base/vmxnet3_defs.h @@ -105,6 +105,9 @@ typedef enum { VMXNET3_CMD_RESERVED4, VMXNET3_CMD_REGISTER_MEMREGS, VMXNET3_CMD_SET_RSS_FIELDS, + VMXNET3_CMD_RESERVED9, + VMXNET3_CMD_RESERVED10, + VMXNET3_CMD_SET_RING_BUFFER_SIZE, VMXNET3_CMD_FIRST_GET = 0xF00D0000, VMXNET3_CMD_GET_QUEUE_STATUS = VMXNET3_CMD_FIRST_GET, @@ -822,6 +825,17 @@ typedef enum Vmxnet3_RSSField { VMXNET3_RSS_FIELDS_ESPIP6 = 0x0020, } Vmxnet3_RSSField; +typedef +#include "vmware_pack_begin.h" +struct Vmxnet3_RingBufferSize { + __le16 ring1BufSizeType0; + __le16 ring1BufSizeType1; + __le16 ring2BufSizeType1; + __le16 pad; +} +#include "vmware_pack_end.h" +Vmxnet3_RingBufferSize; + /* * If the command data <= 16 bytes, use the shared memory direcly. * Otherwise, use the variable length configuration descriptor. @@ -832,6 +846,7 @@ union Vmxnet3_CmdInfo { Vmxnet3_VariableLenConfDesc varConf; Vmxnet3_SetPolling setPolling; Vmxnet3_RSSField setRSSFields; + Vmxnet3_RingBufferSize ringBufSize; __le16 reserved[2]; __le64 data[2]; } diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index a04a16a3e0..72ccd0f7fc 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1018,6 +1018,22 @@ vmxnet3_setup_driver_shared(struct rte_eth_dev *dev) return VMXNET3_SUCCESS; } +static void +vmxnet3_init_bufsize(struct vmxnet3_hw *hw) +{ + struct Vmxnet3_DriverShared *shared = hw->shared; + union Vmxnet3_CmdInfo *cmd_info = &shared->cu.cmdInfo; + + if (!VMXNET3_VERSION_GE_7(hw)) + return; + + cmd_info->ringBufSize.ring1BufSizeType0 = hw->rxdata_buf_size; + cmd_info->ringBufSize.ring1BufSizeType1 = 0; + cmd_info->ringBufSize.ring2BufSizeType1 = hw->rxdata_buf_size; + VMXNET3_WRITE_BAR1_REG(hw, VMXNET3_REG_CMD, + VMXNET3_CMD_SET_RING_BUFFER_SIZE); +} + /* * Configure device link speed and setup link. * Must be called after eth_vmxnet3_dev_init. Other wise it might fail @@ -1101,6 +1117,8 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) return ret; } + vmxnet3_init_bufsize(hw); + hw->adapter_stopped = FALSE; /* Setting proper Rx Mode and issue Rx Mode Update command */ diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.h b/drivers/net/vmxnet3/vmxnet3_ethdev.h index cabd83e7e1..2b3e2c4caa 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.h +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.h @@ -96,6 +96,7 @@ struct vmxnet3_hw { uint16_t txdata_desc_size; /* tx data ring buffer size */ uint16_t rxdata_desc_size; /* rx data ring buffer size */ + uint16_t rxdata_buf_size; /* rx data buffer size */ uint8_t num_intrs; diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 83daac02c4..e31878ecab 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1113,6 +1113,8 @@ vmxnet3_dev_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } else { ring->size = nb_desc; + if (VMXNET3_VERSION_GE_7(hw)) + ring->size = rte_align32prevpow2(nb_desc); ring->size &= ~VMXNET3_RING_SIZE_MASK; } comp_ring->size = data_ring->size = ring->size; @@ -1193,6 +1195,9 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, } rxq->mp = mp; + /* Remember buffer size for initialization in dev start. */ + hw->rxdata_buf_size = + rte_pktmbuf_data_room_size(mp) - RTE_PKTMBUF_HEADROOM; rxq->queue_id = queue_idx; rxq->port_id = dev->data->port_id; rxq->shared = NULL; /* set in vmxnet3_setup_driver_shared() */ @@ -1217,6 +1222,8 @@ vmxnet3_dev_rx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } else { ring0->size = nb_desc; + if (VMXNET3_VERSION_GE_7(hw)) + ring0->size = rte_align32prevpow2(nb_desc); ring0->size &= ~VMXNET3_RING_SIZE_MASK; ring1->size = ring0->size; }