igb/igc: fix XDP registration
Subsystems (3)
v2 cover igb/igc: fix XDP registration
Fix the kernel warning "Missing unregister, handled but fix driver" when running, e.g.,
$ ethtool -G eth0 rx 1024
on igc. Remove memset hack from igb and align igb code to igc.
Corinna Vinschen (2):
igc: avoid kernel warning when changing RX ring parameters
igb: refactor XDP registration
drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ---- drivers/net/ethernet/intel/igb/igb_main.c | 15 +++++++++++---- drivers/net/ethernet/intel/igc/igc_main.c | 20 +++++++++++--------- 3 files changed, 22 insertions(+), 17 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/2 igc: avoid kernel warning when changing RX ring parameters
Calling ethtool changing the RX ring parameters like this:
$ ethtool -G eth0 rx 1024
on igc triggers the "Missing unregister, handled but fix driver" warning in xdp_rxq_info_reg().
igc_ethtool_set_ringparam() copies the igc_ring structure but neglects to reset the xdp_rxq_info member before calling igc_setup_rx_resources(). This in turn calls xdp_rxq_info_reg() with an already registered xdp_rxq_info.
Make sure to unregister the xdp_rxq_info structure first in igc_setup_rx_resources. Move xdp_rxq_info handling down to bethe last action, thus allowing to remove the xdp_rxq_info_unreg call in the error path.
--- drivers/net/ethernet/intel/igc/igc_main.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/net/ethernet/intel/igc/igc_main.c +11 -9
@@ -505,14 +505,6 @@ int igc_setup_rx_resources(struct igc_ring *rx_ring)u8 index = rx_ring->queue_index;int size, desc_len, res; - res =xdp_rxq_info_reg (&rx_ring->xdp_rxq, ndev, index, - rx_ring->q_vector->napi.napi_id); -if (res <0 ) { -netdev_err (ndev,"Failed to register xdp_rxq index %u\n" , - index); -return res; - } - size =sizeof (struct igc_rx_buffer ) * rx_ring->count; rx_ring->rx_buffer_info =vzalloc (size);if (!rx_ring->rx_buffer_info)
@@ -534,10 +526,20 @@ int igc_setup_rx_resources(struct igc_ring *rx_ring) rx_ring->next_to_clean =0 ; rx_ring->next_to_use =0 ; +/* XDP RX-queue info */ +if (xdp_rxq_info_is_reg (&rx_ring->xdp_rxq)) +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); + res =xdp_rxq_info_reg (&rx_ring->xdp_rxq, ndev, index, + rx_ring->q_vector->napi.napi_id); +if (res <0 ) { +netdev_err (ndev,"Failed to register xdp_rxq index %u\n" , + index); +return res; + } +return 0 ; err: -xdp_rxq_info_unreg (&rx_ring->xdp_rxq);vfree (rx_ring->rx_buffer_info); rx_ring->rx_buffer_info =NULL ;netdev_err (ndev,"Unable to allocate memory for Rx descriptor ring\n" );
Signature · 1 line
2.27.0
PATCH v2 2/2 igb: refactor XDP registration
In reply to Corinna VinschenOn changing the RX ring parameters igb uses a hack to avoid a warning when calling xdp_rxq_info_reg via igb_setup_rx_resources. It just clears the struct xdp_rxq_info content.
Change this to unregister if we're already registered instead. ALign code to the igc code.
--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ---- drivers/net/ethernet/intel/igb/igb_main.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-)
drivers/net/ethernet/intel/igb/igb_ethtool.c +0 -4
@@ -965,10 +965,6 @@ static int igb_set_ringparam(struct net_device *netdev,memcpy (&temp_ring[i], adapter->rx_ring[i],sizeof (struct igb_ring )); -/* Clear copied XDP RX-queue info */ -memset (&temp_ring[i].xdp_rxq,0 , -sizeof (temp_ring[i].xdp_rxq)); - temp_ring[i].count = new_rx_count; err =igb_setup_rx_resources (&temp_ring[i]);if (err) {
drivers/net/ethernet/intel/igb/igb_main.c +11 -4
@@ -4352,7 +4352,7 @@ int igb_setup_rx_resources(struct igb_ring *rx_ring) {struct igb_adapter *adapter =netdev_priv (rx_ring->netdev);struct device *dev = rx_ring->dev; -int size; +int size, res; size =sizeof (struct igb_rx_buffer ) * rx_ring->count;
@@ -4376,9 +4376,16 @@ int igb_setup_rx_resources(struct igb_ring *rx_ring) rx_ring->xdp_prog = adapter->xdp_prog;/* XDP RX-queue info */ -if (xdp_rxq_info_reg (&rx_ring->xdp_rxq, rx_ring->netdev, - rx_ring->queue_index,0 ) <0 ) - goto err; +if (xdp_rxq_info_is_reg (&rx_ring->xdp_rxq)) +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); + res =xdp_rxq_info_reg (&rx_ring->xdp_rxq, rx_ring->netdev, + rx_ring->queue_index,0 ); +if (res <0 ) { +netdev_err (rx_ring->netdev, +"Failed to register xdp_rxq index %u\n" , + rx_ring->queue_index); +return res; + }return 0 ;
Signature · 1 line
2.27.0
Re: [PATCH 2/2 net-next v2] igb: refactor XDP registration
1/14/22 14:43, Corinna Vinschen ?????:
Quoted 47 lines
On changing the RX ring parameters igb uses a hack to avoid a warning when calling
xdp_rxq_info_regviaigb_setup_rx_resources. It just clears the structxdp_rxq_infocontent.Change this to unregister if we're already registered instead. ALign code to the igc code.
Fixes 9cbc948b5a20c ("igb: add XDP support")Signed-off-by Corinna Vinschen <[email protected]>--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ---- drivers/net/ethernet/intel/igb/igb_main.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-)drivers/net/ethernet/intel/igb/igb_ethtool.c +0
-4@@ -965,10 +965,6 @@ static int igb_set_ringparam(struct net_device *netdev,memcpy (&temp_ring[i], adapter->rx_ring[i],sizeof (struct igb_ring )); -/* Clear copied XDP RX-queue info */ -memset (&temp_ring[i].xdp_rxq,0 , -sizeof (temp_ring[i].xdp_rxq)); - temp_ring[i].count = new_rx_count; err =igb_setup_rx_resources (&temp_ring[i]);if (err) {drivers/net/ethernet/intel/igb/igb_main.c +1
-2@@ -4352,7 +4352,7 @@ int igb_setup_rx_resources(struct igb_ring *rx_ring) {struct igb_adapter *adapter =netdev_priv (rx_ring->netdev);struct device *dev = rx_ring->dev; -int size; +int size, res; size =sizeof (struct igb_rx_buffer ) * rx_ring->count;@@ -4376,9 +4376,16 @@ int igb_setup_rx_resources(struct igb_ring *rx_ring) rx_ring->xdp_prog = adapter->xdp_prog;/* XDP RX-queue info */ - if (xdp_rxq_info_reg(&rx_ring->xdp_rxq, rx_ring->netdev,
drivers/net/ethernet/intel/igb/igb_main.c int igb_setup_rx_resources(struct igb_ring *rx_ring) · line 4386
Quoted 10 lines
drivers/net/ethernet/intel/igb/igb_main.c +8
-2- rx_ring->queue_index, 0) < 0) - goto err; +if (xdp_rxq_info_is_reg (&rx_ring->xdp_rxq)) +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); + res =xdp_rxq_info_reg (&rx_ring->xdp_rxq, rx_ring->netdev, + rx_ring->queue_index,0 ); +if (res <0 ) { +netdev_err (rx_ring->netdev, +"Failed to register xdp_rxq index %u\n" , + rx_ring->queue_index);
nit: would be nice to have the same printing functions like dev_err() in the error case
Quoted 5 lines
drivers/net/ethernet/intel/igb/igb_main.c +2
-0+return res; + }return 0 ;
Re: [PATCH 2/2 net-next v2] igb: refactor XDP registration
Quoted 8 lines · Denis Kirjanov
1/14/22 14:43, Corinna Vinschen ?????:
Quoted 7 lines
On changing the RX ring parameters igb uses a hack to avoid a warning when calling
xdp_rxq_info_regviaigb_setup_rx_resources. It just clears the structxdp_rxq_infocontent.Change this to unregister if we're already registered instead. ALign code to the igc code.
Quoted 13 lines
drivers/net/ethernet/intel/igb/igb_main.c int igb_setup_rx_resources(struct igb_ring *rx_ring) · line 4386
Quoted 11 lines
Fixes 9cbc948b5a20c ("igb: add XDP support")Signed-off-by Corinna Vinschen <[email protected]>--- drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 ---- drivers/net/ethernet/intel/igb/igb_main.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 8 deletions(-)[...]
drivers/net/ethernet/intel/igb/igb_main.c +4
-0+if (res <0 ) { +netdev_err (rx_ring->netdev, +"Failed to register xdp_rxq index %u\n" , + rx_ring->queue_index);nit: would be nice to have the same printing functions like
dev_err()in the error case
Thanks, I pushed a v3.
Corinna