From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Kevin Loughlin <kevinloughlin@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, Nick Desaulniers <ndesaulniers@google.com>,
Justin Stitt <justinstitt@google.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
Pankaj Gupta <pankaj.gupta@amd.com>,
Hou Wenlong <houwenlong.hwl@antgroup.com>,
Ard Biesheuvel <ardb@kernel.org>,
Dionna Glaze <dionnaglaze@google.com>,
Brijesh Singh <brijesh.singh@amd.com>,
Michael Roth <michael.roth@amd.com>,
linux-kernel@vger.kernel.org, llvm@lists.linux.dev,
linux-coco@lists.linux.dev, Ashish Kalra <ashish.kalra@amd.com>,
Andi Kleen <ak@linux.intel.com>,
Adam Dunlap <acdunlap@google.com>,
Peter Gonda <pgonda@google.com>, Jacob Xu <jacobhxu@google.com>,
Sidharth Telang <sidtelang@google.com>
Subject: Re: [PATCH v3 1/2] x86/sev: enforce RIP-relative accesses in early SEV/SME code
Date: Wed, 31 Jan 2024 10:20:28 +0200 [thread overview]
Message-ID: <4ljfvg7c23g2wx4hcqz6x6tx7uvp6fffayqvu4ptsmfqajlujr@zngokbd2awma> (raw)
In-Reply-To: <20240130220845.1978329-2-kevinloughlin@google.com>
On Tue, Jan 30, 2024 at 10:08:44PM +0000, Kevin Loughlin wrote:
> diff --git a/arch/x86/include/asm/mem_encrypt.h b/arch/x86/include/asm/mem_encrypt.h
> index 359ada486fa9..b65e66ee79c4 100644
> --- a/arch/x86/include/asm/mem_encrypt.h
> +++ b/arch/x86/include/asm/mem_encrypt.h
> @@ -17,6 +17,20 @@
>
> #include <asm/bootparam.h>
>
> +/*
> + * Like the address operator "&", evaluates to the address of a LHS variable
> + * "var", but also enforces the use of RIP-relative logic. This macro can be
> + * used to safely access global data variables prior to kernel relocation.
> + */
> +#define RIP_RELATIVE_ADDR(var) \
> +({ \
> + void *rip_rel_ptr; \
> + asm ("lea "#var"(%%rip), %0" \
> + : "=r" (rip_rel_ptr) \
> + : "p" (&var)); \
> + rip_rel_ptr; \
> +})
> +
I don't think it is the right place for the macro. The next patch uses for
things unrelated to memory encryption.
> @@ -239,14 +244,14 @@ unsigned long __head __startup_64(unsigned long physaddr,
> */
>
> next_pgt_ptr = fixup_pointer(&next_early_pgt, physaddr);
> - pud = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
> - pmd = fixup_pointer(early_dynamic_pgts[(*next_pgt_ptr)++], physaddr);
> + early_dynamic_pgts_ptr = fixup_pointer(early_dynamic_pgts, physaddr);
> + pud = (pudval_t *) early_dynamic_pgts_ptr[(*next_pgt_ptr)++];
> + pmd = (pmdval_t *) early_dynamic_pgts_ptr[(*next_pgt_ptr)++];
>
This change doesn't belong to this patch. Maybe move it into the next
patch and combine with removing fixup_pointer().
--
Kiryl Shutsemau / Kirill A. Shutemov
next prev parent reply other threads:[~2024-01-31 8:20 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-10 1:26 [RFC PATCH] x86/sev: x86/sev: enforce PC-relative addressing in clang Kevin Loughlin
2024-01-10 11:45 ` Andi Kleen
2024-01-10 17:14 ` Kevin Loughlin
2024-01-10 17:49 ` Andi Kleen
2024-01-11 22:36 ` [RFC PATCH v2] x86/sev: enforce RIP-relative accesses in early SEV/SME code Kevin Loughlin
2024-01-12 12:17 ` Kirill A. Shutemov
2024-01-12 18:29 ` Kevin Loughlin
2024-01-15 10:12 ` Kirill A. Shutemov
2024-01-16 22:13 ` Kevin Loughlin
2024-01-15 15:53 ` Tom Lendacky
2024-01-16 23:44 ` Kevin Loughlin
2024-01-15 20:46 ` Borislav Petkov
2024-01-17 0:07 ` Kevin Loughlin
2024-01-17 2:47 ` Hou Wenlong
2024-01-17 10:59 ` Ard Biesheuvel
2024-01-17 11:39 ` Andi Kleen
2024-01-17 11:55 ` Ard Biesheuvel
2024-01-17 13:05 ` Borislav Petkov
2024-01-17 13:38 ` Ard Biesheuvel
2024-01-21 14:12 ` Ard Biesheuvel
2024-01-21 15:37 ` Borislav Petkov
2024-01-21 16:49 ` Ard Biesheuvel
2024-01-21 18:20 ` Borislav Petkov
2024-01-30 22:08 ` [PATCH v3 0/2] x86: enforce and cleanup RIP-relative accesses in early boot code Kevin Loughlin
2024-01-31 14:00 ` Borislav Petkov
2024-01-31 18:16 ` Jacob Xu
2024-01-31 18:29 ` Borislav Petkov
2024-02-03 0:22 ` Kevin Loughlin
2024-02-03 10:15 ` Ard Biesheuvel
2024-02-03 10:19 ` Borislav Petkov
2024-02-03 10:27 ` Ard Biesheuvel
2024-02-03 11:25 ` Borislav Petkov
2024-02-06 15:46 ` [tip: x86/sev] x86/sev: Fix position dependent variable references in startup code tip-bot2 for Ard Biesheuvel
2024-01-30 22:08 ` [PATCH v3 1/2] x86/sev: enforce RIP-relative accesses in early SEV/SME code Kevin Loughlin
2024-01-31 8:20 ` Kirill A. Shutemov [this message]
2024-02-02 22:00 ` Kevin Loughlin
2024-02-02 22:47 ` Ard Biesheuvel
2024-02-03 0:11 ` Kevin Loughlin
2024-01-31 13:42 ` Ard Biesheuvel
2024-02-03 0:14 ` Kevin Loughlin
2024-01-30 22:08 ` [PATCH v3 2/2] x86/head64: Replace pointer fixups with RIP_RELATIVE_ADDR() Kevin Loughlin
2024-01-31 8:22 ` Kirill A. Shutemov
2024-02-01 16:38 ` Kevin Loughlin
2024-01-31 15:30 ` Tom Lendacky
2024-01-31 15:36 ` Kirill A. Shutemov
2024-01-10 13:36 ` [RFC PATCH] x86/sev: x86/sev: enforce PC-relative addressing in clang Kirill A. Shutemov
2024-01-10 17:28 ` Kevin Loughlin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4ljfvg7c23g2wx4hcqz6x6tx7uvp6fffayqvu4ptsmfqajlujr@zngokbd2awma \
--to=kirill.shutemov@linux.intel.com \
--cc=acdunlap@google.com \
--cc=ak@linux.intel.com \
--cc=ardb@kernel.org \
--cc=ashish.kalra@amd.com \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@linux.intel.com \
--cc=dionnaglaze@google.com \
--cc=houwenlong.hwl@antgroup.com \
--cc=jacobhxu@google.com \
--cc=justinstitt@google.com \
--cc=kevinloughlin@google.com \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=llvm@lists.linux.dev \
--cc=michael.roth@amd.com \
--cc=mingo@redhat.com \
--cc=ndesaulniers@google.com \
--cc=pankaj.gupta@amd.com \
--cc=pgonda@google.com \
--cc=sidtelang@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).