]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: lantiq_xrx200: fix lock under memory pressure
authorAleksander Jan Bajkowski <olek2@wp.pl>
Wed, 24 Aug 2022 21:54:07 +0000 (23:54 +0200)
committerJakub Kicinski <kuba@kernel.org>
Thu, 25 Aug 2022 19:41:39 +0000 (12:41 -0700)
When the xrx200_hw_receive() function returns -ENOMEM, the NAPI poll
function immediately returns an error.
This is incorrect for two reasons:
* the function terminates without enabling interrupts or scheduling NAPI,
* the error code (-ENOMEM) is returned instead of the number of received
packets.

After the first memory allocation failure occurs, packet reception is
locked due to disabled interrupts from DMA..

Fixes: 2db54a9ba722 ("net: lantiq: Add Lantiq / Intel VRX200 Ethernet driver")
Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/lantiq_xrx200.c

index 89314b645c822b851a1b6bc981079f48f412e97b..25adce7f0c7c04570a106de4797bff3b1aa6641a 100644 (file)
@@ -294,7 +294,7 @@ static int xrx200_poll_rx(struct napi_struct *napi, int budget)
                        if (ret == XRX200_DMA_PACKET_IN_PROGRESS)
                                continue;
                        if (ret != XRX200_DMA_PACKET_COMPLETE)
-                               return ret;
+                               break;
                        rx++;
                } else {
                        break;