Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
From:   Ross Philipson <ross.philipson@oracle.com>
To:     linux-kernel@vger.kernel.org, x86@kernel.org
Cc:     ross.philipson@oracle.com, daniel.kiper@oracle.com,
        dpsmith@apertussolutions.com, tglx@linutronix.de, mingo@redhat.com,
        bp@alien8.de, hpa@zytor.com, luto@amacapital.net,
        dave.hansen@linux.intel.com, kanth.ghatraju@oracle.com,
        trenchboot-devel@googlegroups.com
Subject: [PATCH v2 2/2] x86/boot: Add setup_indirect support in early_memremap_is_setup_data
Date:   Wed, 23 Feb 2022 21:07:36 -0500
Message-Id: <1645668456-22036-3-git-send-email-ross.philipson@oracle.com>
In-Reply-To: <1645668456-22036-1-git-send-email-ross.philipson@oracle.com>
References: <1645668456-22036-1-git-send-email-ross.philipson@oracle.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?UZqgJSDj7ZfDyTUcJOoNiyaX36czTH1S0C8aJ1pW1kP6kNjqEdCY80RluV9p?=
 =?us-ascii?Q?t5tS0ZP3ARl92yiNcRJ5PcQP8x5aFFU0jx/FxQnuOcXiC/aObTZ+bZGiihtz?=
 =?us-ascii?Q?5mfQai4nF7bNHsAKXD/xBm2wEpWewoakDw7EdjVc3KuTNnS4Dwod4xPbzS/M?=
 =?us-ascii?Q?VAt1U0xVZy60Z4AEykaUiGXq+aBnqmtKJolfgagK+BxH2UkNokkVdEHFutz2?=
 =?us-ascii?Q?VHYaKKZ8hQNIMHQJdZhqV7jgLuB7WW0IRN1r9xebGLeV8zRToIZLnm15Wl9Y?=
 =?us-ascii?Q?W+0yT0jIJe3K/PdijhjgHNxVV1K46+HcCx9nx2pS+QsCq/pLWCYv7KG/XwB7?=
 =?us-ascii?Q?gSigJXfyYaub8woPgyXq5lmuN4h/9CA89hytb3SaOPucnqxAxKyJnl2RmFPk?=
 =?us-ascii?Q?dt3+a+XpJY+c8nP4qR3GJC8IPfbLF4MGujE1jIYKQccsSTjE2rsET0B/2Hsd?=
 =?us-ascii?Q?DzjC+enKVpNjVZooqwE+2FqzXcvUHNAU9y22Fy0ubfr3pVK73gvXdco1WEnL?=
 =?us-ascii?Q?uaArValAdAMFciRGRBeppc1395unMtxG1nrbStb9kYy0Jk6RmUJCZRdVImFW?=
 =?us-ascii?Q?IU94d0r6viMlzoShu/jY5jXSogpLKJ7Eik6AwrBeqwysnm6YNzZPA/QA3/Q9?=
 =?us-ascii?Q?ate08lbHr+YV01xSYMwmY5ZrNwdwjenCQ2xaq9QYmsqLandTyEK7D5ak6b5l?=
 =?us-ascii?Q?hrcosST/wq0agYprgE4iathQj+C72LH6yVzrR/Vkc521siDfZUDdHWNNMaq2?=
 =?us-ascii?Q?XvN9GFoM//3yhoQUyzMdA2W4/rUNPyMri8rhNPlFf77iaAuCaBvipy5uaGtJ?=
 =?us-ascii?Q?nwvqZGWKY//e02h8uHJhRDw7xwcJHurRc/H2mGPn5vk7Ufnlsv+5urA/0UxO?=
 =?us-ascii?Q?zFWx7Hymyjwxzn0NGJaCjRjgBFgMt4c5GP67bLIGDM4gI1No5N8kiDneCG4G?=
 =?us-ascii?Q?BMxCm6JnyRUoulg71ixTrKjXgIa5v1pZa/Uac6Och2X9SEkIvEdyKmdbhgoX?=
 =?us-ascii?Q?XDueskTiQoGWv99lvHNBWGPOO6eGPMBC/9HhIZH7180NUjlopNwT0/fH/5C4?=
 =?us-ascii?Q?RM7YR6VMR1aQdqeBWBw30p8T/RZyB+krIWQmEeWiUIPDVF5/2IAu130bdFGI?=
 =?us-ascii?Q?ufylLcFcygUMD7uswX7nU4gRdeXi/DTB8D3zXZCEF/e9UH7KQyi9Cg0cNYsF?=
 =?us-ascii?Q?5iNvhSRN/18OYRGtAfKVlBVPx9O+CTelKDzGKoHwn3v37x2UZvCJYxJhe4eD?=
 =?us-ascii?Q?zoCvY8+B8RsYP7Zwkl6UvfhARy2ZKLUYlH6lvX6kHpARYavOa8DbBar8XJO8?=
 =?us-ascii?Q?ZHZuavvoPnVdel7rydTt1iuduo+jHkflV3pzrGxotYL4QFQLfCxfF3uEbP4J?=
 =?us-ascii?Q?xkV43zSYrIt+cOR8Z+ZX3euFCx0t4csXnqzZvZIbYp8qdwkWgK6mb9XqKZfg?=
 =?us-ascii?Q?LLzSAB669A05JJgNLRlHC4PoDfgaN0XHnuInKQMCiQ+WclkyDT4zO1Am7EVL?=
 =?us-ascii?Q?po65WN1TyUT6gZCiPkAVYaRa+uxG4FmfsKK+JnD0GPCDipDrsdmTOWLASUVM?=
 =?us-ascii?Q?Ri6LfDczIPL+c5vt8otY9q+ZFI8nWB0Lc0ZABvfpFm5RfLbBgUopMYwwQDiW?=
 =?us-ascii?Q?7dQUMGw1K9GiLRdcFqF0/FACJy+fPqdZ55v0jZFpMWUqNJbFV6iE7XIVUWav?=
 =?us-ascii?Q?QiOMKw=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ce62f2ea-6621-47c8-c7fc-08d9f868c90c
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB3793.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Feb 2022 14:11:58.4543
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: bL5LFZpc/Z69BXyG8Rp0N2l1tOzzrccW/M1h4tmrrg7B9TDkfGwyYQXAnJ1KoDg80od7BTBGHM4xF904DqCP4/zdUYcrOu59Aif//5vob1Y=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB3328
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10268 signatures=684655
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 mlxscore=0
 spamscore=0 mlxlogscore=999 adultscore=0 phishscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202250083
