Skip to contentSkip to conversation

Patch "nbd: ratelimit error msgs after socket close" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message May 6, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

nbd: ratelimit error msgs after socket close

to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
nbd-ratelimit-error-msgs-after-socket-close.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From da6ccaaa79caca4f38b540b651238f87215217a2 Mon Sep 17 00:00:00 2001

From: Dan Streetman <[email protected]>
Date: Thu, 14 Jan 2016 13:42:32 -0500
Subject: nbd: ratelimit error msgs after socket close

From: Dan Streetman <[email protected]>

commit da6ccaaa79caca4f38b540b651238f87215217a2 upstream.

Make the "Attempted send on closed socket" error messages generated in nbd_request_handler() ratelimited.

When the nbd socket is shutdown, the nbd_request_handler() function emits an error message for every request remaining in its queue. If the queue is large, this will spam a large amount of messages to the log. There's no need for a separate error message for each request, so this patch ratelimits it.

In the specific case this was found, the system was virtual and the error messages were logged to the serial port, which overwhelmed it.

Fixes 4d48a542b427 ("nbd: fix I/O hang on disconnected nbds")
---
 drivers/block/nbd.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/block/nbd.c +2 -2
@@ -581,8 +581,8 @@ static void do_nbd_request(struct reques
 		BUG_ON(nbd->magic != NBD_MAGIC);
 
 		if (unlikely(!nbd->sock)) {
-			dev_err(disk_to_dev(nbd->disk),
-				"Attempted send on closed socket\n");
+			dev_err_ratelimited(disk_to_dev(nbd->disk),
+					    "Attempted send on closed socket\n");
 			req->errors++;
 			nbd_end_request(req);
 			spin_lock_irq(q->queue_lock);

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/nbd-ratelimit-error-msgs-after-socket-close.patch