@@ -14,6 +14,9 @@
#include "hbg_txrx.h"
#include "hbg_debugfs.h"
+#define HBG_SUPPORT_FEATURES (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \
+ NETIF_F_RXCSUM)
+
static void hbg_all_irq_enable(struct hbg_priv *priv, bool enabled)
{
struct hbg_irq_info *info;
@@ -263,6 +266,12 @@ static void hbg_net_get_stats(struct net_device *netdev,
stats->rx_crc_errors += h_stats->rx_fcs_error_cnt;
}
+static netdev_features_t hbg_net_fix_features(struct net_device *netdev,
+ netdev_features_t features)
+{
+ return features & HBG_SUPPORT_FEATURES;
+}
+
static const struct net_device_ops hbg_netdev_ops = {
.ndo_open = hbg_net_open,
.ndo_stop = hbg_net_stop,
@@ -273,6 +282,7 @@ static const struct net_device_ops hbg_netdev_ops = {
.ndo_tx_timeout = hbg_net_tx_timeout,
.ndo_set_rx_mode = hbg_net_set_rx_mode,
.ndo_get_stats64 = hbg_net_get_stats,
+ .ndo_fix_features = hbg_net_fix_features,
};
static void hbg_service_task(struct work_struct *work)
@@ -419,6 +429,9 @@ static int hbg_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (ret)
return ret;
+ /* set default features */
+ netdev->features |= HBG_SUPPORT_FEATURES;
+ netdev->hw_features |= HBG_SUPPORT_FEATURES;
netdev->priv_flags |= IFF_UNICAST_FLT;
netdev->pcpu_stat_type = NETDEV_PCPU_STAT_TSTATS;
@@ -202,8 +202,11 @@ static int hbg_napi_tx_recycle(struct napi_struct *napi, int budget)
}
static bool hbg_rx_check_l3l4_error(struct hbg_priv *priv,
- struct hbg_rx_desc *desc)
+ struct hbg_rx_desc *desc,
+ struct sk_buff *skb)
{
+ bool rx_checksum_offload = !!(priv->netdev->features & NETIF_F_RXCSUM);
+
if (likely(!FIELD_GET(HBG_RX_DESC_W4_L3_ERR_CODE_M, desc->word4) &&
!FIELD_GET(HBG_RX_DESC_W4_L4_ERR_CODE_M, desc->word4)))
return true;
@@ -215,6 +218,10 @@ static bool hbg_rx_check_l3l4_error(struct hbg_priv *priv,
priv->stats.rx_desc_l3_wrong_head_cnt++;
return false;
case HBG_L3_CSUM_ERR:
+ if (!rx_checksum_offload) {
+ skb->ip_summed = CHECKSUM_NONE;
+ break;
+ }
priv->stats.rx_desc_l3_csum_err_cnt++;
return false;
case HBG_L3_LEN_ERR:
@@ -238,6 +245,10 @@ static bool hbg_rx_check_l3l4_error(struct hbg_priv *priv,
priv->stats.rx_desc_l4_len_err_cnt++;
return false;
case HBG_L4_CSUM_ERR:
+ if (!rx_checksum_offload) {
+ skb->ip_summed = CHECKSUM_NONE;
+ break;
+ }
priv->stats.rx_desc_l4_csum_err_cnt++;
return false;
case HBG_L4_ZERO_PORT_NUM:
@@ -322,7 +333,8 @@ static void hbg_update_rx_protocol_stats(struct hbg_priv *priv,
hbg_update_rx_ip_protocol_stats(priv, desc);
}
-static bool hbg_rx_pkt_check(struct hbg_priv *priv, struct hbg_rx_desc *desc)
+static bool hbg_rx_pkt_check(struct hbg_priv *priv, struct hbg_rx_desc *desc,
+ struct sk_buff *skb)
{
if (unlikely(FIELD_GET(HBG_RX_DESC_W2_PKT_LEN_M, desc->word2) >
priv->dev_specs.max_frame_len)) {
@@ -342,7 +354,7 @@ static bool hbg_rx_pkt_check(struct hbg_priv *priv, struct hbg_rx_desc *desc)
return false;
}
- if (unlikely(!hbg_rx_check_l3l4_error(priv, desc))) {
+ if (unlikely(!hbg_rx_check_l3l4_error(priv, desc, skb))) {
priv->stats.rx_desc_l3l4_err_cnt++;
return false;
}
@@ -413,7 +425,7 @@ static int hbg_napi_rx_poll(struct napi_struct *napi, int budget)
rx_desc = (struct hbg_rx_desc *)buffer->skb->data;
pkt_len = FIELD_GET(HBG_RX_DESC_W2_PKT_LEN_M, rx_desc->word2);
- if (unlikely(!hbg_rx_pkt_check(priv, rx_desc))) {
+ if (unlikely(!hbg_rx_pkt_check(priv, rx_desc, buffer->skb))) {
hbg_buffer_free(buffer);
goto next_buffer;
}
This patch implements the rx checksum offload feature including NETIF_F_IP_CSUM NETIF_F_IPV6_CSUM and NETIF_F_RXCSUM Signed-off-by: Jijie Shao <shaojijie@huawei.com> --- ChangeLog: v1 -> v2: - Use !! to convert integer to boolean, suggested by Simon Horman. v1: https://lore.kernel.org/all/20250213035529.2402283-1-shaojijie@huawei.com/ --- .../net/ethernet/hisilicon/hibmcge/hbg_main.c | 13 ++++++++++++ .../net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 20 +++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-)