Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [bpf-next PATCH v2] bpf: Add rx_queue_mapping to bpf_sock
@ 2020-05-22 18:28 Amritha Nambiar
  2020-05-22 23:34 ` Daniel Borkmann
  0 siblings, 1 reply; 2+ messages in thread
From: Amritha Nambiar @ 2020-05-22 18:28 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.

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 97e1fd19ff58..d2acd5aeae8d 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;
+	__u32 rx_queue_mapping;
 };
 
 struct bpf_tcp_sock {
diff --git a/net/core/filter.c b/net/core/filter.c
index bd2853d23b50..c4ba92204b73 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -6829,6 +6829,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):
@@ -7872,6 +7873,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, 0);
+		*target_size = 2;
+#endif
+		break;
 	}
 
 	return insn - insn_buf;


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [bpf-next PATCH v2] bpf: Add rx_queue_mapping to bpf_sock
  2020-05-22 18:28 [bpf-next PATCH v2] bpf: Add rx_queue_mapping to bpf_sock Amritha Nambiar
@ 2020-05-22 23:34 ` Daniel Borkmann
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Borkmann @ 2020-05-22 23:34 UTC (permalink / raw)
  To: Amritha Nambiar, netdev, davem, ast; +Cc: kafai, sridhar.samudrala

On 5/22/20 8:28 PM, Amritha Nambiar 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 adds the "what this patch does" but could you also add a description for
the use-case in here?

> 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 97e1fd19ff58..d2acd5aeae8d 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;
> +	__u32 rx_queue_mapping;
>   };
>   
>   struct bpf_tcp_sock {
> diff --git a/net/core/filter.c b/net/core/filter.c
> index bd2853d23b50..c4ba92204b73 100644
> --- a/net/core/filter.c
> +++ b/net/core/filter.c
> @@ -6829,6 +6829,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):
> @@ -7872,6 +7873,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, 0);

This should be -1 as queue mapping as well if XPS is not configured, no?
Otherwise, how do you tell it apart from an actual mapping to 0 if XPS is
built-in?

> +		*target_size = 2;
> +#endif
> +		break;
>   	}
>   
>   	return insn - insn_buf;
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 18:28 [bpf-next PATCH v2] bpf: Add rx_queue_mapping to bpf_sock Amritha Nambiar
2020-05-22 23:34 ` Daniel Borkmann

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org
	public-inbox-index netdev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git