From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f226.google.com (mail-qk1-f226.google.com [209.85.222.226]) (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 34A083A961E for ; Tue, 24 Feb 2026 17:15:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.226 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953306; cv=none; b=NdY/yq4+bDlGhyNdJUIzl80AbCIFeud9m214veQHkkyPTgpyj7vA5tXVOnuADq9H0zXDWZ7/xSPLq5w5tFgwteZYnG8jT1r0Fc7+anjIQwo5Madtsan1RpehBwovUgEwWk78ZiSB2IaL5/nbxBk/VSOnOL/Gm6GOx8I/S65PIWY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953306; c=relaxed/simple; bh=N0sqrv6nVURelHVA7HFFhzMGt9LzqtMjQpJgL79pyMA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dPhTRfczbp/p3qgbFpHpc62Ff53pWH3tUDeNEduvpefhvZIu1SA+CVWLGVf8maolpCPLO6a86MDInXNjwj71eErnBS9BmM4KJ80W25HTmld3sfMhAm6NOwTNSKDWI6Zc2EEpGnuCwzpMFifL07LSUKzr/EirJUyxLLn/zIshxL4= 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=EKN2ET3G; arc=none smtp.client-ip=209.85.222.226 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="EKN2ET3G" Received: by mail-qk1-f226.google.com with SMTP id af79cd13be357-8cb403b7c75so56361085a.2 for ; Tue, 24 Feb 2026 09:15:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771953303; x=1772558103; 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=rLGXbc0gXctnroosx2bL2/uz0im7hCkKsBk3ALVli3I=; b=EKN2ET3GD7HnUdCxcKTBWvc5CHv+YNLhiWBzxVUpG7IojSqBr1CsDuAjVcJcQ5XX9W BJvbxH+l8qiKBBYU36/3V5wY2z5K1o2vPvfhAioDhlUs8gvdtVPSvf+G3W/LvJQfHrLr jFF6vU6Cfe7SgHtUw9Wdxk7TKaskatbS6CeRZ7CcrnmNG3wanX+Ie1IYpp7CPBcodFSa KnBllD3kvAtuNvEHXtV14kENRibozuWfPZdAAZxWNx5f6NuflAbSzy5fuaI2vtJV5j8F 7qdFR/eOsSOJlv5RRgfX8rI3aRT8Wcv+WVDFFhGanL81Nu5rcY8sreCVRWLUSH101nkH mXGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771953303; x=1772558103; 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=rLGXbc0gXctnroosx2bL2/uz0im7hCkKsBk3ALVli3I=; b=P3xwUkYALsATGJm6+Y4OFbWEjcWlGnjUg5uiUS03kdAoWodN3o5IL8KKIN55rKGiA0 3QSi+FvqSsbuPhqFHlriW5szQeFbH0y+7R+UGIV37vehVxRIHI1YYXGVQOTu/9S7rVpE IS7045PIHL5lf0s/vntj/VCF70jX2Q8Icq8jTYkj9sCrfwtLM1rhPsypItQKImCoBY+Q akYKgyKcUqi/qqMXxyoMl3kzUtJ1PET8kSpFQgrp50bXBHUE4gmOOdg2b9vU7YsDHqzJ exZ0O751+xc+hb+sxpbq0JaOLlKXXTz12MFysXvKsgg5D3A/FeppMA1h0t/ps6lndcli lzNg== X-Forwarded-Encrypted: i=1; AJvYcCW8glKmFudrvk0R2+SqXrNwVtBAI1UlywoIv5A89RHn4K7xA0F/aUx/3ZLIVW97fn0SVoYOSsEzISaOF7E=@vger.kernel.org X-Gm-Message-State: AOJu0YwNavo6fx1cf3PQ/iDvfw6890bIflVcrSvIXFEqoG94I6SANUlu qfqFM9vdp1pHinGwn90sc9vLQWIuG77LAP1eRIQfUvR/Ppqg4t3F8/AV8yIitqAA8ymwN1uB7Rp 43xKFiVTdOSgcpC/EkdSVpiV7t/uwnAgO6kFrIUwT4byf6LA62zCS X-Gm-Gg: AZuq6aJbEYcv+Ohatcm2Nc1YdSUH8mN9fjfpKFBnkcXIZ0UZPmBp/ZIM7v2Pz6CRQX+ tLaC5i1bfGYcE+An8JnPjj+pclYQ2ki/zSm9bhYtjxRYw2Pau0QXsbrzcnU/+roRAB9ngsSSSKp 6NQM6h4u64kXIHJ2U3NfITx5zElfe2D+anAW3Nn470BJWCdbhuKe+PRadQonYqR+nN3A+xb9E0t 9HR51nchUYd5+jSbLkINCNQTe6SDVnlCnejym/9srLe0vfBtUxwnV83TYHhH80K4T17d1iirybB lIEdcN7so4pzXoANOpoidvz0S/RoQWQoiEIqDZlRYnShVfTKpO38VsIjGpFS3MzWq2Zemw1CJGg zxsS4rIF3CYcKROyl0tnlFY0pRM3vQIG6AzXLqOc= X-Received: by 2002:ac8:5803:0:b0:506:1c3c:9dfc with SMTP id d75a77b69052e-5070bbe6abfmr147168361cf.3.1771953302906; Tue, 24 Feb 2026 09:15:02 -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 d75a77b69052e-5070d67ab59sm13815861cf.9.2026.02.24.09.15.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Feb 2026 09:15:02 -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 3C883341F2A; Tue, 24 Feb 2026 10:15:02 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 370F8E41254; Tue, 24 Feb 2026 10:15:02 -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 v3 8/8] nvmet: report NPDGL and NPDAL Date: Tue, 24 Feb 2026 10:14:37 -0700 Message-ID: <20260224171437.3175993-9-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260224171437.3175993-1-csander@purestorage.com> References: <20260224171437.3175993-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 Reviewed-by: Christoph Hellwig --- 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