From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f98.google.com (mail-ot1-f98.google.com [209.85.210.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 39CF9280A51 for ; Sat, 21 Feb 2026 03:33:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644789; cv=none; b=PmTQ0bngB4NrhpwqJQWiMdSgCZRL0NbZDwZxVGTbDf/FPM+ebq6+QSL9UlQ38kSMNCeNgCCTVqVOPIR7+otZp3/Zw629vsMQCo5DKGljzSK83IRV7RAMuPiEVbHiOGAQtT78nM2YxEkArKFw0DQL6o5GA1kmz4AI1wigx8yZxjA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771644789; c=relaxed/simple; bh=ocf6ngOMJoJEB7fPHKYupVlbRdS1k67oX/rzqbQshkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QDgfNRUJGG0NvPdetlfE5yJ1EIi5Zk+oGIYjvVetsdbQ3DEqZfNTNLCyqP2Rimog2/DkeK0oeuemiIjuIr5eNZXc3aPLDtlqGdyMD0udIvsDskGG87YynW3WBIwKZv2LndAvccRh6c2HrkqVnnDT0+vqbSWh8O/Vek3kpggysWI= 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=Yu5fOda3; arc=none smtp.client-ip=209.85.210.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="Yu5fOda3" Received: by mail-ot1-f98.google.com with SMTP id 46e09a7af769-7d2ebc06f66so429822a34.0 for ; Fri, 20 Feb 2026 19:33:08 -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=fJltEScUjLqhErd6IHPXM2JEHFKvvI69iCjPQeYZdOk=; b=Yu5fOda38dRgdm2CAadYuuoEijfPCjT9Cl2m53Ry4f5H3QJaFiVAdSLJnbWkSTA9WJ Y6jO/0FfhoKcCdsurfuJhPySEnyFpfXXuHxaxnf09WB53pGfFffR7SCpoMKGVKeK7qQK jQKqbWMS4P73ljwLB9idOdDmyT9lYj4zhXRsLrGpyz9NDRR2ypdyMdcjqkadO6yQqEDv h0xR3oInPSyzqzCyCb3rC1k0+qrGS545pIuAtYQZGbLO8yqVr9G9AKLfhiFndXqgX0RF e/oo5yJQh6xXqBbOM2R2YGslB1VW7s4wQ+WeP9OwzYAB+RekYWRJWHQjz5VCbOOZzVnE 9CyA== 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=fJltEScUjLqhErd6IHPXM2JEHFKvvI69iCjPQeYZdOk=; b=KcRAgqdAFKpPdMX0o6KoH/dLi4K8cbHrP8Pw1HN+1iYTl9QjUCx2N2mMAMavppFG/N 2rYiCZDem57zy351GCWQr4OKj3EG/dXkpy5/0IH4PYCiwyEbaltIu+WAj9JGYVQdOrYv BN3ktsr00ZGnt/xL992tho1+/3N+uGZYaXIf839R6hEgppY7z7Hm0SxFTfSVjH4j+MWe 0ws6ubVvBC3Ciz7qPREzf85SRiExk10cn+LsWynAmv1V6UUUyYpbPzQjvwLQqn6i8ybi AIiDk0UDeVj43bedzOAjdnmPb9SRuNBX3kdmj4OGECyKb5alI1xmpySisuP7lQ0oe7Wp XJEg== X-Forwarded-Encrypted: i=1; AJvYcCVrLhIwvpWwnFOIIJxsagpv9S6wHrfhPMe8SaiVlYJfj6TN/g2ocjfvxeEM57D6RW8eZ5vrlFql2Yt/YNk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw+E+65bNYLCtxHTSSiekBqZ0h3wAlJOwseZmPU1BSDLPd22C50 rNgV143E/gHXLHZ9sxc3n5tAYBKZhqimvuXaTPjmpihtTotfoZsc2PiChS/5nSxnoxq2/a9rIMW T8LVBDJ1nAJWxg/7kjhmy//kfzT2SqCv0WaZgyxc7TIfKPW7oqijq X-Gm-Gg: AZuq6aLfYGQZwVrEfJZvSXYKEbBCuH5+x8wFrdgoI+7j7EeGYQ893/aqZ1UmtdUOtOm SDorE9FCe9tuKiCGlYLBx3o5NSV1IALaXyEsW6lMc7DvXcl/h+cjBhbFvXnHbw4151cC3f5V27O xenGcKcns/0BrwUaF7uAn0wFEU2OurOKpS1zYVfrptbIOOosiANw9DRF8Y5g/xpRa2B2BvfwnTf msqszU3mUdxJzJV8Lo4D4A+Uu3HC+EKOmVy6ziZy7/sbCzXqhvHZ/wqC2f9u5JA1qxeOxlolpSR B9jnipEu48FKfrSD6YJlcSfZcsNWKVLyQOQiMQA0jjhrm00v3mgg62drJKlPkFiRmxDleP9uWKs /RfYYCIgZBwPofvQv7AP0LmumCRLZZrxx9aM2Bx8= X-Received: by 2002:a05:6870:2388:b0:409:54a3:6a88 with SMTP id 586e51a60fabf-4157abca642mr1008619fac.1.1771644786897; Fri, 20 Feb 2026 19:33:06 -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 586e51a60fabf-4157d392440sm182717fac.17.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 99976340991; Fri, 20 Feb 2026 20:33:05 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 95668E427C8; 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 3/7] nvme: update nvme_id_ns OPTPERF constants Date: Fri, 20 Feb 2026 20:32:58 -0700 Message-ID: <20260221033302.1451669-4-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 In NVMe verson 2.0 and below, OPTPERF comprises only bit 4 of NSFEAT in the Identify Namespace structure. Since version 2.1, OPTPERF includes both bits 4 and 5 of NSFEAT. Replace the NVME_NS_FEAT_IO_OPT constant with NVME_NS_FEAT_OPTPERF_SHIFT, NVME_NS_FEAT_OPTPERF_MASK, and NVME_NS_FEAT_OPTPERF_MASK_2_1, representing the first bit, pre-2.1 bit width, and post-2.1 bit width of OPTPERF. Update nvme_update_disk_info() to check both OPTPERF bits for controllers that report version 2.1 or newer, as NPWG and NOWS are supported even if only bit 5 is set. Signed-off-by: Caleb Sander Mateos --- drivers/nvme/host/core.c | 8 +++++++- include/linux/nvme.h | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 8dda2fe69789..bff6f26d7bcf 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -2062,10 +2062,11 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, 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; + u8 optperf; /* * The block layer can't support LBA sizes larger than the page size * or smaller than a sector size yet, so catch this early and don't * allow block I/O. @@ -2076,11 +2077,16 @@ static bool nvme_update_disk_info(struct nvme_ns *ns, struct nvme_id_ns *id, } phys_bs = bs; atomic_bs = nvme_configure_atomic_write(ns, id, lim, bs); - if (id->nsfeat & NVME_NS_FEAT_IO_OPT) { + optperf = id->nsfeat >> NVME_NS_FEAT_OPTPERF_SHIFT; + if (ctrl->vs >= NVME_VS(2, 1, 0)) + optperf &= NVME_NS_FEAT_OPTPERF_MASK_2_1; + else + optperf &= NVME_NS_FEAT_OPTPERF_MASK; + if (optperf) { /* NPWG = Namespace Preferred Write Granularity */ phys_bs = bs * (1 + le16_to_cpu(id->npwg)); /* NOWS = Namespace Optimal Write Size */ if (id->nows) io_opt = bs * (1 + le16_to_cpu(id->nows)); diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 1134e6bf2d5c..a025447212f8 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -595,11 +595,13 @@ enum { }; enum { NVME_NS_FEAT_THIN = 1 << 0, NVME_NS_FEAT_ATOMICS = 1 << 1, - NVME_NS_FEAT_IO_OPT = 1 << 4, + NVME_NS_FEAT_OPTPERF_SHIFT = 4, + NVME_NS_FEAT_OPTPERF_MASK = 0x1, + NVME_NS_FEAT_OPTPERF_MASK_2_1 = 0x3, NVME_NS_ATTR_RO = 1 << 0, NVME_NS_FLBAS_LBA_MASK = 0xf, NVME_NS_FLBAS_LBA_UMASK = 0x60, NVME_NS_FLBAS_LBA_SHIFT = 1, NVME_NS_FLBAS_META_EXT = 0x10, -- 2.45.2