qede: Disable hardware gro when xdp prog is installed
Subsystems (3)
PATCH 1/1 qede: Disable hardware gro when xdp prog is installed
commit 18c602dee472 ("qede: Use NETIF_F_GRO_HW.") introduced a regression in driver that when xdp program is installed on qede device, device's aggregation feature (hardware GRO) is not getting disabled, which is unexpected with xdp.
--- drivers/net/ethernet/qlogic/qede/qede_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/qlogic/qede/qede_main.c +2 -2
@@ -1406,6 +1406,7 @@ static int qede_alloc_mem_rxq(struct qede_dev *edev, struct qede_rx_queue *rxq) rxq->rx_buf_seg_size =roundup_pow_of_two (size); }else { rxq->rx_buf_seg_size =PAGE_SIZE ; + edev->ndev->features &= ~NETIF_F_GRO_HW ; }/* Allocate the parallel driver ring for Rx buffers */
@@ -1450,6 +1451,7 @@ static int qede_alloc_mem_rxq(struct qede_dev *edev, struct qede_rx_queue *rxq) } } + edev->gro_disable = !(edev->ndev->features &NETIF_F_GRO_HW );if (!edev->gro_disable)qede_set_tpa_param (rxq); err:
@@ -1702,8 +1704,6 @@ static void qede_init_fp(struct qede_dev *edev)snprintf (fp->name,sizeof (fp->name),"%s-fp-%d" , edev->ndev->name, queue_id); } - - edev->gro_disable = !(edev->ndev->features &NETIF_F_GRO_HW ); }static int qede_set_real_num_queues (struct qede_dev *edev)
Signature · 1 line
2.18.1
Quoted 9 lines · Manish Chopra
commit
18c602dee472("qede: UseNETIF_F_GRO_HW.") introduced a regression in driver that when xdp program is installed on qede device, device's aggregation feature (hardware GRO) is not getting disabled, which is unexpected with xdp.Fixes 18c602dee472 ("qede: Use NETIF_F_GRO_HW.")Signed-off-by Manish Chopra <[email protected]>Signed-off-by Ariel Elior <[email protected]>
David Miller
maintainerFrom: Manish Chopra <[email protected]>
Date: Thu, 19 Dec 2019 10:35:16 -0800
Quoted 8 lines
commit
18c602dee472("qede: UseNETIF_F_GRO_HW.") introduced a regression in driver that when xdp program is installed on qede device, device's aggregation feature (hardware GRO) is not getting disabled, which is unexpected with xdp.Fixes 18c602dee472 ("qede: Use NETIF_F_GRO_HW.")Signed-off-by Manish Chopra <[email protected]>Signed-off-by Ariel Elior <[email protected]>
Applied and queued up for -stable, thanks.