From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751268AbdFEQDN (ORCPT ); Mon, 5 Jun 2017 12:03:13 -0400 Received: from mail-it0-f50.google.com ([209.85.214.50]:35751 "EHLO mail-it0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751077AbdFEQDM (ORCPT ); Mon, 5 Jun 2017 12:03:12 -0400 MIME-Version: 1.0 In-Reply-To: <20170605154058.r5b2eivguzhfrnnr@gmail.com> References: <20170602135207.21708-1-ard.biesheuvel@linaro.org> <20170602135207.21708-2-ard.biesheuvel@linaro.org> <20170605154058.r5b2eivguzhfrnnr@gmail.com> From: Ard Biesheuvel Date: Mon, 5 Jun 2017 16:03:00 +0000 Message-ID: Subject: Re: [PATCH 01/13] x86/efi: Clean up efi CR3 save/restore To: Ingo Molnar , Andy Lutomirski Cc: "linux-efi@vger.kernel.org" , Thomas Gleixner , "H . Peter Anvin" , "linux-kernel@vger.kernel.org" , Borislav Petkov , Andy Lutomirski , Matt Fleming Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 5 June 2017 at 15:40, Ingo Molnar wrote: > > * Ard Biesheuvel wrote: > >> From: Andy Lutomirski >> >> efi_call_phys_prolog() used to return a "pgd_t *" that meant one of >> three different things depending on kernel and system configuration. >> Clean it up so it uses a union and is more explicit about what's >> going on. >> >> Signed-off-by: Andy Lutomirski >> Cc: Ard Biesheuvel >> Cc: Borislav Petkov >> Cc: Andy Lutomirski >> Cc: Ingo Molnar >> Signed-off-by: Matt Fleming >> Signed-off-by: Ard Biesheuvel >> --- >> arch/x86/include/asm/efi.h | 17 +++++++++++++++-- >> arch/x86/platform/efi/efi.c | 6 +++--- >> arch/x86/platform/efi/efi_32.c | 12 ++++++------ >> arch/x86/platform/efi/efi_64.c | 22 ++++++++++++---------- >> 4 files changed, 36 insertions(+), 21 deletions(-) > > Hm, this patch does not apply cleanly to v4.12-rc4: > > Applying patch patches/x86efi_Clean_up_efi_CR3_saverestore-1.patch > patching file arch/x86/include/asm/efi.h > patching file arch/x86/platform/efi/efi.c > patching file arch/x86/platform/efi/efi_32.c > patching file arch/x86/platform/efi/efi_64.c > Hunk #1 FAILED at 69. > Hunk #2 FAILED at 86. > Hunk #3 succeeded at 152 with fuzz 1 (offset 44 lines). > Hunk #4 FAILED at 116. > 3 out of 4 hunks FAILED -- rejects in file arch/x86/platform/efi/efi_64.c > > what tree is this against? > This is against v4.12-rc3, which lacked the EFI fix Matt sent out in the mean time. Feel free to drop it for now, and we can requeue it later if Andy is willing to rebase it. Thanks, Ard. From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ard Biesheuvel Subject: Re: [PATCH 01/13] x86/efi: Clean up efi CR3 save/restore Date: Mon, 5 Jun 2017 16:03:00 +0000 Message-ID: References: <20170602135207.21708-1-ard.biesheuvel@linaro.org> <20170602135207.21708-2-ard.biesheuvel@linaro.org> <20170605154058.r5b2eivguzhfrnnr@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20170605154058.r5b2eivguzhfrnnr-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: linux-efi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Ingo Molnar , Andy Lutomirski Cc: "linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Thomas Gleixner , "H . Peter Anvin" , "linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" , Borislav Petkov , Andy Lutomirski , Matt Fleming List-Id: linux-efi@vger.kernel.org On 5 June 2017 at 15:40, Ingo Molnar wrote: > > * Ard Biesheuvel wrote: > >> From: Andy Lutomirski >> >> efi_call_phys_prolog() used to return a "pgd_t *" that meant one of >> three different things depending on kernel and system configuration. >> Clean it up so it uses a union and is more explicit about what's >> going on. >> >> Signed-off-by: Andy Lutomirski >> Cc: Ard Biesheuvel >> Cc: Borislav Petkov >> Cc: Andy Lutomirski >> Cc: Ingo Molnar >> Signed-off-by: Matt Fleming >> Signed-off-by: Ard Biesheuvel >> --- >> arch/x86/include/asm/efi.h | 17 +++++++++++++++-- >> arch/x86/platform/efi/efi.c | 6 +++--- >> arch/x86/platform/efi/efi_32.c | 12 ++++++------ >> arch/x86/platform/efi/efi_64.c | 22 ++++++++++++---------- >> 4 files changed, 36 insertions(+), 21 deletions(-) > > Hm, this patch does not apply cleanly to v4.12-rc4: > > Applying patch patches/x86efi_Clean_up_efi_CR3_saverestore-1.patch > patching file arch/x86/include/asm/efi.h > patching file arch/x86/platform/efi/efi.c > patching file arch/x86/platform/efi/efi_32.c > patching file arch/x86/platform/efi/efi_64.c > Hunk #1 FAILED at 69. > Hunk #2 FAILED at 86. > Hunk #3 succeeded at 152 with fuzz 1 (offset 44 lines). > Hunk #4 FAILED at 116. > 3 out of 4 hunks FAILED -- rejects in file arch/x86/platform/efi/efi_64.c > > what tree is this against? > This is against v4.12-rc3, which lacked the EFI fix Matt sent out in the mean time. Feel free to drop it for now, and we can requeue it later if Andy is willing to rebase it. Thanks, Ard.