From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 369691DDC1B for ; Sun, 23 Aug 2026 00:47:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787446028; cv=none; b=puFTLGxZZijLqrInItdlAQY7z1bYiNzz9ZA+0HS90vQtWdD4PS/bkgGRELuHwGzfUbm8GowECcxyA2Ytp2cKNeTm+UdpmMdjVJPK7j3DthP/U0PJ/hDVt7PTz6ICVRZmO1c7y2tnT4VSIxyoxAhmWfU7UGyvRgu7rhIVuVkuGFs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787446028; c=relaxed/simple; bh=pdZufmNYnErLNWVOlre2oYFxmSWycIcY+OSylXewMM8=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TQ2dzeA+cSEs63oqaK8wTtkx0sxcM2+GR5P7WMhvs9p/7Y59f2X1lcy1vozrKqdVP8KczyZeq0hsBpm1sdsvOcnDXwnuSmy2a3o/N5tEbIgQcDHIvIZeHnjHYVJlxJteoxcZgjglUdEG4w9Cfb38ho2mwb4V5RLF+b8z1UwE4Ig= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=pass smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=NOFYVHnB; arc=none smtp.client-ip=209.85.214.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="NOFYVHnB" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso30669325ad.2 for ; Sat, 22 Aug 2026 17:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1787446026; x=1788050826; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=+Jc12zKSf8mmT3ZniJisN3BvVvP0RfZaq/VsQ1cAOq4=; b=NOFYVHnB+0t6aPccPLnngEW4xRKXAfJJJezYMAIwi447lDRQ7iEDEUUO9omD52b1hJ 6tj+1Trd+/PHsA8Q9ktfYjnmGjeE/3TwgAO6gqRB+PJUCFDsN6FLfJtpDRQEOvZkTCVS A671XYupmscMD1F4C0HuSMb/DOOg7ZJdhb21nvgDvmgzmEU1+bXRAabmCkq6cEvaeX3C 0cmQpv76NYYP/CswcebaCELjuQ5qbiMS/qlVNXUf9nocwSDIa0XlL/2QfTsRVms4uG3H 2zKo9eo3BxcJypNSPgyanUFJkvuipyvH8JQD8iyVSpDNypTV0OBIQ8+RHx1Ewmkd7YKL FAgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787446026; x=1788050826; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=+Jc12zKSf8mmT3ZniJisN3BvVvP0RfZaq/VsQ1cAOq4=; b=qsU4JOdtJkUOMGbSdJw7zdLLj2XtRsXSCzCL6eBK38MMtqUDbOkIcr7pmZZ/XPWeP4 mfRzRrFJXKokRaAywg4aLwUCmkpFSTKhXyRYzC16sICenSIxBpktUbOw7rwDa3bBBFY3 jpK2szf2w3kqjNlDr2FdyQPw5y/PuGna6U16531bWKaHwhfNWxe3buRu1xuvDAi3SFJP Bga9LHUgQng3Ce4pwUR0f/zL14yN8GEZ4sB1/9kK8pxoWP1pXST5YsOqHXd5OhTk7FDB InwSlEicCDduS+Pf2cnvqNNoRSEXICbvLC1o38JFarNG5CcxOiEPg1KzH6MKlX706SoN 5Y6g== X-Forwarded-Encrypted: i=1; AHgh+RozZCrgJkvqPqNNVoRDkClYYj4NUv+sTAs9AfzlkO0eRRgR7UGmmHVItjoobJv66zRewzleA64K5R91gYc=@vger.kernel.org X-Gm-Message-State: AFuF++nf1EAVXwh6c6pybZQWr3htCujTE8hoT0HjD5OzFAcmSaFv9bfz j3XuBE4yDSK4oMQ9blpUyg0H3Q4FBQzTPr4azQm/QjuaZWX+SgwAi7f+3KjpG4AtkX4= X-Gm-Gg: AR+sD12TPeqESaeXDoNyTp26dAiAO4ZxorPqcncXLzddkLpa4jaFtdqTchpUSgNpwKB WGQNqYOhrV4KjfBGfappSRLwrGPE1oOUH5oYbYixUnOYlQ3iq7HPC1bp4aSwDHLTEZR0LgJPvq0 HSCtySm+q+835RN4XSNcLXnMNfgEAZENHpVuWp3IQFG8RPEXiTr+SM4eMlbporeT90rXoJoKcaZ 7HvTKqcNB5btkGxit+d9e+kCAnlrBXkRjCPxN7HGRYcJQn+dX7IGQDG7R5Ha0Vmo5eJaYU1AIQx ashod7d2aaztfxAIIH+Q2ClV9KmjY2TrXc7Y8hyaqtiiweZfCSJdlT+zObcWvdEi5svVfyI63No xh/QC+9ZT/D2Y7bPs/6nV/igrU3FsU8zd7BSeNQTQbt8WpYgPdhD5TU03smhArB4TrgncK4hV3U xxO2Py9pda0K2MxsXx8nZd8T6vEypT+uA3yFyOv9G8q52MCg== X-Received: by 2002:a17:903:3804:b0:2cc:777f:d67c with SMTP id d9443c01a7336-2d64b0c5704mr320127395ad.13.1787446026282; Sat, 22 Aug 2026 17:47:06 -0700 (PDT) Received: from ceto ([2607:fb90:9c20:7a99::791d]) by smtp.googlemail.com with ESMTPSA id 5a478bee46e88-32801d7f812sm5767957eec.1.2026.08.22.17.47.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2026 17:47:05 -0700 (PDT) From: Mohamed Khalfella To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Mohamed Khalfella Subject: [PATCH v2] nvme: remove stale namespaces by NSID range during scan Date: Sat, 22 Aug 2026 17:46:41 -0700 Message-ID: <20260823004641.1369895-1-mkhalfella@purestorage.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit nvme_scan_ns_list() drops the stale namespaces in each gap in the reported NSID list one NSID at a time. Every iteration calls nvme_find_get_ns() to look the namespace up and removes it if it is present. The loop runs once per NSID in the gap rather than once per namespace actually present. NSIDs are 32-bit, so a target with a sparse NSID space can make a single gap spin the loop billions of times with nothing to remove. watchdog: BUG: soft lockup - CPU#4 stuck for 26s! Workqueue: nvme-wq nvme_scan_work [nvme_core] RIP: 0010:__srcu_read_unlock+0xb/0x20 Call Trace: nvme_find_get_ns+0x7d/0xb0 [nvme_core] nvme_scan_ns_list+0xe8/0x280 [nvme_core] nvme_scan_work+0x18a/0x280 [nvme_core] process_one_work+0x197/0x380 worker_thread+0x2fe/0x410 kthread+0xe0/0x100 Rename nvme_remove_invalid_namespaces() to nvme_remove_nsid_range() and give it an open (start, end) NSID range. ctrl->namespaces is sorted by NSID, so the whole gap is dropped in a single walk that stops once end is reached. This bounds the work by the namespaces that are present instead of by the size of the gap. Fixes: 540c801c65eb ("NVMe: Implement namespace list scanning") Signed-off-by: Mohamed Khalfella Reviewed-by: Sagi Grimberg --- drivers/nvme/host/core.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 5f2744be7388..cc014cdc72ff 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -155,8 +155,6 @@ static const struct class nvme_ns_chr_class = { }; static void nvme_put_subsystem(struct nvme_subsystem *subsys); -static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl, - unsigned nsid); static void nvme_update_keep_alive(struct nvme_ctrl *ctrl, struct nvme_command *cmd); static int nvme_get_log_lsi(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, @@ -4513,15 +4511,16 @@ static void nvme_scan_ns_async(void *data, async_cookie_t cookie) nvme_scan_ns(scan_info->ctrl, nsid); } -static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl, - unsigned nsid) +static void nvme_remove_nsid_range(struct nvme_ctrl *ctrl, u32 start, u32 end) { struct nvme_ns *ns, *next; LIST_HEAD(rm_list); mutex_lock(&ctrl->namespaces_lock); list_for_each_entry_safe(ns, next, &ctrl->namespaces, list) { - if (ns->head->ns_id > nsid) { + if (ns->head->ns_id >= end) + break; + if (ns->head->ns_id > start) { list_del_rcu(&ns->list); synchronize_srcu(&ctrl->srcu); list_add_tail_rcu(&ns->list, &rm_list); @@ -4571,13 +4570,14 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl) goto out; async_schedule_domain(nvme_scan_ns_async, &scan_info, &domain); - while (++prev < nsid) - nvme_ns_remove_by_nsid(ctrl, prev); + if (prev + 1 < nsid) + nvme_remove_nsid_range(ctrl, prev, nsid); + prev = max(prev + 1, nsid); } async_synchronize_full_domain(&domain); } out: - nvme_remove_invalid_namespaces(ctrl, prev); + nvme_remove_nsid_range(ctrl, prev, UINT_MAX); free: async_synchronize_full_domain(&domain); kfree(ns_list); @@ -4597,7 +4597,7 @@ static void nvme_scan_ns_sequential(struct nvme_ctrl *ctrl) for (i = 1; i <= nn; i++) nvme_scan_ns(ctrl, i); - nvme_remove_invalid_namespaces(ctrl, nn); + nvme_remove_nsid_range(ctrl, nn, UINT_MAX); } static void nvme_clear_changed_ns_log(struct nvme_ctrl *ctrl) -- 2.54.0