From nobody Tue Apr 7 18:45:28 2026 Received: from mail-vk1-f228.google.com (mail-vk1-f228.google.com [209.85.221.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 8DB54413236 for ; Fri, 27 Feb 2026 20:24:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772223844; cv=none; b=N4TQcAqzsi4r3Pwh9CfLYXB/Kxz9gVMrzdK7DInow5627JA+TC/y17fOXfPq6tn6vTSnyjYetRUxUxSqac8FLQwCN7OtHB41/dvF0JUCsvv9jnhYUnyJ8Wy8V2VIOTiF5z27tj2gT4e3MSCz+TZsVxq7cmPjcc80zG6/Z6YfyxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772223844; c=relaxed/simple; bh=62cRCccrSguAwwqDGJINO/15pCmBCVwknmS2odJqMIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WYjJv7ee8Sp//GOgNDNBHpFdyApiSNJykOsO77STpQD2IKOFCvHlIC8bMflcyw5xoD5H0kMiOhBraKTACGJe2haqJ0IlbzCYSi8rLEzwu7djAe5GnOB9AJ7ojhlnWY7T9SZ1C3JBQmEBfwTdworJAqAW9csWBU2NMDJlrUIL+rw= 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=PWVnJjZK; arc=none smtp.client-ip=209.85.221.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="PWVnJjZK" Received: by mail-vk1-f228.google.com with SMTP id 71dfb90a1353d-568d5c03438so150524e0c.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=ooHjh6HrTZHmSmxByDLdiCmY2zTnKYEXcZkNLfcMiWM=; b=PWVnJjZKyax3yfd8jpdAgmtK7k9I9ZEsTuyxgHA1+RWzNrK85+gMDvp/N/0cS5sVRf E0cleb8f4zXfIJkdnjDhPQ2uLw4SxzCN8sbQlrAJfMPqw+kTCE7kGfWesLFXQhWpTj1i iccN7K4844f0nRWqOfsNS505zsPCMlB0I0X84Ao3iOn7GHUYggenDFwcYzR1kDZRwjDb KhpybD9qW1cng2vaIrnfmw9s1fzexvxnsDEodfGQOyPAUT8UXkFK481LgsJkQMWKkaIa TFEzEgdKa/I53meVq1ooBqCvIlwJLq3teYGOss9UBtDVlhLNiOR9KvNg5u1ZgVc5YslC txNQ== 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=ooHjh6HrTZHmSmxByDLdiCmY2zTnKYEXcZkNLfcMiWM=; b=i6L4smgUikY83X+KjYAvfPZeJorsBcAUlzY9FJAalHYK4sXNqsBZZIZ0/ugL9BdnGY 57Zx6qaza78baWe4OlUcJy71h0eA4M1S2OvLU2gyYQSCFu1iPpeRWxX0kRjR1F7XrEFI ny8UOondpf6zY4L/4sGg6jHju3WctbnxOL77t2brF8Q9uKVWA+jikvywnLVYwZo0UmGe B1g8CkJC7b8MPJjYe7l7gTJZJDviqJKT3YWnfH2RAofm2LzGHZTiLWnL2l/vVwmGWa3X mmMKvVY/XOk+5U1O1LraIRyoj9gerGL0AMGuCIN1D04zTDyPJbmZD41JxWBiv9m9MfGX VJDQ== X-Forwarded-Encrypted: i=1; AJvYcCU/H77FgiyxcwCo6+ncfrkBCUf5y2sGDs0siiuPu+6eVGXuMGL0c8gNnv5I6qFZXg/AlUlf4QUg2Sz4KaA=@vger.kernel.org X-Gm-Message-State: AOJu0Yw89xf9MFvlmWSR5R/tXh9lnO5ov8XqbIpfhGhBSgiC/jJrion4 xomEy81YM/jZYQWLZ0Ypo2qAzDW1/RpVgUVjx3o3oCunUgs7Jz7y9W3JDX6HViySMek113YGcSt 6Te3GkhdGvVZioS+nOv/7Gm0jzPvk3vt8KWZf X-Gm-Gg: ATEYQzzXfBWDS8KE5T2hFJ7wa2swlXdY3K4tTCn8bqTpXqKRGSHvYl7+9rbUPi/oey1 R3r6e587ytDq8NuOdVfV4aAQSVZATMF2/uSUOJRb/tAUMlnkMLHFlTAl+aGK2Vn2e7VUPAWXleG G1ObEFahDCjFXgMBF9Gi7K5OL2D2P3DFyR0irL0bKlR/5nuth+q2SdZkyr8q9nEk6909JFcKJRz OoBokMehn1YqtTYtYV2TW3d/wcugx9C0q2AhVgtLwOmklM4rd348vWttNGH24QovcCRQfGqOs3P gvW0wacw/hSFivlArEyTMItSBU185gnvIpGxikaVQY7CE+gGOZav+MSU92213d/6wk7Xl53dR29 P6JT5+kCvbAxSTNr+61pBznuHCtb4kQofoMqxYNR0xvGGa1ypVFKNmw== X-Received: by 2002:a05:6123:2a:b0:566:fec7:2ac3 with SMTP id 71dfb90a1353d-56aa08c75camr916564e0c.0.1772223841453; Fri, 27 Feb 2026 12:24:01 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 71dfb90a1353d-56a9204c539sm697320e0c.8.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 B69293420BE; Fri, 27 Feb 2026 13:24:00 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id B0F46E420D8; 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 3/8] nvme: update nvme_id_ns OPTPERF constants Date: Fri, 27 Feb 2026 13:23:48 -0700 Message-ID: <20260227202354.1012322-4-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" 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 | 6 +++++- 2 files changed, 12 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 *n= s, struct nvme_id_ns *id, 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; + u8 optperf; =20 /* * 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 *n= s, struct nvme_id_ns *id, } =20 phys_bs =3D bs; atomic_bs =3D nvme_configure_atomic_write(ns, id, lim, bs); =20 - if (id->nsfeat & NVME_NS_FEAT_IO_OPT) { + optperf =3D id->nsfeat >> NVME_NS_FEAT_OPTPERF_SHIFT; + if (ctrl->vs >=3D NVME_VS(2, 1, 0)) + optperf &=3D NVME_NS_FEAT_OPTPERF_MASK_2_1; + else + optperf &=3D NVME_NS_FEAT_OPTPERF_MASK; + if (optperf) { /* NPWG =3D Namespace Preferred Write Granularity */ phys_bs =3D bs * (1 + le16_to_cpu(id->npwg)); /* NOWS =3D Namespace Optimal Write Size */ if (id->nows) io_opt =3D bs * (1 + le16_to_cpu(id->nows)); diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 1134e6bf2d5c..d840f5fe79fa 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -595,11 +595,15 @@ enum { }; =20 enum { NVME_NS_FEAT_THIN =3D 1 << 0, NVME_NS_FEAT_ATOMICS =3D 1 << 1, - NVME_NS_FEAT_IO_OPT =3D 1 << 4, + NVME_NS_FEAT_OPTPERF_SHIFT =3D 4, + /* In NVMe version 2.0 and below, OPTPERF is only bit 4 of NSFEAT */ + NVME_NS_FEAT_OPTPERF_MASK =3D 0x1, + /* Since version 2.1, OPTPERF is bits 4 and 5 of NSFEAT */ + NVME_NS_FEAT_OPTPERF_MASK_2_1 =3D 0x3, NVME_NS_ATTR_RO =3D 1 << 0, NVME_NS_FLBAS_LBA_MASK =3D 0xf, NVME_NS_FLBAS_LBA_UMASK =3D 0x60, NVME_NS_FLBAS_LBA_SHIFT =3D 1, NVME_NS_FLBAS_META_EXT =3D 0x10, --=20 2.45.2