Skip to contentSkip to conversation

net: tls: make the offload check helper take skb not socket

PATCH Applied Jakub Kicinski 6 participants 7 messages Jun 13, 2023 – Jun 15, 2023

Subsystems (11)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 net: tls: make the offload check helper take skb not socket

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 drivers/net/bonding/bond_main.c                           | 4 ++--
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c           | 2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h            | 5 -----
 drivers/net/ethernet/chelsio/cxgb4/sge.c                  | 2 +-
 .../ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c    | 2 +-
 drivers/net/ethernet/fungible/funeth/funeth_tx.c          | 3 +--
 .../net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h   | 2 +-
 .../net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c    | 2 +-
 .../net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h  | 5 -----
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c       | 4 ++--
 include/net/tls.h                                         | 8 +++++---
 net/tls/tls_device.c                                      | 4 ++--
 12 files changed, 17 insertions(+), 26 deletions(-)
drivers/net/bonding/bond_main.c +2 -2
index 007cec23a92f..16405b84dc2f 100644
@@ -5442,7 +5442,7 @@ static netdev_tx_t bond_tls_device_xmit(struct bonding *bond, struct sk_buff *sk
 {
 	struct net_device *tls_netdev = rcu_dereference(tls_get_ctx(skb->sk)->netdev);
 
-	/* tls_netdev might become NULL, even if tls_is_sk_tx_device_offloaded
+	/* tls_netdev might become NULL, even if tls_is_skb_tx_device_offloaded
 	 * was true, if tls_device_down is running in parallel, but it's OK,
 	 * because bond_get_slave_by_dev has a NULL check.
 	 */
@@ -5461,7 +5461,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
 		return NETDEV_TX_OK;
 
 #if IS_ENABLED(CONFIG_TLS_DEVICE)
-	if (skb->sk && tls_is_sk_tx_device_offloaded(skb->sk))
+	if (tls_is_skb_tx_device_offloaded(skb))
 		return bond_tls_device_xmit(bond, skb, dev);
 #endif
 
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
index f0bc7396ce2b..2eb33a727bba 100644
@@ -1175,7 +1175,7 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
 		txq = netdev_pick_tx(dev, skb, sb_dev);
 		if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||
 		    skb->encapsulation ||
-		    cxgb4_is_ktls_skb(skb) ||
+		    tls_is_skb_tx_device_offloaded(skb) ||
 		    (proto != IPPROTO_TCP && proto != IPPROTO_UDP))
 			txq = txq % pi->nqsets;
 
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h +0 -5
index 34546f5312ee..a9599ba26975 100644
@@ -497,11 +497,6 @@ struct cxgb4_uld_info {
 #endif
 };
 
-static inline bool cxgb4_is_ktls_skb(struct sk_buff *skb)
-{
-	return skb->sk && tls_is_sk_tx_device_offloaded(skb->sk);
-}
-
 void cxgb4_uld_enable(struct adapter *adap);
 void cxgb4_register_uld(enum cxgb4_uld type, const struct cxgb4_uld_info *p);
 int cxgb4_unregister_uld(enum cxgb4_uld type);
drivers/net/ethernet/chelsio/cxgb4/sge.c +1 -1
index 46809e2d94ee..98dd78551d89 100644
@@ -1530,7 +1530,7 @@ static netdev_tx_t cxgb4_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif /* CHELSIO_IPSEC_INLINE */
 
 #if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)
-	if (cxgb4_is_ktls_skb(skb) &&
+	if (tls_is_skb_tx_device_offloaded(skb) &&
 	    (skb->len - skb_tcp_all_headers(skb)))
 		return adap->uld[CXGB4_ULD_KTLS].tx_handler(skb, dev);
 #endif /* CHELSIO_TLS_DEVICE */
drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c +1 -1
index 1a5fdd755e9e..bcdc7fc2f427 100644
@@ -1946,7 +1946,7 @@ static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev)
 	tls_ctx = tls_get_ctx(skb->sk);
 	tls_netdev = rcu_dereference_bh(tls_ctx->netdev);
 	/* Don't quit on NULL: if tls_device_down is running in parallel,
-	 * netdev might become NULL, even if tls_is_sk_tx_device_offloaded was
+	 * netdev might become NULL, even if tls_is_skb_tx_device_offloaded was
 	 * true. Rather continue processing this packet.
 	 */
 	if (unlikely(tls_netdev && tls_netdev != dev))
drivers/net/ethernet/fungible/funeth/funeth_tx.c +1 -2
index 706d81e39a54..8ddefd3ec15b 100644
@@ -348,8 +348,7 @@ netdev_tx_t fun_start_xmit(struct sk_buff *skb, struct net_device *netdev)
 	unsigned int tls_len = 0;
 	unsigned int ndesc;
 
-	if (IS_ENABLED(CONFIG_TLS_DEVICE) && skb->sk &&
-	    tls_is_sk_tx_device_offloaded(skb->sk)) {
+	if (tls_is_skb_tx_device_offloaded(skb)) {
 		skb = fun_tls_tx(skb, q, &tls_len);
 		if (unlikely(!skb))
 			goto dropped;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +1 -1
index c964644ee866..bac4717548c6 100644
@@ -125,7 +125,7 @@ static inline bool mlx5e_accel_tx_begin(struct net_device *dev,
 
 #ifdef CONFIG_MLX5_EN_TLS
 	/* May send WQEs. */
-	if (mlx5e_ktls_skb_offloaded(skb))
+	if (tls_is_skb_tx_device_offloaded(skb))
 		if (unlikely(!mlx5e_ktls_handle_tx_skb(dev, sq, skb,
 						       &state->tls)))
 			return false;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +1 -1
index 0e4c0a093293..efb2cf74ad6a 100644
@@ -846,7 +846,7 @@ bool mlx5e_ktls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq,
 	tls_ctx = tls_get_ctx(skb->sk);
 	tls_netdev = rcu_dereference_bh(tls_ctx->netdev);
 	/* Don't WARN on NULL: if tls_device_down is running in parallel,
-	 * netdev might become NULL, even if tls_is_sk_tx_device_offloaded was
+	 * netdev might become NULL, even if tls_is_skb_tx_device_offloaded was
 	 * true. Rather continue processing this packet.
 	 */
 	if (WARN_ON_ONCE(tls_netdev && tls_netdev != netdev))
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h +0 -5
index 2dd78dd4ad65..f87b65c560ea 100644
@@ -49,11 +49,6 @@ mlx5e_ktls_rx_pending_resync_list(struct mlx5e_channel *c, int budget)
 	return budget && test_bit(MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC, &c->async_icosq.state);
 }
 
-static inline bool mlx5e_ktls_skb_offloaded(struct sk_buff *skb)
-{
-	return skb->sk && tls_is_sk_tx_device_offloaded(skb->sk);
-}
-
 static inline void
 mlx5e_ktls_handle_tx_wqe(struct mlx5_wqe_ctrl_seg *cseg,
 			 struct mlx5e_accel_tx_tls_state *state)
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +2 -2
index b7cce746b5c0..49f2f081ebb5 100644
@@ -598,7 +598,7 @@ nfp_net_tls_tx(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec,
 
 	if (likely(!dp->ktls_tx))
 		return skb;
-	if (!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk))
+	if (!tls_is_skb_tx_device_offloaded(skb))
 		return skb;
 
 	datalen = skb->len - skb_tcp_all_headers(skb);
@@ -666,7 +666,7 @@ void nfp_net_tls_tx_undo(struct sk_buff *skb, u64 tls_handle)
 
 	if (!tls_handle)
 		return;
-	if (WARN_ON_ONCE(!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk)))
+	if (WARN_ON_ONCE(!tls_is_skb_tx_device_offloaded(skb)))
 		return;
 
 	datalen = skb->len - skb_tcp_all_headers(skb);
include/net/tls.h +5 -3
index b7d0f1e3058b..5e71dd3df8ca 100644
@@ -370,10 +370,12 @@ struct sk_buff *
 tls_validate_xmit_skb_sw(struct sock *sk, struct net_device *dev,
 			 struct sk_buff *skb);
 
-static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk)
+static inline bool tls_is_skb_tx_device_offloaded(const struct sk_buff *skb)
 {
-#ifdef CONFIG_SOCK_VALIDATE_XMIT
-	return sk_fullsock(sk) &&
+#ifdef CONFIG_TLS_DEVICE
+	struct sock *sk = skb->sk;
+
+	return sk && sk_fullsock(sk) &&
 	       (smp_load_acquire(&sk->sk_validate_xmit_skb) ==
 	       &tls_validate_xmit_skb);
 #else
net/tls/tls_device.c +2 -2
index b4864d55900f..b82770f68807 100644
@@ -1219,7 +1219,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
 	tls_device_attach(ctx, sk, netdev);
 	up_read(&device_offload_lock);
 
-	/* following this assignment tls_is_sk_tx_device_offloaded
+	/* following this assignment tls_is_skb_tx_device_offloaded
 	 * will return true and the context might be accessed
 	 * by the netdev's xmit function.
 	 */
@@ -1372,7 +1372,7 @@ static int tls_device_down(struct net_device *netdev)
 
 	list_for_each_entry_safe(ctx, tmp, &list, list)	{
 		/* Stop offloaded TX and switch to the fallback.
-		 * tls_is_sk_tx_device_offloaded will return false.
+		 * tls_is_skb_tx_device_offloaded will return false.
 		 */
 		WRITE_ONCE(ctx->sk->sk_validate_xmit_skb, tls_validate_xmit_skb_sw);
 
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 9 lines · Jakub Kicinski

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

Quoted 6 lines

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

Nice cleanup, thanks!

[...]

Quoted 10 lines
include/net/tls.h +1 -1
index b7d0f1e3058b..5e71dd3df8ca 100644
@@ -370,10 +370,12 @@ struct sk_buff *
 tls_validate_xmit_skb_sw(struct sock *sk, struct net_device *dev,
 			 struct sk_buff *skb);
 
-static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk)
+static inline bool tls_is_skb_tx_device_offloaded(const struct sk_buff *skb)

include/net/tls.h struct sk_buff * · line 381

Quoted 10 lines
include/net/tls.h +4 -2
 {
-#ifdef CONFIG_SOCK_VALIDATE_XMIT
-	return sk_fullsock(sk) &&
+#ifdef CONFIG_TLS_DEVICE
+	struct sock *sk = skb->sk;
+
+	return sk && sk_fullsock(sk) &&
 	       (smp_load_acquire(&sk->sk_validate_xmit_skb) ==
 	       &tls_validate_xmit_skb);
 #else

After this change, the only usage of CONFIG_SOCK_VALIDATE_XMIT remains in sk_validate_xmit_skb, which has #ifdef CONFIG_TLS_DEVICE inside #ifdef CONFIG_SOCK_VALIDATE_XMIT. If feels a little bit weird, given that both defines always have the same value, but maybe it's OK if we consider that more users can start using sk_validate_xmit_skb in the future.

author maintainer
#2 lore raw
Quoted 10 lines · On Wed, 14 Jun 2023 10:09:02 +0300 Maxim Mikityanskiy wrote:
Quoted 9 lines · Jakub Kicinski

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

Quoted 8 lines
Quoted 6 lines

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

Thanks!

Quoted 19 lines
Quoted 19 lines
include/net/tls.h +5 -3
index b7d0f1e3058b..5e71dd3df8ca 100644
@@ -370,10 +370,12 @@ struct sk_buff *
 tls_validate_xmit_skb_sw(struct sock *sk, struct net_device *dev,
 			 struct sk_buff *skb);
 
-static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk)
+static inline bool tls_is_skb_tx_device_offloaded(const struct sk_buff *skb)
 {
-#ifdef CONFIG_SOCK_VALIDATE_XMIT
-	return sk_fullsock(sk) &&
+#ifdef CONFIG_TLS_DEVICE
+	struct sock *sk = skb->sk;
+
+	return sk && sk_fullsock(sk) &&
 	       (smp_load_acquire(&sk->sk_validate_xmit_skb) ==
 	       &tls_validate_xmit_skb);
Quoted 8 lines

include/net/tls.h struct sk_buff * · line 381

Quoted 1 line
include/net/tls.h +0 -0
 #else  

After this change, the only usage of CONFIG_SOCK_VALIDATE_XMIT remains in sk_validate_xmit_skb, which has #ifdef CONFIG_TLS_DEVICE inside #ifdef CONFIG_SOCK_VALIDATE_XMIT. If feels a little bit weird, given that both defines always have the same value, but maybe it's OK if we consider that more users can start using sk_validate_xmit_skb in the future.

I'm working on another user of CONFIG_SOCK_VALIDATE_XMIT so let's keep the two separate.

Reviewed-by on v1 1/1
#3 lore raw
In reply to Jakub Kicinski
Quoted 9 lines · Jakub Kicinski

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

Quoted 6 lines

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

Thanks. This looks correct.
And try as I did, I couldn't find anything missing.

Quoted 14 lines
drivers/net/bonding/bond_main.c +1 -1
index 007cec23a92f..16405b84dc2f 100644
@@ -5442,7 +5442,7 @@ static netdev_tx_t bond_tls_device_xmit(struct bonding *bond, struct sk_buff *sk
 {
 	struct net_device *tls_netdev = rcu_dereference(tls_get_ctx(skb->sk)->netdev);
 
-	/* tls_netdev might become NULL, even if tls_is_sk_tx_device_offloaded
+	/* tls_netdev might become NULL, even if tls_is_skb_tx_device_offloaded
 	 * was true, if tls_device_down is running in parallel, but it's OK,
 	 * because bond_get_slave_by_dev has a NULL check.
 	 */

drivers/net/bonding/bond_main.c static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev · line 5466

Quoted 7 lines
drivers/net/bonding/bond_main.c +1 -1
@@ -5461,7 +5461,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
 		return NETDEV_TX_OK;
 
 #if IS_ENABLED(CONFIG_TLS_DEVICE)
-	if (skb->sk && tls_is_sk_tx_device_offloaded(skb->sk))
+	if (tls_is_skb_tx_device_offloaded(skb))
 		return bond_tls_device_xmit(bond, skb, dev);
 #endif

<2c>
Possibly some further shuffling, perhaps by making bond_tls_device_xmit do nothing if CONFIG_TLS_DEVICE isn't enabled, could remove the #if from here. But possibly that wouldn't be an improvement anyway. </2c>

Acked-by on v1 1/1
#4 lore raw
In reply to Jakub Kicinski
Quoted 15 lines · Jakub Kicinski

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

  if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

Quoted 14 lines

---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]

Thanks.

Acked-by on v1 1/1
#5 lore raw
In reply to Jakub Kicinski
Quoted 10 lines · Jakub Kicinski

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

Quoted 6 lines

While at it change the ifdef condition to TLS_DEVICE. Only TLS_DEVICE selects SOCK_VALIDATE_XMIT, so the two are equivalent. This makes removing the duplicated IS_ENABLED() check in funeth more obviously correct.

Looks good, thanks.

Quoted 237 lines

---
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]
CC: [email protected]

---
 drivers/net/bonding/bond_main.c                           | 4 ++--
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c           | 2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h            | 5 -----
 drivers/net/ethernet/chelsio/cxgb4/sge.c                  | 2 +-
 .../ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c    | 2 +-
 drivers/net/ethernet/fungible/funeth/funeth_tx.c          | 3 +--
 .../net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h   | 2 +-
 .../net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c    | 2 +-
 .../net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h  | 5 -----
 drivers/net/ethernet/netronome/nfp/nfp_net_common.c       | 4 ++--
 include/net/tls.h                                         | 8 +++++---
 net/tls/tls_device.c                                      | 4 ++--
 12 files changed, 17 insertions(+), 26 deletions(-)
drivers/net/bonding/bond_main.c +2 -2
index 007cec23a92f..16405b84dc2f 100644
@@ -5442,7 +5442,7 @@ static netdev_tx_t bond_tls_device_xmit(struct bonding *bond, struct sk_buff *sk
 {
        struct net_device *tls_netdev = rcu_dereference(tls_get_ctx(skb->sk)->netdev);
 
-       /* tls_netdev might become NULL, even if tls_is_sk_tx_device_offloaded
+       /* tls_netdev might become NULL, even if tls_is_skb_tx_device_offloaded
         * was true, if tls_device_down is running in parallel, but it's OK,
         * because bond_get_slave_by_dev has a NULL check.
         */
@@ -5461,7 +5461,7 @@ static netdev_tx_t __bond_start_xmit(struct sk_buff *skb, struct net_device *dev
                return NETDEV_TX_OK;
 
 #if IS_ENABLED(CONFIG_TLS_DEVICE)
-       if (skb->sk && tls_is_sk_tx_device_offloaded(skb->sk))
+       if (tls_is_skb_tx_device_offloaded(skb))
                return bond_tls_device_xmit(bond, skb, dev);
 #endif
 
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +1 -1
index f0bc7396ce2b..2eb33a727bba 100644
@@ -1175,7 +1175,7 @@ static u16 cxgb_select_queue(struct net_device *dev, struct sk_buff *skb,
                txq = netdev_pick_tx(dev, skb, sb_dev);
                if (xfrm_offload(skb) || is_ptp_enabled(skb, dev) ||
                    skb->encapsulation ||
-                   cxgb4_is_ktls_skb(skb) ||
+                   tls_is_skb_tx_device_offloaded(skb) ||
                    (proto != IPPROTO_TCP && proto != IPPROTO_UDP))
                        txq = txq % pi->nqsets;
 
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h +0 -5
index 34546f5312ee..a9599ba26975 100644
@@ -497,11 +497,6 @@ struct cxgb4_uld_info {
 #endif
 };
 
-static inline bool cxgb4_is_ktls_skb(struct sk_buff *skb)
-{
-       return skb->sk && tls_is_sk_tx_device_offloaded(skb->sk);
-}
-
 void cxgb4_uld_enable(struct adapter *adap);
 void cxgb4_register_uld(enum cxgb4_uld type, const struct cxgb4_uld_info *p);
 int cxgb4_unregister_uld(enum cxgb4_uld type);
drivers/net/ethernet/chelsio/cxgb4/sge.c +1 -1
index 46809e2d94ee..98dd78551d89 100644
@@ -1530,7 +1530,7 @@ static netdev_tx_t cxgb4_eth_xmit(struct sk_buff *skb, struct net_device *dev)
 #endif /* CHELSIO_IPSEC_INLINE */
 
 #if IS_ENABLED(CONFIG_CHELSIO_TLS_DEVICE)
-       if (cxgb4_is_ktls_skb(skb) &&
+       if (tls_is_skb_tx_device_offloaded(skb) &&
            (skb->len - skb_tcp_all_headers(skb)))
                return adap->uld[CXGB4_ULD_KTLS].tx_handler(skb, dev);
 #endif /* CHELSIO_TLS_DEVICE */
drivers/net/ethernet/chelsio/inline_crypto/ch_ktls/chcr_ktls.c +1 -1
index 1a5fdd755e9e..bcdc7fc2f427 100644
@@ -1946,7 +1946,7 @@ static int chcr_ktls_xmit(struct sk_buff *skb, struct net_device *dev)
        tls_ctx = tls_get_ctx(skb->sk);
        tls_netdev = rcu_dereference_bh(tls_ctx->netdev);
        /* Don't quit on NULL: if tls_device_down is running in parallel,
-        * netdev might become NULL, even if tls_is_sk_tx_device_offloaded was
+        * netdev might become NULL, even if tls_is_skb_tx_device_offloaded was
         * true. Rather continue processing this packet.
         */
        if (unlikely(tls_netdev && tls_netdev != dev))
drivers/net/ethernet/fungible/funeth/funeth_tx.c +1 -2
index 706d81e39a54..8ddefd3ec15b 100644
@@ -348,8 +348,7 @@ netdev_tx_t fun_start_xmit(struct sk_buff *skb, struct net_device *netdev)
        unsigned int tls_len = 0;
        unsigned int ndesc;
 
-       if (IS_ENABLED(CONFIG_TLS_DEVICE) && skb->sk &&
-           tls_is_sk_tx_device_offloaded(skb->sk)) {
+       if (tls_is_skb_tx_device_offloaded(skb)) {
                skb = fun_tls_tx(skb, q, &tls_len);
                if (unlikely(!skb))
                        goto dropped;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h +1 -1
index c964644ee866..bac4717548c6 100644
@@ -125,7 +125,7 @@ static inline bool mlx5e_accel_tx_begin(struct net_device *dev,
 
 #ifdef CONFIG_MLX5_EN_TLS
        /* May send WQEs. */
-       if (mlx5e_ktls_skb_offloaded(skb))
+       if (tls_is_skb_tx_device_offloaded(skb))
                if (unlikely(!mlx5e_ktls_handle_tx_skb(dev, sq, skb,
                                                       &state->tls)))
                        return false;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c +1 -1
index 0e4c0a093293..efb2cf74ad6a 100644
@@ -846,7 +846,7 @@ bool mlx5e_ktls_handle_tx_skb(struct net_device *netdev, struct mlx5e_txqsq *sq,
        tls_ctx = tls_get_ctx(skb->sk);
        tls_netdev = rcu_dereference_bh(tls_ctx->netdev);
        /* Don't WARN on NULL: if tls_device_down is running in parallel,
-        * netdev might become NULL, even if tls_is_sk_tx_device_offloaded was
+        * netdev might become NULL, even if tls_is_skb_tx_device_offloaded was
         * true. Rather continue processing this packet.
         */
        if (WARN_ON_ONCE(tls_netdev && tls_netdev != netdev))
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_txrx.h +0 -5
index 2dd78dd4ad65..f87b65c560ea 100644
@@ -49,11 +49,6 @@ mlx5e_ktls_rx_pending_resync_list(struct mlx5e_channel *c, int budget)
        return budget && test_bit(MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC, &c->async_icosq.state);
 }
 
-static inline bool mlx5e_ktls_skb_offloaded(struct sk_buff *skb)
-{
-       return skb->sk && tls_is_sk_tx_device_offloaded(skb->sk);
-}
-
 static inline void
 mlx5e_ktls_handle_tx_wqe(struct mlx5_wqe_ctrl_seg *cseg,
                         struct mlx5e_accel_tx_tls_state *state)
drivers/net/ethernet/netronome/nfp/nfp_net_common.c +2 -2
index b7cce746b5c0..49f2f081ebb5 100644
@@ -598,7 +598,7 @@ nfp_net_tls_tx(struct nfp_net_dp *dp, struct nfp_net_r_vector *r_vec,
 
        if (likely(!dp->ktls_tx))
                return skb;
-       if (!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk))
+       if (!tls_is_skb_tx_device_offloaded(skb))
                return skb;
 
        datalen = skb->len - skb_tcp_all_headers(skb);
@@ -666,7 +666,7 @@ void nfp_net_tls_tx_undo(struct sk_buff *skb, u64 tls_handle)
 
        if (!tls_handle)
                return;
-       if (WARN_ON_ONCE(!skb->sk || !tls_is_sk_tx_device_offloaded(skb->sk)))
+       if (WARN_ON_ONCE(!tls_is_skb_tx_device_offloaded(skb)))
                return;
 
        datalen = skb->len - skb_tcp_all_headers(skb);
include/net/tls.h +5 -3
index b7d0f1e3058b..5e71dd3df8ca 100644
@@ -370,10 +370,12 @@ struct sk_buff *
 tls_validate_xmit_skb_sw(struct sock *sk, struct net_device *dev,
                         struct sk_buff *skb);
 
-static inline bool tls_is_sk_tx_device_offloaded(struct sock *sk)
+static inline bool tls_is_skb_tx_device_offloaded(const struct sk_buff *skb)
 {
-#ifdef CONFIG_SOCK_VALIDATE_XMIT
-       return sk_fullsock(sk) &&
+#ifdef CONFIG_TLS_DEVICE
+       struct sock *sk = skb->sk;
+
+       return sk && sk_fullsock(sk) &&
               (smp_load_acquire(&sk->sk_validate_xmit_skb) ==
               &tls_validate_xmit_skb);
 #else
net/tls/tls_device.c +2 -3
index b4864d55900f..b82770f68807 100644
@@ -1219,7 +1219,7 @@ int tls_set_device_offload(struct sock *sk, struct tls_context *ctx)
        tls_device_attach(ctx, sk, netdev);
        up_read(&device_offload_lock);
 
-       /* following this assignment tls_is_sk_tx_device_offloaded
+       /* following this assignment tls_is_skb_tx_device_offloaded
         * will return true and the context might be accessed
         * by the netdev's xmit function.
         */
@@ -1372,7 +1372,7 @@ static int tls_device_down(struct net_device *netdev)
 
        list_for_each_entry_safe(ctx, tmp, &list, list) {
                /* Stop offloaded TX and switch to the fallback.
-                * tls_is_sk_tx_device_offloaded will return false.
+                * tls_is_skb_tx_device_offloaded will return false.
                 */
                WRITE_ONCE(ctx->sk->sk_validate_xmit_skb, tls_validate_xmit_skb_sw);
 
--

2.40.1

#6 lore raw
In reply to Jakub Kicinski
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:

Quoted 10 lines · On Tue, 13 Jun 2023 13:50:06 -0700 you wrote:

All callers of tls_is_sk_tx_device_offloaded() currently do an equivalent of:

if (skb->sk && tls_is_skb_tx_device_offloaded(skb->sk))

Have the helper accept skb and do the skb->sk check locally. Two drivers have local static inlines with similar wrappers already.

[...]

Here is the summary with links:
- [net-next] net: tls: make the offload check helper take skb not socket

    https://git.kernel.org/netdev/net-next/c/ed3c9a2fcab3

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html