Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2018-11-02 10:37:39 +0100
committerTakashi Iwai <tiwai@suse.de>2018-11-02 10:37:39 +0100
commit83d4a1730757d96be28931f390cc6d76bae1ff1a (patch)
tree170e21afd3f14901013d23a5e5f407e88c21bdb2
parent8841aa771d74518a149398efffe405111524a7d4 (diff)
parent9ab91ee2d430cb540321bdc6c2f090639584fddc (diff)
Merge branch 'users/bpetkov/SLE15/for-next' into SLE15
Pull EDAC, x86 and resource fixes from Borislav Petkov
-rw-r--r--blacklist.conf1
-rw-r--r--patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch62
-rw-r--r--patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch47
-rw-r--r--patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch79
-rw-r--r--series.conf3
5 files changed, 192 insertions, 0 deletions
diff --git a/blacklist.conf b/blacklist.conf
index 37a983703c..8075996aa6 100644
--- a/blacklist.conf
+++ b/blacklist.conf
@@ -884,3 +884,4 @@ c894696188d5c2af1e636e458190e80c53fb893d # rtlwifi: the target function doesn't
16d571bb0fe6aa7fed82e19166ca1542026c9c06 # rt2x00: not cleanly applicable, merely optimization
d59d2f9995d28974877750f429e821324bd603c7 # r8822be: not present in SLE15
d3d4ffaae439981e1e441ebb125aa3588627c5d8 # Duplicate of 7233b8cab39014620ac9534da11f0f3e506d8fd8
+711f76a328cbe5b49164bb14bcb593fa52102051 # trivial, no need
diff --git a/patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch b/patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch
new file mode 100644
index 0000000000..52d767bdff
--- /dev/null
+++ b/patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch
@@ -0,0 +1,62 @@
+From: Bjorn Helgaas <bhelgaas@google.com>
+Date: Thu, 27 Sep 2018 09:21:55 -0500
+Subject: x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error
+Git-commit: 51fbf14f2528a8c6401290e37f1c893a2412f1d3
+Patch-mainline: v4.20-rc1
+References: bsc#1114279
+
+The only use of KEXEC_BACKUP_SRC_END is as an argument to
+walk_system_ram_res():
+
+ int crash_load_segments(struct kimage *image)
+ {
+ ...
+ walk_system_ram_res(KEXEC_BACKUP_SRC_START, KEXEC_BACKUP_SRC_END,
+ image, determine_backup_region);
+
+walk_system_ram_res() expects "start, end" arguments that are inclusive,
+i.e., the range to be walked includes both the start and end addresses.
+
+KEXEC_BACKUP_SRC_END was previously defined as (640 * 1024UL), which is the
+first address *past* the desired 0-640KB range.
+
+Define KEXEC_BACKUP_SRC_END as (640 * 1024UL - 1) so the KEXEC_BACKUP_SRC
+region is [0-0x9ffff], not [0-0xa0000].
+
+Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call")
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+CC: "H. Peter Anvin" <hpa@zytor.com>
+CC: Andrew Morton <akpm@linux-foundation.org>
+CC: Brijesh Singh <brijesh.singh@amd.com>
+CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+CC: Ingo Molnar <mingo@redhat.com>
+CC: Lianbo Jiang <lijiang@redhat.com>
+CC: Takashi Iwai <tiwai@suse.de>
+CC: Thomas Gleixner <tglx@linutronix.de>
+CC: Tom Lendacky <thomas.lendacky@amd.com>
+CC: Vivek Goyal <vgoyal@redhat.com>
+CC: baiyaowei@cmss.chinamobile.com
+CC: bhe@redhat.com
+CC: dan.j.williams@intel.com
+CC: dyoung@redhat.com
+CC: kexec@lists.infradead.org
+Link: http://lkml.kernel.org/r/153805811578.1157.6948388946904655969.stgit@bhelgaas-glaptop.roam.corp.google.com
+---
+ arch/x86/include/asm/kexec.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h
+index f327236f0fa7..5125fca472bb 100644
+--- a/arch/x86/include/asm/kexec.h
++++ b/arch/x86/include/asm/kexec.h
+@@ -67,7 +67,7 @@ struct kimage;
+
+ /* Memory to backup during crash kdump */
+ #define KEXEC_BACKUP_SRC_START (0UL)
+-#define KEXEC_BACKUP_SRC_END (640 * 1024UL) /* 640K */
++#define KEXEC_BACKUP_SRC_END (640 * 1024UL - 1) /* 640K */
+
+ /*
+ * CPU does not save ss and sp on stack if execution is already
+
diff --git a/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch b/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
new file mode 100644
index 0000000000..8d07e3208f
--- /dev/null
+++ b/patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
@@ -0,0 +1,47 @@
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Sat, 13 Oct 2018 13:28:43 +0300
+Subject: EDAC, thunderx: Fix memory leak in thunderx_l2c_threaded_isr()
+Git-commit: d8c27ba86a2fd806d3957e5a9b30e66dfca2a61d
+Patch-mainline: v4.20-rc1
+References: bsc#1114279
+
+Fix memory leak in L2c threaded interrupt handler.
+
+ [ bp: Rewrite commit message. ]
+
+Fixes: 41003396f932 ("EDAC, thunderx: Add Cavium ThunderX EDAC driver")
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+CC: David Daney <david.daney@cavium.com>
+CC: Jan Glauber <jglauber@cavium.com>
+CC: Mauro Carvalho Chehab <mchehab@kernel.org>
+CC: Sergey Temerkhanov <s.temerkhanov@gmail.com>
+CC: linux-edac <linux-edac@vger.kernel.org>
+Link: http://lkml.kernel.org/r/20181013102843.GG16086@mwanda
+---
+ drivers/edac/thunderx_edac.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/edac/thunderx_edac.c b/drivers/edac/thunderx_edac.c
+index c009d94f40c5..34be60fe6892 100644
+--- a/drivers/edac/thunderx_edac.c
++++ b/drivers/edac/thunderx_edac.c
+@@ -1884,7 +1884,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)
+ default:
+ dev_err(&l2c->pdev->dev, "Unsupported device: %04x\n",
+ l2c->pdev->device);
+- return IRQ_NONE;
++ goto err_free;
+ }
+
+ while (CIRC_CNT(l2c->ring_head, l2c->ring_tail,
+@@ -1906,7 +1906,7 @@ static irqreturn_t thunderx_l2c_threaded_isr(int irq, void *irq_id)
+ l2c->ring_tail++;
+ }
+
+- return IRQ_HANDLED;
++ ret = IRQ_HANDLED;
+
+ err_free:
+ kfree(other);
+
diff --git a/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch b/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
new file mode 100644
index 0000000000..540e6de955
--- /dev/null
+++ b/patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
@@ -0,0 +1,79 @@
+From: Bjorn Helgaas <bhelgaas@google.com>
+Date: Thu, 27 Sep 2018 09:22:02 -0500
+Subject: resource: Include resource end in walk_*() interfaces
+Git-commit: a98959fdbda1849a01b2150bb635ed559ec06700
+Patch-mainline: v4.20-rc1
+References: bsc#1114279
+
+find_next_iomem_res() finds an iomem resource that covers part of a range
+described by "start, end". All callers expect that range to be inclusive,
+i.e., both start and end are included, but find_next_iomem_res() doesn't
+handle the end address correctly.
+
+If it finds an iomem resource that contains exactly the end address, it
+skips it, e.g., if "start, end" is [0x0-0x10000] and there happens to be an
+iomem resource [mem 0x10000-0x10000] (the single byte at 0x10000), we skip
+it:
+
+ find_next_iomem_res(...)
+ {
+ start = 0x0;
+ end = 0x10000;
+ for (p = next_resource(...)) {
+ # p->start = 0x10000;
+ # p->end = 0x10000;
+ # we *should* return this resource, but this condition is false:
+ if ((p->end >= start) && (p->start < end))
+ break;
+
+Adjust find_next_iomem_res() so it allows a resource that includes the
+single byte at the end of the range. This is a corner case that we
+probably don't see in practice.
+
+Fixes: 58c1b5b07907 ("[PATCH] memory hotadd fixes: find_next_system_ram catch range fix")
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Borislav Petkov <bp@suse.de>
+CC: Andrew Morton <akpm@linux-foundation.org>
+CC: Brijesh Singh <brijesh.singh@amd.com>
+CC: Dan Williams <dan.j.williams@intel.com>
+CC: H. Peter Anvin <hpa@zytor.com>
+CC: Lianbo Jiang <lijiang@redhat.com>
+CC: Takashi Iwai <tiwai@suse.de>
+CC: Thomas Gleixner <tglx@linutronix.de>
+CC: Tom Lendacky <thomas.lendacky@amd.com>
+CC: Vivek Goyal <vgoyal@redhat.com>
+CC: Yaowei Bai <baiyaowei@cmss.chinamobile.com>
+CC: bhe@redhat.com
+CC: dan.j.williams@intel.com
+CC: dyoung@redhat.com
+CC: kexec@lists.infradead.org
+CC: mingo@redhat.com
+CC: x86-ml <x86@kernel.org>
+Link: http://lkml.kernel.org/r/153805812254.1157.16736368485811773752.stgit@bhelgaas-glaptop.roam.corp.google.com
+---
+ kernel/resource.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kernel/resource.c b/kernel/resource.c
+index 30e1bc68503b..155ec873ea4d 100644
+--- a/kernel/resource.c
++++ b/kernel/resource.c
+@@ -319,7 +319,7 @@ int release_resource(struct resource *old)
+ EXPORT_SYMBOL(release_resource);
+
+ /*
+- * Finds the lowest iomem resource existing within [res->start.res->end).
++ * Finds the lowest iomem resource existing within [res->start..res->end].
+ * The caller must specify res->start, res->end, res->flags, and optionally
+ * desc. If found, returns 0, res is overwritten, if not found, returns -1.
+ * This function walks the whole tree and not just first level children until
+@@ -352,7 +352,7 @@ static int find_next_iomem_res(struct resource *res, unsigned long desc,
+ p = NULL;
+ break;
+ }
+- if ((p->end >= start) && (p->start < end))
++ if ((p->end >= start) && (p->start <= end))
+ break;
+ }
+
+
diff --git a/series.conf b/series.conf
index 3e6ffdc1c5..d5047a11ab 100644
--- a/series.conf
+++ b/series.conf
@@ -18284,6 +18284,8 @@
patches.drivers/spi-sh-msiof-fix-deferred-probing.patch
patches.drivers/spi-bcm63xx-hsspi-keep-pll-clk-enabled.patch
patches.drivers/ACPI-processor-Fix-the-return-value-of-acpi_processo.patch
+ patches.arch/x86-kexec-correct-kexec_backup_src_end-off-by-one-error.patch
+ patches.fixes/resource-include-resource-end-in-walk_-interfaces.patch
patches.drivers/iwlwifi-mvm-send-BCAST-management-frames-to-the-righ.patch
patches.drivers/iwlwifi-dbg-don-t-crash-if-the-firmware-crashes-in-t.patch
patches.drivers/iwlwifi-pcie-gen2-build-A-MSDU-only-for-GSO.patch
@@ -18306,6 +18308,7 @@
patches.fixes/nvdimm-use-namespace-index-data-to-reduce-number-of-label-reads-needed.patch
patches.fixes/libnvdimm-label-fix-sparse-warning.patch
patches.drivers/edac-raise-the-maximum-number-of-memory-controllers.patch
+ patches.drivers/edac-thunderx-fix-memory-leak-in-thunderx_l2c_threaded_isr.patch
patches.drivers/PCI-ASPM-Fix-link_state-teardown-on-device-removal.patch
patches.drivers/scsi-qla2xxx-Fix-process-response-queue-for-ISP26XX-.patch
patches.drivers/scsi-qla2xxx-Fix-incorrect-port-speed-being-set-for-.patch