From 69313edad85f8958acc8a47272b3c3da494835ec Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Sat, 3 May 2014 12:53:20 +0100 Subject: [PATCH] [undi] Place an upper limit on the number of PXENV_UNDI_ISR calls per poll PXENV_UNDI_ISR calls may implicitly refill the underlying receive ring, and so could continue to retrieve packets indefinitely. Place an upper limit on the number of calls to PXENV_UNDI_ISR per call to undinet_poll(). Signed-off-by: Michael Brown --- src/arch/i386/drivers/net/undinet.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c index d7a632da..82dd8d2f 100644 --- a/src/arch/i386/drivers/net/undinet.c +++ b/src/arch/i386/drivers/net/undinet.c @@ -72,6 +72,9 @@ struct undi_nic { /** Delay between retries of PXENV_UNDI_INITIALIZE */ #define UNDI_INITIALIZE_RETRY_DELAY_MS 200 +/** Maximum number of calls to PXENV_UNDI_ISR per poll */ +#define UNDI_POLL_QUOTA 4 + /** Alignment of received frame payload */ #define UNDI_RX_ALIGN 16 @@ -328,6 +331,7 @@ static void undinet_poll ( struct net_device *netdev ) { struct undi_nic *undinic = netdev->priv; struct s_PXENV_UNDI_ISR undi_isr; struct io_buffer *iobuf = NULL; + unsigned int quota = UNDI_POLL_QUOTA; size_t len; size_t reserve_len; size_t frag_len; @@ -366,7 +370,7 @@ static void undinet_poll ( struct net_device *netdev ) { } /* Run through the ISR loop */ - while ( 1 ) { + while ( quota-- ) { profile_start ( &undinet_isr_call_profiler ); if ( ( rc = pxeparent_call ( undinet_entry, PXENV_UNDI_ISR, &undi_isr,