License cleanup: add SPDX GPL-2.0 license identifier to files with no license
Many source files in the tree are missing licensing information, which
makes it harder for compliance tools to determine the correct license.
By default all files without license information are under the default
license of the kernel, which is GPL version 2.
Update the files which contain no license information with the 'GPL-2.0'
SPDX license identifier. The SPDX identifier is a legally binding
shorthand, which can be used instead of the full boiler plate text.
This patch is based on work done by Thomas Gleixner and Kate Stewart and
Philippe Ombredanne.
How this work was done:
Patches were generated and checked against linux-4.14-rc6 for a subset of
the use cases:
- file had no licensing information it it.
- file was a */uapi/* one with no licensing information in it,
- file was a */uapi/* one with existing licensing information,
Further patches will be generated in subsequent months to fix up cases
where non-standard license headers were used, and references to license
had to be inferred by heuristics based on keywords.
The analysis to determine which SPDX License Identifier to be applied to
a file was done in a spreadsheet of side by side results from of the
output of two independent scanners (ScanCode & Windriver) producing SPDX
tag:value files created by Philippe Ombredanne. Philippe prepared the
base worksheet, and did an initial spot review of a few 1000 files.
The 4.13 kernel was the starting point of the analysis with 60,537 files
assessed. Kate Stewart did a file by file comparison of the scanner
results in the spreadsheet to determine which SPDX license identifier(s)
to be applied to the file. She confirmed any determination that was not
immediately clear with lawyers working with the Linux Foundation.
Criteria used to select files for SPDX license identifier tagging was:
- Files considered eligible had to be source code files.
- Make and config files were included as candidates if they contained >5
lines of source
- File already had some variant of a license header in it (even if <5
lines).
All documentation files were explicitly excluded.
The following heuristics were used to determine which SPDX license
identifiers to apply.
- when both scanners couldn't find any license traces, file was
considered to have no license information in it, and the top level
COPYING file license applied.
For non */uapi/* files that summary was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 11139
and resulted in the first patch in this series.
If that file was a */uapi/* path one, it was "GPL-2.0 WITH
Linux-syscall-note" otherwise it was "GPL-2.0". Results of that was:
SPDX license identifier # files
---------------------------------------------------|-------
GPL-2.0 WITH Linux-syscall-note 930
and resulted in the second patch in this series.
- if a file had some form of licensing information in it, and was one
of the */uapi/* ones, it was denoted with the Linux-syscall-note if
any GPL family license was found in the file or had no licensing in
it (per prior point). Results summary:
SPDX license identifier # files
---------------------------------------------------|------
GPL-2.0 WITH Linux-syscall-note 270
GPL-2.0+ WITH Linux-syscall-note 169
((GPL-2.0 WITH Linux-syscall-note) OR BSD-2-Clause) 21
((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) 17
LGPL-2.1+ WITH Linux-syscall-note 15
GPL-1.0+ WITH Linux-syscall-note 14
((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) 5
LGPL-2.0+ WITH Linux-syscall-note 4
LGPL-2.1 WITH Linux-syscall-note 3
((GPL-2.0 WITH Linux-syscall-note) OR MIT) 3
((GPL-2.0 WITH Linux-syscall-note) AND MIT) 1
and that resulted in the third patch in this series.
- when the two scanners agreed on the detected license(s), that became
the concluded license(s).
- when there was disagreement between the two scanners (one detected a
license but the other didn't, or they both detected different
licenses) a manual inspection of the file occurred.
- In most cases a manual inspection of the information in the file
resulted in a clear resolution of the license that should apply (and
which scanner probably needed to revisit its heuristics).
- When it was not immediately clear, the license identifier was
confirmed with lawyers working with the Linux Foundation.
- If there was any question as to the appropriate license identifier,
the file was flagged for further research and to be revisited later
in time.
In total, over 70 hours of logged manual review was done on the
spreadsheet to determine the SPDX license identifiers to apply to the
source files by Kate, Philippe, Thomas and, in some cases, confirmation
by lawyers working with the Linux Foundation.
Kate also obtained a third independent scan of the 4.13 code base from
FOSSology, and compared selected files where the other two scanners
disagreed against that SPDX file, to see if there was new insights. The
Windriver scanner is based on an older version of FOSSology in part, so
they are related.
Thomas did random spot checks in about 500 files from the spreadsheets
for the uapi headers and agreed with SPDX license identifier in the
files he inspected. For the non-uapi files Thomas did random spot checks
in about 15000 files.
In initial set of patches against 4.14-rc6, 3 files were found to have
copy/paste license identifier errors, and have been fixed to reflect the
correct identifier.
Additionally Philippe spent 10 hours this week doing a detailed manual
inspection and review of the 12,461 patched files from the initial patch
version early this week with:
- a full scancode scan run, collecting the matched texts, detected
license ids and scores
- reviewing anything where there was a license detected (about 500+
files) to ensure that the applied SPDX license was correct
- reviewing anything where there was no detection but the patch license
was not GPL-2.0 WITH Linux-syscall-note to ensure that the applied
SPDX license was correct
This produced a worksheet with 20 files needing minor correction. This
worksheet was then exported into 3 different .csv files for the
different types of files to be modified.
These .csv files were then reviewed by Greg. Thomas wrote a script to
parse the csv files and add the proper SPDX tag to the file, in the
format that the file expected. This script was further refined by Greg
based on the output to detect more types of files automatically and to
distinguish between header and source .c files (which need different
comment types.) Finally Greg ran the script using the .csv files to
generate the patches.
Reviewed-by: Kate Stewart <kstewart@linuxfoundation.org>
Reviewed-by: Philippe Ombredanne <pombredanne@nexb.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2017-11-01 22:07:57 +08:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
2008-01-30 20:30:09 +08:00
|
|
|
/*
|
2005-04-17 06:20:36 +08:00
|
|
|
* Firmware replacement code.
|
2008-01-30 20:30:09 +08:00
|
|
|
*
|
2008-11-27 00:15:27 +08:00
|
|
|
* Work around broken BIOSes that don't set an aperture, only set the
|
|
|
|
* aperture in the AGP bridge, or set too small aperture.
|
|
|
|
*
|
2008-01-30 20:30:09 +08:00
|
|
|
* If all fails map the aperture over some low memory. This is cheaper than
|
|
|
|
* doing bounce buffering. The memory is lost. This is done at early boot
|
|
|
|
* because only the bootmem allocator can allocate 32+MB.
|
|
|
|
*
|
2005-04-17 06:20:36 +08:00
|
|
|
* Copyright 2002 Andi Kleen, SuSE Labs.
|
|
|
|
*/
|
2014-04-29 05:16:33 +08:00
|
|
|
#define pr_fmt(fmt) "AGP: " fmt
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/kernel.h>
|
2019-03-08 11:05:08 +08:00
|
|
|
#include <linux/kcore.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/types.h>
|
|
|
|
#include <linux/init.h>
|
2010-12-18 08:58:40 +08:00
|
|
|
#include <linux/memblock.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <linux/mmzone.h>
|
|
|
|
#include <linux/pci_ids.h>
|
|
|
|
#include <linux/pci.h>
|
|
|
|
#include <linux/bitops.h>
|
2008-03-14 06:05:41 +08:00
|
|
|
#include <linux/suspend.h>
|
2017-01-27 17:27:10 +08:00
|
|
|
#include <asm/e820/api.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/io.h>
|
2008-07-11 09:23:42 +08:00
|
|
|
#include <asm/iommu.h>
|
2007-10-24 18:49:47 +08:00
|
|
|
#include <asm/gart.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
#include <asm/pci-direct.h>
|
2006-01-12 05:44:27 +08:00
|
|
|
#include <asm/dma.h>
|
2010-09-18 00:03:43 +08:00
|
|
|
#include <asm/amd_nb.h>
|
2009-11-10 18:46:14 +08:00
|
|
|
#include <asm/x86_init.h>
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
#include <linux/crash_dump.h>
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2011-04-18 21:45:43 +08:00
|
|
|
/*
|
|
|
|
* Using 512M as goal, in case kexec will load kernel_big
|
|
|
|
* that will do the on-position decompress, and could overlap with
|
|
|
|
* with the gart aperture that is used.
|
|
|
|
* Sequence:
|
|
|
|
* kernel_small
|
|
|
|
* ==> kexec (with kdump trigger path or gart still enabled)
|
|
|
|
* ==> kernel_small (gart area become e820_reserved)
|
|
|
|
* ==> kexec (with kdump trigger path or gart still enabled)
|
|
|
|
* ==> kerne_big (uncompressed size will be big than 64M or 128M)
|
|
|
|
* So don't use 512M below as gart iommu, leave the space for kernel
|
|
|
|
* code for safe.
|
|
|
|
*/
|
|
|
|
#define GART_MIN_ADDR (512ULL << 20)
|
|
|
|
#define GART_MAX_ADDR (1ULL << 32)
|
|
|
|
|
2007-10-24 18:49:50 +08:00
|
|
|
int gart_iommu_aperture;
|
2008-03-13 18:03:58 +08:00
|
|
|
int gart_iommu_aperture_disabled __initdata;
|
|
|
|
int gart_iommu_aperture_allowed __initdata;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
int fallback_aper_order __initdata = 1; /* 64MB */
|
2008-03-13 18:03:58 +08:00
|
|
|
int fallback_aper_force __initdata;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
int fix_aperture __initdata = 1;
|
|
|
|
|
2019-03-08 11:05:08 +08:00
|
|
|
#if defined(CONFIG_PROC_VMCORE) || defined(CONFIG_PROC_KCORE)
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
/*
|
|
|
|
* If the first kernel maps the aperture over e820 RAM, the kdump kernel will
|
|
|
|
* use the same range because it will remain configured in the northbridge.
|
|
|
|
* Trying to dump this area via /proc/vmcore may crash the machine, so exclude
|
|
|
|
* it from vmcore.
|
|
|
|
*/
|
|
|
|
static unsigned long aperture_pfn_start, aperture_page_count;
|
|
|
|
|
2019-03-08 11:05:08 +08:00
|
|
|
static int gart_mem_pfn_is_ram(unsigned long pfn)
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
{
|
|
|
|
return likely((pfn < aperture_pfn_start) ||
|
|
|
|
(pfn >= aperture_pfn_start + aperture_page_count));
|
|
|
|
}
|
|
|
|
|
2019-03-08 11:05:08 +08:00
|
|
|
static void __init exclude_from_core(u64 aper_base, u32 aper_order)
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
{
|
|
|
|
aperture_pfn_start = aper_base >> PAGE_SHIFT;
|
|
|
|
aperture_page_count = (32 * 1024 * 1024) << aper_order >> PAGE_SHIFT;
|
2019-03-08 11:05:08 +08:00
|
|
|
#ifdef CONFIG_PROC_VMCORE
|
|
|
|
WARN_ON(register_oldmem_pfn_is_ram(&gart_mem_pfn_is_ram));
|
|
|
|
#endif
|
|
|
|
#ifdef CONFIG_PROC_KCORE
|
|
|
|
WARN_ON(register_mem_pfn_is_ram(&gart_mem_pfn_is_ram));
|
|
|
|
#endif
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
}
|
|
|
|
#else
|
2019-03-08 11:05:08 +08:00
|
|
|
static void exclude_from_core(u64 aper_base, u32 aper_order)
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
{
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2005-06-09 06:49:25 +08:00
|
|
|
/* This code runs before the PCI subsystem is initialized, so just
|
|
|
|
access the northbridge directly. */
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:09 +08:00
|
|
|
static u32 __init allocate_aperture(void)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
|
|
|
u32 aper_size;
|
2010-12-18 08:58:40 +08:00
|
|
|
unsigned long addr;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-15 11:40:37 +08:00
|
|
|
/* aper_size should <= 1G */
|
|
|
|
if (fallback_aper_order > 5)
|
|
|
|
fallback_aper_order = 5;
|
2008-01-30 20:30:09 +08:00
|
|
|
aper_size = (32 * 1024 * 1024) << fallback_aper_order;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:09 +08:00
|
|
|
/*
|
|
|
|
* Aperture has to be naturally aligned. This means a 2GB aperture
|
|
|
|
* won't have much chance of finding a place in the lower 4GB of
|
|
|
|
* memory. Unfortunately we cannot move it up because that would
|
|
|
|
* make the IOMMU useless.
|
2005-04-17 06:20:36 +08:00
|
|
|
*/
|
2011-04-18 21:45:43 +08:00
|
|
|
addr = memblock_find_in_range(GART_MIN_ADDR, GART_MAX_ADDR,
|
|
|
|
aper_size, aper_size);
|
2013-04-16 09:37:34 +08:00
|
|
|
if (!addr) {
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_err("Cannot allocate aperture memory hole [mem %#010lx-%#010lx] (%uKB)\n",
|
|
|
|
addr, addr + aper_size - 1, aper_size >> 10);
|
2010-12-18 08:58:40 +08:00
|
|
|
return 0;
|
|
|
|
}
|
2011-07-12 17:16:06 +08:00
|
|
|
memblock_reserve(addr, aper_size);
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("Mapping aperture over RAM [mem %#010lx-%#010lx] (%uKB)\n",
|
|
|
|
addr, addr + aper_size - 1, aper_size >> 10);
|
2010-12-18 08:58:40 +08:00
|
|
|
register_nosave_region(addr >> PAGE_SHIFT,
|
|
|
|
(addr+aper_size) >> PAGE_SHIFT);
|
2008-01-30 20:30:09 +08:00
|
|
|
|
2010-12-18 08:58:40 +08:00
|
|
|
return (u32)addr;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2005-06-09 06:49:25 +08:00
|
|
|
/* Find a PCI capability */
|
2008-05-28 00:03:56 +08:00
|
|
|
static u32 __init find_cap(int bus, int slot, int func, int cap)
|
2008-01-30 20:30:09 +08:00
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
int bytes;
|
2008-01-30 20:30:09 +08:00
|
|
|
u8 pos;
|
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
if (!(read_pci_config_16(bus, slot, func, PCI_STATUS) &
|
2008-01-30 20:30:09 +08:00
|
|
|
PCI_STATUS_CAP_LIST))
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
2008-01-30 20:30:09 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
pos = read_pci_config_byte(bus, slot, func, PCI_CAPABILITY_LIST);
|
2008-01-30 20:30:09 +08:00
|
|
|
for (bytes = 0; bytes < 48 && pos >= 0x40; bytes++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
u8 id;
|
2008-01-30 20:30:09 +08:00
|
|
|
|
|
|
|
pos &= ~3;
|
2008-04-19 16:31:11 +08:00
|
|
|
id = read_pci_config_byte(bus, slot, func, pos+PCI_CAP_LIST_ID);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (id == 0xff)
|
|
|
|
break;
|
2008-01-30 20:30:09 +08:00
|
|
|
if (id == cap)
|
|
|
|
return pos;
|
2008-04-19 16:31:11 +08:00
|
|
|
pos = read_pci_config_byte(bus, slot, func,
|
2008-01-30 20:30:09 +08:00
|
|
|
pos+PCI_CAP_LIST_NEXT);
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Read a standard AGPv3 bridge header */
|
2008-05-28 00:03:56 +08:00
|
|
|
static u32 __init read_agp(int bus, int slot, int func, int cap, u32 *order)
|
2008-01-30 20:30:09 +08:00
|
|
|
{
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 apsize;
|
|
|
|
u32 apsizereg;
|
|
|
|
int nbits;
|
|
|
|
u32 aper_low, aper_hi;
|
|
|
|
u64 aper;
|
2008-04-13 16:11:41 +08:00
|
|
|
u32 old_order;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("pci 0000:%02x:%02x:%02x: AGP bridge\n", bus, slot, func);
|
2008-04-19 16:31:11 +08:00
|
|
|
apsizereg = read_pci_config_16(bus, slot, func, cap + 0x14);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (apsizereg == 0xffffffff) {
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_err("pci 0000:%02x:%02x.%d: APSIZE unreadable\n",
|
|
|
|
bus, slot, func);
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-04-13 16:11:41 +08:00
|
|
|
/* old_order could be the value from NB gart setting */
|
|
|
|
old_order = *order;
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
apsize = apsizereg & 0xfff;
|
|
|
|
/* Some BIOS use weird encodings not in the AGPv3 table. */
|
2008-01-30 20:30:09 +08:00
|
|
|
if (apsize & 0xff)
|
|
|
|
apsize |= 0xf00;
|
2005-04-17 06:20:36 +08:00
|
|
|
nbits = hweight16(apsize);
|
|
|
|
*order = 7 - nbits;
|
|
|
|
if ((int)*order < 0) /* < 32MB */
|
|
|
|
*order = 0;
|
2008-01-30 20:30:09 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
aper_low = read_pci_config(bus, slot, func, 0x10);
|
|
|
|
aper_hi = read_pci_config(bus, slot, func, 0x14);
|
2005-04-17 06:20:36 +08:00
|
|
|
aper = (aper_low & ~((1<<22)-1)) | ((u64)aper_hi << 32);
|
|
|
|
|
2008-04-13 16:11:41 +08:00
|
|
|
/*
|
|
|
|
* On some sick chips, APSIZE is 0. It means it wants 4G
|
|
|
|
* so let double check that order, and lets trust AMD NB settings:
|
|
|
|
*/
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("pci 0000:%02x:%02x.%d: AGP aperture [bus addr %#010Lx-%#010Lx] (old size %uMB)\n",
|
|
|
|
bus, slot, func, aper, aper + (32ULL << (old_order + 20)) - 1,
|
|
|
|
32 << old_order);
|
2008-04-14 09:42:31 +08:00
|
|
|
if (aper + (32ULL<<(20 + *order)) > 0x100000000ULL) {
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("pci 0000:%02x:%02x.%d: AGP aperture size %uMB (APSIZE %#x) is not right, using settings from NB\n",
|
|
|
|
bus, slot, func, 32 << *order, apsizereg);
|
2008-04-13 16:11:41 +08:00
|
|
|
*order = old_order;
|
|
|
|
}
|
|
|
|
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("pci 0000:%02x:%02x.%d: AGP aperture [bus addr %#010Lx-%#010Lx] (%uMB, APSIZE %#x)\n",
|
|
|
|
bus, slot, func, aper, aper + (32ULL << (*order + 20)) - 1,
|
2014-04-29 05:16:33 +08:00
|
|
|
32 << *order, apsizereg);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-14 09:42:31 +08:00
|
|
|
if (!aperture_valid(aper, (32*1024*1024) << *order, 32<<20))
|
2008-01-30 20:30:09 +08:00
|
|
|
return 0;
|
|
|
|
return (u32)aper;
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-01-30 20:30:09 +08:00
|
|
|
/*
|
|
|
|
* Look for an AGP bridge. Windows only expects the aperture in the
|
|
|
|
* AGP bridge and some BIOS forget to initialize the Northbridge too.
|
|
|
|
* Work around this here.
|
|
|
|
*
|
|
|
|
* Do an PCI bus scan by hand because we're running before the PCI
|
|
|
|
* subsystem.
|
|
|
|
*
|
2010-10-29 23:14:30 +08:00
|
|
|
* All AMD AGP bridges are AGPv3 compliant, so we can do this scan
|
2008-01-30 20:30:09 +08:00
|
|
|
* generically. It's probably overkill to always scan all slots because
|
|
|
|
* the AGP bridges should be always an own bus on the HT hierarchy,
|
|
|
|
* but do it here for future safety.
|
|
|
|
*/
|
2008-05-28 00:03:56 +08:00
|
|
|
static u32 __init search_agp_bridge(u32 *order, int *valid_agp)
|
2005-04-17 06:20:36 +08:00
|
|
|
{
|
2008-04-19 16:31:11 +08:00
|
|
|
int bus, slot, func;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
/* Poor man's PCI discovery */
|
2008-04-19 16:31:11 +08:00
|
|
|
for (bus = 0; bus < 256; bus++) {
|
2008-01-30 20:30:09 +08:00
|
|
|
for (slot = 0; slot < 32; slot++) {
|
|
|
|
for (func = 0; func < 8; func++) {
|
2005-04-17 06:20:36 +08:00
|
|
|
u32 class, cap;
|
|
|
|
u8 type;
|
2008-04-19 16:31:11 +08:00
|
|
|
class = read_pci_config(bus, slot, func,
|
2005-04-17 06:20:36 +08:00
|
|
|
PCI_CLASS_REVISION);
|
|
|
|
if (class == 0xffffffff)
|
2008-01-30 20:30:09 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
switch (class >> 16) {
|
2005-04-17 06:20:36 +08:00
|
|
|
case PCI_CLASS_BRIDGE_HOST:
|
|
|
|
case PCI_CLASS_BRIDGE_OTHER: /* needed? */
|
|
|
|
/* AGP bridge? */
|
2008-04-19 16:31:11 +08:00
|
|
|
cap = find_cap(bus, slot, func,
|
2008-01-30 20:30:09 +08:00
|
|
|
PCI_CAP_ID_AGP);
|
2005-04-17 06:20:36 +08:00
|
|
|
if (!cap)
|
|
|
|
break;
|
2008-01-30 20:30:09 +08:00
|
|
|
*valid_agp = 1;
|
2008-04-19 16:31:11 +08:00
|
|
|
return read_agp(bus, slot, func, cap,
|
2008-01-30 20:30:09 +08:00
|
|
|
order);
|
|
|
|
}
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* No multi-function device? */
|
2008-04-19 16:31:11 +08:00
|
|
|
type = read_pci_config_byte(bus, slot, func,
|
2005-04-17 06:20:36 +08:00
|
|
|
PCI_HEADER_TYPE);
|
|
|
|
if (!(type & 0x80))
|
|
|
|
break;
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2014-04-29 05:16:33 +08:00
|
|
|
pr_info("No AGP bridge found\n");
|
2008-01-30 20:30:09 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-03-18 05:23:00 +08:00
|
|
|
static bool gart_fix_e820 __initdata = true;
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
|
|
|
|
static int __init parse_gart_mem(char *p)
|
|
|
|
{
|
2016-03-18 05:23:00 +08:00
|
|
|
return kstrtobool(p, &gart_fix_e820);
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
}
|
|
|
|
early_param("gart_fix_e820", parse_gart_mem);
|
|
|
|
|
2018-11-01 23:24:43 +08:00
|
|
|
/*
|
|
|
|
* With kexec/kdump, if the first kernel doesn't shut down the GART and the
|
|
|
|
* second kernel allocates a different GART region, there might be two
|
|
|
|
* overlapping GART regions present:
|
|
|
|
*
|
|
|
|
* - the first still used by the GART initialized in the first kernel.
|
|
|
|
* - (sub-)set of it used as normal RAM by the second kernel.
|
|
|
|
*
|
|
|
|
* which leads to memory corruptions and a kernel panic eventually.
|
|
|
|
*
|
|
|
|
* This can also happen if the BIOS has forgotten to mark the GART region
|
|
|
|
* as reserved.
|
|
|
|
*
|
|
|
|
* Try to update the e820 map to mark that new region as reserved.
|
|
|
|
*/
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
void __init early_gart_iommu_check(void)
|
|
|
|
{
|
2010-07-21 06:19:49 +08:00
|
|
|
u32 agp_aper_order = 0;
|
2009-12-14 10:52:15 +08:00
|
|
|
int i, fix, slot, valid_agp = 0;
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
u32 ctl;
|
|
|
|
u32 aper_size = 0, aper_order = 0, last_aper_order = 0;
|
|
|
|
u64 aper_base = 0, last_aper_base = 0;
|
aperture_64.c: duplicated code, buggy?
Hi!
void __init early_gart_iommu_check(void)
contains
for (num = 24; num < 32; num++) {
if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
continue;
loop, with very similar loop duplicated in
void __init gart_iommu_hole_init(void)
. First copy of a loop seems to be buggy, too. It uses 0 as a "nothing
set" value, which may actually bite us in last_aper_enabled case
(because it may be often zero).
(Beware, it is hard to test this patch, because this code has about
2^8 different code paths, depending on hardware and cmdline settings).
Plus, the second loop does not check for consistency of
aper_enabled. Should it?
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-27 02:40:47 +08:00
|
|
|
int aper_enabled = 0, last_aper_enabled = 0, last_valid = 0;
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
|
2015-04-08 05:46:37 +08:00
|
|
|
if (!amd_gart_present())
|
|
|
|
return;
|
|
|
|
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
if (!early_pci_allowed())
|
|
|
|
return;
|
|
|
|
|
aperture_64.c: duplicated code, buggy?
Hi!
void __init early_gart_iommu_check(void)
contains
for (num = 24; num < 32; num++) {
if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
continue;
loop, with very similar loop duplicated in
void __init gart_iommu_hole_init(void)
. First copy of a loop seems to be buggy, too. It uses 0 as a "nothing
set" value, which may actually bite us in last_aper_enabled case
(because it may be often zero).
(Beware, it is hard to test this patch, because this code has about
2^8 different code paths, depending on hardware and cmdline settings).
Plus, the second loop does not check for consistency of
aper_enabled. Should it?
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-27 02:40:47 +08:00
|
|
|
/* This is mostly duplicate of iommu_hole_init */
|
2010-07-21 06:19:49 +08:00
|
|
|
search_agp_bridge(&agp_aper_order, &valid_agp);
|
2009-12-14 10:52:15 +08:00
|
|
|
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
fix = 0;
|
2011-01-11 00:20:23 +08:00
|
|
|
for (i = 0; amd_nb_bus_dev_ranges[i].dev_limit; i++) {
|
2008-04-19 16:31:11 +08:00
|
|
|
int bus;
|
|
|
|
int dev_base, dev_limit;
|
|
|
|
|
2011-01-11 00:20:23 +08:00
|
|
|
bus = amd_nb_bus_dev_ranges[i].bus;
|
|
|
|
dev_base = amd_nb_bus_dev_ranges[i].dev_base;
|
|
|
|
dev_limit = amd_nb_bus_dev_ranges[i].dev_limit;
|
2008-04-19 16:31:11 +08:00
|
|
|
|
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
2010-10-29 23:14:30 +08:00
|
|
|
if (!early_is_amd_nb(read_pci_config(bus, slot, 3, 0x00)))
|
2008-04-19 16:31:11 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL);
|
2010-09-04 00:39:39 +08:00
|
|
|
aper_enabled = ctl & GARTEN;
|
2008-04-19 16:31:11 +08:00
|
|
|
aper_order = (ctl >> 1) & 7;
|
|
|
|
aper_size = (32 * 1024 * 1024) << aper_order;
|
|
|
|
aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff;
|
|
|
|
aper_base <<= 25;
|
|
|
|
|
aperture_64.c: duplicated code, buggy?
Hi!
void __init early_gart_iommu_check(void)
contains
for (num = 24; num < 32; num++) {
if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
continue;
loop, with very similar loop duplicated in
void __init gart_iommu_hole_init(void)
. First copy of a loop seems to be buggy, too. It uses 0 as a "nothing
set" value, which may actually bite us in last_aper_enabled case
(because it may be often zero).
(Beware, it is hard to test this patch, because this code has about
2^8 different code paths, depending on hardware and cmdline settings).
Plus, the second loop does not check for consistency of
aper_enabled. Should it?
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-27 02:40:47 +08:00
|
|
|
if (last_valid) {
|
|
|
|
if ((aper_order != last_aper_order) ||
|
|
|
|
(aper_base != last_aper_base) ||
|
|
|
|
(aper_enabled != last_aper_enabled)) {
|
|
|
|
fix = 1;
|
|
|
|
break;
|
|
|
|
}
|
2008-04-19 16:31:11 +08:00
|
|
|
}
|
aperture_64.c: duplicated code, buggy?
Hi!
void __init early_gart_iommu_check(void)
contains
for (num = 24; num < 32; num++) {
if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
continue;
loop, with very similar loop duplicated in
void __init gart_iommu_hole_init(void)
. First copy of a loop seems to be buggy, too. It uses 0 as a "nothing
set" value, which may actually bite us in last_aper_enabled case
(because it may be often zero).
(Beware, it is hard to test this patch, because this code has about
2^8 different code paths, depending on hardware and cmdline settings).
Plus, the second loop does not check for consistency of
aper_enabled. Should it?
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-27 02:40:47 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
last_aper_order = aper_order;
|
|
|
|
last_aper_base = aper_base;
|
|
|
|
last_aper_enabled = aper_enabled;
|
aperture_64.c: duplicated code, buggy?
Hi!
void __init early_gart_iommu_check(void)
contains
for (num = 24; num < 32; num++) {
if (!early_is_k8_nb(read_pci_config(0, num, 3, 0x00)))
continue;
loop, with very similar loop duplicated in
void __init gart_iommu_hole_init(void)
. First copy of a loop seems to be buggy, too. It uses 0 as a "nothing
set" value, which may actually bite us in last_aper_enabled case
(because it may be often zero).
(Beware, it is hard to test this patch, because this code has about
2^8 different code paths, depending on hardware and cmdline settings).
Plus, the second loop does not check for consistency of
aper_enabled. Should it?
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-27 02:40:47 +08:00
|
|
|
last_valid = 1;
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!fix && !aper_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!aper_base || !aper_size || aper_base + aper_size > 0x100000000UL)
|
|
|
|
fix = 1;
|
|
|
|
|
|
|
|
if (gart_fix_e820 && !fix && aper_enabled) {
|
2017-01-28 21:14:25 +08:00
|
|
|
if (e820__mapped_any(aper_base, aper_base + aper_size,
|
2017-01-29 00:09:33 +08:00
|
|
|
E820_TYPE_RAM)) {
|
2008-05-20 22:27:17 +08:00
|
|
|
/* reserve it, so we can reuse it in second kernel */
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("e820: reserve [mem %#010Lx-%#010Lx] for GART\n",
|
|
|
|
aper_base, aper_base + aper_size - 1);
|
2017-01-29 00:09:33 +08:00
|
|
|
e820__range_add(aper_base, aper_size, E820_TYPE_RESERVED);
|
2017-01-28 21:03:04 +08:00
|
|
|
e820__update_table_print();
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-12-14 10:52:15 +08:00
|
|
|
if (valid_agp)
|
2008-05-27 03:17:30 +08:00
|
|
|
return;
|
|
|
|
|
2009-12-14 10:52:15 +08:00
|
|
|
/* disable them all at first */
|
2011-01-11 00:20:23 +08:00
|
|
|
for (i = 0; i < amd_nb_bus_dev_ranges[i].dev_limit; i++) {
|
2008-04-19 16:31:11 +08:00
|
|
|
int bus;
|
|
|
|
int dev_base, dev_limit;
|
|
|
|
|
2011-01-11 00:20:23 +08:00
|
|
|
bus = amd_nb_bus_dev_ranges[i].bus;
|
|
|
|
dev_base = amd_nb_bus_dev_ranges[i].dev_base;
|
|
|
|
dev_limit = amd_nb_bus_dev_ranges[i].dev_limit;
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
2010-10-29 23:14:30 +08:00
|
|
|
if (!early_is_amd_nb(read_pci_config(bus, slot, 3, 0x00)))
|
2008-04-19 16:31:11 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL);
|
2010-09-04 00:39:39 +08:00
|
|
|
ctl &= ~GARTEN;
|
2008-04-19 16:31:11 +08:00
|
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl);
|
|
|
|
}
|
x86: disable the GART early, 64-bit
For K8 system: 4G RAM with memory hole remapping enabled, or more than
4G RAM installed.
when try to use kexec second kernel, and the first doesn't include
gart_shutdown. the second kernel could have different aper position than
the first kernel. and second kernel could use that hole as RAM that is
still used by GART set by the first kernel. esp. when try to kexec
2.6.24 with sparse mem enable from previous kernel (from RHEL 5 or SLES
10). the new kernel will use aper by GART (set by first kernel) for
vmemmap. and after new kernel setting one new GART. the position will be
real RAM. the _mapcount set is lost.
Bad page state in process 'swapper'
page:ffffe2000e600020 flags:0x0000000000000000 mapping:0000000000000000 mapcount:1 count:0
Trying to fix it up, but a reboot is needed
Backtrace:
Pid: 0, comm: swapper Not tainted 2.6.24-rc7-smp-gcdf71a10-dirty #13
Call Trace:
[<ffffffff8026401f>] bad_page+0x63/0x8d
[<ffffffff80264169>] __free_pages_ok+0x7c/0x2a5
[<ffffffff80ba75d1>] free_all_bootmem_core+0xd0/0x198
[<ffffffff80ba3a42>] numa_free_all_bootmem+0x3b/0x76
[<ffffffff80ba3461>] mem_init+0x3b/0x152
[<ffffffff80b959d3>] start_kernel+0x236/0x2c2
[<ffffffff80b9511a>] _sinittext+0x11a/0x121
and
[ffffe2000e600000-ffffe2000e7fffff] PMD ->ffff81001c200000 on node 0
phys addr is : 0x1c200000
RHEL 5.1 kernel -53 said:
PCI-DMA: aperture base @ 1c000000 size 65536 KB
new kernel said:
Mapping aperture over 65536 KB of RAM @ 3c000000
So could try to disable that GART if possible.
According to Ingo
> hm, i'm wondering, instead of modifying the GART, why dont we simply
> _detect_ whatever GART settings we have inherited, and propagate that
> into our e820 maps? I.e. if there's inconsistency, then punch that out
> from the memory maps and just dont use that memory.
>
> that way it would not matter whether the GART settings came from a [old
> or crashing] Linux kernel that has not called gart_iommu_shutdown(), or
> whether it's a BIOS that has set up an aperture hole inconsistent with
> the memory map it passed. (or the memory map we _think_ i tried to pass
> us)
>
> it would also be more robust to only read and do a memory map quirk
> based on that, than actively trying to change the GART so early in the
> bootup. Later on we have to re-enable the GART _anyway_ and have to
> punch a hole for it.
>
> and as a bonus, we would have shored up our defenses against crappy
> BIOSes as well.
add e820 modification for gart inconsistent setting.
gart_fix_e820=off could be used to disable e820 fix.
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-01-30 20:33:09 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2008-04-14 09:42:31 +08:00
|
|
|
static int __initdata printed_gart_size_msg;
|
|
|
|
|
2010-08-27 01:57:57 +08:00
|
|
|
int __init gart_iommu_hole_init(void)
|
2008-01-30 20:30:09 +08:00
|
|
|
{
|
2008-04-14 09:42:31 +08:00
|
|
|
u32 agp_aper_base = 0, agp_aper_order = 0;
|
2005-11-06 00:25:53 +08:00
|
|
|
u32 aper_size, aper_alloc = 0, aper_order = 0, last_aper_order = 0;
|
2005-04-17 06:20:36 +08:00
|
|
|
u64 aper_base, last_aper_base = 0;
|
2008-04-19 16:31:11 +08:00
|
|
|
int fix, slot, valid_agp = 0;
|
|
|
|
int i, node;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2015-04-08 05:46:37 +08:00
|
|
|
if (!amd_gart_present())
|
|
|
|
return -ENODEV;
|
|
|
|
|
2007-10-24 18:49:50 +08:00
|
|
|
if (gart_iommu_aperture_disabled || !fix_aperture ||
|
|
|
|
!early_pci_allowed())
|
2010-08-27 01:57:57 +08:00
|
|
|
return -ENODEV;
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2014-04-29 05:16:33 +08:00
|
|
|
pr_info("Checking aperture...\n");
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-14 09:42:31 +08:00
|
|
|
if (!fallback_aper_force)
|
|
|
|
agp_aper_base = search_agp_bridge(&agp_aper_order, &valid_agp);
|
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
fix = 0;
|
2008-01-30 20:33:18 +08:00
|
|
|
node = 0;
|
2011-01-11 00:20:23 +08:00
|
|
|
for (i = 0; i < amd_nb_bus_dev_ranges[i].dev_limit; i++) {
|
2008-04-19 16:31:11 +08:00
|
|
|
int bus;
|
|
|
|
int dev_base, dev_limit;
|
2010-04-07 18:57:35 +08:00
|
|
|
u32 ctl;
|
2008-04-19 16:31:11 +08:00
|
|
|
|
2011-01-11 00:20:23 +08:00
|
|
|
bus = amd_nb_bus_dev_ranges[i].bus;
|
|
|
|
dev_base = amd_nb_bus_dev_ranges[i].dev_base;
|
|
|
|
dev_limit = amd_nb_bus_dev_ranges[i].dev_limit;
|
2008-04-19 16:31:11 +08:00
|
|
|
|
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
2010-10-29 23:14:30 +08:00
|
|
|
if (!early_is_amd_nb(read_pci_config(bus, slot, 3, 0x00)))
|
2008-04-19 16:31:11 +08:00
|
|
|
continue;
|
|
|
|
|
|
|
|
iommu_detected = 1;
|
|
|
|
gart_iommu_aperture = 1;
|
2009-11-10 18:46:14 +08:00
|
|
|
x86_init.iommu.iommu_init = gart_iommu_init;
|
2008-04-19 16:31:11 +08:00
|
|
|
|
2010-04-07 18:57:35 +08:00
|
|
|
ctl = read_pci_config(bus, slot, 3,
|
|
|
|
AMD64_GARTAPERTURECTL);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Before we do anything else disable the GART. It may
|
|
|
|
* still be enabled if we boot into a crash-kernel here.
|
|
|
|
* Reconfiguring the GART while it is enabled could have
|
|
|
|
* unknown side-effects.
|
|
|
|
*/
|
|
|
|
ctl &= ~GARTEN;
|
|
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl);
|
|
|
|
|
|
|
|
aper_order = (ctl >> 1) & 7;
|
2008-04-19 16:31:11 +08:00
|
|
|
aper_size = (32 * 1024 * 1024) << aper_order;
|
|
|
|
aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff;
|
|
|
|
aper_base <<= 25;
|
|
|
|
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("Node %d: aperture [bus addr %#010Lx-%#010Lx] (%uMB)\n",
|
|
|
|
node, aper_base, aper_base + aper_size - 1,
|
|
|
|
aper_size >> 20);
|
2008-04-19 16:31:11 +08:00
|
|
|
node++;
|
|
|
|
|
|
|
|
if (!aperture_valid(aper_base, aper_size, 64<<20)) {
|
|
|
|
if (valid_agp && agp_aper_base &&
|
|
|
|
agp_aper_base == aper_base &&
|
|
|
|
agp_aper_order == aper_order) {
|
|
|
|
/* the same between two setting from NB and agp */
|
2008-06-25 13:14:09 +08:00
|
|
|
if (!no_iommu &&
|
|
|
|
max_pfn > MAX_DMA32_PFN &&
|
|
|
|
!printed_gart_size_msg) {
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_err("you are using iommu with agp, but GART size is less than 64MB\n");
|
2014-04-29 05:16:33 +08:00
|
|
|
pr_err("please increase GART size in your BIOS setup\n");
|
|
|
|
pr_err("if BIOS doesn't have that option, contact your HW vendor!\n");
|
2008-04-19 16:31:11 +08:00
|
|
|
printed_gart_size_msg = 1;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
fix = 1;
|
|
|
|
goto out;
|
2008-04-14 09:42:31 +08:00
|
|
|
}
|
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
if ((last_aper_order && aper_order != last_aper_order) ||
|
|
|
|
(last_aper_base && aper_base != last_aper_base)) {
|
|
|
|
fix = 1;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
last_aper_order = aper_order;
|
|
|
|
last_aper_base = aper_base;
|
2005-04-17 06:20:36 +08:00
|
|
|
}
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-19 16:31:11 +08:00
|
|
|
out:
|
2006-09-26 16:52:40 +08:00
|
|
|
if (!fix && !fallback_aper_force) {
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
if (last_aper_base) {
|
|
|
|
/*
|
|
|
|
* If this is the kdump kernel, the first kernel
|
|
|
|
* may have allocated the range over its e820 RAM
|
|
|
|
* and fixed up the northbridge
|
|
|
|
*/
|
2019-03-08 11:05:08 +08:00
|
|
|
exclude_from_core(last_aper_base, last_aper_order);
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
|
2010-08-27 01:57:57 +08:00
|
|
|
return 1;
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
}
|
2010-08-27 01:57:57 +08:00
|
|
|
return 0;
|
2006-09-26 16:52:40 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
2008-04-14 09:42:31 +08:00
|
|
|
if (!fallback_aper_force) {
|
|
|
|
aper_alloc = agp_aper_base;
|
|
|
|
aper_order = agp_aper_order;
|
|
|
|
}
|
2008-01-30 20:30:09 +08:00
|
|
|
|
|
|
|
if (aper_alloc) {
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Got the aperture from the AGP bridge */
|
2008-06-25 13:14:09 +08:00
|
|
|
} else if ((!no_iommu && max_pfn > MAX_DMA32_PFN) ||
|
2005-04-17 06:20:36 +08:00
|
|
|
force_iommu ||
|
|
|
|
valid_agp ||
|
2008-01-30 20:30:09 +08:00
|
|
|
fallback_aper_force) {
|
2015-04-08 05:46:37 +08:00
|
|
|
pr_info("Your BIOS doesn't leave an aperture memory hole\n");
|
2014-04-29 05:16:33 +08:00
|
|
|
pr_info("Please enable the IOMMU option in the BIOS setup\n");
|
2014-04-15 05:29:19 +08:00
|
|
|
pr_info("This costs you %dMB of RAM\n",
|
2014-04-29 05:16:33 +08:00
|
|
|
32 << fallback_aper_order);
|
2005-04-17 06:20:36 +08:00
|
|
|
|
|
|
|
aper_order = fallback_aper_order;
|
|
|
|
aper_alloc = allocate_aperture();
|
2008-01-30 20:30:09 +08:00
|
|
|
if (!aper_alloc) {
|
|
|
|
/*
|
|
|
|
* Could disable AGP and IOMMU here, but it's
|
|
|
|
* probably not worth it. But the later users
|
|
|
|
* cannot deal with bad apertures and turning
|
|
|
|
* on the aperture over memory causes very
|
|
|
|
* strange problems, so it's better to panic
|
|
|
|
* early.
|
|
|
|
*/
|
2005-04-17 06:20:36 +08:00
|
|
|
panic("Not enough memory for aperture");
|
|
|
|
}
|
2008-01-30 20:30:09 +08:00
|
|
|
} else {
|
2010-08-27 01:57:57 +08:00
|
|
|
return 0;
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|
2005-04-17 06:20:36 +08:00
|
|
|
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
/*
|
|
|
|
* If this is the kdump kernel _and_ the first kernel did not
|
|
|
|
* configure the aperture in the northbridge, this range may
|
|
|
|
* overlap with the first kernel's memory. We can't access the
|
|
|
|
* range through vmcore even though it should be part of the dump.
|
|
|
|
*/
|
2019-03-08 11:05:08 +08:00
|
|
|
exclude_from_core(aper_alloc, aper_order);
|
x86/gart: Exclude GART aperture from vmcore
On machines where the GART aperture is mapped over physical RAM
/proc/vmcore contains the remapped range and reading it may cause hangs or
reboots.
In the past, the GART region was added into the resource map, implemented
by commit 56dd669a138c ("[PATCH] Insert GART region into resource map")
However, inserting the iomem_resource from the early GART code caused
resource conflicts with some AGP drivers (bko#72201), which got avoided by
reverting the patch in commit 707d4eefbdb3 ("Revert [PATCH] Insert GART
region into resource map"). This revert introduced the /proc/vmcore bug.
The vmcore ELF header is either prepared by the kernel (when using the
kexec_file_load syscall) or by the kexec userspace (when using the kexec_load
syscall). Since we no longer have the GART iomem resource, the userspace
kexec has no way of knowing which region to exclude from the ELF header.
Changes from v1 of this patch:
Instead of excluding the aperture from the ELF header, this patch
makes /proc/vmcore return zeroes in the second kernel when attempting to
read the aperture region. This is done by reusing the
gart_oldmem_pfn_is_ram infrastructure originally intended to exclude XEN
balooned memory. This works for both, the kexec_file_load and kexec_load
syscalls.
[Note that the GART region is the same in the first and second kernels:
regardless whether the first kernel fixed up the northbridge/bios setting
and mapped the aperture over physical memory, the second kernel finds the
northbridge properly configured by the first kernel and the aperture
never overlaps with e820 memory because the second kernel has a fake e820
map created from the crashkernel memory regions. Thus, the second kernel
keeps the aperture address/size as configured by the first kernel.]
register_oldmem_pfn_is_ram can only register one callback and returns an error
if the callback has been registered already. Since XEN used to be the only user
of this function, it never checks the return value. Now that we have more than
one user, I added a WARN_ON just in case agp, XEN, or any other future user of
register_oldmem_pfn_is_ram were to step on each other's toes.
Fixes: 707d4eefbdb3 ("Revert [PATCH] Insert GART region into resource map")
Signed-off-by: Jiri Bohac <jbohac@suse.cz>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: David Airlie <airlied@linux.ie>
Cc: yinghai@kernel.org
Cc: joro@8bytes.org
Cc: kexec@lists.infradead.org
Cc: Borislav Petkov <bp@alien8.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/20180106010013.73suskgxm7lox7g6@dwarf.suse.cz
2018-01-06 09:00:13 +08:00
|
|
|
|
2005-04-17 06:20:36 +08:00
|
|
|
/* Fix up the north bridges */
|
2011-01-11 00:20:23 +08:00
|
|
|
for (i = 0; i < amd_nb_bus_dev_ranges[i].dev_limit; i++) {
|
2010-09-04 00:39:40 +08:00
|
|
|
int bus, dev_base, dev_limit;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't enable translation yet but enable GART IO and CPU
|
|
|
|
* accesses and set DISTLBWALKPRB since GART table memory is UC.
|
|
|
|
*/
|
2011-04-18 21:45:45 +08:00
|
|
|
u32 ctl = aper_order << 1;
|
2008-04-19 16:31:11 +08:00
|
|
|
|
2011-01-11 00:20:23 +08:00
|
|
|
bus = amd_nb_bus_dev_ranges[i].bus;
|
|
|
|
dev_base = amd_nb_bus_dev_ranges[i].dev_base;
|
|
|
|
dev_limit = amd_nb_bus_dev_ranges[i].dev_limit;
|
2008-04-19 16:31:11 +08:00
|
|
|
for (slot = dev_base; slot < dev_limit; slot++) {
|
2010-10-29 23:14:30 +08:00
|
|
|
if (!early_is_amd_nb(read_pci_config(bus, slot, 3, 0x00)))
|
2008-04-19 16:31:11 +08:00
|
|
|
continue;
|
|
|
|
|
2010-09-04 00:39:40 +08:00
|
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl);
|
2008-04-19 16:31:11 +08:00
|
|
|
write_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE, aper_alloc >> 25);
|
|
|
|
}
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|
2008-06-10 06:10:48 +08:00
|
|
|
|
|
|
|
set_up_gart_resume(aper_order, aper_alloc);
|
2010-08-27 01:57:57 +08:00
|
|
|
|
|
|
|
return 1;
|
2008-01-30 20:30:09 +08:00
|
|
|
}
|