Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136554/?format=api
{ "id": 136554, "url": "http://patches.dpdk.org/api/patches/136554/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240208175051.326550-6-stephen@networkplumber.org/", "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": "<20240208175051.326550-6-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240208175051.326550-6-stephen@networkplumber.org", "date": "2024-02-08T17:41:29", "name": "[v3,5/7] net/tap: use libbpf to load new BPF program", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1e451b4299dcbad16d56034c17b4668ef0d45b78", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "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/20240208175051.326550-6-stephen@networkplumber.org/mbox/", "series": [ { "id": 31056, "url": "http://patches.dpdk.org/api/series/31056/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31056", "date": "2024-02-08T17:41:24", "name": "net/tap: RSS using BPF overhaul", "version": 3, "mbox": "http://patches.dpdk.org/series/31056/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136554/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/136554/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 AED2343AE1;\n\tThu, 8 Feb 2024 18:51:42 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 91C0842E65;\n\tThu, 8 Feb 2024 18:51:09 +0100 (CET)", "from mail-pf1-f175.google.com (mail-pf1-f175.google.com\n [209.85.210.175])\n by mails.dpdk.org (Postfix) with ESMTP id 4DF9942E2F\n for <dev@dpdk.org>; Thu, 8 Feb 2024 18:51:06 +0100 (CET)", "by mail-pf1-f175.google.com with SMTP id\n d2e1a72fcca58-6da202aa138so61280b3a.2\n for <dev@dpdk.org>; Thu, 08 Feb 2024 09:51:06 -0800 (PST)", "from hermes.local (204-195-123-141.wavecable.com. [204.195.123.141])\n by smtp.gmail.com with ESMTPSA id\n f19-20020a056a00229300b006dbda7bcf3csm5030pfe.83.2024.02.08.09.51.04\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 08 Feb 2024 09:51:04 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1707414665;\n x=1708019465; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=5fLbfOoPWFp8+7e+bVUmtPAhNL+m2IvM3AhwA0UFGoM=;\n b=nNHm0pX8ITvSvhBeRPUh09YWj+vNGYR99xppm64sicd+pkgUHP88S+IPFA6pUPfzjc\n njMrOloEHbsecfGP4A+WKzNPALOpCujpKvpS9QwyyXYARFaxfmM7Fq3SDk/4Yym/wRmz\n OIOkIkBK3Dv/1WQW8XI4xcH+8tJ49ETNR1NTxqCgJ08UWLJVGqhX6lpINfNoImVS6lwN\n G+wSHb7qQLq9bZiPpNuorMWtK8a9AxvkG7ggJaG0Taxc9E2oJXE5R32Y61thAW9gLHlv\n Atp/FiA5XTZY08qBIEqk8j3vCQx3D4YuDhvggS57mOE5BnAbKYGHQ+rFL98chLEMopRA\n JURw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1707414665; x=1708019465;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=5fLbfOoPWFp8+7e+bVUmtPAhNL+m2IvM3AhwA0UFGoM=;\n b=f2jgkazYqvPeQ1ezKdLQPqRYUO+n5IKPEnLYYicfB+VicQ0NnHXdUIOsKtSxfPojSE\n LSfuhjZjJmrTnORGbS2phIJQYQhM/tRU5RkcOK9nkxwJEmGaLCOXABsTEn7R7qH/C8zg\n 2GePKMEGWr8nRzu8Rv/RZH3duib5RJcXWrUmJ9seqWieIVtN0pnHnQlUgPHwdO72X+uq\n eISWgZbLiwQriKZELp6zer26kdafBcCAKmlF6xqCziPXjMJvTwoA/nG4DrcGeh+g6ORy\n BQwAhS3iiRyl8QkxcQhSulkIvioCa5J57NlPtvAE53NiUeWVclfb+a7nV0hWNFL3jrrx\n IjaQ==", "X-Gm-Message-State": "AOJu0Yxs3sUXEZsa2dMp9Eud/eS7LYpEbF0JwRox61tNxJUkbvDNX9PX\n 8hqHco3gyvSanVikwZLhinTUHKZ1GX3EvXPWRuYYkMtWClf66tL6GnHsKsQ1ngklZaWZ/2WsbEu\n 06wM=", "X-Google-Smtp-Source": "\n AGHT+IH1xjot0vHE3ekGDXMKt6KAk0tgW0Afd+ucHPdXDfH3mwavmR+EV6HGN4YG7hxh/twt8LySxw==", "X-Received": "by 2002:a05:6a20:258c:b0:19c:aaee:bb1b with SMTP id\n k12-20020a056a20258c00b0019caaeebb1bmr386585pzd.7.1707414665241;\n Thu, 08 Feb 2024 09:51:05 -0800 (PST)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>", "Subject": "[PATCH v3 5/7] net/tap: use libbpf to load new BPF program", "Date": "Thu, 8 Feb 2024 09:41:29 -0800", "Message-ID": "<20240208175051.326550-6-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240208175051.326550-1-stephen@networkplumber.org>", "References": "<20240130034925.44869-1-stephen@networkplumber.org>\n <20240208175051.326550-1-stephen@networkplumber.org>", "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>,\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" }, "content": "There were multiple issues in the RSS queue support in the TAP\ndriver. This required extensive rework of the BPF support.\n\nChange the BPF loading to use bpftool to\ncreate a skeleton header file, and load with libbpf.\nThe BPF is always compiled from source so less chance that\nsource and instructions diverge. Also resolves issue where\nlibbpf and source get out of sync. The program\nis only loaded once, so if multiple rules are created\nonly one BPF program is loaded in kernel.\n\nThe new BPF program only needs a single action.\nNo need for action and re-classification step.\n\nIt alsow fixes the missing bits from the original.\n - supports setting RSS key per flow\n - level of hash can be L3 or L3/L4.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/tap/bpf/tap_bpf_program.o | Bin 0 -> 28080 bytes\n drivers/net/tap/meson.build | 26 +-\n drivers/net/tap/rte_eth_tap.c | 2 +\n drivers/net/tap/rte_eth_tap.h | 9 +-\n drivers/net/tap/tap_flow.c | 381 +++++++-------------------\n drivers/net/tap/tap_flow.h | 11 +-\n drivers/net/tap/tap_rss.h | 3 +\n drivers/net/tap/tap_tcmsgs.h | 4 +-\n 8 files changed, 113 insertions(+), 323 deletions(-)\n create mode 100644 drivers/net/tap/bpf/tap_bpf_program.o\n\nindex 5099ccdff11b..ad51b6bbbb7c 100644", "diff": "diff --git a/drivers/net/tap/bpf/tap_bpf_program.o b/drivers/net/tap/bpf/tap_bpf_program.o\nnew file mode 100644\nindex 0000000000000000000000000000000000000000..db016eaadefc63e0bbc45b3115f497a465438d33\nGIT binary patch\nliteral 28080\n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\n\nliteral 0\nHcmV?d00001\n\ndiff --git a/drivers/net/tap/meson.build b/drivers/net/tap/meson.build\n--- a/drivers/net/tap/meson.build\n+++ b/drivers/net/tap/meson.build\n@@ -7,33 +7,21 @@ if not is_linux\n endif\n sources = files(\n 'rte_eth_tap.c',\n- 'tap_bpf_api.c',\n 'tap_flow.c',\n 'tap_intr.c',\n 'tap_netlink.c',\n 'tap_tcmsgs.c',\n )\n \n+subdir('bpf')\n+if enable_tap_rss\n+ cflags += '-DHAVE_BPF_RSS'\n+ ext_deps += libbpf\n+ sources += tap_rss_skel_h\n+endif\n+\n deps = ['bus_vdev', 'gso', 'hash']\n \n cflags += '-DTAP_MAX_QUEUES=16'\n \n-# input array for meson symbol search:\n-# [ \"MACRO to define if found\", \"header for the search\",\n-# \"enum/define\", \"symbol to search\" ]\n-#\n-args = [\n- [ 'HAVE_TC_FLOWER', 'linux/pkt_cls.h', 'TCA_FLOWER_UNSPEC' ],\n- [ 'HAVE_TC_VLAN_ID', 'linux/pkt_cls.h', 'TCA_FLOWER_KEY_VLAN_PRIO' ],\n- [ 'HAVE_TC_BPF', 'linux/pkt_cls.h', 'TCA_BPF_UNSPEC' ],\n- [ 'HAVE_TC_BPF_FD', 'linux/pkt_cls.h', 'TCA_BPF_FD' ],\n- [ 'HAVE_TC_ACT_BPF', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_UNSPEC' ],\n- [ 'HAVE_TC_ACT_BPF_FD', 'linux/tc_act/tc_bpf.h', 'TCA_ACT_BPF_FD' ],\n-]\n-config = configuration_data()\n-foreach arg:args\n- config.set(arg[0], cc.has_header_symbol(arg[1], arg[2]))\n-endforeach\n-configure_file(output : 'tap_autoconf.h', configuration : config)\n-\n require_iova_in_mbuf = false\ndiff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c\nindex b41fa971cb7e..a98cc8f01ae1 100644\n--- a/drivers/net/tap/rte_eth_tap.c\n+++ b/drivers/net/tap/rte_eth_tap.c\n@@ -1138,6 +1138,7 @@ tap_dev_close(struct rte_eth_dev *dev)\n \t\ttap_flow_implicit_flush(internals, NULL);\n \t\ttap_nl_final(internals->nlsk_fd);\n \t\tinternals->nlsk_fd = -1;\n+\t\ttap_flow_bpf_destroy(internals);\n \t}\n \n \tfor (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) {\n@@ -1959,6 +1960,7 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name,\n \tstrlcpy(pmd->name, tap_name, sizeof(pmd->name));\n \tpmd->type = type;\n \tpmd->ka_fd = -1;\n+\tpmd->rss = NULL;\n \tpmd->nlsk_fd = -1;\n \tpmd->gso_ctx_mp = NULL;\n \ndiff --git a/drivers/net/tap/rte_eth_tap.h b/drivers/net/tap/rte_eth_tap.h\nindex 5ac93f93e961..0cf2b30bb03b 100644\n--- a/drivers/net/tap/rte_eth_tap.h\n+++ b/drivers/net/tap/rte_eth_tap.h\n@@ -79,12 +79,11 @@ struct pmd_internals {\n \tint flow_isolate; /* 1 if flow isolation is enabled */\n \tint flower_support; /* 1 if kernel supports, else 0 */\n \tint flower_vlan_support; /* 1 if kernel supports, else 0 */\n-\tint rss_enabled; /* 1 if RSS is enabled, else 0 */\n \tint persist;\t\t\t /* 1 if keep link up, else 0 */\n-\t/* implicit rules set when RSS is enabled */\n-\tint map_fd; /* BPF RSS map fd */\n-\tint bpf_fd[RTE_PMD_TAP_MAX_QUEUES];/* List of bpf fds per queue */\n-\tLIST_HEAD(tap_rss_flows, rte_flow) rss_flows;\n+\n+\tstruct tap_rss *rss;\t\t /* BPF program */\n+\tuint16_t bpf_flowid;\t\t /* next BPF class id */\n+\n \tLIST_HEAD(tap_flows, rte_flow) flows; /* rte_flow rules */\n \t/* implicit rte_flow rules set when a remote device is active */\n \tLIST_HEAD(tap_implicit_flows, rte_flow) implicit_flows;\ndiff --git a/drivers/net/tap/tap_flow.c b/drivers/net/tap/tap_flow.c\nindex 94436af55ce8..bc817bdb4fd3 100644\n--- a/drivers/net/tap/tap_flow.c\n+++ b/drivers/net/tap/tap_flow.c\n@@ -16,24 +16,16 @@\n #include <rte_eth_tap.h>\n \n #include <tap_flow.h>\n-#include <tap_autoconf.h>\n #include <tap_tcmsgs.h>\n #include <tap_rss.h>\n \n-\n-/* RSS key management */\n-enum bpf_rss_key_e {\n-\tKEY_CMD_GET = 1,\n-\tKEY_CMD_RELEASE,\n-\tKEY_CMD_INIT,\n-\tKEY_CMD_DEINIT,\n-};\n-\n-enum key_status_e {\n-\tKEY_STAT_UNSPEC,\n-\tKEY_STAT_USED,\n-\tKEY_STAT_AVAILABLE,\n-};\n+#ifdef HAVE_BPF_RSS\n+/* Workaround for warning in bpftool generated skeleton code */\n+#pragma GCC diagnostic push\n+#pragma GCC diagnostic ignored \"-Wcast-qual\"\n+#include \"tap_rss.skel.h\"\n+#pragma GCC diagnostic pop\n+#endif\n \n #define ISOLATE_HANDLE 1\n #define REMOTE_PROMISCUOUS_HANDLE 2\n@@ -41,8 +33,7 @@ enum key_status_e {\n struct rte_flow {\n \tLIST_ENTRY(rte_flow) next; /* Pointer to the next rte_flow structure */\n \tstruct rte_flow *remote_flow; /* associated remote flow */\n-\tint bpf_fd[SEC_MAX]; /* list of bfs fds per ELF section */\n-\tuint32_t key_idx; /* RSS rule key index into BPF map */\n+\tuint16_t flowid;\n \tstruct nlmsg msg;\n };\n \n@@ -72,6 +63,7 @@ struct action_data {\n \t\t} skbedit;\n \t\tstruct bpf {\n \t\t\tstruct tc_act_bpf bpf;\n+\t\t\tuint16_t classid;\n \t\t\tint bpf_fd;\n \t\t\tconst char *annotation;\n \t\t} bpf;\n@@ -112,13 +104,12 @@ tap_flow_isolate(struct rte_eth_dev *dev,\n \t\t int set,\n \t\t struct rte_flow_error *error);\n \n-static int bpf_rss_key(enum bpf_rss_key_e cmd, __u32 *key_idx);\n-static int rss_enable(struct pmd_internals *pmd,\n-\t\t\tconst struct rte_flow_attr *attr,\n-\t\t\tstruct rte_flow_error *error);\n+#ifdef HAVE_BPF_RSS\n+static int rss_enable(struct pmd_internals *pmd, struct rte_flow_error *error);\n static int rss_add_actions(struct rte_flow *flow, struct pmd_internals *pmd,\n \t\t\tconst struct rte_flow_action_rss *rss,\n \t\t\tstruct rte_flow_error *error);\n+#endif\n \n static const struct rte_flow_ops tap_flow_ops = {\n \t.validate = tap_flow_validate,\n@@ -865,6 +856,9 @@ add_action(struct rte_flow *flow, size_t *act_index, struct action_data *adata)\n \t\ttap_nlattr_add(&msg->nh, TCA_ACT_BPF_PARMS,\n \t\t\t sizeof(adata->bpf.bpf),\n \t\t\t &adata->bpf.bpf);\n+\t\ttap_nlattr_add(&msg->nh, TCA_BPF_CLASSID,\n+\t\t\t sizeof(adata->bpf.classid),\n+\t\t\t &adata->bpf.classid);\n \t} else {\n \t\treturn -1;\n \t}\n@@ -1101,8 +1095,7 @@ priv_flow_process(struct pmd_internals *pmd,\n \t\t\t\t\t},\n \t\t\t\t};\n \n-\t\t\t\terr = add_actions(flow, 1, &adata,\n-\t\t\t\t\t\t TCA_FLOWER_ACT);\n+\t\t\t\terr = add_actions(flow, 1, &adata, TCA_FLOWER_ACT);\n \t\t\t}\n \t\t} else if (actions->type == RTE_FLOW_ACTION_TYPE_QUEUE) {\n \t\t\tconst struct rte_flow_action_queue *queue =\n@@ -1129,6 +1122,7 @@ priv_flow_process(struct pmd_internals *pmd,\n \t\t\t\terr = add_actions(flow, 1, &adata,\n \t\t\t\t\tTCA_FLOWER_ACT);\n \t\t\t}\n+#ifdef HAVE_BPF_RSS\n \t\t} else if (actions->type == RTE_FLOW_ACTION_TYPE_RSS) {\n \t\t\tconst struct rte_flow_action_rss *rss =\n \t\t\t\t(const struct rte_flow_action_rss *)\n@@ -1137,13 +1131,14 @@ priv_flow_process(struct pmd_internals *pmd,\n \t\t\tif (action++)\n \t\t\t\tgoto exit_action_not_supported;\n \n-\t\t\tif (!pmd->rss_enabled) {\n-\t\t\t\terr = rss_enable(pmd, attr, error);\n+\t\t\tif (pmd->rss == NULL) {\n+\t\t\t\terr = rss_enable(pmd, error);\n \t\t\t\tif (err)\n \t\t\t\t\tgoto exit_action_not_supported;\n \t\t\t}\n \t\t\tif (flow)\n \t\t\t\terr = rss_add_actions(flow, pmd, rss, error);\n+#endif\n \t\t} else {\n \t\t\tgoto exit_action_not_supported;\n \t\t}\n@@ -1239,26 +1234,17 @@ tap_flow_set_handle(struct rte_flow *flow)\n *\n */\n static void\n-tap_flow_free(struct pmd_internals *pmd, struct rte_flow *flow)\n+tap_flow_free(struct pmd_internals *pmd __rte_unused, struct rte_flow *flow)\n {\n-\tint i;\n-\n \tif (!flow)\n \t\treturn;\n \n-\tif (pmd->rss_enabled) {\n-\t\t/* Close flow BPF file descriptors */\n-\t\tfor (i = 0; i < SEC_MAX; i++)\n-\t\t\tif (flow->bpf_fd[i] != 0) {\n-\t\t\t\tclose(flow->bpf_fd[i]);\n-\t\t\t\tflow->bpf_fd[i] = 0;\n-\t\t\t}\n-\n-\t\t/* Release the map key for this RSS rule */\n-\t\tbpf_rss_key(KEY_CMD_RELEASE, &flow->key_idx);\n-\t\tflow->key_idx = 0;\n-\t}\n-\n+#ifdef HAVE_BPF_RSS\n+\tstruct tap_rss *rss = pmd->rss;\n+\tif (rss)\n+\t\tbpf_map__delete_elem(rss->maps.rss_map, &flow->flowid,\n+\t\t\t\t sizeof(flow->flowid), 0);\n+#endif\n \t/* Free flow allocated memory */\n \trte_free(flow);\n }\n@@ -1725,14 +1711,18 @@ tap_flow_implicit_flush(struct pmd_internals *pmd, struct rte_flow_error *error)\n \treturn 0;\n }\n \n-#define MAX_RSS_KEYS 256\n-#define KEY_IDX_OFFSET (3 * MAX_RSS_KEYS)\n-#define SEC_NAME_CLS_Q \"cls_q\"\n-\n-static const char *sec_name[SEC_MAX] = {\n-\t[SEC_L3_L4] = \"l3_l4\",\n-};\n+/**\n+ * Cleanup when device is closed\n+ */\n+void tap_flow_bpf_destroy(struct pmd_internals *pmd __rte_unused)\n+{\n+#ifdef HAVE_BPF_RSS\n+\ttap_rss__destroy(pmd->rss);\n+\tpmd->rss = NULL;\n+#endif\n+}\n \n+#ifdef HAVE_BPF_RSS\n /**\n * Enable RSS on tap: create TC rules for queuing.\n *\n@@ -1747,226 +1737,62 @@ static const char *sec_name[SEC_MAX] = {\n *\n * @return 0 on success, negative value on failure.\n */\n-static int rss_enable(struct pmd_internals *pmd,\n-\t\t\tconst struct rte_flow_attr *attr,\n-\t\t\tstruct rte_flow_error *error)\n+static int rss_enable(struct pmd_internals *pmd, struct rte_flow_error *error)\n {\n-\tstruct rte_flow *rss_flow = NULL;\n-\tstruct nlmsg *msg = NULL;\n-\t/* 4096 is the maximum number of instructions for a BPF program */\n-\tchar annotation[64];\n-\tint i;\n-\tint err = 0;\n-\n-\t/* unlimit locked memory */\n-\tstruct rlimit memlock_limit = {\n-\t\t.rlim_cur = RLIM_INFINITY,\n-\t\t.rlim_max = RLIM_INFINITY,\n-\t};\n-\tsetrlimit(RLIMIT_MEMLOCK, &memlock_limit);\n-\n-\t /* Get a new map key for a new RSS rule */\n-\terr = bpf_rss_key(KEY_CMD_INIT, NULL);\n-\tif (err < 0) {\n-\t\trte_flow_error_set(\n-\t\t\terror, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\"Failed to initialize BPF RSS keys\");\n-\n-\t\treturn -1;\n-\t}\n-\n-\t/*\n-\t * Create BPF RSS MAP\n-\t */\n-\tpmd->map_fd = tap_flow_bpf_rss_map_create(sizeof(__u32), /* key size */\n-\t\t\t\tsizeof(struct rss_key),\n-\t\t\t\tMAX_RSS_KEYS);\n-\tif (pmd->map_fd < 0) {\n-\t\tTAP_LOG(ERR,\n-\t\t\t\"Failed to create BPF map (%d): %s\",\n-\t\t\t\terrno, strerror(errno));\n-\t\trte_flow_error_set(\n-\t\t\terror, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\"Kernel too old or not configured \"\n-\t\t\t\"to support BPF maps\");\n+\tint err;\n \n-\t\treturn -ENOTSUP;\n+\t/* Load the BPF program (defined in tap_bpf.h from skeleton) */\n+\tpmd->rss = tap_rss__open_and_load();\n+\tif (pmd->rss == NULL) {\n+\t\tTAP_LOG(ERR, \"Failed to load BPF object: %s\", strerror(errno));\n+\t\trte_flow_error_set(error, errno, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\"BPF object could not be loaded\");\n+\t\treturn -errno;\n \t}\n \n-\t/*\n-\t * Add a rule per queue to match reclassified packets and direct them to\n-\t * the correct queue.\n-\t */\n-\tfor (i = 0; i < pmd->dev->data->nb_rx_queues; i++) {\n-\t\tpmd->bpf_fd[i] = tap_flow_bpf_cls_q(i);\n-\t\tif (pmd->bpf_fd[i] < 0) {\n-\t\t\tTAP_LOG(ERR,\n-\t\t\t\t\"Failed to load BPF section %s for queue %d\",\n-\t\t\t\tSEC_NAME_CLS_Q, i);\n-\t\t\trte_flow_error_set(\n-\t\t\t\terror, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE,\n-\t\t\t\tNULL,\n-\t\t\t\t\"Kernel too old or not configured \"\n-\t\t\t\t\"to support BPF programs loading\");\n-\n-\t\t\treturn -ENOTSUP;\n-\t\t}\n-\n-\t\trss_flow = rte_zmalloc(__func__, sizeof(struct rte_flow), 0);\n-\t\tif (!rss_flow) {\n-\t\t\tTAP_LOG(ERR,\n-\t\t\t\t\"Cannot allocate memory for rte_flow\");\n-\t\t\treturn -1;\n-\t\t}\n-\t\tmsg = &rss_flow->msg;\n-\t\ttc_init_msg(msg, pmd->if_index, RTM_NEWTFILTER, NLM_F_REQUEST |\n-\t\t\t NLM_F_ACK | NLM_F_EXCL | NLM_F_CREATE);\n-\t\tmsg->t.tcm_info = TC_H_MAKE(0, htons(ETH_P_ALL));\n-\t\ttap_flow_set_handle(rss_flow);\n-\t\tuint16_t group = attr->group << GROUP_SHIFT;\n-\t\tuint16_t prio = group | (i + PRIORITY_OFFSET);\n-\t\tmsg->t.tcm_info = TC_H_MAKE(prio << 16, msg->t.tcm_info);\n-\t\tmsg->t.tcm_parent = TC_H_MAKE(MULTIQ_MAJOR_HANDLE, 0);\n-\n-\t\ttap_nlattr_add(&msg->nh, TCA_KIND, sizeof(\"bpf\"), \"bpf\");\n-\t\tif (tap_nlattr_nested_start(msg, TCA_OPTIONS) < 0)\n-\t\t\treturn -1;\n-\t\ttap_nlattr_add32(&msg->nh, TCA_BPF_FD, pmd->bpf_fd[i]);\n-\t\tsnprintf(annotation, sizeof(annotation), \"[%s%d]\",\n-\t\t\tSEC_NAME_CLS_Q, i);\n-\t\ttap_nlattr_add(&msg->nh, TCA_BPF_NAME, strlen(annotation) + 1,\n-\t\t\t annotation);\n-\t\t/* Actions */\n-\t\t{\n-\t\t\tstruct action_data adata = {\n-\t\t\t\t.id = \"skbedit\",\n-\t\t\t\t.skbedit = {\n-\t\t\t\t\t.skbedit = {\n-\t\t\t\t\t\t.action = TC_ACT_PIPE,\n-\t\t\t\t\t},\n-\t\t\t\t\t.queue = i,\n-\t\t\t\t},\n-\t\t\t};\n-\t\t\tif (add_actions(rss_flow, 1, &adata, TCA_BPF_ACT) < 0)\n-\t\t\t\treturn -1;\n-\t\t}\n-\t\ttap_nlattr_nested_finish(msg); /* nested TCA_OPTIONS */\n-\n-\t\t/* Netlink message is now ready to be sent */\n-\t\tif (tap_nl_send(pmd->nlsk_fd, &msg->nh) < 0)\n-\t\t\treturn -1;\n-\t\terr = tap_nl_recv_ack(pmd->nlsk_fd);\n-\t\tif (err < 0) {\n-\t\t\tTAP_LOG(ERR,\n-\t\t\t\t\"Kernel refused TC filter rule creation (%d): %s\",\n-\t\t\t\terrno, strerror(errno));\n-\t\t\treturn err;\n-\t\t}\n-\t\tLIST_INSERT_HEAD(&pmd->rss_flows, rss_flow, next);\n+\t/* Attach the maps defined in BPF program */\n+\terr = tap_rss__attach(pmd->rss);\n+\tif (err < 0) {\n+\t\tTAP_LOG(ERR, \"Failed to attach BPF object: %d\", err);\n+\t\trte_flow_error_set(error, -err, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n+\t\t\t\"BPF object could not be attached\");\n+\t\ttap_flow_bpf_destroy(pmd);\n+\t\treturn err;\n \t}\n \n-\tpmd->rss_enabled = 1;\n-\treturn err;\n+\treturn 0;\n }\n \n-/**\n- * Manage bpf RSS keys repository with operations: init, get, release\n- *\n- * @param[in] cmd\n- * Command on RSS keys: init, get, release\n- *\n- * @param[in, out] key_idx\n- * Pointer to RSS Key index (out for get command, in for release command)\n- *\n- * @return -1 if couldn't get, release or init the RSS keys, 0 otherwise.\n- */\n-static int bpf_rss_key(enum bpf_rss_key_e cmd, __u32 *key_idx)\n-{\n-\t__u32 i;\n-\tint err = 0;\n-\tstatic __u32 num_used_keys;\n-\tstatic __u32 rss_keys[MAX_RSS_KEYS] = {KEY_STAT_UNSPEC};\n-\tstatic __u32 rss_keys_initialized;\n-\t__u32 key;\n-\n-\tswitch (cmd) {\n-\tcase KEY_CMD_GET:\n-\t\tif (!rss_keys_initialized) {\n-\t\t\terr = -1;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\tif (num_used_keys == RTE_DIM(rss_keys)) {\n-\t\t\terr = -1;\n-\t\t\tbreak;\n-\t\t}\n-\n-\t\t*key_idx = num_used_keys % RTE_DIM(rss_keys);\n-\t\twhile (rss_keys[*key_idx] == KEY_STAT_USED)\n-\t\t\t*key_idx = (*key_idx + 1) % RTE_DIM(rss_keys);\n-\n-\t\trss_keys[*key_idx] = KEY_STAT_USED;\n-\n-\t\t/*\n-\t\t * Add an offset to key_idx in order to handle a case of\n-\t\t * RSS and non RSS flows mixture.\n-\t\t * If a non RSS flow is destroyed it has an eBPF map\n-\t\t * index 0 (initialized on flow creation) and might\n-\t\t * unintentionally remove RSS entry 0 from eBPF map.\n-\t\t * To avoid this issue, add an offset to the real index\n-\t\t * during a KEY_CMD_GET operation and subtract this offset\n-\t\t * during a KEY_CMD_RELEASE operation in order to restore\n-\t\t * the real index.\n-\t\t */\n-\t\t*key_idx += KEY_IDX_OFFSET;\n-\t\tnum_used_keys++;\n-\tbreak;\n-\n-\tcase KEY_CMD_RELEASE:\n-\t\tif (!rss_keys_initialized)\n-\t\t\tbreak;\n-\n-\t\t/*\n-\t\t * Subtract offset to restore real key index\n-\t\t * If a non RSS flow is falsely trying to release map\n-\t\t * entry 0 - the offset subtraction will calculate the real\n-\t\t * map index as an out-of-range value and the release operation\n-\t\t * will be silently ignored.\n-\t\t */\n-\t\tkey = *key_idx - KEY_IDX_OFFSET;\n-\t\tif (key >= RTE_DIM(rss_keys))\n-\t\t\tbreak;\n \n-\t\tif (rss_keys[key] == KEY_STAT_USED) {\n-\t\t\trss_keys[key] = KEY_STAT_AVAILABLE;\n-\t\t\tnum_used_keys--;\n-\t\t}\n-\tbreak;\n-\n-\tcase KEY_CMD_INIT:\n-\t\tfor (i = 0; i < RTE_DIM(rss_keys); i++)\n-\t\t\trss_keys[i] = KEY_STAT_AVAILABLE;\n+/* Choose next flow id to use for BPF action */\n+static int tap_rss_flow_assign(struct pmd_internals *pmd, uint16_t *flow_id)\n+{\n+\tstruct rte_flow *flow;\n+\tuint16_t id;\n \n-\t\trss_keys_initialized = 1;\n-\t\tnum_used_keys = 0;\n-\tbreak;\n+\tid = pmd->bpf_flowid;\n \n-\tcase KEY_CMD_DEINIT:\n-\t\tfor (i = 0; i < RTE_DIM(rss_keys); i++)\n-\t\t\trss_keys[i] = KEY_STAT_UNSPEC;\n+next_id:\n+\t/* Skip 0xffff and 0 as id's */\n+\tif (++id == UINT16_MAX)\n+\t\tid = 1;\n \n-\t\trss_keys_initialized = 0;\n-\t\tnum_used_keys = 0;\n-\tbreak;\n+\t/* Wrapped around, all id's have been used */\n+\tif (id == pmd->bpf_flowid)\n+\t\treturn -1;\n \n-\tdefault:\n-\t\tbreak;\n+\t/* Make sure this id has not been used already */\n+\tfor (flow = LIST_FIRST(&pmd->flows); flow; flow = LIST_NEXT(flow, next)) {\n+\t\tif (flow->flowid == id)\n+\t\t\tgoto next_id;\n \t}\n \n-\treturn err;\n+\t/* Record starting point for next time */\n+\tpmd->bpf_flowid = id;\n+\t*flow_id = id;\n+\treturn 0;\n }\n \n-\n /* Default RSS hash key also used by mlx devices */\n static const uint8_t rss_hash_default_key[] = {\n \t0x2c, 0xc6, 0x81, 0xd1,\n@@ -2050,34 +1876,34 @@ static int rss_add_actions(struct rte_flow *flow, struct pmd_internals *pmd,\n \telse if (rss->types & (RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_FRAG_IPV6 | RTE_ETH_RSS_IPV6_EX))\n \t\thash_type |= RTE_BIT32(HASH_FIELD_IPV6_L3);\n \n-\t/* Get a new map key for a new RSS rule */\n-\terr = bpf_rss_key(KEY_CMD_GET, &flow->key_idx);\n+\n+\t/* Choose new flow id, which is used as index into the BPF map */\n+\terr = tap_rss_flow_assign(pmd, &flow->flowid);\n \tif (err < 0) {\n \t\trte_flow_error_set(\n \t\t\terror, EINVAL, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\"Failed to get BPF RSS key\");\n+\t\t\t\"Failed to get BPF flowid\");\n \n \t\treturn -1;\n \t}\n \n-\t/* Update RSS map entry with queues */\n-\trss_entry.nb_queues = rss->queue_num;\n-\tfor (i = 0; i < rss->queue_num; i++)\n-\t\trss_entry.queues[i] = rss->queue[i];\n-\n \trss_entry.hash_fields = hash_type;\n \trte_convert_rss_key((const uint32_t *)key_in, (uint32_t *)rss_entry.key,\n \t\t\t TAP_RSS_HASH_KEY_SIZE);\n \n+\t/* Update RSS map entry with queues */\n+\trss_entry.nb_queues = rss->queue_num;\n+\tfor (i = 0; i < rss->queue_num; i++)\n+\t\trss_entry.queues[i] = rss->queue[i];\n \n \t/* Add this RSS entry to map */\n-\terr = tap_flow_bpf_update_rss_elem(pmd->map_fd,\n-\t\t\t\t&flow->key_idx, &rss_entry);\n-\n+\terr = bpf_map__update_elem(pmd->rss->maps.rss_map,\n+\t\t\t\t &flow->flowid, sizeof(uint16_t),\n+\t\t\t\t &rss_entry, sizeof(rss_entry), 0);\n \tif (err) {\n \t\tTAP_LOG(ERR,\n \t\t\t\"Failed to update BPF map entry #%u (%d): %s\",\n-\t\t\tflow->key_idx, errno, strerror(errno));\n+\t\t\tflow->flowid, errno, strerror(errno));\n \t\trte_flow_error_set(\n \t\t\terror, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n \t\t\t\"Kernel too old or not configured \"\n@@ -2086,33 +1912,16 @@ static int rss_add_actions(struct rte_flow *flow, struct pmd_internals *pmd,\n \t\treturn -ENOTSUP;\n \t}\n \n-\n-\t/*\n-\t * Load bpf rules to calculate hash for this key_idx\n-\t */\n-\n-\tflow->bpf_fd[SEC_L3_L4] =\n-\t\ttap_flow_bpf_calc_l3_l4_hash(flow->key_idx, pmd->map_fd);\n-\tif (flow->bpf_fd[SEC_L3_L4] < 0) {\n-\t\tTAP_LOG(ERR,\n-\t\t\t\"Failed to load BPF section %s (%d): %s\",\n-\t\t\t\tsec_name[SEC_L3_L4], errno, strerror(errno));\n-\t\trte_flow_error_set(\n-\t\t\terror, ENOTSUP, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,\n-\t\t\t\"Kernel too old or not configured \"\n-\t\t\t\"to support BPF program loading\");\n-\n-\t\treturn -ENOTSUP;\n-\t}\n-\n \t/* Actions */\n \t{\n+\t\tconst struct bpf_program *rss_prog = pmd->rss->progs.rss_flow_action;\n \t\tstruct action_data adata[] = {\n \t\t\t{\n \t\t\t\t.id = \"bpf\",\n \t\t\t\t.bpf = {\n-\t\t\t\t\t.bpf_fd = flow->bpf_fd[SEC_L3_L4],\n-\t\t\t\t\t.annotation = sec_name[SEC_L3_L4],\n+\t\t\t\t\t.annotation = \"tap_rss\",\n+\t\t\t\t\t.classid = flow->flowid,\n+\t\t\t\t\t.bpf_fd = bpf_program__fd(rss_prog),\n \t\t\t\t\t.bpf = {\n \t\t\t\t\t\t.action = TC_ACT_PIPE,\n \t\t\t\t\t},\n@@ -2120,13 +1929,13 @@ static int rss_add_actions(struct rte_flow *flow, struct pmd_internals *pmd,\n \t\t\t},\n \t\t};\n \n-\t\tif (add_actions(flow, RTE_DIM(adata), adata,\n-\t\t\tTCA_FLOWER_ACT) < 0)\n+\t\tif (add_actions(flow, 1, adata, TCA_FLOWER_ACT) < 0)\n \t\t\treturn -1;\n \t}\n \n \treturn 0;\n }\n+#endif\n \n /**\n * Get rte_flow operations.\ndiff --git a/drivers/net/tap/tap_flow.h b/drivers/net/tap/tap_flow.h\nindex 240fbc3dfaef..41f9833619a1 100644\n--- a/drivers/net/tap/tap_flow.h\n+++ b/drivers/net/tap/tap_flow.h\n@@ -9,7 +9,6 @@\n #include <rte_flow.h>\n #include <rte_flow_driver.h>\n #include <rte_eth_tap.h>\n-#include <tap_autoconf.h>\n \n /**\n * In TC, priority 0 means we require the kernel to allocate one for us.\n@@ -41,10 +40,6 @@ enum implicit_rule_index {\n \tTAP_REMOTE_MAX_IDX,\n };\n \n-enum bpf_fd_idx {\n-\tSEC_L3_L4,\n-\tSEC_MAX,\n-};\n \n int tap_dev_flow_ops_get(struct rte_eth_dev *dev,\n \t\t\t const struct rte_flow_ops **ops);\n@@ -57,10 +52,6 @@ int tap_flow_implicit_destroy(struct pmd_internals *pmd,\n int tap_flow_implicit_flush(struct pmd_internals *pmd,\n \t\t\t struct rte_flow_error *error);\n \n-int tap_flow_bpf_cls_q(__u32 queue_idx);\n-int tap_flow_bpf_calc_l3_l4_hash(__u32 key_idx, int map_fd);\n-int tap_flow_bpf_rss_map_create(unsigned int key_size, unsigned int value_size,\n-\t\t\tunsigned int max_entries);\n-int tap_flow_bpf_update_rss_elem(int fd, void *key, void *value);\n+void tap_flow_bpf_destroy(struct pmd_internals *pmd);\n \n #endif /* _TAP_FLOW_H_ */\ndiff --git a/drivers/net/tap/tap_rss.h b/drivers/net/tap/tap_rss.h\nindex 6009be7031b0..51b7ff0d007e 100644\n--- a/drivers/net/tap/tap_rss.h\n+++ b/drivers/net/tap/tap_rss.h\n@@ -9,6 +9,9 @@\n #define TAP_MAX_QUEUES 16\n #endif\n \n+/* Size of the map from BPF classid to queue table */\n+#define TAP_RSS_MAX\tTAP_MAX_QUEUES\n+\n /* Fixed RSS hash key size in bytes. */\n #define TAP_RSS_HASH_KEY_SIZE 40\n \ndiff --git a/drivers/net/tap/tap_tcmsgs.h b/drivers/net/tap/tap_tcmsgs.h\nindex a64cb29d6fa8..00a0f22e3108 100644\n--- a/drivers/net/tap/tap_tcmsgs.h\n+++ b/drivers/net/tap/tap_tcmsgs.h\n@@ -6,7 +6,6 @@\n #ifndef _TAP_TCMSGS_H_\n #define _TAP_TCMSGS_H_\n \n-#include <tap_autoconf.h>\n #include <linux/if_ether.h>\n #include <linux/rtnetlink.h>\n #include <linux/pkt_sched.h>\n@@ -14,9 +13,8 @@\n #include <linux/tc_act/tc_mirred.h>\n #include <linux/tc_act/tc_gact.h>\n #include <linux/tc_act/tc_skbedit.h>\n-#ifdef HAVE_TC_ACT_BPF\n #include <linux/tc_act/tc_bpf.h>\n-#endif\n+\n #include <inttypes.h>\n \n #include <rte_ether.h>\n", "prefixes": [ "v3", "5/7" ] }