| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 24 Jul 2020 13:14:12 -0700
From: Tom Herbert <tom@...bertland.com>
To: netdev@...r.kernel.org, amritha.nambiar@...el.com
Cc: Tom Herbert <tom@...bertland.com>
Subject: [RFC PATCH net-next 3/3] sock: Use dev_and_queue structure for RX queue mapping in sock
Replace sk_rx_queue_mapping with sk_rx_dev_and_queue_mapping and
change associated function to set, get, and clear mapping.
---
.../mellanox/mlx5/core/en_accel/ktls_rx.c | 10 +++--
include/net/busy_poll.h | 2 +-
include/net/sock.h | 38 +++++++++----------
net/core/dev.c | 7 +++-
net/core/filter.c | 7 ++--
net/core/sock.c | 2 +-
net/ipv4/tcp_input.c | 2 +-
7 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
index acf6d80a6bb7..ef8b38c0ee56 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_rx.c
@@ -547,11 +547,13 @@ void mlx5e_ktls_handle_ctx_completion(struct mlx5e_icosq_wqe_info *wi)
queue_work(rule->priv->tls->rx_wq, &rule->work);
}
-static int mlx5e_ktls_sk_get_rxq(struct sock *sk)
+static int mlx5e_ktls_sk_get_rxq(struct sock *sk, struct net_device *dev)
{
- int rxq = sk_rx_queue_get(sk);
+ int ifindex, rxq;
- if (unlikely(rxq == -1))
+ sk_rx_dev_and_queue_get(sk, &ifindex, &rxq);
+
+ if (unlikely(ifindex != dev->ifindex || rxq == -1))
rxq = 0;
return rxq;
@@ -583,7 +585,7 @@ int mlx5e_ktls_add_rx(struct net_device *netdev, struct sock *sk,
priv_rx->crypto_info =
*(struct tls12_crypto_info_aes_gcm_128 *)crypto_info;
- rxq = mlx5e_ktls_sk_get_rxq(sk);
+ rxq = mlx5e_ktls_sk_get_rxq(sk, netdev);
priv_rx->rxq = rxq;
priv_rx->sk = sk;
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h
index b001fa91c14e..f04283c54bcd 100644
--- a/include/net/busy_poll.h
+++ b/include/net/busy_poll.h
@@ -128,7 +128,7 @@ static inline void sk_mark_napi_id(struct sock *sk, const struct sk_buff *skb)
#ifdef CONFIG_NET_RX_BUSY_POLL
WRITE_ONCE(sk->sk_napi_id, skb->napi_id);
#endif
- sk_rx_queue_set(sk, skb);
+ sk_rx_dev_and_queue_set(sk, skb);
}
/* variant used for unconnected sockets */
diff --git a/include/net/sock.h b/include/net/sock.h
index f311425513ff..fe8b669237f3 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -150,7 +150,7 @@ typedef __u64 __bitwise __addrpair;
* @skc_node: main hash linkage for various protocol lookup tables
* @skc_nulls_node: main hash linkage for TCP/UDP/UDP-Lite protocol
* @skc_tx_dev_and_queue_mapping: tx ifindex/queue for this connection
- * @skc_rx_queue_mapping: rx queue number for this connection
+ * @skc_rx_dev_and_queue_mapping: rx ifindex/queue for this connection
* @skc_flags: place holder for sk_flags
* %SO_LINGER (l_onoff), %SO_BROADCAST, %SO_KEEPALIVE,
* %SO_OOBINLINE settings, %SO_TIMESTAMPING settings
@@ -236,7 +236,7 @@ struct sock_common {
};
struct dev_and_queue skc_tx_dev_and_queue_mapping;
#ifdef CONFIG_XPS
- unsigned short skc_rx_queue_mapping;
+ struct dev_and_queue skc_rx_dev_and_queue_mapping;
#endif
union {
int skc_incoming_cpu;
@@ -364,7 +364,7 @@ struct sock {
#define sk_refcnt __sk_common.skc_refcnt
#define sk_tx_dev_and_queue_mapping __sk_common.skc_tx_dev_and_queue_mapping
#ifdef CONFIG_XPS
-#define sk_rx_queue_mapping __sk_common.skc_rx_queue_mapping
+#define sk_rx_dev_and_queue_mapping __sk_common.skc_rx_dev_and_queue_mapping
#endif
#define sk_dontcopy_begin __sk_common.skc_dontcopy_begin
@@ -1865,34 +1865,34 @@ static inline void sk_tx_dev_and_queue_get(const struct sock *sk, int *ifindex,
}
}
-static inline void sk_rx_queue_set(struct sock *sk, const struct sk_buff *skb)
+static inline void sk_rx_dev_and_queue_set(struct sock *sk,
+ const struct sk_buff *skb)
{
#ifdef CONFIG_XPS
- if (skb_rx_queue_recorded(skb)) {
- u16 rx_queue = skb_get_rx_queue(skb);
-
- if (WARN_ON_ONCE(rx_queue == NO_QUEUE_MAPPING))
- return;
-
- sk->sk_rx_queue_mapping = rx_queue;
- }
+ if (skb->dev && skb_rx_queue_recorded(skb))
+ __dev_and_queue_set(&sk->sk_rx_dev_and_queue_mapping, skb->dev,
+ skb_get_rx_queue(skb));
#endif
}
-static inline void sk_rx_queue_clear(struct sock *sk)
+static inline void sk_rx_dev_and_queue_clear(struct sock *sk)
{
#ifdef CONFIG_XPS
- sk->sk_rx_queue_mapping = NO_QUEUE_MAPPING;
+ __dev_and_queue_clear(&sk->sk_rx_dev_and_queue_mapping);
#endif
}
#ifdef CONFIG_XPS
-static inline int sk_rx_queue_get(const struct sock *sk)
+static inline void sk_rx_dev_and_queue_get(const struct sock *sk,
+ int *ifindex, int *rx_queue)
{
- if (sk && sk->sk_rx_queue_mapping != NO_QUEUE_MAPPING)
- return sk->sk_rx_queue_mapping;
-
- return -1;
+ if (sk) {
+ __dev_and_queue_get(&sk->sk_rx_dev_and_queue_mapping,
+ ifindex, rx_queue);
+ } else {
+ *ifindex = -1;
+ *rx_queue = -1;
+ }
}
#endif
diff --git a/net/core/dev.c b/net/core/dev.c
index 669dea31b467..10a704c79ea7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3939,9 +3939,12 @@ static int get_xps_queue(struct net_device *dev, struct net_device *sb_dev,
dev_maps = rcu_dereference(sb_dev->xps_rxqs_map);
if (dev_maps) {
- int tci = sk_rx_queue_get(sk);
+ int tci, ifindex;
- if (tci >= 0 && tci < dev->num_rx_queues)
+ sk_rx_dev_and_queue_get(sk, &ifindex, &tci);
+
+ if (dev->ifindex == ifindex &&
+ tci >= 0 && tci < dev->num_rx_queues)
queue_index = __get_xps_queue_idx(dev, skb, dev_maps,
tci);
}
diff --git a/net/core/filter.c b/net/core/filter.c
index 3fa16b8c0d61..eef2b778ade6 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -8044,11 +8044,12 @@ u32 bpf_sock_convert_ctx_access(enum bpf_access_type type,
case offsetof(struct bpf_sock, rx_queue_mapping):
#ifdef CONFIG_XPS
*insn++ = BPF_LDX_MEM(
- BPF_FIELD_SIZEOF(struct sock, sk_rx_queue_mapping),
+ BPF_FIELD_SIZEOF(struct sock,
+ sk_rx_dev_and_queue_mapping.queue),
si->dst_reg, si->src_reg,
- bpf_target_off(struct sock, sk_rx_queue_mapping,
+ bpf_target_off(struct sock, sk_rx_dev_and_queue_mapping.queue,
sizeof_field(struct sock,
- sk_rx_queue_mapping),
+ sk_rx_dev_and_queue_mapping.queue),
target_size));
*insn++ = BPF_JMP_IMM(BPF_JNE, si->dst_reg, NO_QUEUE_MAPPING,
1);
diff --git a/net/core/sock.c b/net/core/sock.c
index 92129b017074..8b44512c8b3a 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -3000,7 +3000,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
WRITE_ONCE(sk->sk_pacing_shift, 10);
sk->sk_incoming_cpu = -1;
- sk_rx_queue_clear(sk);
+ sk_rx_dev_and_queue_clear(sk);
/*
* Before updating sk_refcnt, we must commit prior changes to memory
* (Documentation/RCU/rculist_nulls.txt for details)
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 82906deb7874..5c7e1a7a7ed9 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -6746,7 +6746,7 @@ int tcp_conn_request(struct request_sock_ops *rsk_ops,
tcp_rsk(req)->snt_isn = isn;
tcp_rsk(req)->txhash = net_tx_rndhash();
tcp_openreq_init_rwin(req, sk, dst);
- sk_rx_queue_set(req_to_sk(req), skb);
+ sk_rx_dev_and_queue_set(req_to_sk(req), skb);
if (!want_cookie) {
tcp_reqsk_record_syn(sk, req, skb);
fastopen_sk = tcp_try_fastopen(sk, skb, req, &foc, dst);
--
2.25.1
Powered by blists - more mailing lists