Commit 7c37101c authored by Wei Liu's avatar Wei Liu Committed by Greg Kroah-Hartman

xen-netback: correctly schedule rate-limited queues


[ Upstream commit dfa523ae ]

Add a flag to indicate if a queue is rate-limited. Test the flag in
NAPI poll handler and avoid rescheduling the queue if true, otherwise
we risk locking up the host. The rescheduling will be done in the
timer callback function.
Reported-by: default avatarJean-Louis Dupond <jean-louis@dupond.be>
Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
Tested-by: default avatarJean-Louis Dupond <jean-louis@dupond.be>
Reviewed-by: default avatarPaul Durrant <paul.durrant@citrix.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2933fb22
...@@ -201,6 +201,7 @@ struct xenvif_queue { /* Per-queue data for xenvif */ ...@@ -201,6 +201,7 @@ struct xenvif_queue { /* Per-queue data for xenvif */
unsigned long remaining_credit; unsigned long remaining_credit;
struct timer_list credit_timeout; struct timer_list credit_timeout;
u64 credit_window_start; u64 credit_window_start;
bool rate_limited;
/* Statistics */ /* Statistics */
struct xenvif_stats stats; struct xenvif_stats stats;
......
...@@ -105,6 +105,10 @@ static int xenvif_poll(struct napi_struct *napi, int budget) ...@@ -105,6 +105,10 @@ static int xenvif_poll(struct napi_struct *napi, int budget)
if (work_done < budget) { if (work_done < budget) {
napi_complete(napi); napi_complete(napi);
/* If the queue is rate-limited, it shall be
* rescheduled in the timer callback.
*/
if (likely(!queue->rate_limited))
xenvif_napi_schedule_or_enable_events(queue); xenvif_napi_schedule_or_enable_events(queue);
} }
......
...@@ -687,6 +687,7 @@ static void tx_add_credit(struct xenvif_queue *queue) ...@@ -687,6 +687,7 @@ static void tx_add_credit(struct xenvif_queue *queue)
max_credit = ULONG_MAX; /* wrapped: clamp to ULONG_MAX */ max_credit = ULONG_MAX; /* wrapped: clamp to ULONG_MAX */
queue->remaining_credit = min(max_credit, max_burst); queue->remaining_credit = min(max_credit, max_burst);
queue->rate_limited = false;
} }
void xenvif_tx_credit_callback(unsigned long data) void xenvif_tx_credit_callback(unsigned long data)
...@@ -1184,8 +1185,10 @@ static bool tx_credit_exceeded(struct xenvif_queue *queue, unsigned size) ...@@ -1184,8 +1185,10 @@ static bool tx_credit_exceeded(struct xenvif_queue *queue, unsigned size)
msecs_to_jiffies(queue->credit_usec / 1000); msecs_to_jiffies(queue->credit_usec / 1000);
/* Timer could already be pending in rare cases. */ /* Timer could already be pending in rare cases. */
if (timer_pending(&queue->credit_timeout)) if (timer_pending(&queue->credit_timeout)) {
queue->rate_limited = true;
return true; return true;
}
/* Passed the point where we can replenish credit? */ /* Passed the point where we can replenish credit? */
if (time_after_eq64(now, next_credit)) { if (time_after_eq64(now, next_credit)) {
...@@ -1200,6 +1203,7 @@ static bool tx_credit_exceeded(struct xenvif_queue *queue, unsigned size) ...@@ -1200,6 +1203,7 @@ static bool tx_credit_exceeded(struct xenvif_queue *queue, unsigned size)
mod_timer(&queue->credit_timeout, mod_timer(&queue->credit_timeout,
next_credit); next_credit);
queue->credit_window_start = next_credit; queue->credit_window_start = next_credit;
queue->rate_limited = true;
return true; return true;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment