Commit 47590400 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Zheng Zengkai
Browse files

nvme: add a quirk to disable namespace identifiers 

stable inclusion
from stable-v5.10.113
commit 316bd86c2261fffa37577c3d35721a9337248e54
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5ISAH

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=316bd86c2261fffa37577c3d35721a9337248e54



--------------------------------

[ Upstream commit 00ff400e ]

Add a quirk to disable using and exporting namespace identifiers for
controllers where they are broken beyond repair.

The most directly visible problem with non-unique namespace identifiers
is that they break the /dev/disk/by-id/ links, with the link for a
supposedly unique identifier now pointing to one of multiple possible
namespaces that share the same ID, and a somewhat random selection of
which one actually shows up.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 7bec2850

drivers/nvme/host/core.c

+18 −6
Original line number Diff line number Diff line
@@ -1250,6 +1250,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_EUI64_LEN;

		memcpy(ids->eui64, data + sizeof(*cur), NVME_NIDT_EUI64_LEN);

		return NVME_NIDT_EUI64_LEN;

	case NVME_NIDT_NGUID:
@@ -1258,6 +1260,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_NGUID_LEN;

		memcpy(ids->nguid, data + sizeof(*cur), NVME_NIDT_NGUID_LEN);

		return NVME_NIDT_NGUID_LEN;

	case NVME_NIDT_UUID:
@@ -1266,6 +1270,8 @@ static int nvme_process_ns_desc(struct nvme_ctrl *ctrl, struct nvme_ns_ids *ids, 
				 warn_str, cur->nidl);

			return -1;

		}

		if (ctrl->quirks & NVME_QUIRK_BOGUS_NID)

			return NVME_NIDT_UUID_LEN;

		uuid_copy(&ids->uuid, data + sizeof(*cur));

		return NVME_NIDT_UUID_LEN;

	case NVME_NIDT_CSI:
@@ -1361,12 +1367,18 @@ static int nvme_identify_ns(struct nvme_ctrl *ctrl, unsigned nsid, 
	if ((*id)->ncap == 0) /* namespace not allocated or attached */

		goto out_free_id;





	if (ctrl->quirks & NVME_QUIRK_BOGUS_NID) {

		dev_info(ctrl->device,

			 "Ignoring bogus Namespace Identifiers\n");

	} else {

		if (ctrl->vs >= NVME_VS(1, 1, 0) &&

		    !memchr_inv(ids->eui64, 0, sizeof(ids->eui64)))

			memcpy(ids->eui64, (*id)->eui64, sizeof(ids->eui64));

		if (ctrl->vs >= NVME_VS(1, 2, 0) &&

		    !memchr_inv(ids->nguid, 0, sizeof(ids->nguid)))

			memcpy(ids->nguid, (*id)->nguid, sizeof(ids->nguid));

	}



	return 0;

drivers/nvme/host/nvme.h

+5 −0
Original line number Diff line number Diff line
@@ -151,6 +151,11 @@ enum nvme_quirks { 
	 * encoding the generation sequence number.

	 */

	NVME_QUIRK_SKIP_CID_GEN			= (1 << 17),



	/*

	 * Reports garbage in the namespace identifiers (eui64, nguid, uuid).

	 */

	NVME_QUIRK_BOGUS_NID			= (1 << 18),

};



/*