* [bpf-next PATCH v3] bpf: Add rx_queue_mapping to bpf_sock
@ 2020-05-27 0:34 Amritha Nambiar
2020-06-01 20:23 ` Alexei Starovoitov
0 siblings, 1 reply; 2+ messages in thread
From: Amritha Nambiar @ 2020-05-27 0:34 UTC (permalink / raw)
To: netdev, davem, daniel, ast; +Cc: kafai, sridhar.samudrala, amritha.nambiar
Add "rx_queue_mapping" to bpf_sock. This gives read access for the
existing field (sk_rx_queue_mapping) of struct sock from bpf_sock.
Semantics for the bpf_sock rx_queue_mapping access are similar to
sk_rx_queue_get(), i.e the value NO_QUEUE_MAPPING is not allowed
and -1 is returned in that case. This is useful for transmit queue
selection based on the received queue index which is cached in the
socket in the receive path.
v3: Addressed review comments to add usecase in patch description,
and fixed default value for rx_queue_mapping.
v2: fixed build error for CONFIG_XPS wrapping, reported by
kbuild test robot <lkp@intel.com>
Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
---
include/uapi/linux/bpf.h | 1 +
net/core/filter.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 54b93f8b49b8..2a833f23c09f 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -3530,6 +3530,7 @@ struct bpf_sock {
__u32 dst_ip4;
__u32 dst_ip6[4];
__u32 state;
+ __s32 rx_queue_mapping;
};
struct bpf_tcp_sock {
diff --git a/net/core/filter.c b/net/core/filter.c
index a6fc23447f12..0008b029d644 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6849,6 +6849,7 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type,
case offsetof(struct bpf_sock, protocol):
case offsetof(struct bpf_sock, dst_port):
case offsetof(struct bpf_sock, src_port):
+ case offsetof(struct bpf_sock, rx_queue_mapping):
case bpf_ctx_range(struct bpf_sock, src_ip4):
case bpf_ctx_range_till(struct bpf_sock, src_ip6[0], src_ip6[3]):
case bpf_ctx_range(struct bpf_sock, dst_ip4):
@@ -7897,6 +7898,23 @@ u32 bpf_sock_convert_ctx_access(enum bpf_access_type type,
skc_state),
target_size));
break;
+ case offsetof(struct bpf_sock, rx_queue_mapping):
+#ifdef CONFIG_XPS
+ *insn++ = BPF_LDX_MEM(
+ BPF_FIELD_SIZEOF(struct sock, sk_rx_queue_mapping),
+ si->dst_reg, si->src_reg,
+ bpf_target_off(struct sock, sk_rx_queue_mapping,
+ sizeof_field(struct sock,
+ sk_rx_queue_mapping),
+ target_size));
+ *insn++ = BPF_JMP_IMM(BPF_JNE, si->dst_reg, NO_QUEUE_MAPPING,
+ 1);
+ *insn++ = BPF_MOV64_IMM(si->dst_reg, -1);
+#else
+ *insn++ = BPF_MOV64_IMM(si->dst_reg, -1);
+ *target_size = 2;
+#endif
+ break;
}
return insn - insn_buf;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [bpf-next PATCH v3] bpf: Add rx_queue_mapping to bpf_sock
2020-05-27 0:34 [bpf-next PATCH v3] bpf: Add rx_queue_mapping to bpf_sock Amritha Nambiar
@ 2020-06-01 20:23 ` Alexei Starovoitov
0 siblings, 0 replies; 2+ messages in thread
From: Alexei Starovoitov @ 2020-06-01 20:23 UTC (permalink / raw)
To: Amritha Nambiar
Cc: Network Development, David S. Miller, Daniel Borkmann,
Alexei Starovoitov, Martin KaFai Lau, Sridhar Samudrala
On Tue, May 26, 2020 at 5:34 PM Amritha Nambiar
<amritha.nambiar@intel.com> wrote:
>
> Add "rx_queue_mapping" to bpf_sock. This gives read access for the
> existing field (sk_rx_queue_mapping) of struct sock from bpf_sock.
> Semantics for the bpf_sock rx_queue_mapping access are similar to
> sk_rx_queue_get(), i.e the value NO_QUEUE_MAPPING is not allowed
> and -1 is returned in that case. This is useful for transmit queue
> selection based on the received queue index which is cached in the
> socket in the receive path.
>
> v3: Addressed review comments to add usecase in patch description,
> and fixed default value for rx_queue_mapping.
> v2: fixed build error for CONFIG_XPS wrapping, reported by
> kbuild test robot <lkp@intel.com>
>
> Signed-off-by: Amritha Nambiar <amritha.nambiar@intel.com>
Applied. Thanks
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-01 20:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 0:34 [bpf-next PATCH v3] bpf: Add rx_queue_mapping to bpf_sock Amritha Nambiar
2020-06-01 20:23 ` Alexei Starovoitov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.