From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE88E13D600; Tue, 23 Jul 2024 18:33:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759629; cv=none; b=uf4or9lTaQvHLsznLqr2UxzgLzgwwQow5rwEG9DGtSiFVpDjYcA63yjm8QESK00YAdF1ISuGDea/6/NxICcpRonC6AXVQyBJdf+zQUgWaRKiPkP4YYLzJXsyVED32cq8lhKxMEgpgVE8YU2h8f3KruVFFVkVOAwC0w8AM0DJkxI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759629; c=relaxed/simple; bh=zUMwzimKQ4nE+1+ti6jhK9RIccUPbxl5WiLnkU7oN4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iNbsC0HpjPV5XKMLeaYcoDok5UGWWBddAQO+T4GHXTJOuanDntR0uzDpOP1fywc30pAi/vgf/9c9DG0vvbWHY3JnHUAm6dCyppK96E1S394YXN+Pd84W6JUR3v0qwjPLcbHsuKdYKC6UdJ7EDAUdtVCOUBhePJWE7LxVlBMznvM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xUQonuGC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="xUQonuGC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 18D0EC4AF0A; Tue, 23 Jul 2024 18:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759629; bh=zUMwzimKQ4nE+1+ti6jhK9RIccUPbxl5WiLnkU7oN4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xUQonuGCOtQm4xtg/Ry6HMLrhQ+CyxA++fUrC1YYUIS28DUsD3vU7Xnt3OlseMO8+ NcfcxpQQveYSSA1EMSG+Hk7iI4cqDBmlfhXm2NNWJskFgTtCreVQZbq2xwghFJQRYy d25B0QKVaiku+fCOw2cvDFSYx/xqCU0tKmz6UEW8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Boyang Yu , Kanchan Joshi , Keith Busch , Sasha Levin Subject: [PATCH 6.6 075/129] nvme: fix NVME_NS_DEAC may incorrectly identifying the disk as EXT_LBA. Date: Tue, 23 Jul 2024 20:23:43 +0200 Message-ID: <20240723180407.681588704@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180404.759900207@linuxfoundation.org> References: <20240723180404.759900207@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Boyang Yu [ Upstream commit 9570a48847e3acfa1a741cef431c923325ddc637 ] The value of NVME_NS_DEAC is 3, which means NVME_NS_METADATA_SUPPORTED | NVME_NS_EXT_LBAS. Provide a unique value for this feature flag. Fixes 1b96f862eccc ("nvme: implement the DEAC bit for the Write Zeroes command") Signed-off-by: Boyang Yu Reviewed-by: Kanchan Joshi Signed-off-by: Keith Busch Signed-off-by: Sasha Levin --- drivers/nvme/host/nvme.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index fd67240795e3a..21c24cd8b1e8a 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h @@ -485,7 +485,7 @@ static inline bool nvme_ns_head_multipath(struct nvme_ns_head *head) enum nvme_ns_features { NVME_NS_EXT_LBAS = 1 << 0, /* support extended LBA format */ NVME_NS_METADATA_SUPPORTED = 1 << 1, /* support getting generated md */ - NVME_NS_DEAC, /* DEAC bit in Write Zeores supported */ + NVME_NS_DEAC = 1 << 2, /* DEAC bit in Write Zeores supported */ }; struct nvme_ns { -- 2.43.0