Now ice is ready to get queue_mgmt_ops support. It already has API
to disable/reconfig/enable one particular queue (for XSk). Reuse as
much of its code as possible to implement Rx queue management
callbacks and vice versa -- ice_queue_mem_{alloc,free}() can be
reused during ifup/ifdown to elide code duplication.
With this, ice passes the io_uring zcrx selftests, meaning the Rx
part of netmem/MP support is done.
Reviewed-by: Jacob Keller
Reviewed-by: Aleksandr Loktionov
Signed-off-by: Alexander Lobakin
---
drivers/net/ethernet/intel/ice/ice_lib.h| 5 +
drivers/net/ethernet/intel/ice/ice_txrx.h | 2 +
drivers/net/ethernet/intel/ice/ice_base.c | 192 ++--
drivers/net/ethernet/intel/ice/ice_main.c | 2 +-
drivers/net/ethernet/intel/ice/ice_sf_eth.c | 2 +-
drivers/net/ethernet/intel/ice/ice_txrx.c | 26 ++-
6 files changed, 163 insertions(+), 66 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_lib.h
b/drivers/net/ethernet/intel/ice/ice_lib.h
index 347b63e497e7..2d3168458891 100644
--- a/drivers/net/ethernet/intel/ice/ice_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_lib.h
@@ -4,6 +4,8 @@
#ifndef _ICE_LIB_H_
#define _ICE_LIB_H_
+#include
+
#include "ice.h"
#include "ice_vlan.h"
@@ -132,4 +134,7 @@ void ice_clear_feature_support(struct ice_pf *pf, enum
ice_feature f);
void ice_init_feature_support(struct ice_pf *pf);
bool ice_vsi_is_rx_queue_active(struct ice_vsi *vsi);
void ice_vsi_update_l2tsel(struct ice_vsi *vsi, enum ice_l2tsel l2tsel);
+
+extern const struct netdev_queue_mgmt_ops ice_queue_mgmt_ops;
+
#endif /* !_ICE_LIB_H_ */
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h
b/drivers/net/ethernet/intel/ice/ice_txrx.h
index c51b1e60f717..e3c682723107 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -440,6 +440,8 @@ u16
ice_select_queue(struct net_device *dev, struct sk_buff *skb,
struct net_device *sb_dev);
void ice_clean_tx_ring(struct ice_tx_ring *tx_ring);
+void ice_queue_mem_free(struct net_device *dev, void *per_queue_mem);
+void ice_zero_rx_ring(struct ice_rx_ring *rx_ring);
void ice_clean_rx_ring(struct ice_rx_ring *rx_ring);
int ice_setup_tx_ring(struct ice_tx_ring *tx_ring);
int ice_setup_rx_ring(struct ice_rx_ring *rx_ring);
diff --git a/drivers/net/ethernet/intel/ice/ice_base.c
b/drivers/net/ethernet/intel/ice/ice_base.c
index 7097324c38f3..4479bb5e66ac 100644
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -651,6 +651,42 @@ static int ice_rxq_pp_create(struct ice_rx_ring *rq)
return err;
}
+static int ice_queue_mem_alloc(struct net_device *dev, void *per_queue_mem,
+ int idx)
+{
+ const struct ice_netdev_priv *priv = netdev_priv(dev);
+ const struct ice_rx_ring *real = priv->vsi->rx_rings[idx];
+ struct ice_rx_ring *new = per_queue_mem;
+ int ret;
+
+ new->count = real->count;
+ new->netdev = real->netdev;
+ new->q_index = real->q_index;
+ new->q_vector = real->q_vector;
+ new->vsi = real->vsi;
+
+ ret = ice_rxq_pp_create(new);
+ if (ret)
+ return ret;
+
+ if (!netif_running(dev))
+ return 0;
+
+ ret = __xdp_rxq_info_reg(&new->xdp_rxq, new->netdev, new->q_index,
+new->q_vector->napi.napi_id, new->rx_buf_len);
+ if (ret)
+ goto err_destroy_fq;
+
+ xdp_rxq_info_attach_page_pool(&new->xdp_rxq, new->pp);
+
+ return 0;
+
+err_destroy_fq:
+ ice_rxq_pp_destroy(new);
+
+ return ret;
+}
+
/**
* ice_vsi_cfg_rxq - Configure an Rx queue
* @ring: the ring being configured
@@ -665,23 +701,12 @@ static int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)
int err;
if (ring->vsi->type == ICE_VSI_PF || ring->vsi->type == ICE_VSI_SF) {
- if (!xdp_rxq_info_is_reg(&ring->xdp_rxq)) {
- err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
-ring->q_index,
-ring->q_vector->napi.napi_id,
-ring->rx_buf_len);
- if (err)
- return err;
- }
-
ice_rx_xsk_pool(ring);
err = ice_realloc_rx_xdp_bufs(ring, ring->xsk_pool);
if (err)
return err;
if (ring->xsk_pool) {
- xdp_rxq_info_unreg(&ring->xdp_rxq);
-
rx_buf_len =
xsk_pool_get_rx_frame_size(ring->xsk_pool);
err = __xdp_rxq_info_reg(&ring->xdp_rxq, ring->netdev,
@@ -700,20 +725,10 @@ static int ice_vsi_cfg_rxq(struct ice_rx_ring *ring)
dev_info(dev, "Registered XDP mem model
MEM_TYPE_
