From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org
Cc: Andrew Melnychenko <andrew@daynix.com>, Jason Wang <jasowang@redhat.com>
Subject: [PULL 13/17] ebpf: Added eBPF map update through mmap.
Date: Fri, 8 Sep 2023 14:45:03 +0800 [thread overview]
Message-ID: <20230908064507.14596-14-jasowang@redhat.com> (raw)
In-Reply-To: <20230908064507.14596-1-jasowang@redhat.com>
From: Andrew Melnychenko <andrew@daynix.com>
Changed eBPF map updates through mmaped array.
Mmaped arrays provide direct access to map data.
It should omit using bpf_map_update_elem() call,
which may require capabilities that are not present.
Signed-off-by: Andrew Melnychenko <andrew@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
| 117 +++++++++++++++++++++++++++++++++++++++++++++-----------
| 5 +++
2 files changed, 99 insertions(+), 23 deletions(-)
--git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c
index cee658c..247f5ee 100644
--- a/ebpf/ebpf_rss.c
+++ b/ebpf/ebpf_rss.c
@@ -27,19 +27,83 @@ void ebpf_rss_init(struct EBPFRSSContext *ctx)
{
if (ctx != NULL) {
ctx->obj = NULL;
+ ctx->program_fd = -1;
+ ctx->map_configuration = -1;
+ ctx->map_toeplitz_key = -1;
+ ctx->map_indirections_table = -1;
+
+ ctx->mmap_configuration = NULL;
+ ctx->mmap_toeplitz_key = NULL;
+ ctx->mmap_indirections_table = NULL;
}
}
bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx)
{
- return ctx != NULL && ctx->obj != NULL;
+ return ctx != NULL && (ctx->obj != NULL || ctx->program_fd != -1);
+}
+
+static bool ebpf_rss_mmap(struct EBPFRSSContext *ctx)
+{
+ if (!ebpf_rss_is_loaded(ctx)) {
+ return false;
+ }
+
+ ctx->mmap_configuration = mmap(NULL, qemu_real_host_page_size(),
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ctx->map_configuration, 0);
+ if (ctx->mmap_configuration == MAP_FAILED) {
+ trace_ebpf_error("eBPF RSS", "can not mmap eBPF configuration array");
+ return false;
+ }
+ ctx->mmap_toeplitz_key = mmap(NULL, qemu_real_host_page_size(),
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ctx->map_toeplitz_key, 0);
+ if (ctx->mmap_toeplitz_key == MAP_FAILED) {
+ trace_ebpf_error("eBPF RSS", "can not mmap eBPF toeplitz key");
+ goto toeplitz_fail;
+ }
+ ctx->mmap_indirections_table = mmap(NULL, qemu_real_host_page_size(),
+ PROT_READ | PROT_WRITE, MAP_SHARED,
+ ctx->map_indirections_table, 0);
+ if (ctx->mmap_indirections_table == MAP_FAILED) {
+ trace_ebpf_error("eBPF RSS", "can not mmap eBPF indirection table");
+ goto indirection_fail;
+ }
+
+ return true;
+
+indirection_fail:
+ munmap(ctx->mmap_toeplitz_key, qemu_real_host_page_size());
+toeplitz_fail:
+ munmap(ctx->mmap_configuration, qemu_real_host_page_size());
+
+ ctx->mmap_configuration = NULL;
+ ctx->mmap_toeplitz_key = NULL;
+ ctx->mmap_indirections_table = NULL;
+ return false;
+}
+
+static void ebpf_rss_munmap(struct EBPFRSSContext *ctx)
+{
+ if (!ebpf_rss_is_loaded(ctx)) {
+ return;
+ }
+
+ munmap(ctx->mmap_indirections_table, qemu_real_host_page_size());
+ munmap(ctx->mmap_toeplitz_key, qemu_real_host_page_size());
+ munmap(ctx->mmap_configuration, qemu_real_host_page_size());
+
+ ctx->mmap_configuration = NULL;
+ ctx->mmap_toeplitz_key = NULL;
+ ctx->mmap_indirections_table = NULL;
}
bool ebpf_rss_load(struct EBPFRSSContext *ctx)
{
struct rss_bpf *rss_bpf_ctx;
- if (ctx == NULL) {
+ if (ctx == NULL || ebpf_rss_is_loaded(ctx)) {
return false;
}
@@ -66,10 +130,18 @@ bool ebpf_rss_load(struct EBPFRSSContext *ctx)
ctx->map_toeplitz_key = bpf_map__fd(
rss_bpf_ctx->maps.tap_rss_map_toeplitz_key);
+ if (!ebpf_rss_mmap(ctx)) {
+ goto error;
+ }
+
return true;
error:
rss_bpf__destroy(rss_bpf_ctx);
ctx->obj = NULL;
+ ctx->program_fd = -1;
+ ctx->map_configuration = -1;
+ ctx->map_toeplitz_key = -1;
+ ctx->map_indirections_table = -1;
return false;
}
@@ -77,15 +149,11 @@ error:
static bool ebpf_rss_set_config(struct EBPFRSSContext *ctx,
struct EBPFRSSConfig *config)
{
- uint32_t map_key = 0;
-
if (!ebpf_rss_is_loaded(ctx)) {
return false;
}
- if (bpf_map_update_elem(ctx->map_configuration,
- &map_key, config, 0) < 0) {
- return false;
- }
+
+ memcpy(ctx->mmap_configuration, config, sizeof(*config));
return true;
}
@@ -93,27 +161,19 @@ static bool ebpf_rss_set_indirections_table(struct EBPFRSSContext *ctx,
uint16_t *indirections_table,
size_t len)
{
- uint32_t i = 0;
-
if (!ebpf_rss_is_loaded(ctx) || indirections_table == NULL ||
len > VIRTIO_NET_RSS_MAX_TABLE_LEN) {
return false;
}
- for (; i < len; ++i) {
- if (bpf_map_update_elem(ctx->map_indirections_table, &i,
- indirections_table + i, 0) < 0) {
- return false;
- }
- }
+ memcpy(ctx->mmap_indirections_table, indirections_table,
+ sizeof(*indirections_table) * len);
return true;
}
static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx,
uint8_t *toeplitz_key)
{
- uint32_t map_key = 0;
-
/* prepare toeplitz key */
uint8_t toe[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {};
@@ -123,10 +183,7 @@ static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx,
memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_MAX_KEY_SIZE);
*(uint32_t *)toe = ntohl(*(uint32_t *)toe);
- if (bpf_map_update_elem(ctx->map_toeplitz_key, &map_key, toe,
- 0) < 0) {
- return false;
- }
+ memcpy(ctx->mmap_toeplitz_key, toe, VIRTIO_NET_RSS_MAX_KEY_SIZE);
return true;
}
@@ -160,6 +217,20 @@ void ebpf_rss_unload(struct EBPFRSSContext *ctx)
return;
}
- rss_bpf__destroy(ctx->obj);
+ ebpf_rss_munmap(ctx);
+
+ if (ctx->obj) {
+ rss_bpf__destroy(ctx->obj);
+ } else {
+ close(ctx->program_fd);
+ close(ctx->map_configuration);
+ close(ctx->map_toeplitz_key);
+ close(ctx->map_indirections_table);
+ }
+
ctx->obj = NULL;
+ ctx->program_fd = -1;
+ ctx->map_configuration = -1;
+ ctx->map_toeplitz_key = -1;
+ ctx->map_indirections_table = -1;
}
--git a/ebpf/ebpf_rss.h b/ebpf/ebpf_rss.h
index bf3f257..ab08a72 100644
--- a/ebpf/ebpf_rss.h
+++ b/ebpf/ebpf_rss.h
@@ -20,6 +20,11 @@ struct EBPFRSSContext {
int map_configuration;
int map_toeplitz_key;
int map_indirections_table;
+
+ /* mapped eBPF maps for direct access to omit bpf_map_update_elem() */
+ void *mmap_configuration;
+ void *mmap_toeplitz_key;
+ void *mmap_indirections_table;
};
struct EBPFRSSConfig {
--
2.7.4
next prev parent reply other threads:[~2023-09-08 6:46 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-08 6:44 [PULL 00/17] Net patches Jason Wang
2023-09-08 6:44 ` [PULL 01/17] tap: Add USO support to tap device Jason Wang
2023-09-08 6:44 ` [PULL 02/17] tap: Add check for USO features Jason Wang
2023-09-08 6:44 ` [PULL 03/17] virtio-net: Add USO flags to vhost support Jason Wang
2023-09-08 6:44 ` [PULL 04/17] virtio-net: Add support for USO features Jason Wang
2024-05-16 13:43 ` Fiona Ebner
2024-05-17 0:47 ` Jason Wang
2023-09-08 6:44 ` [PULL 05/17] igb: remove TCP ACK detection Jason Wang
2023-09-08 6:44 ` [PULL 06/17] igb: rename E1000E_RingInfo_st Jason Wang
2023-09-08 6:44 ` [PULL 07/17] igb: RX descriptors guest writting refactoring Jason Wang
2023-09-08 6:44 ` [PULL 08/17] igb: RX payload " Jason Wang
2023-09-08 6:44 ` [PULL 09/17] igb: add IPv6 extended headers traffic detection Jason Wang
2023-09-08 6:45 ` [PULL 10/17] igb: packet-split descriptors support Jason Wang
2023-09-08 6:45 ` [PULL 11/17] e1000e: rename e1000e_ba_state and e1000e_write_hdr_to_rx_buffers Jason Wang
2023-09-08 6:45 ` [PULL 12/17] net: add initial support for AF_XDP network backend Jason Wang
2023-09-08 11:48 ` Daniel P. Berrangé
2023-09-08 11:55 ` Ilya Maximets
2023-09-08 6:45 ` Jason Wang [this message]
2023-09-08 6:45 ` [PULL 14/17] ebpf: Added eBPF initialization by fds Jason Wang
2023-09-08 6:45 ` [PULL 15/17] virtio-net: Added property to load eBPF RSS with fds Jason Wang
2023-09-08 6:45 ` [PULL 16/17] qmp: Added new command to retrieve eBPF blob Jason Wang
2023-09-08 6:45 ` [PULL 17/17] ebpf: Updated eBPF program and skeleton Jason Wang
2023-09-08 11:19 ` [PULL 00/17] Net patches Stefan Hajnoczi
2023-09-08 11:34 ` Ilya Maximets
2023-09-08 11:49 ` Daniel P. Berrangé
2023-09-08 12:00 ` Ilya Maximets
2023-09-08 12:15 ` Daniel P. Berrangé
2023-09-08 14:06 ` Ilya Maximets
2023-09-08 14:15 ` Daniel P. Berrangé
2023-09-13 18:46 ` Ilya Maximets
2023-09-14 8:13 ` Daniel P. Berrangé
2023-09-18 19:36 ` Ilya Maximets
2023-09-19 8:40 ` Daniel P. Berrangé
2023-09-19 9:39 ` Ilya Maximets
2023-09-19 10:03 ` Daniel P. Berrangé
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=20230908064507.14596-14-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=andrew@daynix.com \
--cc=qemu-devel@nongnu.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).