From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f97.google.com (mail-ot1-f97.google.com [209.85.210.97]) (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 7E99A279DA2 for ; Tue, 24 Feb 2026 17:15:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.97 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953304; cv=none; b=BO7L7XYlP/UlifaMW2yRd3Hw0Etp9/XkxBFgispu8L0+RoHeZsVjGs1KOfR8+KHYYoaaXLROPr+CzJBPCHZikRl3DU+fx0OsKyJJXLtnJx5ynrrap6neBeIQ5A1TWAhVGXuyVgtnDhVxMCzE+1EnxR1zzNKPILr+WFsC6ABp4kI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771953304; c=relaxed/simple; bh=62cRCccrSguAwwqDGJINO/15pCmBCVwknmS2odJqMIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZYcN3WrEHqq3vvtmBMu3yw2ssNz2j4b3oSi769fYOvd5DuTcZ4pVjYgp272Lmnx60THegTRYcPSbvh+IeSBDorGd8uytk6n9LZM2fUOcBetg8I8wlghI5XdU12180UF1aQKFSrUTqSc3LvL0FDyX1XfnUvu0r8L9Y7shim25rvU= 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=Y2QeJB4H; arc=none smtp.client-ip=209.85.210.97 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="Y2QeJB4H" Received: by mail-ot1-f97.google.com with SMTP id 46e09a7af769-7d18e9fb43eso806281a34.3 for ; Tue, 24 Feb 2026 09:15:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1771953302; x=1772558102; 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=Y2QeJB4HgQu/suTVSjjEnKnO1JuK+kB0j2OWHNPVAXg6qezbaMWrnpcCAM8BBekIuV HW6jE4y3RsbnpS7MEcPQpECGACi9Kl/Wp1uMy3LR8dFB+XXzNMbyjdEpMyjnny9+XoiM v8G4QniRQ3sL9AsYneANIBJbfRIkJE+OPn8si2/DVQfFyxTjfy+Ef2aZDLsMUfbc0b19 rnT9Zdx6A373LIGmidHljsviyR2H9QafSCFyDpBzJxY7UmwrYVocNZZPOTENS8vLHrqj 9Vpix1uQGcMb07hqSETpHOTiiE/HGJFqHt3+AI7H+cAIn5VkN6SrrH2DC9qY/WKtHpyi /BAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771953302; x=1772558102; 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=re3TFAvSJHNoNqI9qTnSSwy9KggTp9EHSWx45cnZrgUCKZlxbNK7wpL5ownrKE1t19 FhdjZkB1/hk0zTA4q/uu2snL/HU79Jp5AUmGqTKclIe6u9A0kdQOrR5dj9462jUEKEUg GlscOjReTPjxR2OmgQqsogRkdcUcBFZjR39WPf9hBilV9W9eMARWo1OQNQSrsy20qIcP t5oZhbdnNxtp1vyZuNaB20z4e/7zEZ+MmBPe36exIS/BRDyy0f23aRkxtY47VnF+jt8D Xb7Y+nXJmAHrJNa5OQkrYo8vdPmrwNkfAbVZ9Ep7OFdLef3HORER/NFkW1jExyc/3C3V OOhA== X-Forwarded-Encrypted: i=1; AJvYcCV90HroAgNKxgcTviqder5mYvGYc/hf8MkJvwpJ0i7Udr3k4yWGbEgkMiKLFycMTM2I0/WhD0xth0/mHDI=@vger.kernel.org X-Gm-Message-State: AOJu0YwHGNh+TqtnELamSQM+Uqlnyfyt+gbT0qGtL720tr1T94lSmWcp me8XBnok+w6LAPgLkCIH9GiWxxYyYBPTuDsOqPDZZ2km/ky6yagtfRWjznxmgoyw4J2ez+zXnIw jpEuRZaR4ITSsBxz9bmMEd21lykDLf3iDV6uB X-Gm-Gg: AZuq6aIUGWchAlhuDlKk1U5ALJ4kXqrPOEsBKDu0XfKqoeJNbuCWdNvvfMcPALTnqZb 6SlfUyEHfxKygNKx30zG43FFFL4MnLsoaEpo2Fk4E29hYbNs2lsDBjy/F73b631lusZalOJgpQU FRYpXn5BoPIw2h1+NGBcgNbHPjvdpVGA0A3Ghk8/2MRnl86Qoav//dinkaBCk+UxfxjBOSx/z+F panQAmfJdp4fjQr0Vvc0w9H3qLYB4UBxjgm/0f/GBz0XSShyoS2XUaR7DIjXbYZg84Pis9TgFLq IsCD8Po45UiwV75h1gv4wd0+/sEWT24mIijuV4Ga5CGIuZ5p0cepJSbNKQN/HqVhDcUvyb7h1Nt ijYw6OnWkUcG8EJ6pm09c1ujgmC+caXJhuYYucANkCKEzjsI1XSPlCw== X-Received: by 2002:a05:6830:71a7:b0:7d1:4684:ea96 with SMTP id 46e09a7af769-7d52bf24219mr6568321a34.4.1771953302166; Tue, 24 Feb 2026 09:15:02 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 46e09a7af769-7d52cf74750sm1233685a34.2.2026.02.24.09.15.01 (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 4CB4A3420C0; Tue, 24 Feb 2026 10:15:01 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 484C1E41254; Tue, 24 Feb 2026 10:15:01 -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 3/8] nvme: update nvme_id_ns OPTPERF constants Date: Tue, 24 Feb 2026 10:14:32 -0700 Message-ID: <20260224171437.3175993-4-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 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 *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..d840f5fe79fa 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -595,11 +595,15 @@ 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, + /* In NVMe version 2.0 and below, OPTPERF is only bit 4 of NSFEAT */ + NVME_NS_FEAT_OPTPERF_MASK = 0x1, + /* Since version 2.1, OPTPERF is bits 4 and 5 of NSFEAT */ + 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