From mboxrd@z Thu Jan 1 00:00:00 1970 From: Borislav Petkov Subject: Re: [Part1 PATCH v4 10/17] x86/mm, resource: Use PAGE_KERNEL protection for ioremap of memory pages Date: Sun, 17 Sep 2017 16:07:03 +0200 Message-ID: <20170917140703.GH4733@nazgul.tnic> References: <20170916123418.37807-1-brijesh.singh@amd.com> <20170916123418.37807-11-brijesh.singh@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Andy Lutomirski , Tom Lendacky , "Kirill A. Shutemov" , Laura Abbott , =?utf-8?B?SsOpcsO0bWU=?= Glisse , Andrew Morton , Dan Williams , Kees Cook To: Brijesh Singh Return-path: Content-Disposition: inline In-Reply-To: <20170916123418.37807-11-brijesh.singh@amd.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On Sat, Sep 16, 2017 at 07:34:11AM -0500, Brijesh Singh wrote: > From: Tom Lendacky > > In order for memory pages to be properly mapped when SEV is active, we > need to use the PAGE_KERNEL protection attribute as the base protection. > This will insure that memory mapping of, e.g. ACPI tables, receives the > proper mapping attributes. > > Cc: Thomas Gleixner > Cc: Ingo Molnar > Cc: "H. Peter Anvin" > Cc: Borislav Petkov > Cc: "Kirill A. Shutemov" > Cc: Laura Abbott > Cc: Andy Lutomirski > Cc: "Jérôme Glisse" > Cc: Andrew Morton > Cc: Dan Williams > Cc: Kees Cook > Cc: x86@kernel.org > Cc: linux-kernel@vger.kernel.org > Signed-off-by: Tom Lendacky > Signed-off-by: Brijesh Singh > --- > arch/x86/mm/ioremap.c | 77 ++++++++++++++++++++++++++++++++++++++++++-------- > include/linux/ioport.h | 3 ++ > kernel/resource.c | 19 +++++++++++++ > 3 files changed, 88 insertions(+), 11 deletions(-) > > diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c > index 52cc0f4ed494..812b8a8066ba 100644 > --- a/arch/x86/mm/ioremap.c > +++ b/arch/x86/mm/ioremap.c > @@ -27,6 +27,11 @@ > > #include "physaddr.h" > > +struct ioremap_mem_flags { > + bool system_ram; > + bool desc_other; > +}; > + > /* > * Fix up the linear direct mapping of the kernel to avoid cache attribute > * conflicts. > @@ -56,19 +61,61 @@ int ioremap_change_attr(unsigned long vaddr, unsigned long size, > return err; > } > > -static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages, > - void *arg) > +static int __ioremap_check_ram(struct resource *res) > { > + unsigned long start_pfn, stop_pfn; > unsigned long i; > > - for (i = 0; i < nr_pages; ++i) > - if (pfn_valid(start_pfn + i) && > - !PageReserved(pfn_to_page(start_pfn + i))) > - return 1; > + if ((res->flags & IORESOURCE_SYSTEM_RAM) != IORESOURCE_SYSTEM_RAM) > + return 0; > + > + start_pfn = (res->start + PAGE_SIZE - 1) >> PAGE_SHIFT; > + stop_pfn = (res->end + 1) >> PAGE_SHIFT; > + if (stop_pfn > start_pfn) { > + for (i = 0; i < (stop_pfn - start_pfn); ++i) > + if (pfn_valid(start_pfn + i) && > + !PageReserved(pfn_to_page(start_pfn + i))) > + return 1; > + } > > return 0; Should return bool I guess. Btw, this whole resource code is needlessly complex. Trying to follow through it is one sick brain-twister. One day someone should go and clean up that silly function pointer passing. -- Regards/Gruss, Boris. SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg) --