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 E5A4D41DA8; Wed, 1 Mar 2023 12:12:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D4AC94161A; Wed, 1 Mar 2023 12:12:05 +0100 (CET) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 66D944161A for ; Wed, 1 Mar 2023 12:12:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677669124; x=1709205124; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=XdZURruDGNFtPzjVA3UAzgR9fb8RSpc4QqgHuh949zU=; b=lgeDFd+a1EgVA+cQs9S3zhDv2kr02Bw0JtuXV0ZydLxPevxd34EXKz5S 90Bub/EL1SMGbwSiSFdFn8FA75y6q5b27zCDT/gy2utbbQvlv5cyUZdpl CNLK1p+KuRjh6SrMlnRfGEMDk53RVWB3nqU/suH0nYH9AXvTwqXCr0ev/ JubOa91QyTr9pzbC3N8cpNOgm0zRbFXvP5lQpcPrKomVMJDE7Cde3rFgG bnszCHCIdzI/7tS0aPdt3eJ76vFtTBgfbN8EpGosCJCRYqGEojiNhnfU7 ZK1rX5it01XsqwVqDWQkVmXj0fbExJegLYdH7ONxMbnYvpghJdIdTYAZx A==; X-IronPort-AV: E=McAfee;i="6500,9779,10635"; a="331861576" X-IronPort-AV: E=Sophos;i="5.98,224,1673942400"; d="scan'208";a="331861576" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Mar 2023 03:12:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10635"; a="743384140" X-IronPort-AV: E=Sophos;i="5.98,224,1673942400"; d="scan'208";a="743384140" Received: from dpdk-mingxial-ice.sh.intel.com ([10.67.110.191]) by fmsmga004.fm.intel.com with ESMTP; 01 Mar 2023 03:12:01 -0800 From: Mingxia Liu To: dev@dpdk.org Cc: jingjing.wu@intel.com, beilei.xing@intel.com, Mingxia Liu Subject: [PATCH v2] net/idpf: refine Rx/Tx queue model info Date: Wed, 1 Mar 2023 19:26:59 +0000 Message-Id: <20230301192659.601892-1-mingxia.liu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230301161605.436754-1-mingxia.liu@intel.com> References: <20230301161605.436754-1-mingxia.liu@intel.com> 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 This patch updates queue mode info in struct idpf_adapter. Using is_rx_singleq_model to diffentiate rx_singq and rx_splitq explicitly, instead of deducing it from pointer values. Signed-off-by: Mingxia Liu --- drivers/common/idpf/idpf_common_device.c | 4 ++-- drivers/common/idpf/idpf_common_device.h | 4 ++-- drivers/common/idpf/idpf_common_rxtx.c | 2 +- drivers/common/idpf/idpf_common_rxtx.h | 5 +++++ drivers/net/idpf/idpf_ethdev.c | 4 ++-- drivers/net/idpf/idpf_rxtx.c | 6 +++--- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/common/idpf/idpf_common_device.c b/drivers/common/idpf/idpf_common_device.c index 5475a3e52c..c5e7bbf66c 100644 --- a/drivers/common/idpf/idpf_common_device.c +++ b/drivers/common/idpf/idpf_common_device.c @@ -623,7 +623,7 @@ idpf_vport_info_init(struct idpf_vport *vport, struct idpf_adapter *adapter = vport->adapter; vport_info->vport_type = rte_cpu_to_le_16(VIRTCHNL2_VPORT_TYPE_DEFAULT); - if (adapter->txq_model == 0) { + if (!adapter->is_tx_singleq) { vport_info->txq_model = rte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT); vport_info->num_tx_q = @@ -636,7 +636,7 @@ idpf_vport_info_init(struct idpf_vport *vport, vport_info->num_tx_q = rte_cpu_to_le_16(IDPF_DEFAULT_TXQ_NUM); vport_info->num_tx_complq = 0; } - if (adapter->rxq_model == 0) { + if (!adapter->is_rx_singleq) { vport_info->rxq_model = rte_cpu_to_le_16(VIRTCHNL2_QUEUE_MODEL_SPLIT); vport_info->num_rx_q = rte_cpu_to_le_16(IDPF_DEFAULT_RXQ_NUM); diff --git a/drivers/common/idpf/idpf_common_device.h b/drivers/common/idpf/idpf_common_device.h index 364a60221a..c2dc2f16b9 100644 --- a/drivers/common/idpf/idpf_common_device.h +++ b/drivers/common/idpf/idpf_common_device.h @@ -43,8 +43,8 @@ struct idpf_adapter { uint32_t ptype_tbl[IDPF_MAX_PKT_TYPE] __rte_cache_min_aligned; - uint32_t txq_model; /* 0 - split queue model, non-0 - single queue model */ - uint32_t rxq_model; /* 0 - split queue model, non-0 - single queue model */ + bool is_tx_singleq; /* true - single queue model, false - split queue model */ + bool is_rx_singleq; /* true - single queue model, false - split queue model */ /* For timestamp */ uint64_t time_hw; diff --git a/drivers/common/idpf/idpf_common_rxtx.c b/drivers/common/idpf/idpf_common_rxtx.c index d7e8df1895..fc87e3e243 100644 --- a/drivers/common/idpf/idpf_common_rxtx.c +++ b/drivers/common/idpf/idpf_common_rxtx.c @@ -309,7 +309,7 @@ idpf_qc_rx_queue_release(void *rxq) return; /* Split queue */ - if (q->bufq1 != NULL && q->bufq2 != NULL) { + if (!q->adapter->is_rx_singleq) { q->bufq1->ops->release_mbufs(q->bufq1); rte_free(q->bufq1->sw_ring); rte_memzone_free(q->bufq1->mz); diff --git a/drivers/common/idpf/idpf_common_rxtx.h b/drivers/common/idpf/idpf_common_rxtx.h index 7e6df080e6..d0f79783b5 100644 --- a/drivers/common/idpf/idpf_common_rxtx.h +++ b/drivers/common/idpf/idpf_common_rxtx.h @@ -90,6 +90,11 @@ #define PF_GLTSYN_SHTIME_L_5 (PF_TIMESYNC_BAR4_BASE + 0x138) #define PF_GLTSYN_SHTIME_H_5 (PF_TIMESYNC_BAR4_BASE + 0x13C) +enum idpf_rx_split_bufq_id { + IDPF_RX_SPLIT_BUFQ1_ID = 1, + IDPF_RX_SPLIT_BUFQ2_ID = 2 +}; + struct idpf_rx_stats { uint64_t mbuf_alloc_failed; }; diff --git a/drivers/net/idpf/idpf_ethdev.c b/drivers/net/idpf/idpf_ethdev.c index 5b4f4fd82b..db58157ba3 100644 --- a/drivers/net/idpf/idpf_ethdev.c +++ b/drivers/net/idpf/idpf_ethdev.c @@ -993,12 +993,12 @@ idpf_parse_devargs(struct rte_pci_device *pci_dev, struct idpf_adapter_ext *adap goto bail; ret = rte_kvargs_process(kvlist, IDPF_TX_SINGLE_Q, &parse_bool, - &adapter->base.txq_model); + &adapter->base.is_tx_singleq); if (ret != 0) goto bail; ret = rte_kvargs_process(kvlist, IDPF_RX_SINGLE_Q, &parse_bool, - &adapter->base.rxq_model); + &adapter->base.is_rx_singleq); if (ret != 0) goto bail; diff --git a/drivers/net/idpf/idpf_rxtx.c b/drivers/net/idpf/idpf_rxtx.c index d16acd87fb..34205a1025 100644 --- a/drivers/net/idpf/idpf_rxtx.c +++ b/drivers/net/idpf/idpf_rxtx.c @@ -189,9 +189,9 @@ idpf_rx_split_bufq_setup(struct rte_eth_dev *dev, struct idpf_rx_queue *rxq, bufq->ops = &def_rxq_ops; bufq->q_set = true; - if (bufq_id == 1) { + if (bufq_id == IDPF_RX_SPLIT_BUFQ1_ID) { rxq->bufq1 = bufq; - } else if (bufq_id == 2) { + } else if (bufq_id == IDPF_RX_SPLIT_BUFQ2_ID) { rxq->bufq2 = bufq; } else { PMD_INIT_LOG(ERR, "Invalid buffer queue index."); @@ -536,7 +536,7 @@ idpf_rx_queue_init(struct rte_eth_dev *dev, uint16_t rx_queue_id) return -EIO; } - if (rxq->bufq1 == NULL) { + if (rxq->adapter->is_rx_singleq) { /* Single queue */ err = idpf_qc_single_rxq_mbufs_alloc(rxq); if (err != 0) { -- 2.34.1