Commit 4fb37e72 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sock-rx-qmap' 



Tariq Toukan says:

====================
Compile-flag for sock RX queue mapping

Socket's RX queue mapping logic is useful also for non-XPS use cases.
This series breaks the dependency between the two, introducing a new
kernel config flag SOCK_RX_QUEUE_MAPPING.

Here we select this new kernel flag from TLS_DEVICE, as well as XPS.
====================

Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3c5a2fd0 2af3e35c

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ config MLX5_FPGA_TLS 
	depends on TLS=y || MLX5_CORE=m

	depends on MLX5_CORE_EN

	depends on MLX5_FPGA

	depends on XPS

	select MLX5_EN_TLS

	default n

	help
@@ -181,7 +180,6 @@ config MLX5_TLS 
	depends on TLS_DEVICE

	depends on TLS=y || MLX5_CORE=m

	depends on MLX5_CORE_EN

	depends on XPS

	select MLX5_ACCEL

	select MLX5_EN_TLS

	default n

include/net/sock.h

+6 −6
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ struct sock_common { 
		struct hlist_nulls_node skc_nulls_node;

	};

	unsigned short		skc_tx_queue_mapping;

#ifdef CONFIG_XPS

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

	unsigned short		skc_rx_queue_mapping;

#endif

	union {
@@ -356,7 +356,7 @@ struct sock { 
#define sk_nulls_node		__sk_common.skc_nulls_node

#define sk_refcnt		__sk_common.skc_refcnt

#define sk_tx_queue_mapping	__sk_common.skc_tx_queue_mapping

#ifdef CONFIG_XPS

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

#define sk_rx_queue_mapping	__sk_common.skc_rx_queue_mapping

#endif
@@ -1838,7 +1838,7 @@ static inline int sk_tx_queue_get(const struct sock *sk) 


static inline void sk_rx_queue_set(struct sock *sk, const struct sk_buff *skb)

{

#ifdef CONFIG_XPS

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

	if (skb_rx_queue_recorded(skb)) {

		u16 rx_queue = skb_get_rx_queue(skb);
@@ -1852,20 +1852,20 @@ static inline void sk_rx_queue_set(struct sock *sk, const struct sk_buff *skb) 


static inline void sk_rx_queue_clear(struct sock *sk)

{

#ifdef CONFIG_XPS

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

	sk->sk_rx_queue_mapping = NO_QUEUE_MAPPING;

#endif

}



#ifdef CONFIG_XPS

static inline int sk_rx_queue_get(const struct sock *sk)

{

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

	if (sk && sk->sk_rx_queue_mapping != NO_QUEUE_MAPPING)

		return sk->sk_rx_queue_mapping;

#endif



	return -1;

}

#endif



static inline void sk_set_socket(struct sock *sk, struct socket *sock)

{

net/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -256,9 +256,13 @@ config RFS_ACCEL 
	select CPU_RMAP

	default y



config SOCK_RX_QUEUE_MAPPING

	bool



config XPS

	bool

	depends on SMP

	select SOCK_RX_QUEUE_MAPPING

	default y



config HWBM

net/core/filter.c

+1 −1
Original line number Diff line number Diff line
@@ -8814,7 +8814,7 @@ u32 bpf_sock_convert_ctx_access(enum bpf_access_type type, 
				       target_size));

		break;

	case offsetof(struct bpf_sock, rx_queue_mapping):

#ifdef CONFIG_XPS

#ifdef CONFIG_SOCK_RX_QUEUE_MAPPING

		*insn++ = BPF_LDX_MEM(

			BPF_FIELD_SIZEOF(struct sock, sk_rx_queue_mapping),

			si->dst_reg, si->src_reg,

net/tls/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config TLS_DEVICE 
	bool "Transport Layer Security HW offload"

	depends on TLS

	select SOCK_VALIDATE_XMIT

	select SOCK_RX_QUEUE_MAPPING

	default n

	help

	Enable kernel support for HW offload of the TLS protocol.