From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id CCD0B45BB4;
Wed, 23 Oct 2024 18:28:03 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id AE0F342E96;
Wed, 23 Oct 2024 18:28:00 +0200 (CEST)
Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14])
by mails.dpdk.org (Postfix) with ESMTP id DFB4240B97
for <dev@dpdk.org>; Wed, 23 Oct 2024 18:27:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1729700878; x=1761236878;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=TfiG96G1mYHPVB7/A+NKig/8pRrCyQG0B1J5ssXkOC8=;
b=SnDuxr/fd5ib0Rz7jhvJM52pRZ2fjDUhb1DNfK0zgCfG0eNPKN2EtgVw
Im/aR4v6xMNIaaDO+RHWagkdos1ajo67ldRcSCbO3CL9h0xYMPmjQM3Ro
aIJ0ehGcnoFNedQC57VmJgOvKyYMrcMR7yH3obYrKNMS8yRV7RkoVbt1A
QERZprw+t/f9MA2jqOrioMDdrced8BKZwKVqTDpHaxfeHhinaJSDoDKgZ
rJ9ArMZ53goEhBUWKMKB+s9wes/Shl2bjlej8k1hOUx0cv4EjoC48rT2V
DfKOFc+3A4/aGE3fmmg/x1SkZeZaXonNYxOy3VnpYe1JPcVpeo+T50sgr Q==;
X-CSE-ConnectionGUID: i59QXqXySFitILksBqIgiw==
X-CSE-MsgGUID: HgQJet/UTNeUhYsJVb7JjQ==
X-IronPort-AV: E=McAfee;i="6700,10204,11234"; a="29521273"
X-IronPort-AV: E=Sophos;i="6.11,226,1725346800"; d="scan'208";a="29521273"
Received: from fmviesa002.fm.intel.com ([10.60.135.142])
by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
23 Oct 2024 09:27:57 -0700
X-CSE-ConnectionGUID: YZfmOXOSRZaVXT1WI6kzvQ==
X-CSE-MsgGUID: 1nMdxc3FR92bmtf5/cUv9A==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="6.11,226,1725346800"; d="scan'208";a="103583863"
Received: from unknown (HELO silpixa00401385.ir.intel.com) ([10.237.214.25])
by fmviesa002.fm.intel.com with ESMTP; 23 Oct 2024 09:27:56 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [PATCH v4 1/5] net/ice: add option to download scheduler topology
Date: Wed, 23 Oct 2024 17:27:32 +0100
Message-ID: <20241023162747.453267-2-bruce.richardson@intel.com>
X-Mailer: git-send-email 2.43.0
In-Reply-To: <20241023162747.453267-1-bruce.richardson@intel.com>
References: <20240807093407.452784-1-bruce.richardson@intel.com>
<20241023162747.453267-1-bruce.richardson@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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
The DDP package file being loaded at init time may contain an
alternative Tx Scheduler topology in it. Add driver option to load this
topology at init time.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
doc/guides/nics/ice.rst | 15 +++++++++++++++
drivers/net/ice/base/ice_ddp.c | 18 +++++++++++++++---
drivers/net/ice/base/ice_ddp.h | 4 ++--
drivers/net/ice/ice_ethdev.c | 24 +++++++++++++++---------
drivers/net/ice/ice_ethdev.h | 1 +
5 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst
index 6c66dc8008..bb8f01cb38 100644
--- a/doc/guides/nics/ice.rst
+++ b/doc/guides/nics/ice.rst
@@ -298,6 +298,21 @@ Runtime Configuration
As a trade-off, this configuration may cause the packet processing performance
degradation due to the PCI bandwidth limitation.
+- ``Tx Scheduler Topology Download``
+
+ The default Tx scheduler topology exposed by the NIC,
+ generally a 9-level topology of which 8 levels are SW configurable,
+ may be updated by a new topology loaded from a DDP package file file.
+ The ``ddp_load_sched_topo`` option can be used to specify that the scheduler topology,
+ if any, in the DDP package file being used should be loaded into the NIC.
+ For example::
+
+ -a 0000:88:00.0,ddp_load_sched_topo=1
+
+ or::
+
+ -a 0000:88:00.0,ddp_pkg_file=/path/to/pkg.file,ddp_load_sched_topo=1
+
- ``Tx diagnostics`` (default ``not enabled``)
Set the ``devargs`` parameter ``mbuf_check`` to enable Tx diagnostics.
diff --git a/drivers/net/ice/base/ice_ddp.c b/drivers/net/ice/base/ice_ddp.c
index c17a58eab8..ab9645f3a2 100644
--- a/drivers/net/ice/base/ice_ddp.c
+++ b/drivers/net/ice/base/ice_ddp.c
@@ -1333,7 +1333,7 @@ ice_fill_hw_ptype(struct ice_hw *hw)
* ice_copy_and_init_pkg() instead of directly calling ice_init_pkg() in this
* case.
*/
-enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
+enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len, bool load_sched)
{
bool already_loaded = false;
enum ice_ddp_state state;
@@ -1351,6 +1351,18 @@ enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
return state;
}
+ if (load_sched) {
+ enum ice_status res = ice_cfg_tx_topo(hw, buf, len);
+ if (res != ICE_SUCCESS) {
+ ice_debug(hw, ICE_DBG_INIT, "failed to apply sched topology (err: %d)\n",
+ res);
+ return ICE_DDP_PKG_ERR;
+ }
+ ice_debug(hw, ICE_DBG_INIT, "Topology download successful, reinitializing device\n");
+ ice_deinit_hw(hw);
+ ice_init_hw(hw);
+ }
+
/* initialize package info */
state = ice_init_pkg_info(hw, pkg);
if (state)
@@ -1423,7 +1435,7 @@ enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)
* related routines.
*/
enum ice_ddp_state
-ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len)
+ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len, bool load_sched)
{
enum ice_ddp_state state;
u8 *buf_copy;
@@ -1433,7 +1445,7 @@ ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len)
buf_copy = (u8 *)ice_memdup(hw, buf, len, ICE_NONDMA_TO_NONDMA);
- state = ice_init_pkg(hw, buf_copy, len);
+ state = ice_init_pkg(hw, buf_copy, len, load_sched);
if (!ice_is_init_pkg_successful(state)) {
/* Free the copy, since we failed to initialize the package */
ice_free(hw, buf_copy);
diff --git a/drivers/net/ice/base/ice_ddp.h b/drivers/net/ice/base/ice_ddp.h
index 5512669f44..d79cdee13a 100644
--- a/drivers/net/ice/base/ice_ddp.h
+++ b/drivers/net/ice/base/ice_ddp.h
@@ -454,9 +454,9 @@ ice_pkg_enum_entry(struct ice_seg *ice_seg, struct ice_pkg_enum *state,
void *
ice_pkg_enum_section(struct ice_seg *ice_seg, struct ice_pkg_enum *state,
u32 sect_type);
-enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buff, u32 len);
+enum ice_ddp_state ice_init_pkg(struct ice_hw *hw, u8 *buff, u32 len, bool load_sched);
enum ice_ddp_state
-ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len);
+ice_copy_and_init_pkg(struct ice_hw *hw, const u8 *buf, u32 len, bool load_sched);
bool ice_is_init_pkg_successful(enum ice_ddp_state state);
void ice_free_seg(struct ice_hw *hw);
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index d5e94a6685..d0a845accd 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -39,6 +39,7 @@
#define ICE_RX_LOW_LATENCY_ARG "rx_low_latency"
#define ICE_MBUF_CHECK_ARG "mbuf_check"
#define ICE_DDP_FILENAME_ARG "ddp_pkg_file"
+#define ICE_DDP_LOAD_SCHED_ARG "ddp_load_sched_topo"
#define ICE_CYCLECOUNTER_MASK 0xffffffffffffffffULL
@@ -56,6 +57,7 @@ static const char * const ice_valid_args[] = {
ICE_DEFAULT_MAC_DISABLE,
ICE_MBUF_CHECK_ARG,
ICE_DDP_FILENAME_ARG,
+ ICE_DDP_LOAD_SCHED_ARG,
NULL
};
@@ -1997,7 +1999,7 @@ int ice_load_pkg(struct ice_adapter *adapter, bool use_dsn, uint64_t dsn)
load_fw:
PMD_INIT_LOG(DEBUG, "DDP package name: %s", pkg_file);
- err = ice_copy_and_init_pkg(hw, buf, bufsz);
+ err = ice_copy_and_init_pkg(hw, buf, bufsz, adapter->devargs.ddp_load_sched);
if (!ice_is_init_pkg_successful(err)) {
PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d", err);
free(buf);
@@ -2030,19 +2032,18 @@ static int
parse_bool(const char *key, const char *value, void *args)
{
int *i = (int *)args;
- char *end;
- int num;
- num = strtoul(value, &end, 10);
-
- if (num != 0 && num != 1) {
- PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", "
- "value must be 0 or 1",
+ if (value == NULL || value[0] == '\0') {
+ PMD_DRV_LOG(WARNING, "key:\"%s\", requires a value, which must be 0 or 1", key);
+ return -1;
+ }
+ if (value[1] != '\0' || (value[0] != '0' && value[0] != '1')) {
+ PMD_DRV_LOG(WARNING, "invalid value:\"%s\" for key:\"%s\", value must be 0 or 1",
value, key);
return -1;
}
- *i = num;
+ *i = value[0] - '0';
return 0;
}
@@ -2307,6 +2308,10 @@ static int ice_parse_devargs(struct rte_eth_dev *dev)
if (ret)
goto bail;
+ ret = rte_kvargs_process(kvlist, ICE_DDP_LOAD_SCHED_ARG,
+ &parse_bool, &ad->devargs.ddp_load_sched);
+ if (ret)
+ goto bail;
bail:
rte_kvargs_free(kvlist);
return ret;
@@ -7185,6 +7190,7 @@ RTE_PMD_REGISTER_PARAM_STRING(net_ice,
ICE_SAFE_MODE_SUPPORT_ARG "=<0|1>"
ICE_DEFAULT_MAC_DISABLE "=<0|1>"
ICE_DDP_FILENAME_ARG "=</path/to/file>"
+ ICE_DDP_LOAD_SCHED_ARG "=<0|1>"
ICE_RX_LOW_LATENCY_ARG "=<0|1>");
RTE_LOG_REGISTER_SUFFIX(ice_logtype_init, init, NOTICE);
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 076cf595e8..2794a76096 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -564,6 +564,7 @@ struct ice_devargs {
uint8_t proto_xtr[ICE_MAX_QUEUE_NUM];
uint8_t pin_idx;
uint8_t pps_out_ena;
+ uint8_t ddp_load_sched;
int xtr_field_offs;
uint8_t xtr_flag_offs[PROTO_XTR_MAX];
/* Name of the field. */
--
2.43.0