From: Ivan Malov <ivan.malov@oktetlabs.ru>
To: dev@dpdk.org
Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
Subject: [dpdk-dev] [PATCH 2/5] net/sfc: provide API to negotiate supported Rx meta features
Date: Thu, 2 Sep 2021 17:23:56 +0300 [thread overview]
Message-ID: <20210902142359.28138-3-ivan.malov@oktetlabs.ru> (raw)
In-Reply-To: <20210902142359.28138-1-ivan.malov@oktetlabs.ru>
This is a preparation step. Later patches will make features
FLAG and MARK on EF100 native Rx datapath available to users.
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Reviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>
---
drivers/net/sfc/sfc.h | 2 ++
drivers/net/sfc/sfc_ethdev.c | 34 ++++++++++++++++++++++++++++++++++
drivers/net/sfc/sfc_flow.c | 10 +++++-----
drivers/net/sfc/sfc_mae.c | 22 ++++++++++++++++++++--
4 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 331e06bac6..2812d76cbb 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -312,6 +312,8 @@ struct sfc_adapter {
boolean_t tso;
boolean_t tso_encap;
+ uint64_t negotiated_rx_meta;
+
uint32_t rxd_wait_timeout_ns;
};
diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c
index 2db0d000c3..57bcccdb1b 100644
--- a/drivers/net/sfc/sfc_ethdev.c
+++ b/drivers/net/sfc/sfc_ethdev.c
@@ -1859,6 +1859,27 @@ sfc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t ethdev_qid)
return sap->dp_rx->intr_disable(rxq_info->dp);
}
+static int
+sfc_negotiate_rx_meta(struct rte_eth_dev *dev, uint64_t *features)
+{
+ struct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);
+
+ sfc_adapter_lock(sa);
+
+ if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_FLAG) != 0)
+ sa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_FLAG;
+
+ if ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0)
+ sa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_MARK;
+
+ sa->negotiated_rx_meta &= *features;
+ *features = sa->negotiated_rx_meta;
+
+ sfc_adapter_unlock(sa);
+
+ return 0;
+}
+
static const struct eth_dev_ops sfc_eth_dev_ops = {
.dev_configure = sfc_dev_configure,
.dev_start = sfc_dev_start,
@@ -1906,6 +1927,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {
.xstats_get_by_id = sfc_xstats_get_by_id,
.xstats_get_names_by_id = sfc_xstats_get_names_by_id,
.pool_ops_supported = sfc_pool_ops_supported,
+ .negotiate_rx_meta = sfc_negotiate_rx_meta,
};
/**
@@ -1998,6 +2020,18 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)
goto fail_dp_rx_name;
}
+ if (strcmp(dp_rx->dp.name, SFC_KVARG_DATAPATH_EF10_ESSB) == 0) {
+ /*
+ * Datapath EF10 ESSB is available only on EF10 NICs running
+ * Rx FW variant DPDK, which always provides fields FLAG and
+ * MARK in Rx prefix, so point this fact out below. This way,
+ * legacy applications from EF10 era, which are not aware of
+ * rte_eth_negotiate_rx_meta(), can keep the workflow intact.
+ */
+ sa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_FLAG;
+ sa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_MARK;
+ }
+
sfc_notice(sa, "use %s Rx datapath", sas->dp_rx_name);
rc = sfc_kvargs_process(sa, SFC_KVARG_TX_DATAPATH,
diff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c
index 4f5993a68d..a2034b5f5e 100644
--- a/drivers/net/sfc/sfc_flow.c
+++ b/drivers/net/sfc/sfc_flow.c
@@ -1759,7 +1759,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
int rc;
struct sfc_flow_spec *spec = &flow->spec;
struct sfc_flow_spec_filter *spec_filter = &spec->filter;
- const unsigned int dp_rx_features = sa->priv.dp_rx->features;
+ const uint64_t rx_meta = sa->negotiated_rx_meta;
uint32_t actions_set = 0;
const uint32_t fate_actions_mask = (1UL << RTE_FLOW_ACTION_TYPE_QUEUE) |
(1UL << RTE_FLOW_ACTION_TYPE_RSS) |
@@ -1827,10 +1827,10 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
if ((actions_set & mark_actions_mask) != 0)
goto fail_actions_overlap;
- if ((dp_rx_features & SFC_DP_RX_FEAT_FLOW_FLAG) == 0) {
+ if ((rx_meta & RTE_ETH_RX_META_USER_FLAG) == 0) {
rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
- "FLAG action is not supported on the current Rx datapath");
+ "Action FLAG is unsupported on the current Rx datapath or has not been negotiated");
return -rte_errno;
}
@@ -1844,10 +1844,10 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,
if ((actions_set & mark_actions_mask) != 0)
goto fail_actions_overlap;
- if ((dp_rx_features & SFC_DP_RX_FEAT_FLOW_MARK) == 0) {
+ if ((rx_meta & RTE_ETH_RX_META_USER_MARK) == 0) {
rte_flow_error_set(error, ENOTSUP,
RTE_FLOW_ERROR_TYPE_ACTION, NULL,
- "MARK action is not supported on the current Rx datapath");
+ "Action MARK is unsupported on the current Rx datapath or has not been negotiated");
return -rte_errno;
}
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 4b520bc619..89c161ef88 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -2963,6 +2963,7 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,
efx_mae_actions_t *spec,
struct rte_flow_error *error)
{
+ const uint64_t rx_meta = sa->negotiated_rx_meta;
bool custom_error = B_FALSE;
int rc = 0;
@@ -3012,12 +3013,29 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,
case RTE_FLOW_ACTION_TYPE_FLAG:
SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_FLAG,
bundle->actions_mask);
- rc = efx_mae_action_set_populate_flag(spec);
+ if ((rx_meta & RTE_ETH_RX_META_USER_FLAG) != 0) {
+ rc = efx_mae_action_set_populate_flag(spec);
+ } else {
+ rc = rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "Action FLAG has not been negotiated");
+ custom_error = B_TRUE;
+ }
break;
case RTE_FLOW_ACTION_TYPE_MARK:
SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_MARK,
bundle->actions_mask);
- rc = sfc_mae_rule_parse_action_mark(sa, action->conf, spec);
+ if ((rx_meta & RTE_ETH_RX_META_USER_MARK) != 0) {
+ rc = sfc_mae_rule_parse_action_mark(sa, action->conf,
+ spec);
+ } else {
+ rc = rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "Action MARK has not been negotiated");
+ custom_error = B_TRUE;
+ }
break;
case RTE_FLOW_ACTION_TYPE_PHY_PORT:
SFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PHY_PORT,
--
2.20.1
next prev parent reply other threads:[~2021-09-02 14:24 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-02 14:23 [dpdk-dev] [PATCH 0/5] A means to negotiate support for Rx meta information Ivan Malov
2021-09-02 14:23 ` [dpdk-dev] [PATCH 1/5] ethdev: add API " Ivan Malov
2021-09-02 14:47 ` Jerin Jacob
2021-09-02 16:14 ` Kinsella, Ray
2021-09-03 9:34 ` Jerin Jacob
2021-09-02 14:23 ` Ivan Malov [this message]
2021-09-02 14:23 ` [dpdk-dev] [PATCH 3/5] net/sfc: allow to use EF100 native datapath Rx mark in flows Ivan Malov
2021-09-02 14:23 ` [dpdk-dev] [PATCH 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-09-02 14:23 ` [dpdk-dev] [PATCH 5/5] net/sfc: allow to discern user flag on EF100 native datapath Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 0/5] A means to negotiate support for Rx meta information Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 1/5] ethdev: add API " Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 2/5] net/sfc: provide API to negotiate supported Rx meta features Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 3/5] net/sfc: allow to use EF100 native datapath Rx mark in flows Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-09-03 0:15 ` [dpdk-dev] [PATCH v2 5/5] net/sfc: allow to discern user flag on EF100 native datapath Ivan Malov
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 0/5] A means to negotiate delivery of Rx meta data Ivan Malov
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 1/5] ethdev: add API " Ivan Malov
2021-09-30 14:59 ` Ori Kam
2021-09-30 15:07 ` Andrew Rybchenko
2021-09-30 19:07 ` Ivan Malov
2021-10-01 6:50 ` Andrew Rybchenko
2021-10-03 7:42 ` Ori Kam
2021-10-03 9:30 ` Ivan Malov
2021-10-03 11:01 ` Ori Kam
2021-10-03 17:30 ` Ivan Malov
2021-10-03 21:04 ` Ori Kam
2021-10-03 23:50 ` Ivan Malov
2021-10-04 6:56 ` Ori Kam
2021-10-04 11:39 ` Ivan Malov
2021-10-04 13:53 ` Andrew Rybchenko
2021-10-05 6:30 ` Ori Kam
2021-10-05 7:27 ` Andrew Rybchenko
2021-10-05 8:17 ` Ori Kam
2021-10-05 8:38 ` Andrew Rybchenko
2021-10-05 9:41 ` Ori Kam
2021-10-05 10:01 ` Andrew Rybchenko
2021-10-05 10:10 ` Ori Kam
2021-10-05 11:11 ` Andrew Rybchenko
2021-10-06 8:30 ` Thomas Monjalon
2021-10-06 8:38 ` Andrew Rybchenko
2021-10-06 9:14 ` Ori Kam
2021-09-30 21:48 ` Ajit Khaparde
2021-09-30 22:00 ` Ivan Malov
2021-09-30 22:12 ` Ajit Khaparde
2021-09-30 22:22 ` Ivan Malov
2021-10-03 7:05 ` Ori Kam
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 2/5] net/sfc: support " Ivan Malov
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 3/5] net/sfc: support flow mark delivery on EF100 native datapath Ivan Malov
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-09-23 11:20 ` [dpdk-dev] [PATCH v3 5/5] net/sfc: report user flag on EF100 native datapath Ivan Malov
2021-09-30 16:18 ` [dpdk-dev] [PATCH v3 0/5] A means to negotiate delivery of Rx meta data Thomas Monjalon
2021-09-30 19:30 ` Ivan Malov
2021-10-01 6:47 ` Andrew Rybchenko
2021-10-01 8:11 ` Thomas Monjalon
2021-10-01 8:54 ` Andrew Rybchenko
2021-10-01 9:32 ` Thomas Monjalon
2021-10-01 9:41 ` Andrew Rybchenko
2021-10-01 8:55 ` Ivan Malov
2021-10-01 9:48 ` Thomas Monjalon
2021-10-01 10:15 ` Andrew Rybchenko
2021-10-01 12:10 ` Thomas Monjalon
2021-10-04 9:17 ` Andrew Rybchenko
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 0/5] Negotiate the NIC's ability to deliver Rx metadata to the PMD Ivan Malov
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 1/5] ethdev: negotiate delivery of packet metadata from HW to PMD Ivan Malov
2021-10-05 12:03 ` Ori Kam
2021-10-05 12:50 ` Ivan Malov
2021-10-05 13:17 ` Andrew Rybchenko
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 2/5] net/sfc: support API to negotiate delivery of Rx metadata Ivan Malov
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 3/5] net/sfc: support flow mark delivery on EF100 native datapath Ivan Malov
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-10-04 23:50 ` [dpdk-dev] [PATCH v4 5/5] net/sfc: report user flag on EF100 native datapath Ivan Malov
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 0/5] ethdev: negotiate the NIC's ability to deliver Rx metadata to the PMD Ivan Malov
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 1/5] ethdev: negotiate delivery of packet metadata from HW to PMD Ivan Malov
2021-10-05 21:40 ` Ajit Khaparde
2021-10-06 6:04 ` Somnath Kotur
2021-10-06 6:10 ` Ori Kam
2021-10-06 7:22 ` Wisam Monther
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 2/5] net/sfc: support API to negotiate delivery of Rx metadata Ivan Malov
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 3/5] net/sfc: support flow mark delivery on EF100 native datapath Ivan Malov
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-10-05 15:56 ` [dpdk-dev] [PATCH v5 5/5] net/sfc: report user flag on EF100 native datapath Ivan Malov
2021-10-12 18:08 ` Ferruh Yigit
2021-10-12 19:39 ` Ivan Malov
2021-10-12 19:48 ` Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 0/5] ethdev: negotiate the NIC's ability to deliver Rx metadata to the PMD Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 1/5] ethdev: negotiate delivery of packet metadata from HW to PMD Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 2/5] net/sfc: support API to negotiate delivery of Rx metadata Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 3/5] net/sfc: support flow mark delivery on EF100 native datapath Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-10-12 19:38 ` [dpdk-dev] [PATCH v6 5/5] net/sfc: report user flag on EF100 native datapath Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 0/5] ethdev: negotiate the NIC's ability to deliver Rx metadata to the PMD Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 1/5] ethdev: negotiate delivery of packet metadata from HW to PMD Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 2/5] net/sfc: support API to negotiate delivery of Rx metadata Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 3/5] net/sfc: support flow mark delivery on EF100 native datapath Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 4/5] common/sfc_efx/base: add RxQ flag to use Rx prefix user flag Ivan Malov
2021-10-12 19:46 ` [dpdk-dev] [PATCH v7 5/5] net/sfc: report user flag on EF100 native datapath Ivan Malov
2021-10-12 23:25 ` [dpdk-dev] [PATCH v7 0/5] ethdev: negotiate the NIC's ability to deliver Rx metadata to the PMD Ferruh Yigit
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=20210902142359.28138-3-ivan.malov@oktetlabs.ru \
--to=ivan.malov@oktetlabs.ru \
--cc=andrew.rybchenko@oktetlabs.ru \
--cc=dev@dpdk.org \
/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).