Linux block layer
 help / color / mirror / Atom feed
From: Yang Erkun <yangerkun@huawei.com>
To: josef@toxicpanda.com, axboe@kernel.dk, hch@lst.de, yukuai@kernel.org
Cc: yi.zhang@huawei.com, chengzhihao1@huawei.com,
	echo.chenlin@huawei.com, leo.lilong@huaweicloud.com,
	wangkefeng.wang@huawei.com, huawei.libin@huawei.com,
	leijitang@huawei.com, linux-block@vger.kernel.org,
	nbd@other.debian.org
Subject: [PATCH v5 2/8] nbd: disallow NBD_SET_SOCK on an active device
Date: Thu, 30 Jul 2026 16:20:40 +0800	[thread overview]
Message-ID: <20260730082046.3459239-3-yangerkun@huawei.com> (raw)
In-Reply-To: <20260730082046.3459239-1-yangerkun@huawei.com>

We cannot add a socket to an already running nbd device, the reconfigure
for netlink can only active an inactive socket. But for ioctl path, we can
call NBD_SET_SOCK after NBD_DO_IT, reject this using nbd->pid which has
been setted when NBD_DO_IT. Besides, it is the root cause for commit
b98e762e3d71 ("nbd: freeze the queue while we're adding connections").

Signed-off-by: Yang Erkun <yangerkun@huawei.com>
---
 drivers/block/nbd.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index b1a5acd57426..7ec85f94f742 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1278,6 +1278,13 @@ static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg,
 	/* Arg will be cast to int, check it to avoid overflow */
 	if (arg > INT_MAX)
 		return -EINVAL;
+
+	if (nbd->pid) {
+		dev_err(disk_to_dev(nbd->disk),
+			"Cannot add socket to a running device\n");
+		return -EBUSY;
+	}
+
 	sock = nbd_get_socket(nbd, arg, &err);
 	if (!sock)
 		return err;
-- 
2.52.0


  parent reply	other threads:[~2026-07-30  8:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-30  8:20 [PATCH v5 0/8] nbd: eliminate queue freeze/unfreeze overhead in connection setup Yang Erkun
2026-07-30  8:20 ` [PATCH v5 1/8] nbd: simplify find_fallback() by removing redundant logic Yang Erkun
2026-07-30  8:20 ` Yang Erkun [this message]
2026-07-30  8:20 ` [PATCH v5 3/8] nbd: reset write cache on disconnect Yang Erkun
2026-07-30  8:20 ` [PATCH v5 4/8] nbd: remove queue freeze in nbd_add_socket Yang Erkun
2026-07-30  8:20 ` [PATCH v5 5/8] nbd: skip queue freeze when setting size at device startup Yang Erkun
2026-07-30  8:20 ` [PATCH v5 6/8] nbd: factor out a nbd_genl_foreach_sock Yang Erkun
2026-07-30  8:20 ` [PATCH v5 7/8] nbd: remove queue freeze for newly created nbd from netlink path Yang Erkun
2026-07-30  8:20 ` [PATCH v5 8/8] nbd: add nr_hw_queues module parameter for pre-created devices Yang Erkun

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260730082046.3459239-3-yangerkun@huawei.com \
    --to=yangerkun@huawei.com \
    --cc=axboe@kernel.dk \
    --cc=chengzhihao1@huawei.com \
    --cc=echo.chenlin@huawei.com \
    --cc=hch@lst.de \
    --cc=huawei.libin@huawei.com \
    --cc=josef@toxicpanda.com \
    --cc=leijitang@huawei.com \
    --cc=leo.lilong@huaweicloud.com \
    --cc=linux-block@vger.kernel.org \
    --cc=nbd@other.debian.org \
    --cc=wangkefeng.wang@huawei.com \
    --cc=yi.zhang@huawei.com \
    --cc=yukuai@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox