Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/97846/?format=api
{ "id": 97846, "url": "http://patches.dpdk.org/api/patches/97846/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20210903001542.15309-3-ivan.malov@oktetlabs.ru/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20210903001542.15309-3-ivan.malov@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20210903001542.15309-3-ivan.malov@oktetlabs.ru", "date": "2021-09-03T00:15:39", "name": "[v2,2/5] net/sfc: provide API to negotiate supported Rx meta features", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "2cb72cfc8b501fd6845f4b4fe0fe526ffb4eb99f", "submitter": { "id": 869, "url": "http://patches.dpdk.org/api/people/869/?format=api", "name": "Ivan Malov", "email": "Ivan.Malov@oktetlabs.ru" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20210903001542.15309-3-ivan.malov@oktetlabs.ru/mbox/", "series": [ { "id": 18639, "url": "http://patches.dpdk.org/api/series/18639/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=18639", "date": "2021-09-03T00:15:37", "name": "A means to negotiate support for Rx meta information", "version": 2, "mbox": "http://patches.dpdk.org/series/18639/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/97846/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/97846/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "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])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 02437A0C4D;\n\tFri, 3 Sep 2021 02:16:11 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 48B4040E78;\n\tFri, 3 Sep 2021 02:16:01 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id 4F18F4003E\n for <dev@dpdk.org>; Fri, 3 Sep 2021 02:15:57 +0200 (CEST)", "from localhost.localdomain (unknown [5.144.122.241])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by shelob.oktetlabs.ru (Postfix) with ESMTPSA id EA3B67F6C0;\n Fri, 3 Sep 2021 03:15:56 +0300 (MSK)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru EA3B67F6C0", "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru;\n s=default; t=1630628157;\n bh=QVn0UwP4m1M6BFjlvaM+KWbJJR31uJ/3fdT7VqV5s78=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References;\n b=iRHWqiFiOeg55e+DScEXDu2WhzQ2WgKzhClX9qcsGMR9Tbny93niL0VWp7Y2XRwPA\n 9qft1BTjcQg3om9jvWSvxyXx36iegEHNO3HN80CajgX30KTB51W7sztmpaun9Xgiv0\n to1j2205txslCM61VD3w29+jGhiWDfK5vUCU6xaQ=", "From": "Ivan Malov <ivan.malov@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Jerin Jacob <jerinjacobk@gmail.com>, Ray Kinsella <mdr@ashroe.eu>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "Date": "Fri, 3 Sep 2021 03:15:39 +0300", "Message-Id": "<20210903001542.15309-3-ivan.malov@oktetlabs.ru>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20210903001542.15309-1-ivan.malov@oktetlabs.ru>", "References": "<20210902142359.28138-1-ivan.malov@oktetlabs.ru>\n <20210903001542.15309-1-ivan.malov@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v2 2/5] net/sfc: provide API to negotiate\n supported Rx meta features", "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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This is a preparation step. Later patches will make features\nFLAG and MARK on EF100 native Rx datapath available to users.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nReviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\n---\n drivers/net/sfc/sfc.h | 2 ++\n drivers/net/sfc/sfc_ethdev.c | 34 ++++++++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_flow.c | 10 +++++-----\n drivers/net/sfc/sfc_mae.c | 22 ++++++++++++++++++++--\n 4 files changed, 61 insertions(+), 7 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 331e06bac6..2812d76cbb 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -312,6 +312,8 @@ struct sfc_adapter {\n \tboolean_t\t\t\ttso;\n \tboolean_t\t\t\ttso_encap;\n \n+\tuint64_t\t\t\tnegotiated_rx_meta;\n+\n \tuint32_t\t\t\trxd_wait_timeout_ns;\n };\n \ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 2db0d000c3..94203616c3 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -1859,6 +1859,27 @@ sfc_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t ethdev_qid)\n \treturn sap->dp_rx->intr_disable(rxq_info->dp);\n }\n \n+static int\n+sfc_rx_meta_negotiate(struct rte_eth_dev *dev, uint64_t *features)\n+{\n+\tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\n+\tsfc_adapter_lock(sa);\n+\n+\tif ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_FLAG) != 0)\n+\t\tsa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_FLAG;\n+\n+\tif ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0)\n+\t\tsa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_MARK;\n+\n+\tsa->negotiated_rx_meta &= *features;\n+\t*features = sa->negotiated_rx_meta;\n+\n+\tsfc_adapter_unlock(sa);\n+\n+\treturn 0;\n+}\n+\n static const struct eth_dev_ops sfc_eth_dev_ops = {\n \t.dev_configure\t\t\t= sfc_dev_configure,\n \t.dev_start\t\t\t= sfc_dev_start,\n@@ -1906,6 +1927,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {\n \t.xstats_get_by_id\t\t= sfc_xstats_get_by_id,\n \t.xstats_get_names_by_id\t\t= sfc_xstats_get_names_by_id,\n \t.pool_ops_supported\t\t= sfc_pool_ops_supported,\n+\t.rx_meta_negotiate\t\t= sfc_rx_meta_negotiate,\n };\n \n /**\n@@ -1998,6 +2020,18 @@ sfc_eth_dev_set_ops(struct rte_eth_dev *dev)\n \t\tgoto fail_dp_rx_name;\n \t}\n \n+\tif (strcmp(dp_rx->dp.name, SFC_KVARG_DATAPATH_EF10_ESSB) == 0) {\n+\t\t/*\n+\t\t * Datapath EF10 ESSB is available only on EF10 NICs running\n+\t\t * Rx FW variant DPDK, which always provides fields FLAG and\n+\t\t * MARK in Rx prefix, so point this fact out below. This way,\n+\t\t * legacy applications from EF10 era, which are not aware of\n+\t\t * rte_eth_rx_meta_negotiate(), can keep the workflow intact.\n+\t\t */\n+\t\tsa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_FLAG;\n+\t\tsa->negotiated_rx_meta |= RTE_ETH_RX_META_USER_MARK;\n+\t}\n+\n \tsfc_notice(sa, \"use %s Rx datapath\", sas->dp_rx_name);\n \n \trc = sfc_kvargs_process(sa, SFC_KVARG_TX_DATAPATH,\ndiff --git a/drivers/net/sfc/sfc_flow.c b/drivers/net/sfc/sfc_flow.c\nindex 4f5993a68d..a2034b5f5e 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -1759,7 +1759,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\n \tint rc;\n \tstruct sfc_flow_spec *spec = &flow->spec;\n \tstruct sfc_flow_spec_filter *spec_filter = &spec->filter;\n-\tconst unsigned int dp_rx_features = sa->priv.dp_rx->features;\n+\tconst uint64_t rx_meta = sa->negotiated_rx_meta;\n \tuint32_t actions_set = 0;\n \tconst uint32_t fate_actions_mask = (1UL << RTE_FLOW_ACTION_TYPE_QUEUE) |\n \t\t\t\t\t (1UL << RTE_FLOW_ACTION_TYPE_RSS) |\n@@ -1827,10 +1827,10 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\n \t\t\tif ((actions_set & mark_actions_mask) != 0)\n \t\t\t\tgoto fail_actions_overlap;\n \n-\t\t\tif ((dp_rx_features & SFC_DP_RX_FEAT_FLOW_FLAG) == 0) {\n+\t\t\tif ((rx_meta & RTE_ETH_RX_META_USER_FLAG) == 0) {\n \t\t\t\trte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, NULL,\n-\t\t\t\t\t\"FLAG action is not supported on the current Rx datapath\");\n+\t\t\t\t\t\"Action FLAG is unsupported on the current Rx datapath or has not been negotiated\");\n \t\t\t\treturn -rte_errno;\n \t\t\t}\n \n@@ -1844,10 +1844,10 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\n \t\t\tif ((actions_set & mark_actions_mask) != 0)\n \t\t\t\tgoto fail_actions_overlap;\n \n-\t\t\tif ((dp_rx_features & SFC_DP_RX_FEAT_FLOW_MARK) == 0) {\n+\t\t\tif ((rx_meta & RTE_ETH_RX_META_USER_MARK) == 0) {\n \t\t\t\trte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION, NULL,\n-\t\t\t\t\t\"MARK action is not supported on the current Rx datapath\");\n+\t\t\t\t\t\"Action MARK is unsupported on the current Rx datapath or has not been negotiated\");\n \t\t\t\treturn -rte_errno;\n \t\t\t}\n \ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 4b520bc619..89c161ef88 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -2963,6 +2963,7 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,\n \t\t\t efx_mae_actions_t *spec,\n \t\t\t struct rte_flow_error *error)\n {\n+\tconst uint64_t rx_meta = sa->negotiated_rx_meta;\n \tbool custom_error = B_FALSE;\n \tint rc = 0;\n \n@@ -3012,12 +3013,29 @@ sfc_mae_rule_parse_action(struct sfc_adapter *sa,\n \tcase RTE_FLOW_ACTION_TYPE_FLAG:\n \t\tSFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_FLAG,\n \t\t\t\t bundle->actions_mask);\n-\t\trc = efx_mae_action_set_populate_flag(spec);\n+\t\tif ((rx_meta & RTE_ETH_RX_META_USER_FLAG) != 0) {\n+\t\t\trc = efx_mae_action_set_populate_flag(spec);\n+\t\t} else {\n+\t\t\trc = rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\taction,\n+\t\t\t\t\t\t\"Action FLAG has not been negotiated\");\n+\t\t\tcustom_error = B_TRUE;\n+\t\t}\n \t\tbreak;\n \tcase RTE_FLOW_ACTION_TYPE_MARK:\n \t\tSFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_MARK,\n \t\t\t\t bundle->actions_mask);\n-\t\trc = sfc_mae_rule_parse_action_mark(sa, action->conf, spec);\n+\t\tif ((rx_meta & RTE_ETH_RX_META_USER_MARK) != 0) {\n+\t\t\trc = sfc_mae_rule_parse_action_mark(sa, action->conf,\n+\t\t\t\t\t\t\t spec);\n+\t\t} else {\n+\t\t\trc = rte_flow_error_set(error, ENOTSUP,\n+\t\t\t\t\t\tRTE_FLOW_ERROR_TYPE_ACTION,\n+\t\t\t\t\t\taction,\n+\t\t\t\t\t\t\"Action MARK has not been negotiated\");\n+\t\t\tcustom_error = B_TRUE;\n+\t\t}\n \t\tbreak;\n \tcase RTE_FLOW_ACTION_TYPE_PHY_PORT:\n \t\tSFC_BUILD_SET_OVERFLOW(RTE_FLOW_ACTION_TYPE_PHY_PORT,\n", "prefixes": [ "v2", "2/5" ] }