From: Michal Kubiak <michal.kubiak@intel.com>
To: Jiawen Wu <jiawenwu@trustnetic.com>
Cc: <netdev@vger.kernel.org>, <andrew+netdev@lunn.ch>,
<davem@davemloft.net>, <edumazet@google.com>, <kuba@kernel.org>,
<pabeni@redhat.com>, <horms@kernel.org>, <dlemoal@kernel.org>,
<jdamato@fastly.com>, <saikrishnag@marvell.com>,
<vadim.fedorenko@linux.dev>, <przemyslaw.kitszel@intel.com>,
<ecree.xilinx@gmail.com>, <rmk+kernel@armlinux.org.uk>,
<mengyuanlou@net-swift.com>
Subject: Re: [PATCH net-next 2/2] net: wangxun: restrict feature flags for tunnel packets
Date: Fri, 11 Apr 2025 15:52:11 +0200 [thread overview]
Message-ID: <Z/keixoyLzcgEGZu@localhost.localdomain> (raw)
In-Reply-To: <20250410074456.321847-3-jiawenwu@trustnetic.com>
On Thu, Apr 10, 2025 at 03:44:56PM +0800, Jiawen Wu wrote:
> Implement ndo_features_check to restrict Tx checksum offload flags, since
> there are some inner layer length and protocols unsupported.
>
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
> drivers/net/ethernet/wangxun/libwx/wx_lib.c | 27 +++++++++++++++++++
> drivers/net/ethernet/wangxun/libwx/wx_lib.h | 3 +++
> drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 1 +
> .../net/ethernet/wangxun/txgbe/txgbe_main.c | 1 +
> 4 files changed, 32 insertions(+)
>
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.c b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> index 59d904f23764..a1f9d2287fdc 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.c
> @@ -2998,6 +2998,33 @@ netdev_features_t wx_fix_features(struct net_device *netdev,
> }
> EXPORT_SYMBOL(wx_fix_features);
>
> +#define WX_MAX_TUNNEL_HDR_LEN 80
> +netdev_features_t wx_features_check(struct sk_buff *skb,
> + struct net_device *netdev,
> + netdev_features_t features)
> +{
> + struct wx *wx = netdev_priv(netdev);
> +
> + if (!skb->encapsulation)
> + return features;
> +
> + if (wx->mac.type == wx_mac_em)
> + return features & ~NETIF_F_CSUM_MASK;
> +
> + if (unlikely(skb_inner_mac_header(skb) - skb_transport_header(skb) >
> + WX_MAX_TUNNEL_HDR_LEN))
> + return features & ~NETIF_F_CSUM_MASK;
> +
> + if (skb->inner_protocol_type == ENCAP_TYPE_ETHER &&
> + skb->inner_protocol != htons(ETH_P_IP) &&
> + skb->inner_protocol != htons(ETH_P_IPV6) &&
> + skb->inner_protocol != htons(ETH_P_TEB))
> + return features & ~(NETIF_F_CSUM_MASK | NETIF_F_GSO_MASK);
> +
> + return features;
> +}
> +EXPORT_SYMBOL(wx_features_check);
> +
> void wx_set_ring(struct wx *wx, u32 new_tx_count,
> u32 new_rx_count, struct wx_ring *temp_ring)
> {
> diff --git a/drivers/net/ethernet/wangxun/libwx/wx_lib.h b/drivers/net/ethernet/wangxun/libwx/wx_lib.h
> index fdeb0c315b75..919f49999308 100644
> --- a/drivers/net/ethernet/wangxun/libwx/wx_lib.h
> +++ b/drivers/net/ethernet/wangxun/libwx/wx_lib.h
> @@ -33,6 +33,9 @@ void wx_get_stats64(struct net_device *netdev,
> int wx_set_features(struct net_device *netdev, netdev_features_t features);
> netdev_features_t wx_fix_features(struct net_device *netdev,
> netdev_features_t features);
> +netdev_features_t wx_features_check(struct sk_buff *skb,
> + struct net_device *netdev,
> + netdev_features_t features);
> void wx_set_ring(struct wx *wx, u32 new_tx_count,
> u32 new_rx_count, struct wx_ring *temp_ring);
>
> diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> index fd102078f5c9..82e27b9cfc9c 100644
> --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_main.c
> @@ -587,6 +587,7 @@ static const struct net_device_ops ngbe_netdev_ops = {
> .ndo_set_rx_mode = wx_set_rx_mode,
> .ndo_set_features = wx_set_features,
> .ndo_fix_features = wx_fix_features,
> + .ndo_features_check = wx_features_check,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_set_mac_address = wx_set_mac,
> .ndo_get_stats64 = wx_get_stats64,
> diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> index c984745504b4..0c5d0914e830 100644
> --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_main.c
> @@ -656,6 +656,7 @@ static const struct net_device_ops txgbe_netdev_ops = {
> .ndo_set_rx_mode = wx_set_rx_mode,
> .ndo_set_features = wx_set_features,
> .ndo_fix_features = wx_fix_features,
> + .ndo_features_check = wx_features_check,
> .ndo_validate_addr = eth_validate_addr,
> .ndo_set_mac_address = wx_set_mac,
> .ndo_get_stats64 = wx_get_stats64,
> --
> 2.27.0
>
>
Thanks,
Reviewed-by: Michal Kubiak <michal.kubiak@intel.com>
prev parent reply other threads:[~2025-04-11 13:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-10 7:44 [PATCH net-next 0/2] Implement udp tunnel port for txgbe Jiawen Wu
2025-04-10 7:44 ` [PATCH net-next 1/2] net: txgbe: Support to set UDP tunnel port Jiawen Wu
2025-04-11 13:49 ` Michal Kubiak
2025-04-11 23:22 ` Jakub Kicinski
2025-04-10 7:44 ` [PATCH net-next 2/2] net: wangxun: restrict feature flags for tunnel packets Jiawen Wu
2025-04-11 13:52 ` Michal Kubiak [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Z/keixoyLzcgEGZu@localhost.localdomain \
--to=michal.kubiak@intel.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=dlemoal@kernel.org \
--cc=ecree.xilinx@gmail.com \
--cc=edumazet@google.com \
--cc=horms@kernel.org \
--cc=jdamato@fastly.com \
--cc=jiawenwu@trustnetic.com \
--cc=kuba@kernel.org \
--cc=mengyuanlou@net-swift.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=przemyslaw.kitszel@intel.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=saikrishnag@marvell.com \
--cc=vadim.fedorenko@linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).