Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/101261/?format=api
{ "id": 101261, "url": "http://patches.dpdk.org/api/patches/101261/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211012194620.26366-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": "<20211012194620.26366-3-ivan.malov@oktetlabs.ru>", "list_archive_url": "https://inbox.dpdk.org/dev/20211012194620.26366-3-ivan.malov@oktetlabs.ru", "date": "2021-10-12T19:46:17", "name": "[v7,2/5] net/sfc: support API to negotiate delivery of Rx metadata", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "ece5699d05f7e75fd070ea2059813211866369b6", "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/20211012194620.26366-3-ivan.malov@oktetlabs.ru/mbox/", "series": [ { "id": 19571, "url": "http://patches.dpdk.org/api/series/19571/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=19571", "date": "2021-10-12T19:46:15", "name": "ethdev: negotiate the NIC's ability to deliver Rx metadata to the PMD", "version": 7, "mbox": "http://patches.dpdk.org/series/19571/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/101261/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/101261/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 9A6CEA0C4C;\n\tTue, 12 Oct 2021 21:46:45 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id DDBA441139;\n\tTue, 12 Oct 2021 21:46:37 +0200 (CEST)", "from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113])\n by mails.dpdk.org (Postfix) with ESMTP id BE01F40E50\n for <dev@dpdk.org>; Tue, 12 Oct 2021 21:46:34 +0200 (CEST)", "from localhost.localdomain (unknown [5.144.123.2])\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 6E6B07F6D4;\n Tue, 12 Oct 2021 22:46:34 +0300 (MSK)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 6E6B07F6D4", "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple; d=oktetlabs.ru;\n s=default; t=1634067994;\n bh=95VuAV6Oh/RkEeEHo2XE1+NtPWl0U5jQxfRBUsaO7dk=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References;\n b=uUwxj9I92W2lUAUuD+V+nkxYAlUUKeVHy/Ol4VL34XvcJhYEc9xXdrN4p/bKItDFq\n 2g274ZjNm9DyPe4DhTL5zOUWSkW+fp+wiLnosoEC+JkS64OjQ9Ul9M9yzJw8Kd4lZu\n 7JTyf6l2QhhO9+AyfQFqAMmpw8BEfM+1L3xCzgoM=", "From": "Ivan Malov <ivan.malov@oktetlabs.ru>", "To": "dev@dpdk.org", "Cc": "Ferruh Yigit <ferruh.yigit@intel.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Andy Moreton <amoreton@xilinx.com>", "Date": "Tue, 12 Oct 2021 22:46:17 +0300", "Message-Id": "<20211012194620.26366-3-ivan.malov@oktetlabs.ru>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20211012194620.26366-1-ivan.malov@oktetlabs.ru>", "References": "<20210923112012.14595-1-ivan.malov@oktetlabs.ru>\n <20211012194620.26366-1-ivan.malov@oktetlabs.ru>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v7 2/5] net/sfc: support API to negotiate\n delivery of Rx metadata", "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": "Initial support for the method. Later patches will extend it to\nmake FLAG and MARK delivery available on EF100 native datapath.\n\nSigned-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>\nReviewed-by: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>\nReviewed-by: Andy Moreton <amoreton@xilinx.com>\n---\n drivers/net/sfc/sfc.h | 2 ++\n drivers/net/sfc/sfc_ethdev.c | 29 +++++++++++++++++++++++++++++\n drivers/net/sfc/sfc_flow.c | 13 +++++++++++++\n drivers/net/sfc/sfc_mae.c | 22 ++++++++++++++++++++--\n 4 files changed, 64 insertions(+), 2 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h\nindex 2b459a72db..bba9adc424 100644\n--- a/drivers/net/sfc/sfc.h\n+++ b/drivers/net/sfc/sfc.h\n@@ -289,6 +289,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_metadata;\n+\n \tuint32_t\t\t\trxd_wait_timeout_ns;\n \n \tbool\t\t\t\tswitchdev;\ndiff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c\nindex 200961cfc8..c0d9810fbb 100644\n--- a/drivers/net/sfc/sfc_ethdev.c\n+++ b/drivers/net/sfc/sfc_ethdev.c\n@@ -2318,6 +2318,28 @@ sfc_representor_info_get(struct rte_eth_dev *dev,\n \treturn nb_repr;\n }\n \n+static int\n+sfc_rx_metadata_negotiate(struct rte_eth_dev *dev, uint64_t *features)\n+{\n+\tstruct sfc_adapter *sa = sfc_adapter_by_eth_dev(dev);\n+\tuint64_t supported = 0;\n+\n+\tsfc_adapter_lock(sa);\n+\n+\tif ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_FLAG) != 0)\n+\t\tsupported |= RTE_ETH_RX_METADATA_USER_FLAG;\n+\n+\tif ((sa->priv.dp_rx->features & SFC_DP_RX_FEAT_FLOW_MARK) != 0)\n+\t\tsupported |= RTE_ETH_RX_METADATA_USER_MARK;\n+\n+\tsa->negotiated_rx_metadata = supported & *features;\n+\t*features = sa->negotiated_rx_metadata;\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@@ -2366,6 +2388,7 @@ static const struct eth_dev_ops sfc_eth_dev_ops = {\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.representor_info_get\t\t= sfc_representor_info_get,\n+\t.rx_metadata_negotiate\t\t= sfc_rx_metadata_negotiate,\n };\n \n struct sfc_ethdev_init_data {\n@@ -2462,6 +2485,12 @@ 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/* FLAG and MARK are always available from Rx prefix. */\n+\t\tsa->negotiated_rx_metadata |= RTE_ETH_RX_METADATA_USER_FLAG;\n+\t\tsa->negotiated_rx_metadata |= RTE_ETH_RX_METADATA_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 36ee79f331..9e6d8109c7 100644\n--- a/drivers/net/sfc/sfc_flow.c\n+++ b/drivers/net/sfc/sfc_flow.c\n@@ -1760,6 +1760,7 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\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_metadata = sa->negotiated_rx_metadata;\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@@ -1832,6 +1833,12 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\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\treturn -rte_errno;\n+\t\t\t} else if ((rx_metadata &\n+\t\t\t\t RTE_ETH_RX_METADATA_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 delivery has not been negotiated\");\n+\t\t\t\treturn -rte_errno;\n \t\t\t}\n \n \t\t\tspec_filter->template.efs_flags |=\n@@ -1849,6 +1856,12 @@ sfc_flow_parse_actions(struct sfc_adapter *sa,\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\treturn -rte_errno;\n+\t\t\t} else if ((rx_metadata &\n+\t\t\t\t RTE_ETH_RX_METADATA_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 delivery has not been negotiated\");\n+\t\t\t\treturn -rte_errno;\n \t\t\t}\n \n \t\t\trc = sfc_flow_parse_mark(sa, actions->conf, flow);\ndiff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c\nindex 053a729a77..571673a723 100644\n--- a/drivers/net/sfc/sfc_mae.c\n+++ b/drivers/net/sfc/sfc_mae.c\n@@ -3088,6 +3088,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_metadata = sa->negotiated_rx_metadata;\n \tbool custom_error = B_FALSE;\n \tint rc = 0;\n \n@@ -3137,12 +3138,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_metadata & RTE_ETH_RX_METADATA_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\"flag delivery 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_metadata & RTE_ETH_RX_METADATA_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\"mark delivery 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": [ "v7", "2/5" ] }