diff options
| author |   Mina Almasry <almasrymina@google.com> | 2025-05-08 00:48:28 +0000 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2025-05-13 11:12:49 +0200 |
| commit | ae28cb114727dd599689725c27fb1c45627094ba (patch) | |
| tree | 5b595ac5e66a9ba63e21a1fc30814bd3766184dd /net/core/dev.c | |
| parent | gve: add netmem TX support to GVE DQO-RDA mode (diff) | |
| download | wireguard-linux-ae28cb114727dd599689725c27fb1c45627094ba.tar.xz wireguard-linux-ae28cb114727dd599689725c27fb1c45627094ba.zip | |
net: check for driver support in netmem TX
We should not enable netmem TX for drivers that don't declare support.
Check for driver netmem TX support during devmem TX binding and fail if
the driver does not have the functionality.
Check for driver support in validate_xmit_skb as well.
Signed-off-by: Mina Almasry <almasrymina@google.com>
Acked-by: Stanislav Fomichev <sdf@fomichev.me>
Link: https://patch.msgid.link/20250508004830.4100853-9-almasrymina@google.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index c9013632296f..33d5e95209cb 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3896,12 +3896,42 @@ sw_checksum: } EXPORT_SYMBOL(skb_csum_hwoffload_help); +static struct sk_buff *validate_xmit_unreadable_skb(struct sk_buff *skb, + struct net_device *dev) +{ + struct skb_shared_info *shinfo; + struct net_iov *niov; + + if (likely(skb_frags_readable(skb))) + goto out; + + if (!dev->netmem_tx) + goto out_free; + + shinfo = skb_shinfo(skb); + + if (shinfo->nr_frags > 0) { + niov = netmem_to_net_iov(skb_frag_netmem(&shinfo->frags[0])); + if (net_is_devmem_iov(niov) && + net_devmem_iov_binding(niov)->dev != dev) + goto out_free; + } + +out: + return skb; + +out_free: + kfree_skb(skb); + return NULL; +} + static struct sk_buff *validate_xmit_skb(struct sk_buff *skb, struct net_device *dev, bool *again) { netdev_features_t features; - if (!skb_frags_readable(skb)) - goto out_kfree_skb; + skb = validate_xmit_unreadable_skb(skb, dev); + if (unlikely(!skb)) + goto out_null; features = netif_skb_features(skb); skb = validate_xmit_vlan(skb, features); |