| Message ID | 20191219183516.7017-1-manishc@marvell.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,1/1] qede: Disable hardware gro when xdp prog is installed | expand |
On Thu, Dec 19, 2019 at 10:35 AM Manish Chopra <manishc@marvell.com> wrote: > > 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. > > Fixes: 18c602dee472 ("qede: Use NETIF_F_GRO_HW.") > Signed-off-by: Manish Chopra <manishc@marvell.com> > Signed-off-by: Ariel Elior <aelior@marvell.com> Reviewed-by: Michael Chan <michael.chan@broadcom.com>
From: Manish Chopra <manishc@marvell.com> Date: Thu, 19 Dec 2019 10:35:16 -0800 > 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. > > Fixes: 18c602dee472 ("qede: Use NETIF_F_GRO_HW.") > Signed-off-by: Manish Chopra <manishc@marvell.com> > Signed-off-by: Ariel Elior <aelior@marvell.com> Applied and queued up for -stable, thanks.
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index a220cc7c947a..ba53612ae0df 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -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)
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. Fixes: 18c602dee472 ("qede: Use NETIF_F_GRO_HW.") Signed-off-by: Manish Chopra <manishc@marvell.com> Signed-off-by: Ariel Elior <aelior@marvell.com> --- drivers/net/ethernet/qlogic/qede/qede_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)