Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp2909242pxb; Tue, 24 Aug 2021 10:22:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwy9Kl5vUN0kI/OXnqc3H7CVI1jZcziI3PLBGjp5u1pt0ayF4QTeybFDYDdCuV9QIAaZ0XW X-Received: by 2002:a02:664e:: with SMTP id l14mr35811052jaf.56.1629825731963; Tue, 24 Aug 2021 10:22:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629825731; cv=none; d=google.com; s=arc-20160816; b=F1edGI5yRQsqfp1QJGhaHHcreuRCZVw4PaIYuCMFjEEu06Pd6ssGeL54OKoO7udo3a ZnaWVMbPKqY1/p39ebAOfO7Y+6Tl338DP7Ke1etns7LH5YqueCCRq91oCIjNua4HKcYz ocvO3lRvA5VKZqmi/MDJF4U9FYgPJ9jH4KITNoDlA9UiXsuoAyLP3dHi06shVq/uYrGH 78Vq21xJGlCgmYGM3JlW9WMP29wIDwQEVL+EGqA92ykER+8KaP/HaXqh/farbO1OU33+ B4S7U7fJC2psUCjsu7Mt886/05V6yteJI0X1ZAZksP7u3e4xLR1TD9gqTEo+t4zwdQ/f K+qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=i3QRswUDoAiT0uBUmRrCVfckEhlDN1d5zX8B1Pj2HDA=; b=MolYEtMjTqr/8pbQQB3cX+XYTXRc6G6L8dzI+37t6VfbosEfDGDX1ia4F/CpDRfbIB nATypli18bJUeP1xSnV8NXkUCdqCzY5XcJsqgpr1B0rOCtTz4bGO3DBVuuP6114NAK8V 8zCZFtnLu5UJsUfEdSruEUImZFD+i4g1sQgCcn1mAtSmGQjncti+QGqnbrGX4ewWZn7b Wp4NF0OYk3bl8LADNBQ6XZUAiKiOPxLMJawb4bVNVPYk692oSwaHEcK46FgIl0fkFbet pF4JvLBqI+EboUwKzbyLG+SkGfJu+OoZwheYpumM/707vne4y+6b83Sn/Vhjz+6Oq0L8 k8gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jkKjPK5y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y20si235103jao.34.2021.08.24.10.22.00; Tue, 24 Aug 2021 10:22:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=jkKjPK5y; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239288AbhHXRVv (ORCPT + 99 others); Tue, 24 Aug 2021 13:21:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:55606 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240169AbhHXRSh (ORCPT ); Tue, 24 Aug 2021 13:18:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9819D61ACF; Tue, 24 Aug 2021 17:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1629824577; bh=9C7UgSGhTKfheChZxXjlYbqP34n0cIFBR5L25jYP4dY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jkKjPK5y3vixu8NjPpuuz1ygMCtBVvhNuD65dpJHmnuDJTrE82tUciXLoBF84w11m 62dP00YONBvZQIjmqup2F5lMhWkvE/9g5nRa+iKMa6tpZfazNKyvRMpSpRp6LDOt99 x253sH1xqqPRgyfwpkBHBdFvgtPcRkVF2V+wac6CCxwkbl4vcyrhoj0nXPNtEkRGT4 bX3ME0Qe0BiFVSogGbzGkhDCzwl57neWy5TwrgDjSzdVOvxLsmBKLs4zsqXW0xoWbH Ck++SNrlvLzjnYM2smtyewcESYKKmRMNsk/qJoo/qpIiZU2OiniPfNrfnkkKKTWsrj P/fcU8llRLC1A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Williams , Jacek Zloch , Lukasz Sobieraj , "Lee, Chun-Yi" , Krzysztof Rusocki , Damian Bassa , Jeff Moyer , Greg Kroah-Hartman Subject: [PATCH 4.19 05/84] ACPI: NFIT: Fix support for virtual SPA ranges Date: Tue, 24 Aug 2021 13:01:31 -0400 Message-Id: <20210824170250.710392-6-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210824170250.710392-1-sashal@kernel.org> References: <20210824170250.710392-1-sashal@kernel.org> MIME-Version: 1.0 X-KernelTest-Patch: http://kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.19.205-rc1.gz X-KernelTest-Tree: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git X-KernelTest-Branch: linux-4.19.y X-KernelTest-Patches: git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git X-KernelTest-Version: 4.19.205-rc1 X-KernelTest-Deadline: 2021-08-26T17:02+00:00 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Williams commit b93dfa6bda4d4e88e5386490f2b277a26958f9d3 upstream. Fix the NFIT parsing code to treat a 0 index in a SPA Range Structure as a special case and not match Region Mapping Structures that use 0 to indicate that they are not mapped. Without this fix some platform BIOS descriptions of "virtual disk" ranges do not result in the pmem driver attaching to the range. Details: In addition to typical persistent memory ranges, the ACPI NFIT may also convey "virtual" ranges. These ranges are indicated by a UUID in the SPA Range Structure of UUID_VOLATILE_VIRTUAL_DISK, UUID_VOLATILE_VIRTUAL_CD, UUID_PERSISTENT_VIRTUAL_DISK, or UUID_PERSISTENT_VIRTUAL_CD. The critical difference between virtual ranges and UUID_PERSISTENT_MEMORY, is that virtual do not support associations with Region Mapping Structures. For this reason the "index" value of virtual SPA Range Structures is allowed to be 0. If a platform BIOS decides to represent NVDIMMs with disconnected "Region Mapping Structures" (range-index == 0), the kernel may falsely associate them with standalone ranges where the "SPA Range Structure Index" is also zero. When this happens the driver may falsely require labels where "virtual disks" are expected to be label-less. I.e. "label-less" is where the namespace-range == region-range and the pmem driver attaches with no user action to create a namespace. Cc: Jacek Zloch Cc: Lukasz Sobieraj Cc: "Lee, Chun-Yi" Cc: Fixes: c2f32acdf848 ("acpi, nfit: treat virtual ramdisk SPA as pmem region") Reported-by: Krzysztof Rusocki Reported-by: Damian Bassa Reviewed-by: Jeff Moyer Link: https://lore.kernel.org/r/162870796589.2521182.1240403310175570220.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/acpi/nfit/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index cb88f3b43a94..58a756ca14d8 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c @@ -2834,6 +2834,9 @@ static int acpi_nfit_register_region(struct acpi_nfit_desc *acpi_desc, struct acpi_nfit_memory_map *memdev = nfit_memdev->memdev; struct nd_mapping_desc *mapping; + /* range index 0 == unmapped in SPA or invalid-SPA */ + if (memdev->range_index == 0 || spa->range_index == 0) + continue; if (memdev->range_index != spa->range_index) continue; if (count >= ND_MAX_MAPPINGS) { -- 2.30.2