[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 17/18] ebpf: Refactor tun_rss_steering_prog()
From: |
Akihiko Odaki |
Subject: |
[PATCH v10 17/18] ebpf: Refactor tun_rss_steering_prog() |
Date: |
Sun, 28 Apr 2024 16:01:00 +0900 |
This saves branches and makes later BPF program changes easier.
Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
---
tools/ebpf/rss.bpf.c | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/tools/ebpf/rss.bpf.c b/tools/ebpf/rss.bpf.c
index 77434435ac15..c989cb3cd82c 100644
--- a/tools/ebpf/rss.bpf.c
+++ b/tools/ebpf/rss.bpf.c
@@ -547,27 +547,23 @@ int tun_rss_steering_prog(struct __sk_buff *skb)
config = bpf_map_lookup_elem(&tap_rss_map_configurations, &key);
toe = bpf_map_lookup_elem(&tap_rss_map_toeplitz_key, &key);
- if (config && toe) {
- if (!config->redirect) {
- return config->default_queue;
- }
+ if (!config || !toe) {
+ return 0;
+ }
- if (calculate_rss_hash(skb, config, toe, &hash)) {
- __u32 table_idx = hash % config->indirections_len;
- __u16 *queue = 0;
+ if (config->redirect && calculate_rss_hash(skb, config, toe, &hash)) {
+ __u32 table_idx = hash % config->indirections_len;
+ __u16 *queue = 0;
- queue = bpf_map_lookup_elem(&tap_rss_map_indirection_table,
- &table_idx);
+ queue = bpf_map_lookup_elem(&tap_rss_map_indirection_table,
+ &table_idx);
- if (queue) {
- return *queue;
- }
+ if (queue) {
+ return *queue;
}
-
- return config->default_queue;
}
- return 0;
+ return config->default_queue;
}
char _license[] SEC("license") = "GPL v2";
--
2.44.0
- [PATCH v10 05/18] tap: Call tap_receive_iov() from tap_receive(), (continued)
- [PATCH v10 05/18] tap: Call tap_receive_iov() from tap_receive(), Akihiko Odaki, 2024/04/28
- [PATCH v10 06/18] tap: Shrink zeroed virtio-net header, Akihiko Odaki, 2024/04/28
- [PATCH v10 07/18] virtio-net: Do not propagate ebpf-rss-fds errors, Akihiko Odaki, 2024/04/28
- [PATCH v10 08/18] virtio-net: Add only one queue pair when realizing, Akihiko Odaki, 2024/04/28
- [PATCH v10 09/18] virtio-net: Copy header only when necessary, Akihiko Odaki, 2024/04/28
- [PATCH v10 10/18] virtio-net: Shrink header byte swapping buffer, Akihiko Odaki, 2024/04/28
- [PATCH v10 11/18] virtio-net: Disable RSS on reset, Akihiko Odaki, 2024/04/28
- [PATCH v10 13/18] virtio-net: Always set populate_hash, Akihiko Odaki, 2024/04/28
- [PATCH v10 14/18] virtio-net: Do not write hashes to peer buffer, Akihiko Odaki, 2024/04/28
- [PATCH v10 12/18] virtio-net: Unify the logic to update NIC state for RSS, Akihiko Odaki, 2024/04/28
- [PATCH v10 17/18] ebpf: Refactor tun_rss_steering_prog(),
Akihiko Odaki <=
- [PATCH v10 15/18] ebpf: Fix RSS error handling, Akihiko Odaki, 2024/04/28
- [PATCH v10 16/18] ebpf: Return 0 when configuration fails, Akihiko Odaki, 2024/04/28
- [PATCH v10 18/18] ebpf: Add a separate target for skeleton, Akihiko Odaki, 2024/04/28