From: Borislav Petkov <bp@alien8.de>
To: Tom Lendacky <thomas.lendacky@amd.com>
Cc: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org,
kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org,
kexec@lists.infradead.org, linux-kernel@vger.kernel.org,
kasan-dev@googlegroups.com, linux-mm@kvack.org,
iommu@lists.linux-foundation.org,
"Rik van Riel" <riel@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Toshimitsu Kani" <toshi.kani@hpe.com>,
"Arnd Bergmann" <arnd@arndb.de>,
"Jonathan Corbet" <corbet@lwn.net>,
"Matt Fleming" <matt@codeblueprint.co.uk>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Joerg Roedel" <joro@8bytes.org>,
"Konrad Rzeszutek Wilk" <konrad.wilk@oracle.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Larry Woodman" <lwoodman@redhat.com>,
"Brijesh Singh" <brijesh.singh@amd.com>,
"Ingo Molnar" <mingo@redhat.com>,
"Andy Lutomirski" <luto@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"Andrey Ryabinin" <aryabinin@virtuozzo.com>,
"Alexander Potapenko" <glider@google.com>,
"Dave Young" <dyoung@redhat.com>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Dmitry Vyukov" <dvyukov@google.com>
Subject: Re: [PATCH v5 18/32] x86, mpparse: Use memremap to map the mpf and mpc data
Date: Tue, 16 May 2017 10:36:58 +0200 [thread overview]
Message-ID: <20170516083658.fq2h4ysmrbgn23cs@pd.tnic> (raw)
In-Reply-To: <20170418211930.10190.62640.stgit@tlendack-t1.amdoffice.net>
On Tue, Apr 18, 2017 at 04:19:30PM -0500, Tom Lendacky wrote:
> The SMP MP-table is built by UEFI and placed in memory in a decrypted
> state. These tables are accessed using a mix of early_memremap(),
> early_memunmap(), phys_to_virt() and virt_to_phys(). Change all accesses
> to use early_memremap()/early_memunmap(). This allows for proper setting
> of the encryption mask so that the data can be successfully accessed when
> SME is active.
>
> Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
> ---
> arch/x86/kernel/mpparse.c | 102 +++++++++++++++++++++++++++++++--------------
> 1 file changed, 71 insertions(+), 31 deletions(-)
>
> diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
> index fd37f39..afbda41d 100644
> --- a/arch/x86/kernel/mpparse.c
> +++ b/arch/x86/kernel/mpparse.c
> @@ -429,7 +429,21 @@ static inline void __init construct_default_ISA_mptable(int mpc_default_type)
> }
> }
>
> -static struct mpf_intel *mpf_found;
> +static unsigned long mpf_base;
> +
> +static void __init unmap_mpf(struct mpf_intel *mpf)
> +{
> + early_memunmap(mpf, sizeof(*mpf));
> +}
> +
> +static struct mpf_intel * __init map_mpf(unsigned long paddr)
> +{
> + struct mpf_intel *mpf;
> +
> + mpf = early_memremap(paddr, sizeof(*mpf));
> +
> + return mpf;
return early_memremap(paddr, sizeof(*mpf));
...
> @@ -842,25 +873,26 @@ static int __init update_mp_table(void)
> if (!enable_update_mptable)
> return 0;
>
> - mpf = mpf_found;
> - if (!mpf)
> + if (!mpf_base)
> return 0;
>
> + mpf = map_mpf(mpf_base);
> +
> /*
> * Now see if we need to go further.
> */
> if (mpf->feature1 != 0)
You're kidding, right? map_mpf() *can* return NULL.
Also, simplify that test:
if (mpf->feature1)
...
> - return 0;
> + goto do_unmap_mpf;
>
> if (!mpf->physptr)
> - return 0;
> + goto do_unmap_mpf;
>
> - mpc = phys_to_virt(mpf->physptr);
> + mpc = map_mpc(mpf->physptr);
Again: error checking !!!
You have other calls to early_memremap()/map_mpf() in this patch. Please
add error checking everywhere.
>
> if (!smp_check_mpc(mpc, oem, str))
> - return 0;
> + goto do_unmap_mpc;
>
> - pr_info("mpf: %llx\n", (u64)virt_to_phys(mpf));
> + pr_info("mpf: %llx\n", (u64)mpf_base);
> pr_info("physptr: %x\n", mpf->physptr);
>
> if (mpc_new_phys && mpc->length > mpc_new_length) {
> @@ -878,21 +910,23 @@ static int __init update_mp_table(void)
> new = mpf_checksum((unsigned char *)mpc, mpc->length);
> if (old == new) {
> pr_info("mpc is readonly, please try alloc_mptable instead\n");
> - return 0;
> + goto do_unmap_mpc;
> }
> pr_info("use in-position replacing\n");
> } else {
> mpf->physptr = mpc_new_phys;
> - mpc_new = phys_to_virt(mpc_new_phys);
> + mpc_new = map_mpc(mpc_new_phys);
Ditto.
> memcpy(mpc_new, mpc, mpc->length);
> + unmap_mpc(mpc);
> mpc = mpc_new;
> /* check if we can modify that */
> if (mpc_new_phys - mpf->physptr) {
> struct mpf_intel *mpf_new;
> /* steal 16 bytes from [0, 1k) */
> pr_info("mpf new: %x\n", 0x400 - 16);
> - mpf_new = phys_to_virt(0x400 - 16);
> + mpf_new = map_mpf(0x400 - 16);
Ditto.
> memcpy(mpf_new, mpf, 16);
> + unmap_mpf(mpf);
> mpf = mpf_new;
> mpf->physptr = mpc_new_phys;
> }
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2017-05-16 8:37 UTC|newest]
Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 21:16 [PATCH v5 00/32] x86: Secure Memory Encryption (AMD) Tom Lendacky
2017-04-18 21:16 ` [PATCH v5 01/32] x86: Documentation for AMD Secure Memory Encryption (SME) Tom Lendacky
2017-04-19 9:02 ` Borislav Petkov
2017-04-19 14:23 ` Tom Lendacky
2017-04-19 15:38 ` Borislav Petkov
2017-04-19 9:52 ` David Howells
2017-04-18 21:16 ` [PATCH v5 02/32] x86/mm/pat: Set write-protect cache mode for full PAT support Tom Lendacky
2017-04-18 21:16 ` [PATCH v5 03/32] x86, mpparse, x86/acpi, x86/PCI, SFI: Use memremap for RAM mappings Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 04/32] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 05/32] x86/CPU/AMD: Handle SME reduction in physical address size Tom Lendacky
2017-04-20 16:59 ` Borislav Petkov
2017-04-20 17:29 ` Tom Lendacky
2017-04-20 18:52 ` Borislav Petkov
2017-04-18 21:17 ` [PATCH v5 06/32] x86/mm: Add Secure Memory Encryption (SME) support Tom Lendacky
2017-04-27 15:46 ` Borislav Petkov
2017-05-04 14:24 ` Tom Lendacky
2017-05-04 14:36 ` Borislav Petkov
2017-05-16 19:28 ` Tom Lendacky
2017-05-17 7:05 ` Borislav Petkov
2017-04-18 21:17 ` [PATCH v5 07/32] x86/mm: Add support to enable SME in early boot processing Tom Lendacky
2017-04-21 14:55 ` Borislav Petkov
2017-04-21 21:40 ` Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 08/32] x86/mm: Simplify p[g4um]d_page() macros Tom Lendacky
2017-04-18 21:17 ` [PATCH v5 09/32] x86/mm: Provide general kernel support for memory encryption Tom Lendacky
2017-04-21 21:52 ` Dave Hansen
2017-04-24 15:53 ` Tom Lendacky
2017-04-24 15:57 ` Dave Hansen
2017-04-24 16:10 ` Tom Lendacky
2017-04-27 16:12 ` Borislav Petkov
2017-05-04 14:34 ` Tom Lendacky
2017-05-04 17:01 ` Borislav Petkov
2017-04-18 21:18 ` [PATCH v5 10/32] x86/mm: Extend early_memremap() support with additional attrs Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 11/32] x86/mm: Add support for early encrypt/decrypt of memory Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 12/32] x86/mm: Insure that boot memory areas are mapped properly Tom Lendacky
2017-05-04 10:16 ` Borislav Petkov
2017-05-04 14:39 ` Tom Lendacky
2017-04-18 21:18 ` [PATCH v5 13/32] x86/boot/e820: Add support to determine the E820 type of an address Tom Lendacky
2017-05-05 17:11 ` Borislav Petkov
2017-05-06 7:48 ` Ard Biesheuvel
2017-04-18 21:18 ` [PATCH v5 14/32] efi: Add an EFI table address match function Tom Lendacky
2017-05-15 18:09 ` Borislav Petkov
2017-05-16 21:53 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 15/32] efi: Update efi_mem_type() to return an error rather than 0 Tom Lendacky
2017-05-07 17:18 ` Borislav Petkov
2017-05-08 13:20 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 16/32] x86/efi: Update EFI pagetable creation to work with SME Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 17/32] x86/mm: Add support to access boot related data in the clear Tom Lendacky
2017-05-15 18:35 ` Borislav Petkov
2017-05-17 18:54 ` Tom Lendacky
2017-05-18 9:02 ` Borislav Petkov
2017-05-19 20:50 ` Tom Lendacky
2017-05-21 7:16 ` Borislav Petkov
2017-05-30 16:46 ` Tom Lendacky
2017-05-31 11:31 ` Borislav Petkov
2017-05-18 19:50 ` Matt Fleming
2017-05-26 16:22 ` Tom Lendacky
2017-05-26 16:35 ` Borislav Petkov
2017-05-30 17:47 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 18/32] x86, mpparse: Use memremap to map the mpf and mpc data Tom Lendacky
2017-05-16 8:36 ` Borislav Petkov [this message]
2017-05-17 20:26 ` Tom Lendacky
2017-05-18 9:03 ` Borislav Petkov
2017-04-18 21:19 ` [PATCH v5 19/32] x86/mm: Add support to access persistent memory in the clear Tom Lendacky
2017-05-16 14:04 ` Borislav Petkov
2017-05-19 19:52 ` Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 20/32] x86/mm: Add support for changing the memory encryption attribute Tom Lendacky
2017-04-18 21:19 ` [PATCH v5 21/32] x86, realmode: Decrypt trampoline area if memory encryption is active Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 22/32] x86, swiotlb: DMA support for memory encryption Tom Lendacky
2017-05-16 14:27 ` Borislav Petkov
2017-05-19 19:54 ` Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 23/32] swiotlb: Add warnings for use of bounce buffers with SME Tom Lendacky
2017-05-16 14:52 ` Borislav Petkov
2017-05-19 19:55 ` Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 24/32] iommu/amd: Disable AMD IOMMU if memory encryption is active Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 25/32] x86, realmode: Check for memory encryption on the APs Tom Lendacky
2017-04-18 21:20 ` [PATCH v5 26/32] x86, drm, fbdev: Do not specify encrypted memory for video mappings Tom Lendacky
2017-05-16 17:35 ` Borislav Petkov
2017-05-30 20:07 ` Tom Lendacky
2017-04-18 21:21 ` [PATCH v5 27/32] kvm: x86: svm: Enable Secure Memory Encryption within KVM Tom Lendacky
2017-04-18 21:21 ` [PATCH v5 28/32] x86/mm, kexec: Allow kexec to be used with SME Tom Lendacky
2017-05-17 19:17 ` Borislav Petkov
2017-05-19 20:45 ` Tom Lendacky
2017-05-19 20:58 ` Borislav Petkov
2017-05-19 21:07 ` Tom Lendacky
2017-05-19 21:28 ` Borislav Petkov
2017-05-19 21:38 ` Tom Lendacky
2017-05-26 4:17 ` Xunlei Pang
2017-05-27 2:17 ` Dave Young
2017-05-30 17:46 ` Tom Lendacky
2017-05-31 10:01 ` Borislav Petkov
2017-05-31 15:03 ` Xunlei Pang
2017-05-31 15:48 ` Borislav Petkov
2017-04-18 21:21 ` [PATCH v5 29/32] x86/mm: Add support to encrypt the kernel in-place Tom Lendacky
2017-05-18 12:46 ` Borislav Petkov
2017-05-25 22:24 ` Tom Lendacky
2017-05-26 16:25 ` Borislav Petkov
2017-05-30 16:39 ` Tom Lendacky
2017-05-31 9:51 ` Borislav Petkov
2017-05-31 13:12 ` Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 30/32] x86/boot: Add early cmdline parsing for options with arguments Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 31/32] x86: Add sysfs support for Secure Memory Encryption Tom Lendacky
2017-04-21 21:55 ` Dave Hansen
2017-04-27 7:25 ` Dave Young
2017-04-27 15:52 ` Dave Hansen
2017-04-28 5:32 ` Dave Young
2017-05-04 14:17 ` Tom Lendacky
2017-05-04 14:13 ` Tom Lendacky
2017-05-18 17:01 ` Borislav Petkov
2017-05-26 2:49 ` Dave Young
2017-05-26 5:04 ` Xunlei Pang
2017-05-26 15:47 ` Tom Lendacky
2017-04-18 21:22 ` [PATCH v5 32/32] x86/mm: Add support to make use of " Tom Lendacky
2017-04-21 18:56 ` Tom Lendacky
2017-05-19 11:30 ` Borislav Petkov
2017-05-19 20:16 ` Josh Poimboeuf
2017-05-19 20:29 ` Borislav Petkov
2017-05-30 15:48 ` Tom Lendacky
2017-05-31 9:15 ` Borislav Petkov
2017-05-30 15:46 ` Tom Lendacky
2017-05-19 11:27 ` Borislav Petkov
2017-05-30 14:38 ` Tom Lendacky
2017-05-30 14:55 ` Borislav Petkov
2017-05-30 15:37 ` Tom Lendacky
2017-05-31 8:49 ` Borislav Petkov
2017-05-31 13:37 ` Tom Lendacky
2017-05-31 14:12 ` Borislav Petkov
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=20170516083658.fq2h4ysmrbgn23cs@pd.tnic \
--to=bp@alien8.de \
--cc=arnd@arndb.de \
--cc=aryabinin@virtuozzo.com \
--cc=brijesh.singh@amd.com \
--cc=corbet@lwn.net \
--cc=dvyukov@google.com \
--cc=dyoung@redhat.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=kasan-dev@googlegroups.com \
--cc=kexec@lists.infradead.org \
--cc=konrad.wilk@oracle.com \
--cc=kvm@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-efi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=luto@kernel.org \
--cc=lwoodman@redhat.com \
--cc=matt@codeblueprint.co.uk \
--cc=mingo@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=riel@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=toshi.kani@hpe.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).