From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qv1-f97.google.com (mail-qv1-f97.google.com [209.85.219.97]) (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 2E07433987 for ; Sat, 21 Feb 2026 03:33:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644788; cv=none; b=NQ2VbOk+H/e7Qe4JrpfHQ9Lfti/B/RdpDWjxBpdW+RMPbOQRlQsVzshoirM4EtjOe14PDS9ecLeBvrBNi3wQQqP6pSM0oI9GPKDXJc38SSm/hfER55cRy2X4ddAMiALtLoaN2e1598tHI05zGeH59mfDo6xE857GEy5aeJRz8SM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644788; c=relaxed/simple; bh=b+nRZBOa3beO/MTGItF1Rz/gmkK999ZqYLCnOCB/bro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bSjGGcQYHlcCEbiehmpa5AQpgwLpkaR06INc8N4p258fC9HQcNmMwGMtSh5Qgt+je8l/1bUCjRDWcTaQpEUiRXPAlmJVd0Vzm9Ka0sCmSXQ32inEdvJkA/Y+POIylSg4Pp0Dea1SYhanPCLi77dQ8doMgdZFJTMxVzMUBYtdpv4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=dSPmyrC7; arc=none smtp.client-ip=209.85.219.97 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail 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="dSPmyrC7" Received: by mail-qv1-f97.google.com with SMTP id 6a1803df08f44-89470513c62so5880676d6.1 for ; Fri, 20 Feb 2026 19:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771644786; x=1772249586; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eYFSHEsFJdDOj3cQkRPFLn4/+IOAqySMBQqhkpK+Jyo=; b=dSPmyrC7y/sumWcOLDUo61cfWHTkmfOK9fASMokfYfWmqC1dohs6b0Aco/7ym0Pg6M v8B9f1+wBKIQrYXoY5DIuzLkfaYsebHxR6wbpANdTGhcq8lKeWeicunZaoj/w0gBvKKd 2JoVhwrd+qxumS9klgAtHqnM5oavv7pALkqzz8tQBxq9kl8XefskseKMaDsY1d/vR3/2 FmT96Xj084tVXderhlhpX1eNzie0BXnwtX6SqKmiPCL1IrRy/nTlc5aODje9bhcbAcGn 9tiraK14B9b0QfR+dtXAouwXbL6kCPvHJznipgxp7Ezc1XGbGWEJWRxo1vthbMkLMnCp TjFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771644786; x=1772249586; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=eYFSHEsFJdDOj3cQkRPFLn4/+IOAqySMBQqhkpK+Jyo=; b=vZFWpczexEH19iEg9fjyO/p3uEowwYdVLur+wHmN1EKqdzx3XhdREel1OcfgErNz0V /LvWzownk6ZkLUZP8HcA3KCb+G51pK4R0hJEwZi3KwSf9n0cNVCNO6r3Gi6WXgYKm+5U K/2TYX7Y8xvFxU3APloblVUUvhtuk6Gqle63blNTztZkPmTSl2iQUpUjKGDLqI3HuqFd ZCqZdrTtX+IILfwD63nd91GcejRq58s3pweJZkKB+mbCxijdk7gyvCj7CJQvMa9zvwex mvAPR2N+w4+vnrTA9SxNC/tVMDrd6uOzWent4hUB5f2ZzKHfTmj/XxYnLpvhPhEPgZ7V ExTg== X-Forwarded-Encrypted: i=1; AJvYcCWlZY6o+p2wrU4NY5EuIjot5KUlHbuTI1wjsLxhzbTrfLOXJeYbI8MH3KhvvRfGJ13iPiyloaAY5Kl1Ivg=@vger.kernel.org X-Gm-Message-State: AOJu0YxVK3xmfVWoUNQZ/KH/+VHTEebd9LQ2FaOSmjafWP62Y4ow58Su ERnbbEYr2z56f5C8AeK2xXhRafiGo8aepthRVTRal1GpGxLtEolteppJG3+TfmJRwhp3nAOrNzO ooeoQ/tIRi582eiP/e8xqBz4ewnYxvFPOHoYC X-Gm-Gg: AZuq6aJUVrcHd8HywW4xw2qSbZ2tdc8ZOC2TXtmxYYtf2ZaVxPLFaqYPaExme7v/Oox CD6v+tMbI2ASZk/UDbXRdU4ZujSDKM6a6O1wZ1KsTlZlh5rMDblo9/6rt2EnAUX/KJgCzNWsFlN vmn5AhcfMkvezUyn9K/Eshk/Ro++wphSpBlxJ7lrMAuF9QvZb6WryWrOqhSDUlLGRGVL3/rb++C tmVvcReFzqNplHnIX1PGBBA/nEQWlnEE7adUfGtIk3Ol7NQXKpr9AC2nSBzjYALxTyK+7xRntJb F7bGGQl5odpbEhBaYhosS5Qj2XwLcawNBqwtIw6M+qULIfGkfwSr2XLxrvWBMrHj0LlvhxnGtN0 +Pu60GvfVH4i1XCdHxJylbMhqBv77WOiKeBXCVWZemjRTJ15ooQXcKQ== X-Received: by 2002:a05:6214:4f04:b0:896:fd66:a084 with SMTP id 6a1803df08f44-89979e1ebe5mr22124746d6.8.1771644786127; Fri, 20 Feb 2026 19:33:06 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id af79cd13be357-8cb8d0c103csm18720085a.3.2026.02.20.19.33.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 19:33:06 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 71DA8340705; Fri, 20 Feb 2026 20:33:05 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 6D28DE427C8; Fri, 20 Feb 2026 20:33:05 -0700 (MST) From: Caleb Sander Mateos To: Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg , Chaitanya Kulkarni Cc: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH v2 2/7] nvme: fold nvme_config_discard() into nvme_update_disk_info() Date: Fri, 20 Feb 2026 20:32:57 -0700 Message-ID: <20260221033302.1451669-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260221033302.1451669-1-csander@purestorage.com> References: <20260221033302.1451669-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The choice of what queue limits are set in nvme_update_disk_info() vs. nvme_config_discard() seems a bit arbitrary. A subsequent commit will compute the discard_granularity limit using struct nvme_id_ns, which is only passed to nvme_update_disk_info() currently. So move the logic in nvme_config_discard() to nvme_update_disk_info(). Replace several instances of ns->ctrl in nvme_update_disk_info() with the ctrl variable brought from nvme_config_discard(). Signed-off-by: Caleb Sander Mateos --- drivers/nvme/host/core.c | 43 ++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 3a2126584a23..8dda2fe69789 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -1880,30 +1880,10 @@ static bool nvme_init_integrity(struct nvme_ns_head *head, bi->pi_offset = info->pi_offset; } return true; } -static void nvme_config_discard(struct nvme_ns *ns, struct queue_limits *lim) -{ - struct nvme_ctrl *ctrl = ns->ctrl; - - if (ctrl->dmrsl && ctrl->dmrsl <= nvme_sect_to_lba(ns->head, UINT_MAX)) - lim->max_hw_discard_sectors = - nvme_lba_to_sect(ns->head, ctrl->dmrsl); - else if (ctrl->oncs & NVME_CTRL_ONCS_DSM) - lim->max_hw_discard_sectors = UINT_MAX; - else - lim->max_hw_discard_sectors = 0; - - lim->discard_granularity = lim->logical_block_size; - - if (ctrl->dmrl) - lim->max_discard_segments = ctrl->dmrl; - else - lim->max_discard_segments = NVME_DSM_MAX_RANGES; -} - static bool nvme_ns_ids_equal(struct nvme_ns_ids *a, struct nvme_ns_ids *b) { return uuid_equal(&a->uuid, &b->uuid) && memcmp(&a->nguid, &b->nguid, sizeof(a->nguid)) == 0 && memcmp(&a->eui64, &b->eui64, sizeof(a->eui64)) == 0 && @@ -2078,10 +2058,11 @@ static void nvme_set_ctrl_limits(struct nvme_ctrl *ctrl, static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, struct queue_limits *lim) { struct nvme_ns_head *head = ns->head; + struct nvme_ctrl *ctrl = ns->ctrl; u32 bs = 1U << head->lba_shift; u32 atomic_bs, phys_bs, io_opt = 0; bool valid = true; /* @@ -2112,15 +2093,30 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, */ lim->logical_block_size = bs; lim->physical_block_size = min(phys_bs, atomic_bs); lim->io_min = phys_bs; lim->io_opt = io_opt; - if ((ns->ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) && - (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM)) + if ((ctrl->quirks & NVME_QUIRK_DEALLOCATE_ZEROES) && + (ctrl->oncs & NVME_CTRL_ONCS_DSM)) lim->max_write_zeroes_sectors = UINT_MAX; else - lim->max_write_zeroes_sectors = ns->ctrl->max_zeroes_sectors; + lim->max_write_zeroes_sectors = ctrl->max_zeroes_sectors; + + if (ctrl->dmrsl && ctrl->dmrsl <= nvme_sect_to_lba(ns->head, UINT_MAX)) + lim->max_hw_discard_sectors = + nvme_lba_to_sect(ns->head, ctrl->dmrsl); + else if (ctrl->oncs & NVME_CTRL_ONCS_DSM) + lim->max_hw_discard_sectors = UINT_MAX; + else + lim->max_hw_discard_sectors = 0; + + lim->discard_granularity = lim->logical_block_size; + + if (ctrl->dmrl) + lim->max_discard_segments = ctrl->dmrl; + else + lim->max_discard_segments = NVME_DSM_MAX_RANGES; return valid; } static bool nvme_ns_is_readonly(struct nvme_ns *ns, struct nvme_ns_info *info) { @@ -2381,11 +2377,10 @@ static int nvme_update_ns_info_block(struct nvme_ns *ns, nvme_configure_metadata(ns->ctrl, ns->head, id, nvm, info); nvme_set_chunk_sectors(ns, id, &lim); if (!nvme_update_disk_info(ns, id, &lim)) capacity = 0; - nvme_config_discard(ns, &lim); if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) && ns->head->ids.csi == NVME_CSI_ZNS) nvme_update_zone_info(ns, &lim, &zi); if ((ns->ctrl->vwc & NVME_CTRL_VWC_PRESENT) && !info->no_vwc) -- 2.45.2