From nobody Tue Apr 7 18:45:27 2026 Received: from mail-vs1-f98.google.com (mail-vs1-f98.google.com [209.85.217.98]) (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 7789334252B for ; Fri, 27 Feb 2026 20:24:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772223843; cv=none; b=XzHbcwcGD7wi/P372r2DFDdNLKD+fWQ7AaNjkfPUvECeLPu1JUYdV0BL1/vo7kGNsbz5/6vjbFiys/IvG3BLjUDgUnL1VAbeJKTRREi5GcfwsSbp7oOT/o5qg0KkD3n8x6k70fR9PzKCksaTIH7tp6Xbs73eK5/RZZBXY4BdI2U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772223843; c=relaxed/simple; bh=552bYwko8otEYpm5ebh3dNg2RT6Pd9XEkCxMlc7h/U0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OGq1lKIrYGkmkQ0pIn7+twI1ADdl1jUIAgHnVxtEO3Wo+FR7kchMqoy9tDzQTGEBJYExQcQmmJIoWehe3175sVk+OWxyScr2GMlwWIOPyEbs9FJ362upQkCEjp1blP1dMGpWu4JeEG0Ogbdog2RXO1PF7WxKpV6t0rD8cI0PHu0= 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=ddmb4c4x; arc=none smtp.client-ip=209.85.217.98 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="ddmb4c4x" Received: by mail-vs1-f98.google.com with SMTP id ada2fe7eead31-5fdfef72ad0so80613137.1 for ; Fri, 27 Feb 2026 12:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1772223841; x=1772828641; 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=iTyR51foYUPBOnnEwYMeOkSAEe5aT2w2QE+WyN/3DlE=; b=ddmb4c4xq6/N7t40TSB7ek7wlHl19Br//ucyCGMIYRCJPD9NETJVKLnImGBFPbYJdl gjnQruhJcrh5JSxBB8spl+fokiiBoAxoa0kKJH0b2jDoligvJQPwpSvYul+wyc/Ik0SD Th6VmBiiqlahLoGTUqq+9TAVsRSQ03KVS65SNoZQO0wSsslZsUcXM35FM0Ibs8Y8tRZI tj3GYFkUDUh9oRG0dYdJCkAcxAHomZ43cqy6InNa2D/W9VF4811dQjZ+TO9zxi2tY6Nx hrgjJBKMhXoyZMXW3Wwg98qYjSX5zhA7K2QAgwzobIhRXOV7N5u+RP9Csrnm7TKuRMck lPBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772223841; x=1772828641; 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=iTyR51foYUPBOnnEwYMeOkSAEe5aT2w2QE+WyN/3DlE=; b=TxLNCPEQlqDcKLG7ZxLg2MsKyvUksRE96d5UEjVBJ5dGeCp5zBxoYSOUdEOmabqlMN Wa0PZtFHgwulFrwaHUwtES4NxV/TeZEU0Bot9CurMg2L6zZT6uv89uc56sPxgJbwyp7N uARgVQ7r0hB+o3TYfsMg7Q56qtM2YEEGg8D//nQEOxpPLmylBx5kpRWGArrLUBpDcagH arQLLzThVtLEtRSi6YacrofGC/S9UEHEP+N52ZCmggSNpw5xxcypClag+hIFVX7ZlIDQ RPzJesEauJ+sUfv76w+koR38pK+3jHLFiNetRFoefrNElllRvbaw2caLDPcU2go5NukS zSRQ== X-Forwarded-Encrypted: i=1; AJvYcCXMmRLbwG5bH7af7hqAyg9RcvGKFSfBLsAiE4DyF5nifBNr1zqqEnkTdFs1FsHVH+FTlXLodrq7WcQ0H5Y=@vger.kernel.org X-Gm-Message-State: AOJu0YwsePAVd7g9Fb1n8WatMJqMekLBE8K7OPK/nap70coVUkaiwmqN 83hX1O8b12KjZztowfDbHDFywEKKdy0aTbQ6H4plkg/Z5SzurT9KAleKStO91w5j5qdf1FLH6Fw Us45hB39aiYRDOlOTkliPuxv/xWCspPGBg0m/ X-Gm-Gg: ATEYQzwvuf8zXNx/xaKIbINI5Pco3OefNneQKRuMp84QckDSD/IkStH7PybDtTMReok Z1HKuu41rCVAlI6/3lk2WcmDBCruKu37tWmyG4IBSorS45hXUVWBA+yPpEOwf/frwuXrriwFW9X w/TmvqUREyeg/akT0/UU7NFfayBJRWXH8q4cDvXoOevRKitDnPNQYX+gq2VXQ/y1OZeoLcjLkz9 WV4nHdkd+rN0l+8Uuzm6eCUShwGR7H9KzrvYidbVsRKiyCk0xgNSIW3Cfn+u/ZCEiunW0wV7XNa V8MRHgQhRBVK3zqnodwHSbg1+HlRtpHBhDUe4DcMbFx9n5nKXtcTWUUcXh/20anozCUD3EMSJsI nQbeP96WrlCIgUxvuxYKBk+d7+DMuAYn8WjIct/mQaMpZ6AFJgSNq7A== X-Received: by 2002:a05:6102:d86:b0:5f5:3a57:1e88 with SMTP id ada2fe7eead31-5ff32536282mr1200513137.6.1772223841310; Fri, 27 Feb 2026 12:24:01 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id a1e0cc1a2514c-94df6542376sm546097241.7.2026.02.27.12.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Feb 2026 12:24:01 -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 8F7C53405ED; Fri, 27 Feb 2026 13:24:00 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 8A735E420D8; Fri, 27 Feb 2026 13:24:00 -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 v5 2/8] nvme: fold nvme_config_discard() into nvme_update_disk_info() Date: Fri, 27 Feb 2026 13:23:47 -0700 Message-ID: <20260227202354.1012322-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260227202354.1012322-1-csander@purestorage.com> References: <20260227202354.1012322-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Christoph Hellwig --- 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 =3D info->pi_offset; } return true; } =20 -static void nvme_config_discard(struct nvme_ns *ns, struct queue_limits *l= im) -{ - struct nvme_ctrl *ctrl =3D ns->ctrl; - - if (ctrl->dmrsl && ctrl->dmrsl <=3D nvme_sect_to_lba(ns->head, UINT_MAX)) - lim->max_hw_discard_sectors =3D - nvme_lba_to_sect(ns->head, ctrl->dmrsl); - else if (ctrl->oncs & NVME_CTRL_ONCS_DSM) - lim->max_hw_discard_sectors =3D UINT_MAX; - else - lim->max_hw_discard_sectors =3D 0; - - lim->discard_granularity =3D lim->logical_block_size; - - if (ctrl->dmrl) - lim->max_discard_segments =3D ctrl->dmrl; - else - lim->max_discard_segments =3D 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)) =3D=3D 0 && memcmp(&a->eui64, &b->eui64, sizeof(a->eui64)) =3D=3D 0 && @@ -2078,10 +2058,11 @@ static void nvme_set_ctrl_limits(struct nvme_ctrl *= ctrl, =20 static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *i= d, struct queue_limits *lim) { struct nvme_ns_head *head =3D ns->head; + struct nvme_ctrl *ctrl =3D ns->ctrl; u32 bs =3D 1U << head->lba_shift; u32 atomic_bs, phys_bs, io_opt =3D 0; bool valid =3D true; =20 /* @@ -2112,15 +2093,30 @@ static bool nvme_update_disk_info(struct nvme_ns *n= s, struct nvme_id_ns *id, */ lim->logical_block_size =3D bs; lim->physical_block_size =3D min(phys_bs, atomic_bs); lim->io_min =3D phys_bs; lim->io_opt =3D 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 =3D UINT_MAX; else - lim->max_write_zeroes_sectors =3D ns->ctrl->max_zeroes_sectors; + lim->max_write_zeroes_sectors =3D ctrl->max_zeroes_sectors; + + if (ctrl->dmrsl && ctrl->dmrsl <=3D nvme_sect_to_lba(ns->head, UINT_MAX)) + lim->max_hw_discard_sectors =3D + nvme_lba_to_sect(ns->head, ctrl->dmrsl); + else if (ctrl->oncs & NVME_CTRL_ONCS_DSM) + lim->max_hw_discard_sectors =3D UINT_MAX; + else + lim->max_hw_discard_sectors =3D 0; + + lim->discard_granularity =3D lim->logical_block_size; + + if (ctrl->dmrl) + lim->max_discard_segments =3D ctrl->dmrl; + else + lim->max_discard_segments =3D NVME_DSM_MAX_RANGES; return valid; } =20 static bool nvme_ns_is_readonly(struct nvme_ns *ns, struct nvme_ns_info *i= nfo) { @@ -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 =3D 0; =20 - nvme_config_discard(ns, &lim); if (IS_ENABLED(CONFIG_BLK_DEV_ZONED) && ns->head->ids.csi =3D=3D NVME_CSI_ZNS) nvme_update_zone_info(ns, &lim, &zi); =20 if ((ns->ctrl->vwc & NVME_CTRL_VWC_PRESENT) && !info->no_vwc) --=20 2.45.2