eea: introduce ethtool support

Add basic driver framework for the Alibaba Elastic Ethernet Adapter(EEA).

This commit introduces ethtool support.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Dust Li <dust.li@linux.alibaba.com>
Reviewed-by: Philo Lu <lulie@linux.alibaba.com>
Signed-off-by: Wen Gu <guwen@linux.alibaba.com>
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://patch.msgid.link/20260514095138.80680-8-xuanzhuo@linux.alibaba.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Xuan Zhuo 2026-05-14 17:51:37 +08:00 committed by Paolo Abeni
parent aef5055e97
commit 5f4f7bc0ed
7 changed files with 377 additions and 5 deletions

View File

@ -4,5 +4,6 @@ eea-y := eea_ring.o \
eea_net.o \
eea_pci.o \
eea_adminq.o \
eea_ethtool.o \
eea_tx.o \
eea_rx.o

View File

@ -0,0 +1,273 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Driver for Alibaba Elastic Ethernet Adapter.
*
* Copyright (C) 2025 Alibaba Inc.
*/
#include <linux/ethtool.h>
#include <linux/ethtool_netlink.h>
#include <linux/rtnetlink.h>
#include "eea_adminq.h"
#include "eea_net.h"
#include "eea_pci.h"
struct eea_stat_desc {
char desc[ETH_GSTRING_LEN];
size_t offset;
};
#define EEA_TX_STAT(m) {#m, offsetof(struct eea_tx_stats, m)}
#define EEA_RX_STAT(m) {#m, offsetof(struct eea_rx_stats, m)}
static const struct eea_stat_desc eea_rx_stats_desc[] = {
EEA_RX_STAT(descs),
EEA_RX_STAT(kicks),
};
static const struct eea_stat_desc eea_tx_stats_desc[] = {
EEA_TX_STAT(descs),
EEA_TX_STAT(kicks),
};
#define EEA_TX_STATS_LEN ARRAY_SIZE(eea_tx_stats_desc)
#define EEA_RX_STATS_LEN ARRAY_SIZE(eea_rx_stats_desc)
static void eea_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *info)
{
struct eea_net *enet = netdev_priv(netdev);
struct eea_device *edev = enet->edev;
strscpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
strscpy(info->bus_info, eea_pci_name(edev), sizeof(info->bus_info));
}
static void eea_get_ringparam(struct net_device *netdev,
struct ethtool_ringparam *ring,
struct kernel_ethtool_ringparam *kernel_ring,
struct netlink_ext_ack *extack)
{
struct eea_net *enet = netdev_priv(netdev);
ring->rx_max_pending = enet->cfg_hw.rx_ring_depth;
ring->tx_max_pending = enet->cfg_hw.tx_ring_depth;
ring->rx_pending = enet->cfg.rx_ring_depth;
ring->tx_pending = enet->cfg.tx_ring_depth;
kernel_ring->tcp_data_split = enet->cfg.split_hdr ?
ETHTOOL_TCP_DATA_SPLIT_ENABLED :
ETHTOOL_TCP_DATA_SPLIT_DISABLED;
}
static int eea_set_ringparam(struct net_device *netdev,
struct ethtool_ringparam *ring,
struct kernel_ethtool_ringparam *kernel_ring,
struct netlink_ext_ack *extack)
{
struct eea_net *enet = netdev_priv(netdev);
struct eea_net_init_ctx ctx;
bool need_update = false;
struct eea_net_cfg *cfg;
bool sh;
if (ring->rx_pending < EEA_NET_IO_RING_DEPTH_MIN ||
ring->tx_pending < EEA_NET_IO_RING_DEPTH_MIN)
return -EINVAL;
if (!is_power_of_2(ring->rx_pending) ||
!is_power_of_2(ring->tx_pending))
return -EINVAL;
eea_init_ctx(enet, &ctx);
cfg = &ctx.cfg;
if (ring->rx_pending != cfg->rx_ring_depth)
need_update = true;
if (ring->tx_pending != cfg->tx_ring_depth)
need_update = true;
sh = false;
switch (kernel_ring->tcp_data_split) {
case ETHTOOL_TCP_DATA_SPLIT_ENABLED:
sh = true;
break;
case ETHTOOL_TCP_DATA_SPLIT_DISABLED:
sh = false;
break;
case ETHTOOL_TCP_DATA_SPLIT_UNKNOWN:
sh = !!cfg->split_hdr;
break;
}
if (sh != !!(cfg->split_hdr))
need_update = true;
if (!need_update)
return 0;
cfg->rx_ring_depth = ring->rx_pending;
cfg->tx_ring_depth = ring->tx_pending;
/* By default, enet->cfg_hw.split_hdr is 128. */
cfg->split_hdr = sh ? enet->cfg_hw.split_hdr : 0;
return eea_reset_hw_resources(enet, &ctx);
}
static int eea_set_channels(struct net_device *netdev,
struct ethtool_channels *channels)
{
struct eea_net *enet = netdev_priv(netdev);
u16 queue_pairs = channels->combined_count;
struct eea_net_init_ctx ctx;
struct eea_net_cfg *cfg;
eea_init_ctx(enet, &ctx);
cfg = &ctx.cfg;
cfg->rx_ring_num = queue_pairs;
cfg->tx_ring_num = queue_pairs;
return eea_reset_hw_resources(enet, &ctx);
}
static void eea_get_channels(struct net_device *netdev,
struct ethtool_channels *channels)
{
struct eea_net *enet = netdev_priv(netdev);
channels->combined_count = enet->cfg.rx_ring_num;
channels->max_combined = enet->cfg_hw.rx_ring_num;
}
static void eea_get_strings(struct net_device *netdev, u32 stringset, u8 *data)
{
struct eea_net *enet = netdev_priv(netdev);
u8 *p = data;
u32 i, j;
if (stringset != ETH_SS_STATS)
return;
for (i = 0; i < enet->cfg.rx_ring_num; i++) {
for (j = 0; j < EEA_RX_STATS_LEN; j++)
ethtool_sprintf(&p, "rx%u_%s", i,
eea_rx_stats_desc[j].desc);
}
for (i = 0; i < enet->cfg.tx_ring_num; i++) {
for (j = 0; j < EEA_TX_STATS_LEN; j++)
ethtool_sprintf(&p, "tx%u_%s", i,
eea_tx_stats_desc[j].desc);
}
}
static int eea_get_sset_count(struct net_device *netdev, int sset)
{
struct eea_net *enet = netdev_priv(netdev);
if (sset != ETH_SS_STATS)
return -EOPNOTSUPP;
return enet->cfg.rx_ring_num * EEA_RX_STATS_LEN +
enet->cfg.tx_ring_num * EEA_TX_STATS_LEN;
}
static void eea_stats_fill_for_q(struct u64_stats_sync *syncp, u32 num,
const struct eea_stat_desc *desc,
u64 *data, u32 idx)
{
void *stats_base = syncp;
u32 start, i;
do {
start = u64_stats_fetch_begin(syncp);
for (i = 0; i < num; i++)
data[idx + i] =
u64_stats_read(stats_base + desc[i].offset);
} while (u64_stats_fetch_retry(syncp, start));
BUILD_BUG_ON(offsetof(struct eea_tx_stats, syncp));
BUILD_BUG_ON(offsetof(struct eea_rx_stats, syncp));
}
static void eea_get_ethtool_stats(struct net_device *netdev,
struct ethtool_stats *stats, u64 *data)
{
struct eea_net *enet = netdev_priv(netdev);
u32 i, idx = 0;
ASSERT_RTNL();
if (enet->rx) {
for (i = 0; i < enet->cfg.rx_ring_num; i++) {
struct eea_net_rx *rx = enet->rx[i];
eea_stats_fill_for_q(&rx->stats.syncp, EEA_RX_STATS_LEN,
eea_rx_stats_desc, data, idx);
idx += EEA_RX_STATS_LEN;
}
}
if (enet->tx) {
for (i = 0; i < enet->cfg.tx_ring_num; i++) {
struct eea_net_tx *tx = &enet->tx[i];
eea_stats_fill_for_q(&tx->stats.syncp, EEA_TX_STATS_LEN,
eea_tx_stats_desc, data, idx);
idx += EEA_TX_STATS_LEN;
}
}
}
void eea_update_rx_stats(struct eea_rx_stats *rx_stats,
struct eea_rx_ctx_stats *stats)
{
u64_stats_update_begin(&rx_stats->syncp);
u64_stats_add(&rx_stats->descs, stats->descs);
u64_stats_add(&rx_stats->packets, stats->packets);
u64_stats_add(&rx_stats->bytes, stats->bytes);
u64_stats_add(&rx_stats->drops, stats->drops);
u64_stats_add(&rx_stats->split_hdr_bytes, stats->split_hdr_bytes);
u64_stats_add(&rx_stats->split_hdr_packets, stats->split_hdr_packets);
u64_stats_add(&rx_stats->length_errors, stats->length_errors);
u64_stats_add(&rx_stats->kicks, stats->kicks);
u64_stats_update_end(&rx_stats->syncp);
}
static int eea_get_link_ksettings(struct net_device *netdev,
struct ethtool_link_ksettings *cmd)
{
struct eea_net *enet = netdev_priv(netdev);
cmd->base.speed = enet->speed;
cmd->base.duplex = enet->duplex;
cmd->base.port = PORT_OTHER;
return 0;
}
const struct ethtool_ops eea_ethtool_ops = {
.supported_ring_params = ETHTOOL_RING_USE_TCP_DATA_SPLIT,
.get_drvinfo = eea_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ringparam = eea_get_ringparam,
.set_ringparam = eea_set_ringparam,
.set_channels = eea_set_channels,
.get_channels = eea_get_channels,
.get_strings = eea_get_strings,
.get_sset_count = eea_get_sset_count,
.get_ethtool_stats = eea_get_ethtool_stats,
.get_link_ksettings = eea_get_link_ksettings,
};

