merge originkernel-4.17.10-250.vanilla.knurd.1.fc28

7 files changed, 198 insertions, 181 deletions

diff --git a/1-2-xen-netfront-Fix-mismatched-rtnl_unlock.patch b/1-2-xen-netfront-Fix-mismatched-rtnl_unlock.patch
deleted file mode 100644
index ed73771aa..000000000
--- a/1-2-xen-netfront-Fix-mismatched-rtnl_unlock.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From patchwork Thu Jun 21 13:00:20 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/2] xen-netfront: Fix mismatched rtnl_unlock
-X-Patchwork-Submitter: Ross Lagerwall <ross.lagerwall@citrix.com>
-X-Patchwork-Id: 932721
-Message-Id: <20180621130021.27029-2-ross.lagerwall@citrix.com>
-To: <netdev@vger.kernel.org>
-Cc: Ross Lagerwall <ross.lagerwall@citrix.com>,
- Boris Ostrovsky <boris.ostrovsky@oracle.com>,
- Juergen Gross <jgross@suse.com>, "David S. Miller" <davem@davemloft.net>,
- <xen-devel@lists.xenproject.org>, <linux-kernel@vger.kernel.org>
-Date: Thu, 21 Jun 2018 14:00:20 +0100
-From: Ross Lagerwall <ross.lagerwall@citrix.com>
-List-Id: <netdev.vger.kernel.org>
-
-Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
-Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
-Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
----
- drivers/net/xen-netfront.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index 922ce0a..ee4cb6c 100644
---- a/drivers/net/xen-netfront.c
-+++ b/drivers/net/xen-netfront.c
-@@ -1810,7 +1810,7 @@ static int talk_to_netback(struct xenbus_device *dev,
- 	err = xen_net_read_mac(dev, info->netdev->dev_addr);
- 	if (err) {
- 		xenbus_dev_fatal(dev, err, "parsing %s/mac", dev->nodename);
--		goto out;
-+		goto out_unlocked;
- 	}
- 
- 	rtnl_lock();
-@@ -1925,6 +1925,7 @@ static int talk_to_netback(struct xenbus_device *dev,
- 	xennet_destroy_queues(info);
-  out:
- 	rtnl_unlock();
-+out_unlocked:
- 	device_unregister(&dev->dev);
- 	return err;
- }
diff --git a/2-2-xen-netfront-Update-features-after-registering-netdev.patch b/2-2-xen-netfront-Update-features-after-registering-netdev.patch
deleted file mode 100644
index b23d6bfaa..000000000
--- a/2-2-xen-netfront-Update-features-after-registering-netdev.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From patchwork Thu Jun 21 13:00:21 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [2/2] xen-netfront: Update features after registering netdev
-X-Patchwork-Submitter: Ross Lagerwall <ross.lagerwall@citrix.com>
-X-Patchwork-Id: 932720
-Message-Id: <20180621130021.27029-3-ross.lagerwall@citrix.com>
-To: <netdev@vger.kernel.org>
-Cc: Ross Lagerwall <ross.lagerwall@citrix.com>,
- Boris Ostrovsky <boris.ostrovsky@oracle.com>,
- Juergen Gross <jgross@suse.com>, "David S. Miller" <davem@davemloft.net>,
- <xen-devel@lists.xenproject.org>, <linux-kernel@vger.kernel.org>,
- Liam Shepherd <liam@dancer.es>
-Date: Thu, 21 Jun 2018 14:00:21 +0100
-From: Ross Lagerwall <ross.lagerwall@citrix.com>
-List-Id: <netdev.vger.kernel.org>
-
-Update the features after calling register_netdev() otherwise the
-device features are not set up correctly and it not possible to change
-the MTU of the device. After this change, the features reported by
-ethtool match the device's features before the commit which introduced
-the issue and it is possible to change the device's MTU.
-
-Fixes: f599c64fdf7d ("xen-netfront: Fix race between device setup and open")
-Reported-by: Liam Shepherd <liam@dancer.es>
-Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
-Reviewed-by: Juergen Gross <jgross@suse.com>
----
- drivers/net/xen-netfront.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c
-index ee4cb6c..a57daec 100644
---- a/drivers/net/xen-netfront.c
-+++ b/drivers/net/xen-netfront.c
-@@ -1951,10 +1951,6 @@ static int xennet_connect(struct net_device *dev)
- 	/* talk_to_netback() sets the correct number of queues */
- 	num_queues = dev->real_num_tx_queues;
- 
--	rtnl_lock();
--	netdev_update_features(dev);
--	rtnl_unlock();
--
- 	if (dev->reg_state == NETREG_UNINITIALIZED) {
- 		err = register_netdev(dev);
- 		if (err) {
-@@ -1964,6 +1960,10 @@ static int xennet_connect(struct net_device *dev)
- 		}
- 	}
- 
-+	rtnl_lock();
-+	netdev_update_features(dev);
-+	rtnl_unlock();
-+
- 	/*
- 	 * All public and private state should now be sane.  Get
- 	 * ready to start sending and receiving packets and give the driver
diff --git a/Revert-iommu-intel-iommu-Enable-CONFIG_DMA_DIRECT_OP.patch b/Revert-iommu-intel-iommu-Enable-CONFIG_DMA_DIRECT_OP.patch
new file mode 100644
index 000000000..46212341f
--- /dev/null
+++ b/Revert-iommu-intel-iommu-Enable-CONFIG_DMA_DIRECT_OP.patch
@@ -0,0 +1,125 @@
+From 3c16e0cc4ace8bd838bf234caead5a766b07fe9d Mon Sep 17 00:00:00 2001
+From: Christoph Hellwig <hch@lst.de>
+Date: Thu, 5 Jul 2018 13:29:55 -0600
+Subject: [PATCH] Revert "iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and
+ clean up intel_{alloc,free}_coherent()"
+
+This commit may cause a less than required dma mask to be used for
+some allocations, which apparently leads to module load failures for
+iwlwifi sometimes.
+
+This reverts commit d657c5c73ca987214a6f9436e435b34fc60f332a.
+
+Signed-off-by: Christoph Hellwig <hch@lst.de>
+Reported-by: Fabio Coatti <fabio.coatti@gmail.com>
+Tested-by: Fabio Coatti <fabio.coatti@gmail.com>
+Signed-off-by: Jeremy Cline <jcline@redhat.com>
+---
+ drivers/iommu/Kconfig       |  1 -
+ drivers/iommu/intel-iommu.c | 62 +++++++++++++++++++++++++++----------
+ 2 files changed, 46 insertions(+), 17 deletions(-)
+
+diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
+index b38798cc5288..f3a21343e636 100644
+--- a/drivers/iommu/Kconfig
++++ b/drivers/iommu/Kconfig
+@@ -142,7 +142,6 @@ config DMAR_TABLE
+ config INTEL_IOMMU
+ 	bool "Support for Intel IOMMU using DMA Remapping Devices"
+ 	depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)
+-	select DMA_DIRECT_OPS
+ 	select IOMMU_API
+ 	select IOMMU_IOVA
+ 	select DMAR_TABLE
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index 749d8f235346..6392a4964fc5 100644
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
+@@ -31,7 +31,6 @@
+ #include <linux/pci.h>
+ #include <linux/dmar.h>
+ #include <linux/dma-mapping.h>
+-#include <linux/dma-direct.h>
+ #include <linux/mempool.h>
+ #include <linux/memory.h>
+ #include <linux/cpu.h>
+@@ -3709,30 +3708,61 @@ static void *intel_alloc_coherent(struct device *dev, size_t size,
+ 				  dma_addr_t *dma_handle, gfp_t flags,
+ 				  unsigned long attrs)
+ {
+-	void *vaddr;
++	struct page *page = NULL;
++	int order;
+ 
+-	vaddr = dma_direct_alloc(dev, size, dma_handle, flags, attrs);
+-	if (iommu_no_mapping(dev) || !vaddr)
+-		return vaddr;
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
+ 
+-	*dma_handle = __intel_map_single(dev, virt_to_phys(vaddr),
+-			PAGE_ALIGN(size), DMA_BIDIRECTIONAL,
+-			dev->coherent_dma_mask);
+-	if (!*dma_handle)
+-		goto out_free_pages;
+-	return vaddr;
++	if (!iommu_no_mapping(dev))
++		flags &= ~(GFP_DMA | GFP_DMA32);
++	else if (dev->coherent_dma_mask < dma_get_required_mask(dev)) {
++		if (dev->coherent_dma_mask < DMA_BIT_MASK(32))
++			flags |= GFP_DMA;
++		else
++			flags |= GFP_DMA32;
++	}
++
++	if (gfpflags_allow_blocking(flags)) {
++		unsigned int count = size >> PAGE_SHIFT;
++
++		page = dma_alloc_from_contiguous(dev, count, order, flags);
++		if (page && iommu_no_mapping(dev) &&
++		    page_to_phys(page) + size > dev->coherent_dma_mask) {
++			dma_release_from_contiguous(dev, page, count);
++			page = NULL;
++		}
++	}
++
++	if (!page)
++		page = alloc_pages(flags, order);
++	if (!page)
++		return NULL;
++	memset(page_address(page), 0, size);
++
++	*dma_handle = __intel_map_single(dev, page_to_phys(page), size,
++					 DMA_BIDIRECTIONAL,
++					 dev->coherent_dma_mask);
++	if (*dma_handle)
++		return page_address(page);
++	if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
++		__free_pages(page, order);
+ 
+-out_free_pages:
+-	dma_direct_free(dev, size, vaddr, *dma_handle, attrs);
+ 	return NULL;
+ }
+ 
+ static void intel_free_coherent(struct device *dev, size_t size, void *vaddr,
+ 				dma_addr_t dma_handle, unsigned long attrs)
+ {
+-	if (!iommu_no_mapping(dev))
+-		intel_unmap(dev, dma_handle, PAGE_ALIGN(size));
+-	dma_direct_free(dev, size, vaddr, dma_handle, attrs);
++	int order;
++	struct page *page = virt_to_page(vaddr);
++
++	size = PAGE_ALIGN(size);
++	order = get_order(size);
++
++	intel_unmap(dev, dma_handle, size);
++	if (!dma_release_from_contiguous(dev, page, size >> PAGE_SHIFT))
++		__free_pages(page, order);
+ }
+ 
+ static void intel_unmap_sg(struct device *dev, struct scatterlist *sglist,
+-- 
+2.17.1
+
diff --git a/ext4-fix-false-negative-and-false-positives.patch b/ext4-fix-false-negative-and-false-positives.patch
new file mode 100644
index 000000000..2beba4f94
--- /dev/null
+++ b/ext4-fix-false-negative-and-false-positives.patch
@@ -0,0 +1,56 @@
+From 44de022c4382541cebdd6de4465d1f4f465ff1dd Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Sun, 8 Jul 2018 19:35:02 -0400
+Subject: ext4: fix false negatives *and* false positives in
+ ext4_check_descriptors()
+
+Ext4_check_descriptors() was getting called before s_gdb_count was
+initialized.  So for file systems w/o the meta_bg feature, allocation
+bitmaps could overlap the block group descriptors and ext4 wouldn't
+notice.
+
+For file systems with the meta_bg feature enabled, there was a
+fencepost error which would cause the ext4_check_descriptors() to
+incorrectly believe that the block allocation bitmap overlaps with the
+block group descriptor blocks, and it would reject the mount.
+
+Fix both of these problems.
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Cc: stable@vger.kernel.org
+---
+ fs/ext4/super.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index ba2396a7bd04..eff5c983e067 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -2342,7 +2342,7 @@ static int ext4_check_descriptors(struct super_block *sb,
+ 	struct ext4_sb_info *sbi = EXT4_SB(sb);
+ 	ext4_fsblk_t first_block = le32_to_cpu(sbi->s_es->s_first_data_block);
+ 	ext4_fsblk_t last_block;
+-	ext4_fsblk_t last_bg_block = sb_block + ext4_bg_num_gdb(sb, 0) + 1;
++	ext4_fsblk_t last_bg_block = sb_block + ext4_bg_num_gdb(sb, 0);
+ 	ext4_fsblk_t block_bitmap;
+ 	ext4_fsblk_t inode_bitmap;
+ 	ext4_fsblk_t inode_table;
+@@ -4085,14 +4085,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
+ 			goto failed_mount2;
+ 		}
+ 	}
++	sbi->s_gdb_count = db_count;
+ 	if (!ext4_check_descriptors(sb, logical_sb_block, &first_not_zeroed)) {
+ 		ext4_msg(sb, KERN_ERR, "group descriptors corrupted!");
+ 		ret = -EFSCORRUPTED;
+ 		goto failed_mount2;
+ 	}
+ 
+-	sbi->s_gdb_count = db_count;
+-
+ 	timer_setup(&sbi->s_err_report, print_daily_error_info, 0);
+ 
+ 	/* Register extent status tree shrinker */
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/kernel.spec b/kernel.spec
index 1ae0de550..662f2027d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
 %define stable_rc 0
 
 # Do we have a -stable update to apply?
-%define stable_update 9
+%define stable_update 10
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -656,10 +656,6 @@ Patch508: ath10k-Update-the-phymode-along-with-bandwidth-change.patch
 # In 4.18
 Patch509: rtc-nvmem-don-t-return-an-error-when-not-enabled.patch
 
-# rhbz 1584216
-Patch510: 1-2-xen-netfront-Fix-mismatched-rtnl_unlock.patch
-Patch511: 2-2-xen-netfront-Update-features-after-registering-netdev.patch
-
 # rhbz 1591516
 Patch515: 0001-signal-Stop-special-casing-TRAP_FIXME-and-FPE_FIXME-.patch
 
@@ -688,8 +684,11 @@ Patch523: 0001-xfs-More-robust-inode-extent-count-validation.patch
 # rhbz 1597333
 # Patch526: xhci-Fix-perceived-dead-host-due-to-runtime-suspend-.patch
 
-# i686 patch that will eventually be 4.17.8
-Patch527: mm-don-t-do-zero_resv_unavail-if-memmap-is-not-allocated.patch
+# rbhz 1607092
+Patch528: Revert-iommu-intel-iommu-Enable-CONFIG_DMA_DIRECT_OP.patch
+
+# rhbz 1602971
+Patch529: ext4-fix-false-negative-and-false-positives.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -1943,6 +1942,16 @@ fi
 #
 #
 %changelog
+* Wed Jul 25 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.10-200
+- Linux v4.17.10
+
+* Mon Jul 23 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.9-200
+- Linux v4.17.9
+- Fix emergency shell with ext4 rootfs (rhbz 1602971)
+
+* Mon Jul 23 2018 Jeremy Cline <jeremy@jcline.org>
+- Fix iwlwifi module load failure (rhbz 1607092)
+
 * Tue Jul 17 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.7-200
 - Linux v4.17.7
 
diff --git a/mm-don-t-do-zero_resv_unavail-if-memmap-is-not-allocated.patch b/mm-don-t-do-zero_resv_unavail-if-memmap-is-not-allocated.patch
deleted file mode 100644
index f72e111ad..000000000
--- a/mm-don-t-do-zero_resv_unavail-if-memmap-is-not-allocated.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From d1b47a7c9efcf3c3384b70f6e3c8f1423b44d8c7 Mon Sep 17 00:00:00 2001
-From: Pavel Tatashin <pasha.tatashin@oracle.com>
-Date: Mon, 16 Jul 2018 11:16:30 -0400
-Subject: mm: don't do zero_resv_unavail if memmap is not allocated
-
-From: Pavel Tatashin <pasha.tatashin@oracle.com>
-
-commit d1b47a7c9efcf3c3384b70f6e3c8f1423b44d8c7 upstream.
-
-Moving zero_resv_unavail before memmap_init_zone(), caused a regression on
-x86-32.
-
-The cause is that we access struct pages before they are allocated when
-CONFIG_FLAT_NODE_MEM_MAP is used.
-
-free_area_init_nodes()
-  zero_resv_unavail()
-    mm_zero_struct_page(pfn_to_page(pfn)); <- struct page is not alloced
-  free_area_init_node()
-    if CONFIG_FLAT_NODE_MEM_MAP
-      alloc_node_mem_map()
-        memblock_virt_alloc_node_nopanic() <- struct page alloced here
-
-On the other hand memblock_virt_alloc_node_nopanic() zeroes all the memory
-that it returns, so we do not need to do zero_resv_unavail() here.
-
-Fixes: e181ae0c5db9 ("mm: zero unavailable pages before memmap init")
-Signed-off-by: Pavel Tatashin <pasha.tatashin@oracle.com>
-Tested-by: Matt Hart <matt@mattface.org>
-Acked-by: Michal Hocko <mhocko@suse.com>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- include/linux/mm.h |    2 +-
- mm/page_alloc.c    |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
---- a/include/linux/mm.h
-+++ b/include/linux/mm.h
-@@ -2081,7 +2081,7 @@ extern int __meminit __early_pfn_to_nid(
- 					struct mminit_pfnnid_cache *state);
- #endif
- 
--#ifdef CONFIG_HAVE_MEMBLOCK
-+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
- void zero_resv_unavail(void);
- #else
- static inline void zero_resv_unavail(void) {}
---- a/mm/page_alloc.c
-+++ b/mm/page_alloc.c
-@@ -6377,7 +6377,7 @@ void __paginginit free_area_init_node(in
- 	free_area_init_core(pgdat);
- }
- 
--#ifdef CONFIG_HAVE_MEMBLOCK
-+#if defined(CONFIG_HAVE_MEMBLOCK) && !defined(CONFIG_FLAT_NODE_MEM_MAP)
- /*
-  * Only struct pages that are backed by physical memory are zeroed and
-  * initialized by going through __init_single_page(). But, there are some
-@@ -6415,7 +6415,7 @@ void __paginginit zero_resv_unavail(void
- 	if (pgcnt)
- 		pr_info("Reserved but unavailable: %lld pages", pgcnt);
- }
--#endif /* CONFIG_HAVE_MEMBLOCK */
-+#endif /* CONFIG_HAVE_MEMBLOCK && !CONFIG_FLAT_NODE_MEM_MAP */
- 
- #ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP
- 
diff --git a/sources b/sources
index dd6f2497c..99f6c7c2c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
-SHA512 (patch-4.17.9.xz) = 4fce83a490b9127a37e50b783bad590cd01c5a3442fa1913a0d581e8083b1a3729bb54286a16321c003995af2ce3e62874423f62cdd10673a5b0bf444616c666
+SHA512 (patch-4.17.10.xz) = 4ed5a6d47de7b4153805d937c44cb5eb03628a590d597c38be299afe67047611a6b37b1c13d0a8503de296779fc4ad6337dd4209f06b375c0111400b454b59c7