Home Home > GIT Browse > openSUSE-42.3
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Koutný <mkoutny@suse.com>2019-01-10 17:47:34 +0100
committerMichal Koutný <mkoutny@suse.com>2019-01-14 19:22:08 +0100
commitf04fdc98a457544a222135150006f8c6e10bbbd3 (patch)
tree584dc7e129f4efbddd82d2a0f4ab82c4f657da3c
parentae92107a92124feaf510ad03b316eca80759a067 (diff)
Delete patches.drivers/0119-dax-fix-device-dax-region-base.patch (bsc#1023175).
It is a duplicate of patches.drivers/0115-dax-fix-device-dax-region-base.patch and happens to add the same chunk twice.
-rw-r--r--patches.drivers/0115-dax-fix-device-dax-region-base.patch60
-rw-r--r--patches.drivers/0119-dax-fix-device-dax-region-base.patch4
-rw-r--r--series.conf1
3 files changed, 2 insertions, 63 deletions
diff --git a/patches.drivers/0115-dax-fix-device-dax-region-base.patch b/patches.drivers/0115-dax-fix-device-dax-region-base.patch
deleted file mode 100644
index a4fc67c110..0000000000
--- a/patches.drivers/0115-dax-fix-device-dax-region-base.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From: Dan Williams <dan.j.williams@intel.com>
-Subject: dax: fix device-dax region base
-Date: Wed, 24 Aug 2016 09:16:07 -0700
-Patch-mainline: Submitted, https://patchwork.kernel.org/patch/9298045
-References: bsc#995532
-
-The data offset for a dax region needs to account for a reservation in
-the resource range. Otherwise, device-dax is allowing mappings directly
-into the memmap or device-info-block area with crash signatures like the
-following:
-
- BUG: unable to handle kernel NULL pointer dereference at 0000000000000008
- IP: [<ffffffff811ac851>] get_zone_device_page+0x11/0x30
- Call Trace:
- follow_devmap_pmd+0x298/0x2c0
- follow_page_mask+0x275/0x530
- __get_user_pages+0xe3/0x750
- __gfn_to_pfn_memslot+0x1b2/0x450 [kvm]
- ? hrtimer_try_to_cancel+0x2c/0x120
- ? kvm_read_l1_tsc+0x55/0x60 [kvm]
- try_async_pf+0x66/0x230 [kvm]
- ? kvm_host_page_size+0x90/0xa0 [kvm]
- tdp_page_fault+0x130/0x280 [kvm]
- kvm_mmu_page_fault+0x5f/0xf0 [kvm]
- handle_ept_violation+0x94/0x180 [kvm_intel]
- vmx_handle_exit+0x1d3/0x1440 [kvm_intel]
- ? atomic_switch_perf_msrs+0x6f/0xa0 [kvm_intel]
- ? vmx_vcpu_run+0x2d1/0x490 [kvm_intel]
- kvm_arch_vcpu_ioctl_run+0x81d/0x16a0 [kvm]
- ? wake_up_q+0x44/0x80
- kvm_vcpu_ioctl+0x33c/0x620 [kvm]
- ? __vfs_write+0x37/0x160
- do_vfs_ioctl+0xa2/0x5d0
- SyS_ioctl+0x79/0x90
- entry_SYSCALL_64_fastpath+0x1a/0xa4
-
-Cc: <stable@vger.kernel.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Fixes: ab68f2622136 ("/dev/dax, pmem: direct access to persistent memory")
-Reported-by: Abhilash Kumar Mulumudi <m.abhilash-kumar@hpe.com>
-Reported-by: Toshi Kani <toshi.kani@hpe.com>
-Tested-by: Toshi Kani <toshi.kani@hpe.com>
-Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
----
- drivers/dax/pmem.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/dax/pmem.c
-+++ b/drivers/dax/pmem.c
-@@ -118,6 +118,9 @@ static int dax_pmem_probe(struct device
- return rc;
- }
-
-+ /* adjust the dax_region resource to the start of data */
-+ res.start += le64_to_cpu(pfn_sb->dataoff);
-+
- nd_region = to_nd_region(dev->parent);
- dax_region = alloc_dax_region(dev, nd_region->id, &res,
- le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP);
diff --git a/patches.drivers/0119-dax-fix-device-dax-region-base.patch b/patches.drivers/0119-dax-fix-device-dax-region-base.patch
index a5088d5c1d..d15ed7dc06 100644
--- a/patches.drivers/0119-dax-fix-device-dax-region-base.patch
+++ b/patches.drivers/0119-dax-fix-device-dax-region-base.patch
@@ -49,8 +49,8 @@ index 82e6743..5c77a97 100644
--- a/drivers/dax/pmem.c
+++ b/drivers/dax/pmem.c
@@ -121,6 +121,9 @@ static int dax_pmem_probe(struct device *dev)
- /* adjust the dax_region resource to the start of data */
- res.start += le64_to_cpu(pfn_sb->dataoff);
+ return rc;
+ }
+ /* adjust the dax_region resource to the start of data */
+ res.start += le64_to_cpu(pfn_sb->dataoff);
diff --git a/series.conf b/series.conf
index e1238d50f0..1c96721b1e 100644
--- a/series.conf
+++ b/series.conf
@@ -7398,7 +7398,6 @@
patches.drivers/0112-devm_memremap_pages-fix-vmem_altmap-lifetime-alignment-handling.patch
patches.drivers/0113-nfit-make-dimm-dsms-optional.patch
patches.drivers/0114-libnvdimm-Fix-nvdimm_probe-error-on-NVDIMM-N.patch
- patches.drivers/0115-dax-fix-device-dax-region-base.patch
patches.drivers/0116-dax-fix-mapping-size-check.patch
patches.fixes/0117-fs-block-force-direct-i-o-for-dax-enabled-block-devices.patch
patches.drivers/0118-device-dax-fail-all-private-mapping-attempts.patch