X-Proofpoint-ORIG-GUID: cNLe_QACVryIDDgbMZyI_-cmDoQoVnfi
X-Proofpoint-GUID: cNLe_QACVryIDDgbMZyI_-cmDoQoVnfi
X-Spam-Status: No, score=-0.6 required=5.0 tests=BAYES_00,DATE_IN_PAST_24_48,
	DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
	lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The x86 boot documentation describes the setup_indirect structures and
how they are used. Only one of the two functions in ioremap.c that needed
to be modified to be aware of the introduction of setup_indirect
functionality was updated. Adds comparable support to the other function
where it was missing.

Fixes: b3c72fc9a78e ("x86/boot: Introduce setup_indirect")
Signed-off-by: Ross Philipson <ross.philipson@oracle.com>
---
 arch/x86/mm/ioremap.c | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index ab666c4..17a492c 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -676,22 +676,51 @@ static bool memremap_is_setup_data(resource_size_t phys_addr,
 static bool __init early_memremap_is_setup_data(resource_size_t phys_addr,
 						unsigned long size)
 {
+	struct setup_indirect *indirect;
 	struct setup_data *data;
 	u64 paddr, paddr_next;
 
 	paddr = boot_params.hdr.setup_data;
 	while (paddr) {
-		unsigned int len;
+		unsigned int len, size;
 
 		if (phys_addr == paddr)
 			return true;
 
 		data = early_memremap_decrypted(paddr, sizeof(*data));
+		if (!data) {
+			pr_warn("failed to early memremap setup_data entry\n");
+			return false;
+		}
+
+		size = sizeof(*data);
 
 		paddr_next = data->next;
 		len = data->len;
 
-		early_memunmap(data, sizeof(*data));
+		if ((phys_addr > paddr) && (phys_addr < (paddr + len))) {
+			early_memunmap(data, sizeof(*data));
+			return true;
+		}
+
+		if (data->type == SETUP_INDIRECT) {
+			size += len;
+			early_memunmap(data, sizeof(*data));
+			data = early_memremap_decrypted(paddr, size);
+			if (!data) {
+				pr_warn("failed to early memremap indirect setup_data\n");
+				return false;
+			}
+
+			indirect = (struct setup_indirect *)data->data;
+
+			if (indirect->type != SETUP_INDIRECT) {
+				paddr = indirect->addr;
+				len = indirect->len;
+			}
+		}
+
+		early_memunmap(data, size);
 
 		if ((phys_addr > paddr) && (phys_addr < (paddr + len)))
 			return true;
-- 
1.8.3.1