View File

@ -0,0 +1,48 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
/*
* Driver for Alibaba Elastic Ethernet Adapter.
*
* Copyright (C) 2025 Alibaba Inc.
*/
#ifndef __EEA_ETHTOOL_H__
#define __EEA_ETHTOOL_H__
struct eea_tx_stats {
struct u64_stats_sync syncp;
u64_stats_t descs;
u64_stats_t packets;
u64_stats_t bytes;
u64_stats_t drops;
u64_stats_t kicks;
};
struct eea_rx_ctx_stats {
u64 descs;
u64 packets;
u64 bytes;
u64 drops;
u64 split_hdr_bytes;
u64 split_hdr_packets;
u64 kicks;
u64 length_errors;
};
struct eea_rx_stats {
struct u64_stats_sync syncp;
u64_stats_t descs;
u64_stats_t packets;
u64_stats_t bytes;
u64_stats_t drops;
u64_stats_t kicks;
u64_stats_t split_hdr_bytes;
u64_stats_t split_hdr_packets;
u64_stats_t length_errors;
};
void eea_update_rx_stats(struct eea_rx_stats *rx_stats,
struct eea_rx_ctx_stats *stats);
extern const struct ethtool_ops eea_ethtool_ops;
#endif

View File

@ -624,6 +624,7 @@ static struct eea_net *eea_netdev_alloc(struct eea_device *edev, u32 pairs)
}
netdev->netdev_ops = &eea_netdev;
netdev->ethtool_ops = &eea_ethtool_ops;
SET_NETDEV_DEV(netdev, edev->dma_dev);
enet = netdev_priv(netdev);

