From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f228.google.com (mail-pf1-f228.google.com [209.85.210.228]) (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 BA7D025CC74 for ; Sat, 21 Feb 2026 03:33:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.228 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644789; cv=none; b=FkczXAFM/huGTEruR/44n9VA2gftTx35BuDZU431EdkKot2iw5ckIXkvQPiEkEuGVBX5ScH62j2u0B5zyqJagK9fVfI/JfZmibohlZXCjx+qID7H/6nLXW83JG3IkAnMk9LL3byITH9A2DWT2P0W+hKfWZPvytjwlxsxvp3koyE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644789; c=relaxed/simple; bh=LV5733WF2Amrq7TZbrAkujCFMKLuo+5jXT+GVMP94K0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Oz/YkI7VMWrE1rHiv2sgC+zmw/JjpQjlhgTAstxZavNiBC7Sj3rvpj7KtIBD0F2kdFn1BhNl2EFX5aBzuVlZs543kRI5vSsEOgO4zmaR5K4mlVHwbZd1HtWjaSr0LZfgX//Z9uMxeYvLaKkYQ8P/AcogERyp7lt5xRfPvjiQCSU= 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=B+ACL0Yc; arc=none smtp.client-ip=209.85.210.228 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="B+ACL0Yc" Received: by mail-pf1-f228.google.com with SMTP id d2e1a72fcca58-824a8039d9fso257270b3a.0 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=1771644787; x=1772249587; 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=0AEEfE6xiusQnEvNeZM84fhKgvDhfLyCCrKC1bZTQl0=; b=B+ACL0Yc+MxH0H9WiLx8RVcDfzbzRgRzJXxF63gGOVfQC8vcHGwV1+F8Oy3mYSEJMO lsPdBcYNtgi9ehu3XMXmaeCNe6IHL6esEOKczyr7ke63m588z7ZeAbGPR0J9XbgeL2xu 2DuIjdMZt2Yv13xYo4TZpBIMaoxh23d5rbulnJfRio+CwF724TyVIeKGN1fEAPP0ESdl zawqoWHiXep+APfoHIYzxYAUGUX1VDz1LBPnfZtL5nNiwmCrxLwYkve5ZEO/rFU5tT0D 1vPa99Z2t4msaY+lEb5TdNCLUDhF3CcGZvN7tFl+YDjc5+06hmEksSElufWi17EWaIgk C7RQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771644787; x=1772249587; 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=0AEEfE6xiusQnEvNeZM84fhKgvDhfLyCCrKC1bZTQl0=; b=CjngfmAumQxkU2Yep4Cyo1tjlJ+Wuw7aDuVWHvd/wnOebB3BYDDcWDe1F81gSxNIMj puOWpKfuy/ev6F4Z0BCU4TdE1M4rT3WYVYLaMHuQNk/zk5adrFYWMlpL7oNjrnl8jvMu 2Jg7URPIX9Kf9UK+HqvQE7ns9YCY9060uc8RjSfsMPi7Y9sa/Yp+f47G9GdEK19e0Odg vgemOBKuH2umZjY46JpqOcYu67kukcLNQk5HVekNm6yqtjaWi7t419NqrMmFjI606aES G1r4OAj6vzGYv10X8neIyFmzLe40bL9+NdqKUYHBcV3ehNhIAAA2xM9X3zPt+/K5Mkvu nlXA== X-Forwarded-Encrypted: i=1; AJvYcCVg4NUVttVz/lFmHz1l3KGMixnmLqsnr3nYDv9LI9l/MhA7OuIsXxixDOLAh8AJq46c2KcWaKlSEif3qGI=@vger.kernel.org X-Gm-Message-State: AOJu0YzRTRjPzVf2tdenL5dnCXGzAfeqzkwYXSLFDm4OOHaaAXXkATcu 8+GQ34uJ9xQIgdrPFIMA2V4uCivzih17qbBFTEev6rTkE42ZyxTQUlA1OqX1RH7HXQtHsDTDvwU XGRSdXp53Q8v5ygCi3FhsChc8QzbgZhWtWzqE5ZageUe8r9FUaCLm X-Gm-Gg: AZuq6aIcPVrogLv0BRJJVO9kB6YhNlUxcwQhHPcMPw0aVMyp0b4kfHsctle1yJP0qM7 EIZKNQyq5C8ZmsTiLSL/wMw18ZlUjLzgv6LBelwT3RxPOQnIciMasnehLk0rdCAVKm/0uoIeTcd WZSDZOA8h/+UBbzjhjoVsuZMW2ikiVhnSjsWfWIr52Oh8LHpFDUbU/VybSotJ1T/EGUvt+uU+Db tbKEIvZLeY/T4AWEG3TF+gtuVjBUi1jDmaQBA/nRsCA+hyxHa5gEAqLnsKFrwelf0bLZ3z64fAf B38lgOyrJgLMK6tZihXM6WKG2KGd6cu4ZiUGC3F/VQHx54C7tI8YwfRgPlzgCqXgxLMakJ+VLw3 Yt9A86TA5BpPp9k/7sBVYfLVq99zL+kkh1vUyyoA= X-Received: by 2002:a05:6a00:1993:b0:7b7:90de:e18d with SMTP id d2e1a72fcca58-826daaf4226mr1064232b3a.6.1771644787098; Fri, 20 Feb 2026 19:33:07 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id d2e1a72fcca58-826dd844942sm164449b3a.7.2026.02.20.19.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Feb 2026 19:33:07 -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 55EEC340648; Fri, 20 Feb 2026 20:33:06 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 51094E427CB; Fri, 20 Feb 2026 20:33:06 -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 7/7] nvmet: report NPDGL and NPDAL Date: Fri, 20 Feb 2026 20:33:02 -0700 Message-ID: <20260221033302.1451669-8-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 A block device with a very large discard_granularity queue limit may not be able to report it in the 16-bit NPDG and NPDA fields in the Identify Namespace data structure. For this reason, version 2.1 of the NVMe specs added 32-bit fields NPDGL and NPDAL to the NVM Command Set Specific Identify Namespace structure. So report the discard_granularity there too and set OPTPERF to 11b to indicate those fields are supported. Signed-off-by: Caleb Sander Mateos --- drivers/nvme/target/admin-cmd.c | 2 ++ drivers/nvme/target/io-cmd-bdev.c | 19 +++++++++++++++---- drivers/nvme/target/nvmet.h | 2 ++ 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c index 3da31bb1183e..72e733b62a2c 100644 --- a/drivers/nvme/target/admin-cmd.c +++ b/drivers/nvme/target/admin-cmd.c @@ -1056,10 +1056,12 @@ static void nvme_execute_identify_ns_nvm(struct nvmet_req *req) id = kzalloc(sizeof(*id), GFP_KERNEL); if (!id) { status = NVME_SC_INTERNAL; goto out; } + if (req->ns->bdev) + nvmet_bdev_set_nvm_limits(req->ns->bdev, id); status = nvmet_copy_to_sgl(req, 0, id, sizeof(*id)); kfree(id); out: nvmet_req_complete(req, status); } diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c index d94f885a56d9..485b5cd42e4f 100644 --- a/drivers/nvme/target/io-cmd-bdev.c +++ b/drivers/nvme/target/io-cmd-bdev.c @@ -28,15 +28,15 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id) id->nawun = lpp0b; id->nawupf = lpp0b; id->nacwu = lpp0b; /* - * OPTPERF = 01b indicates that the fields NPWG, NPWA, NPDG, NPDA, and - * NOWS are defined for this namespace and should be used by - * the host for I/O optimization. + * OPTPERF = 11b indicates that the fields NPWG, NPWA, NPDG, NPDA, + * NPDGL, NPDAL, and NOWS are defined for this namespace and should be + * used by the host for I/O optimization. */ - id->nsfeat |= 0x1 << NVME_NS_FEAT_OPTPERF_SHIFT; + id->nsfeat |= 0x3 << NVME_NS_FEAT_OPTPERF_SHIFT; /* NPWG = Namespace Preferred Write Granularity. 0's based */ id->npwg = to0based(bdev_io_min(bdev) / bdev_logical_block_size(bdev)); /* NPWA = Namespace Preferred Write Alignment. 0's based */ id->npwa = id->npwg; /* NPDG = Namespace Preferred Deallocate Granularity. 0's based */ @@ -50,10 +50,21 @@ void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id) /* Set WZDS and DRB if device supports unmapped write zeroes */ if (bdev_write_zeroes_unmap_sectors(bdev)) id->dlfeat = (1 << 3) | 0x1; } +void nvmet_bdev_set_nvm_limits(struct block_device *bdev, + struct nvme_id_ns_nvm *id) +{ + /* + * NPDGL = Namespace Preferred Deallocate Granularity Large + * NPDAL = Namespace Preferred Deallocate Alignment Large + */ + id->npdgl = id->npdal = cpu_to_le32(bdev_discard_granularity(bdev) / + bdev_logical_block_size(bdev)); +} + void nvmet_bdev_ns_disable(struct nvmet_ns *ns) { if (ns->bdev_file) { fput(ns->bdev_file); ns->bdev = NULL; diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h index b664b584fdc8..3a7efd9cb81a 100644 --- a/drivers/nvme/target/nvmet.h +++ b/drivers/nvme/target/nvmet.h @@ -547,10 +547,12 @@ void nvmet_start_keep_alive_timer(struct nvmet_ctrl *ctrl); void nvmet_stop_keep_alive_timer(struct nvmet_ctrl *ctrl); u16 nvmet_parse_connect_cmd(struct nvmet_req *req); u32 nvmet_connect_cmd_data_len(struct nvmet_req *req); void nvmet_bdev_set_limits(struct block_device *bdev, struct nvme_id_ns *id); +void nvmet_bdev_set_nvm_limits(struct block_device *bdev, + struct nvme_id_ns_nvm *id); u16 nvmet_bdev_parse_io_cmd(struct nvmet_req *req); u16 nvmet_file_parse_io_cmd(struct nvmet_req *req); u16 nvmet_bdev_zns_parse_io_cmd(struct nvmet_req *req); u32 nvmet_admin_cmd_data_len(struct nvmet_req *req); u16 nvmet_parse_admin_cmd(struct nvmet_req *req); -- 2.45.2