diff --git a/kernel/kernel/files/configs/kernel-x86_64-config b/kernel/kernel/files/configs/kernel-x86_64-config index 0e7cf7b6..803993ff 100644 --- a/kernel/kernel/files/configs/kernel-x86_64-config +++ b/kernel/kernel/files/configs/kernel-x86_64-config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 4.9.18 Kernel Configuration +# Linux/x86_64 4.9.21 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6936,7 +6936,7 @@ CONFIG_SBITMAP=y # # Unofficial 3rd party kernel additions # -CONFIG_NDISWRAPPER=m -CONFIG_VIAHSS=m CONFIG_RTL8723BS=m CONFIG_WLAN_SDIO=y +CONFIG_NDISWRAPPER=m +CONFIG_VIAHSS=m diff --git a/kernel/kernel/files/patches/linux/patch-4.9.21.xz b/kernel/kernel/files/patches/linux/patch-4.9.21.xz new file mode 100644 index 00000000..7a0964f2 Binary files /dev/null and b/kernel/kernel/files/patches/linux/patch-4.9.21.xz differ diff --git a/kernel/kernel/files/patches/mageia/gpu-drm-amd-amdgpu-add-POLARIS12-PCI-ID.patch b/kernel/kernel/files/patches/mageia/gpu-drm-amd-amdgpu-add-POLARIS12-PCI-ID.patch new file mode 100644 index 00000000..e8bff963 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/gpu-drm-amd-amdgpu-add-POLARIS12-PCI-ID.patch @@ -0,0 +1,28 @@ +From cf8c73afb3abf0f8905efbaddd4ce11a0deec9da Mon Sep 17 00:00:00 2001 +From: Evan Quan +Date: Fri, 17 Mar 2017 10:22:51 +0800 +Subject: [PATCH] drm/amd/amdgpu: add POLARIS12 PCI ID + +Signed-off-by: Evan Quan +Reviewed-by: Junwei Zhang +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +index f7adbac..b76cd69 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -421,6 +421,7 @@ static const struct pci_device_id pciidlist[] = { + {0x1002, 0x6985, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6986, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x6987, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, ++ {0x1002, 0x6995, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + {0x1002, 0x699F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_POLARIS12}, + + {0, 0, 0} +-- +2.10.2 + diff --git a/kernel/kernel/files/patches/mageia/net-libceph-force-gfp_noio-for-socket-allocations.patch b/kernel/kernel/files/patches/mageia/net-libceph-force-gfp_noio-for-socket-allocations.patch new file mode 100644 index 00000000..75ce33ff --- /dev/null +++ b/kernel/kernel/files/patches/mageia/net-libceph-force-gfp_noio-for-socket-allocations.patch @@ -0,0 +1,108 @@ +From 633ee407b9d15a75ac9740ba9d3338815e1fcb95 Mon Sep 17 00:00:00 2001 +From: Ilya Dryomov +Date: Tue, 21 Mar 2017 13:44:28 +0100 +Subject: libceph: force GFP_NOIO for socket allocations + +From: Ilya Dryomov + +commit 633ee407b9d15a75ac9740ba9d3338815e1fcb95 upstream. + +sock_alloc_inode() allocates socket+inode and socket_wq with +GFP_KERNEL, which is not allowed on the writeback path: + + Workqueue: ceph-msgr con_work [libceph] + ffff8810871cb018 0000000000000046 0000000000000000 ffff881085d40000 + 0000000000012b00 ffff881025cad428 ffff8810871cbfd8 0000000000012b00 + ffff880102fc1000 ffff881085d40000 ffff8810871cb038 ffff8810871cb148 + Call Trace: + [] schedule+0x29/0x70 + [] schedule_timeout+0x1bd/0x200 + [] ? ttwu_do_wakeup+0x2c/0x120 + [] ? ttwu_do_activate.constprop.135+0x66/0x70 + [] wait_for_completion+0xbf/0x180 + [] ? try_to_wake_up+0x390/0x390 + [] flush_work+0x165/0x250 + [] ? worker_detach_from_pool+0xd0/0xd0 + [] xlog_cil_force_lsn+0x81/0x200 [xfs] + [] ? __slab_free+0xee/0x234 + [] _xfs_log_force_lsn+0x4d/0x2c0 [xfs] + [] ? lookup_page_cgroup_used+0xe/0x30 + [] ? xfs_reclaim_inode+0xa3/0x330 [xfs] + [] xfs_log_force_lsn+0x3f/0xf0 [xfs] + [] ? xfs_reclaim_inode+0xa3/0x330 [xfs] + [] xfs_iunpin_wait+0xc6/0x1a0 [xfs] + [] ? wake_atomic_t_function+0x40/0x40 + [] xfs_reclaim_inode+0xa3/0x330 [xfs] + [] xfs_reclaim_inodes_ag+0x257/0x3d0 [xfs] + [] xfs_reclaim_inodes_nr+0x33/0x40 [xfs] + [] xfs_fs_free_cached_objects+0x15/0x20 [xfs] + [] super_cache_scan+0x178/0x180 + [] shrink_slab_node+0x14e/0x340 + [] ? mem_cgroup_iter+0x16b/0x450 + [] shrink_slab+0x100/0x140 + [] do_try_to_free_pages+0x335/0x490 + [] try_to_free_pages+0xb9/0x1f0 + [] ? __alloc_pages_direct_compact+0x69/0x1be + [] __alloc_pages_nodemask+0x69a/0xb40 + [] alloc_pages_current+0x9e/0x110 + [] new_slab+0x2c5/0x390 + [] __slab_alloc+0x33b/0x459 + [] ? sock_alloc_inode+0x2d/0xd0 + [] ? inet_sendmsg+0x71/0xc0 + [] ? sock_alloc_inode+0x2d/0xd0 + [] kmem_cache_alloc+0x1a2/0x1b0 + [] sock_alloc_inode+0x2d/0xd0 + [] alloc_inode+0x26/0xa0 + [] new_inode_pseudo+0x1a/0x70 + [] sock_alloc+0x1e/0x80 + [] __sock_create+0x95/0x220 + [] sock_create_kern+0x24/0x30 + [] con_work+0xef9/0x2050 [libceph] + [] ? rbd_img_request_submit+0x4c/0x60 [rbd] + [] process_one_work+0x159/0x4f0 + [] worker_thread+0x11b/0x530 + [] ? create_worker+0x1d0/0x1d0 + [] kthread+0xc9/0xe0 + [] ? flush_kthread_worker+0x90/0x90 + [] ret_from_fork+0x58/0x90 + [] ? flush_kthread_worker+0x90/0x90 + +Use memalloc_noio_{save,restore}() to temporarily force GFP_NOIO here. + +Link: http://tracker.ceph.com/issues/19309 +Reported-by: Sergey Jerusalimov +Signed-off-by: Ilya Dryomov +Reviewed-by: Jeff Layton +Signed-off-by: Greg Kroah-Hartman + +--- + net/ceph/messenger.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/net/ceph/messenger.c ++++ b/net/ceph/messenger.c +@@ -7,6 +7,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -469,11 +470,16 @@ static int ceph_tcp_connect(struct ceph_ + { + struct sockaddr_storage *paddr = &con->peer_addr.in_addr; + struct socket *sock; ++ unsigned int noio_flag; + int ret; + + BUG_ON(con->sock); ++ ++ /* sock_create_kern() allocates with GFP_KERNEL */ ++ noio_flag = memalloc_noio_save(); + ret = sock_create_kern(read_pnet(&con->msgr->net), paddr->ss_family, + SOCK_STREAM, IPPROTO_TCP, &sock); ++ memalloc_noio_restore(noio_flag); + if (ret) + return ret; + sock->sk->sk_allocation = GFP_NOFS; diff --git a/kernel/kernel/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch b/kernel/kernel/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch new file mode 100644 index 00000000..c996a702 --- /dev/null +++ b/kernel/kernel/files/patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch @@ -0,0 +1,32 @@ +From d8320d75b59ecdc1b8e60ac793d3a54d84333a18 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrg=20Billeter?= +Date: Mon, 10 Oct 2016 18:30:00 +0200 +Subject: [PATCH] iwlwifi: fix MODULE_FIRMWARE for 6030 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +IWL6000G2B_UCODE_API_MAX is not defined. ucode_api_max of +IWL_DEVICE_6030 uses IWL6000G2_UCODE_API_MAX. Use this also for +MODULE_FIRMWARE. + +Fixes: 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK") +Signed-off-by: Jürg Billeter +Signed-off-by: Luca Coelho +--- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c +index 0b9f6a7..39335b7 100644 +--- a/drivers/net/wireless/intel/iwlwifi/iwl-6000.c ++++ b/drivers/net/wireless/intel/iwlwifi/iwl-6000.c +@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg = { + MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX)); + MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX)); + MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); +-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX)); ++MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX)); +-- +2.10.2 + diff --git a/kernel/kernel/files/patches/mageia/series b/kernel/kernel/files/patches/mageia/series index 92c06398..1e3c6689 100644 --- a/kernel/kernel/files/patches/mageia/series +++ b/kernel/kernel/files/patches/mageia/series @@ -14,7 +14,6 @@ ### ### Stable Queue ### -patch-4.9.19-rc1.patch ### ### Arch x86 @@ -200,6 +199,7 @@ gpu-drm-i915-don-t-warn-about-Skylake-CPU-KabyPoint-PCH-.patch gpu-drm-amd-amdgpu-add-Polaris12-PCI-ID.patch gpu-drm-amd-amdgpu-add-Polaris12-support-v3.patch gpu-drm-amdgpu-powerplay-add-Polaris12-support.patch +gpu-drm-amd-amdgpu-add-POLARIS12-PCI-ID.patch # fix crash gpu-drm-amdgpu-pm-check-for-headless-before-calling-comp.patch @@ -256,6 +256,9 @@ net-netfilter-psd-mdv.patch net-netfilter-psd-2.6.35-buildfix.patch net-netfilter-psd-fix-redefines.patch +# iwlwifi fixes +net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch + # rtlwifi fixes net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch @@ -263,6 +266,9 @@ net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch # update rtl8xxxu for mga#20508 net-wireless-realtek-rtl8xxxu-linux-4.11-rc.patch +# ceph +net-libceph-force-gfp_noio-for-socket-allocations.patch + # WireGuard support net-wireguard.patch diff --git a/kernel/kernel/pspec.xml b/kernel/kernel/pspec.xml index 61c08238..4f1aa721 100644 --- a/kernel/kernel/pspec.xml +++ b/kernel/kernel/pspec.xml @@ -28,8 +28,8 @@ - patches/linux/patch-4.9.18.xz - + patches/linux/patch-4.9.21.xz + @@ -92,6 +92,7 @@ patches/mageia/gpu-drm-amd-amdgpu-add-Polaris12-PCI-ID.patch patches/mageia/gpu-drm-amd-amdgpu-add-Polaris12-support-v3.patch patches/mageia/gpu-drm-amdgpu-powerplay-add-Polaris12-support.patch + patches/mageia/gpu-drm-amd-amdgpu-add-POLARIS12-PCI-ID.patch patches/mageia/gpu-drm-amdgpu-pm-check-for-headless-before-calling-comp.patch patches/mageia/input-i8042-quirks-for-Fujitsu-Lifebook-A544-and-Lif.patch patches/mageia/net-sis190-fix-list-usage.patch @@ -106,9 +107,11 @@ patches/mageia/net-netfilter-psd-mdv.patch patches/mageia/net-netfilter-psd-2.6.35-buildfix.patch patches/mageia/net-netfilter-psd-fix-redefines.patch + patches/mageia/net-wireless-iwlwifi-fix-MODULE_FIRMWARE-for-6030.patch patches/mageia/net-wireless-rtlwifi-Use-dev_kfree_skb_irq-instead-of-kfree_skb.patch patches/mageia/net-wireless-rtlwifi-Fix-kernel-oops-introduced-with-commit-e4965.patch patches/mageia/net-wireless-realtek-rtl8xxxu-linux-4.11-rc.patch + patches/mageia/net-wireguard.patch patches/mageia/platform-x86-add-shuttle-wmi-driver.patch patches/mageia/platform-x86-shuttle-wmi-drop-devinit-exit.patch @@ -206,7 +209,7 @@ 2017-03-30 - 4.9.18 + 4.9.21 Version Bump. security