View File

@ -12,6 +12,7 @@
#include <linux/netdevice.h>
#include "eea_adminq.h"
#include "eea_ethtool.h"
#include "eea_ring.h"
#define EEA_VER_MAJOR 1
@ -33,6 +34,8 @@ struct eea_net_tx {
u32 index;
char name[16];
struct eea_tx_stats stats;
};
struct eea_rx_meta {
@ -87,6 +90,8 @@ struct eea_net_rx {
struct napi_struct *napi;
struct eea_rx_stats stats;
char name[16];
struct eea_net_rx_pkt_ctx pkt;

View File

@ -29,6 +29,8 @@ struct eea_rx_ctx {
bool more;
struct eea_rx_meta *meta;
struct eea_rx_ctx_stats stats;
};
static struct eea_rx_meta *eea_rx_meta_get(struct eea_net_rx *rx)
@ -232,6 +234,7 @@ static int eea_harden_check_overflow(struct eea_rx_ctx *ctx,
if (unlikely(ctx->len > max_len)) {
pr_debug("%s: rx error: len %u exceeds truesize %u\n",
enet->netdev->name, ctx->len, max_len);
++ctx->stats.length_errors;
return -EINVAL;
}
@ -250,6 +253,7 @@ static int eea_harden_check_size(struct eea_rx_ctx *ctx, struct eea_net *enet)
if (unlikely(ctx->hdr_len < ETH_HLEN)) {
pr_debug("%s: short hdr %u\n", enet->netdev->name,
ctx->hdr_len);
++ctx->stats.length_errors;
return -EINVAL;
}
@ -257,6 +261,7 @@ static int eea_harden_check_size(struct eea_rx_ctx *ctx, struct eea_net *enet)
pr_debug("%s: rx error: hdr len %u exceeds hdr buffer size %u\n",
enet->netdev->name, ctx->hdr_len,
enet->cfg.split_hdr);
++ctx->stats.length_errors;
return -EINVAL;
}
@ -265,6 +270,7 @@ static int eea_harden_check_size(struct eea_rx_ctx *ctx, struct eea_net *enet)
if (unlikely(ctx->len < ETH_HLEN)) {
pr_debug("%s: short packet %u\n", enet->netdev->name, ctx->len);
++ctx->stats.length_errors;
return -EINVAL;
}
@ -373,6 +379,7 @@ static void process_remain_buf(struct eea_net_rx *rx, struct eea_rx_ctx *ctx)
err:
dev_kfree_skb(rx->pkt.head_skb);
++ctx->stats.drops;
rx->pkt.do_drop = true;
rx->pkt.head_skb = NULL;
}
@ -400,6 +407,7 @@ static void process_first_buf(struct eea_net_rx *rx, struct eea_rx_ctx *ctx)
return;
err:
++ctx->stats.drops;
rx->pkt.do_drop = true;
}
@ -460,6 +468,8 @@ static int eea_rx_desc_to_ctx(struct eea_net_rx *rx,
if (ctx->flags & EEA_DESC_F_SPLIT_HDR) {
ctx->hdr_len = le16_to_cpu(desc->len_ex) &
EEA_RX_CDESC_HDR_LEN_MASK;
ctx->stats.split_hdr_bytes += ctx->hdr_len;
++ctx->stats.split_hdr_packets;
}
ctx->more = ctx->flags & EEA_RING_DESC_F_MORE;
@ -484,8 +494,10 @@ static int eea_cleanrx(struct eea_net_rx *rx, int budget,
if (ctx->meta)
eea_rx_meta_put(rx, ctx->meta);
if (rx->pkt.head_skb)
if (rx->pkt.head_skb) {
dev_kfree_skb(rx->pkt.head_skb);
++ctx->stats.drops;
}
/* A hardware error occurred; we are attempting to
* mitigate the impact. Subsequent packets may be
@ -512,13 +524,17 @@ static int eea_cleanrx(struct eea_net_rx *rx, int budget,
++rx->pkt.idx;
if (!ctx->more && rx->pkt.head_skb)
if (!ctx->more && rx->pkt.head_skb) {
eea_submit_skb(rx, rx->pkt.head_skb, desc);
ctx->stats.bytes += rx->pkt.recv_len;
++ctx->stats.packets;
}
skip:
eea_rx_meta_put(rx, meta);
ack:
eea_ering_cq_ack_desc(rx->ering, 1);
++ctx->stats.descs;
if (!ctx->more) {
memset(&rx->pkt, 0, sizeof(rx->pkt));
@ -537,7 +553,7 @@ static void eea_rx_dma_sync_hdr(struct eea_net_rx *rx, dma_addr_t addr)
}
/* Only be called from napi. */
static void eea_rx_post(struct eea_net_rx *rx)
static void eea_rx_post(struct eea_net_rx *rx, struct eea_rx_ctx *ctx)
{
u32 tailroom, headroom, room, len;
struct eea_rx_meta *meta;
@ -586,8 +602,10 @@ static void eea_rx_post(struct eea_net_rx *rx)
++num;
}
if (num)
if (num) {
eea_ering_kick(rx->ering);
++ctx->stats.kicks;
}
}
static int eea_poll(struct napi_struct *napi, int budget)
@ -608,12 +626,14 @@ static int eea_poll(struct napi_struct *napi, int budget)
* buffers are exhausted. Therefore, we should proactively
* pre-fill the buffers to avoid starvation.
*/
eea_rx_post(rx);
eea_rx_post(rx, &ctx);
if (rx->ering->num - rx->ering->num_free < budget)
busy = true;
}
eea_update_rx_stats(&rx->stats, &ctx.stats);
busy |= received >= budget;
if (busy)
@ -751,6 +771,8 @@ struct eea_net_rx *eea_alloc_rx(struct eea_net_init_ctx *ctx, u32 idx)
rx->index = idx;
snprintf(rx->name, sizeof(rx->name), "rx.%u", idx);
u64_stats_init(&rx->stats.syncp);
/* ering */
ering = eea_ering_alloc(idx * 2, ctx->cfg.rx_ring_depth, ctx->edev,
ctx->cfg.rx_sq_desc_size,

View File

@ -93,6 +93,7 @@ static void eea_meta_free_xmit(struct eea_net_tx *tx,
}
++stats->packets;
stats->bytes += meta->skb->len;
napi_consume_skb(meta->skb, budget);
meta->data = NULL;
@ -137,6 +138,13 @@ static int eea_clean_tx(struct eea_net_tx *tx, int budget)
eea_ering_cq_ack_desc(tx->ering, desc_n);
}
if (stats.packets) {
u64_stats_update_begin(&tx->stats.syncp);
u64_stats_add(&tx->stats.bytes, stats.bytes);
u64_stats_add(&tx->stats.packets, stats.packets);
u64_stats_update_end(&tx->stats.syncp);
}
return stats.packets;
}
@ -341,6 +349,10 @@ static int eea_tx_post_skb(struct eea_net_tx *tx, struct sk_buff *skb)
eea_ering_sq_commit_desc(tx->ering);
u64_stats_update_begin(&tx->stats.syncp);
u64_stats_add(&tx->stats.descs, meta->num);
u64_stats_update_end(&tx->stats.syncp);
return 0;
err_cancel:
@ -353,6 +365,10 @@ static int eea_tx_post_skb(struct eea_net_tx *tx, struct sk_buff *skb)
static void eea_tx_kick(struct eea_net_tx *tx)
{
eea_ering_kick(tx->ering);
u64_stats_update_begin(&tx->stats.syncp);
u64_stats_inc(&tx->stats.kicks);
u64_stats_update_end(&tx->stats.syncp);
}
static int eea_tx_check_free_num(struct eea_net_tx *tx,
@ -383,6 +399,10 @@ netdev_tx_t eea_tx_xmit(struct sk_buff *skb, struct net_device *netdev)
err = eea_tx_post_skb(tx, skb);
if (unlikely(err)) {
u64_stats_update_begin(&tx->stats.syncp);
u64_stats_inc(&tx->stats.drops);
u64_stats_update_end(&tx->stats.syncp);
dev_kfree_skb_any(skb);
} else {
if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP))
@ -444,6 +464,8 @@ int eea_alloc_tx(struct eea_net_init_ctx *ctx, struct eea_net_tx *tx, u32 idx)
struct eea_ring *ering;
u32 i;
u64_stats_init(&tx->stats.syncp);
snprintf(tx->name, sizeof(tx->name), "tx.%u", idx);
ering = eea_ering_alloc(idx * 2 + 1, ctx->cfg.tx_ring_depth, ctx->edev,