From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 4A8594C61F for ; Wed, 21 Feb 2024 11:35:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708515347; cv=none; b=iVQ2G5zk7sUbYayhV31IXsKBF7kn+c8ZLWr9wPuRLJkOz/oTPyNUUV/C0MTbEEoRRIkwBmgg7QU0DLvqQ23ba/t1IaLIHaxDxMmS0d+lGiwOTGvFexZi8ZSlOpVHzdqmuWRj3tfV5Eyr6T/9SDEgwsjMj0pYfiE6/v1IrjSlFrE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708515347; c=relaxed/simple; bh=6Y7B3eAU7WFGxIfJIx2em1X2j1KbkoJBGgvBRFQVJuk=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ctCkypFDhxQBR4w+n8Y9dZDufkA4NCFvgBHqcs5cfsKv2DFZ2gWBh07LF+7lql5IiW5jvZdR7dWzGw7u0m5v22x6CdPAlk6964j77xeOMYtYZGZNq3QZ1NrJwJ2yDBPAX4jQ7/pVA/zVOQgWvR+vPSl0/vcIhWtaec522CgsI1k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=Pbua9M3v; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ardb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Pbua9M3v" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608405e0340so9454067b3.0 for ; Wed, 21 Feb 2024 03:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708515344; x=1709120144; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=0rqzUwS6BdxGjI3H1JUFmWLh2DB/nlQLPYKogLCLbB8=; b=Pbua9M3v7TbfyjLNTsp4jtwX2FH4MLVff2aDdTchL9x2u9BNXr0GmslAqTvLy6AZRp LuL+c85zSCmhQ/Bh0qjjKZaEDgqFAahLT+9OQOEGANJgZKQRgcvGr3tRcsKEgDRogKyH rXVMNAfj51kaKgjM7/l9Jl41iTA+Lk+qRnYZh94M8PD4AcHPxMXOwWnegOqQcKNDvrNr yWdTp+425VuvMgyO9fyDZg4r4+xkM+ijuKG99BtqS18TlEWcGlyoWapRPCgj7R3H8Fl2 GooVSNDprwVaM7Kliw4cpxnRIl0qt/aOYM6KvW0maMzL1M4m7V1yXzKcrthEmviC62Xg Xx2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708515344; x=1709120144; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0rqzUwS6BdxGjI3H1JUFmWLh2DB/nlQLPYKogLCLbB8=; b=tMaoMF4fTC2kT6xlQUjkqY4cjHNFFllXVnezmDdP11n0nAVMPfuJxQbzp/SZV6wDdl 0rk8N0/dedFiymm6D2fmdFeH9sEwukVYmKVBjf5rkhzEcSHZj5/qGufd5Eqs+vSc+4fr pamHLby99Vk/qweOl5wCBaQTizTz4mcK2F+Dl7KpzAnRxgTSo8O9ssE79kUV1pMeN8zW mVp19eJr4DrOMqgCwYTkvsEZb5cYvdswuJePgsxu6hgHW42ok4/fy5PI2+ncL/jhX/h7 re+yHgkxEL6Zkg13FPd+aT943jfylgIFjXTWIZQRm5IU4UPdu0r0PTJwwWD6vZNlREOL jzog== X-Forwarded-Encrypted: i=1; AJvYcCURAVIaLyhenZZ8NW/o8sBY8iP6Y6Om8YgLUk5g9WsS+J05mt71aDBhx3ESQFptSERDPdAs0M1LMhQp0FfkRFOz6EyEsA+8qLMyNQ== X-Gm-Message-State: AOJu0YzI9M59F9RsnE/AutO6VO0axHPNzIXNg7qiZ3Do68zpQ7yE74aG BMvM7/xSzlbc2U9/tm7R+CTXr5sEtsDqZoUkktjSt6Hek3VAN4c2QW1yd717Wt0lII7tMA== X-Google-Smtp-Source: AGHT+IEwHju/X9vIeqhihYIRGISY1cX5Xt88mGLo3fj9jImWuJGJ1FfqScqrj4iTyDBujg+MUcvlGxTW X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a81:5748:0:b0:607:c418:33ba with SMTP id l69-20020a815748000000b00607c41833bamr4147129ywb.8.1708515344377; Wed, 21 Feb 2024 03:35:44 -0800 (PST) Date: Wed, 21 Feb 2024 12:35:11 +0100 In-Reply-To: <20240221113506.2565718-18-ardb+git@google.com> Precedence: bulk X-Mailing-List: linux-arch@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240221113506.2565718-18-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1147; i=ardb@kernel.org; h=from:subject; bh=e7Puh3E2XK1VJqqP8geKZexKLK94zY042KFjfKEULUs=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIfXq/bd/VsVJTi+bPPmYuH9fB1t473PjspnToo1YUsxUq 2rZ/8p1lLIwiHEwyIopsgjM/vtu5+mJUrXOs2Rh5rAygQxh4OIUgIlcn8fwP59By9ztn+WWpIp/ Ox3ZZ2pacQjfWxM61eabxvsZwdx2xxj+2ZrtjxF+psy/dvm6zgKZQ2ypEpVS2Y8L2oKWh7RmbCt kBgA= X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog Message-ID: <20240221113506.2565718-22-ardb+git@google.com> Subject: [PATCH v5 04/16] x86/startup_64: Use RIP_REL_REF() to access __supported_pte_mask From: Ard Biesheuvel To: linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Kevin Loughlin , Tom Lendacky , Dionna Glaze , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Andy Lutomirski , Arnd Bergmann , Nathan Chancellor , Nick Desaulniers , Justin Stitt , Kees Cook , Brian Gerst , linux-arch@vger.kernel.org, llvm@lists.linux.dev Content-Type: text/plain; charset="UTF-8" From: Ard Biesheuvel __supported_pte_mask is accessed from code that executes from a 1:1 mapping so it cannot use a plain access from C. Replace the use of fixup_pointer() with RIP_REL_REF(), which is better and simpler. Signed-off-by: Ard Biesheuvel --- arch/x86/kernel/head64.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 2ac904110f6a..e2573ddae32f 100644 --- a/arch/x86/kernel/head64.c +++ b/arch/x86/kernel/head64.c @@ -177,7 +177,6 @@ unsigned long __head __startup_64(unsigned long physaddr, p4dval_t *p4d; pudval_t *pud; pmdval_t *pmd, pmd_entry; - pteval_t *mask_ptr; bool la57; int i; @@ -259,8 +258,7 @@ unsigned long __head __startup_64(unsigned long physaddr, pmd_entry = __PAGE_KERNEL_LARGE_EXEC & ~_PAGE_GLOBAL; /* Filter out unsupported __PAGE_KERNEL_* bits: */ - mask_ptr = fixup_pointer(&__supported_pte_mask, physaddr); - pmd_entry &= *mask_ptr; + pmd_entry &= RIP_REL_REF(__supported_pte_mask); pmd_entry += sme_get_me_mask(); pmd_entry += physaddr; -- 2.44.0.rc0.258.g7320e95886-goog