Linux v4.4.6
This commit is contained in:
Laura Abbott
parent
f491185626
commit
da240bb5b6
|
|
@ -1,25 +0,0 @@
|
|||
From b461a1b881b40fa9b75b9b8f54d6f9fefc2f2fef Mon Sep 17 00:00:00 2001
|
||||
From: Laura Abbott <labbott@fedoraproject.org>
|
||||
Date: Tue, 15 Mar 2016 11:34:47 -0700
|
||||
Subject: [PATCH] Revert "drm/radeon: call hpd_irq_event on resume"
|
||||
|
||||
This reverts commit b36e52c44ce6728824546d8b5f05b844cede96f1.
|
||||
---
|
||||
drivers/gpu/drm/radeon/radeon_device.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
|
||||
index d690df5..c566993 100644
|
||||
--- a/drivers/gpu/drm/radeon/radeon_device.c
|
||||
+++ b/drivers/gpu/drm/radeon/radeon_device.c
|
||||
@@ -1744,7 +1744,6 @@ int radeon_resume_kms(struct drm_device *dev, bool resume, bool fbcon)
|
||||
}
|
||||
|
||||
drm_kms_helper_poll_enable(dev);
|
||||
- drm_helper_hpd_irq_event(dev);
|
||||
|
||||
/* set the power state here in case we are a PX system or headless */
|
||||
if ((rdev->pm.pm_method == PM_METHOD_DPM) && rdev->pm.dpm_enabled)
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From b3ffe8a6522dd1f07c181a5f2581142776e2162d Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Tue, 8 Mar 2016 21:09:29 +0700
|
||||
Subject: [PATCH] arm64: account for sparsemem section alignment when choosing
|
||||
vmemmap offset
|
||||
|
||||
Commit dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear
|
||||
region") fixed an issue where the struct page array would overflow into the
|
||||
adjacent virtual memory region if system RAM was placed so high up in
|
||||
physical memory that its addresses were not representable in the build time
|
||||
configured virtual address size.
|
||||
|
||||
However, the fix failed to take into account that the vmemmap region needs
|
||||
to be relatively aligned with respect to the sparsemem section size, so that
|
||||
a sequence of page structs corresponding with a sparsemem section in the
|
||||
linear region appears naturally aligned in the vmemmap region.
|
||||
|
||||
So round up vmemmap to sparsemem section size. Since this essentially moves
|
||||
the projection of the linear region up in memory, also revert the reduction
|
||||
of the size of the vmemmap region.
|
||||
|
||||
Fixes: dfd55ad85e4a ("arm64: vmemmap: use virtual projection of linear region")
|
||||
Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
arch/arm64/include/asm/pgtable.h | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h
|
||||
index fc9f7ef..eaa9cab 100644
|
||||
--- a/arch/arm64/include/asm/pgtable.h
|
||||
+++ b/arch/arm64/include/asm/pgtable.h
|
||||
@@ -40,7 +40,7 @@
|
||||
* VMALLOC_END: extends to the available space below vmmemmap, PCI I/O space,
|
||||
* fixed mappings and modules
|
||||
*/
|
||||
-#define VMEMMAP_SIZE ALIGN((1UL << (VA_BITS - PAGE_SHIFT - 1)) * sizeof(struct page), PUD_SIZE)
|
||||
+#define VMEMMAP_SIZE ALIGN((1UL << (VA_BITS - PAGE_SHIFT)) * sizeof(struct page), PUD_SIZE)
|
||||
|
||||
#ifndef CONFIG_KASAN
|
||||
#define VMALLOC_START (VA_START)
|
||||
@@ -52,7 +52,8 @@
|
||||
#define VMALLOC_END (PAGE_OFFSET - PUD_SIZE - VMEMMAP_SIZE - SZ_64K)
|
||||
|
||||
#define VMEMMAP_START (VMALLOC_END + SZ_64K)
|
||||
-#define vmemmap ((struct page *)VMEMMAP_START - (memstart_addr >> PAGE_SHIFT))
|
||||
+#define vmemmap ((struct page *)VMEMMAP_START - \
|
||||
+ SECTION_ALIGN_DOWN(memstart_addr >> PAGE_SHIFT))
|
||||
|
||||
#define FIRST_USER_ADDRESS 0UL
|
||||
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
|
@ -1,83 +0,0 @@
|
|||
From cb150b9d23be6ee7f3a0fff29784f1c5b5ac514d Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Wed, 27 Jan 2016 13:29:34 +0100
|
||||
Subject: cfg80211/wext: fix message ordering
|
||||
|
||||
Since cfg80211 frequently takes actions from its netdev notifier
|
||||
call, wireless extensions messages could still be ordered badly
|
||||
since the wext netdev notifier, since wext is built into the
|
||||
kernel, runs before the cfg80211 netdev notifier. For example,
|
||||
the following can happen:
|
||||
|
||||
5: wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc mq state DOWN group default
|
||||
link/ether 02:00:00:00:01:00 brd ff:ff:ff:ff:ff:ff
|
||||
5: wlan1: <BROADCAST,MULTICAST,UP>
|
||||
link/ether
|
||||
|
||||
when setting the interface down causes the wext message.
|
||||
|
||||
To also fix this, export the wireless_nlevent_flush() function
|
||||
and also call it from the cfg80211 notifier.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
include/net/iw_handler.h | 6 ++++++
|
||||
net/wireless/core.c | 2 ++
|
||||
net/wireless/wext-core.c | 3 ++-
|
||||
3 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h
|
||||
index 8f81bbb..e0f4109 100644
|
||||
--- a/include/net/iw_handler.h
|
||||
+++ b/include/net/iw_handler.h
|
||||
@@ -439,6 +439,12 @@ int dev_get_wireless_info(char *buffer, char **start, off_t offset, int length);
|
||||
/* Send a single event to user space */
|
||||
void wireless_send_event(struct net_device *dev, unsigned int cmd,
|
||||
union iwreq_data *wrqu, const char *extra);
|
||||
+#ifdef CONFIG_WEXT_CORE
|
||||
+/* flush all previous wext events - if work is done from netdev notifiers */
|
||||
+void wireless_nlevent_flush(void);
|
||||
+#else
|
||||
+static inline void wireless_nlevent_flush(void) {}
|
||||
+#endif
|
||||
|
||||
/* We may need a function to send a stream of events to user space.
|
||||
* More on that later... */
|
||||
diff --git a/net/wireless/core.c b/net/wireless/core.c
|
||||
index b091551..8f0bac7 100644
|
||||
--- a/net/wireless/core.c
|
||||
+++ b/net/wireless/core.c
|
||||
@@ -1147,6 +1147,8 @@ static int cfg80211_netdev_notifier_call(struct notifier_block *nb,
|
||||
return NOTIFY_DONE;
|
||||
}
|
||||
|
||||
+ wireless_nlevent_flush();
|
||||
+
|
||||
return NOTIFY_OK;
|
||||
}
|
||||
|
||||
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
|
||||
index 87dd619..b50ee5d 100644
|
||||
--- a/net/wireless/wext-core.c
|
||||
+++ b/net/wireless/wext-core.c
|
||||
@@ -342,7 +342,7 @@ static const int compat_event_type_size[] = {
|
||||
|
||||
/* IW event code */
|
||||
|
||||
-static void wireless_nlevent_flush(void)
|
||||
+void wireless_nlevent_flush(void)
|
||||
{
|
||||
struct sk_buff *skb;
|
||||
struct net *net;
|
||||
@@ -355,6 +355,7 @@ static void wireless_nlevent_flush(void)
|
||||
GFP_KERNEL);
|
||||
}
|
||||
}
|
||||
+EXPORT_SYMBOL_GPL(wireless_nlevent_flush);
|
||||
|
||||
static int wext_netdev_notifier_call(struct notifier_block *nb,
|
||||
unsigned long state, void *ptr)
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
22
kernel.spec
22
kernel.spec
|
|
@ -52,7 +52,7 @@ Summary: The Linux kernel
|
|||
%if 0%{?released_kernel}
|
||||
|
||||
# Do we have a -stable update to apply?
|
||||
%define stable_update 5
|
||||
%define stable_update 6
|
||||
# Set rpm version accordingly
|
||||
%if 0%{?stable_update}
|
||||
%define stablerev %{stable_update}
|
||||
|
|
@ -609,10 +609,6 @@ Patch640: PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
|
|||
#rhbz 1278942
|
||||
Patch643: media-ivtv-avoid-going-past-input-audio-array.patch
|
||||
|
||||
#rhbz 1302037
|
||||
Patch644: wext-fix-message-delay-ordering.patch
|
||||
Patch645: cfg80211-wext-fix-message-ordering.patch
|
||||
|
||||
#rhbz 1255325
|
||||
Patch646: HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
|
||||
|
||||
|
|
@ -625,9 +621,6 @@ Patch659: pipe-limit-the-per-user-amount-of-pages-allocated-in.patch
|
|||
#rhbz 1310252 1313318
|
||||
Patch660: 0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
|
||||
|
||||
#Fix for known arm64 breakage. No bugzilla becuase proactivity \o/
|
||||
Patch661: 0001-arm64-account-for-sparsemem-section-alignment-when-c.patch
|
||||
|
||||
#rhbz 1316719
|
||||
Patch662: 0001-cdc-acm-fix-NULL-pointer-reference.patch
|
||||
|
||||
|
|
@ -643,8 +636,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
|
|||
#CVE-2016-3135 rhbz 1318172 1318270
|
||||
Patch666: ipv4-Dont-do-expensive-useless-work-during-inetdev-des.patch
|
||||
|
||||
#rhbz 1317300 1317179
|
||||
Patch667: 0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch
|
||||
# END OF PATCH DEFINITIONS
|
||||
%endif
|
||||
|
||||
|
|
@ -1318,10 +1309,6 @@ ApplyPatch PNP-Add-Haswell-ULT-to-Intel-MCH-size-workaround.patch
|
|||
#rhbz 1278942
|
||||
ApplyPatch media-ivtv-avoid-going-past-input-audio-array.patch
|
||||
|
||||
#rhbz 1302037
|
||||
ApplyPatch wext-fix-message-delay-ordering.patch
|
||||
ApplyPatch cfg80211-wext-fix-message-ordering.patch
|
||||
|
||||
#rhbz 1255325
|
||||
ApplyPatch HID-sony-do-not-bail-out-when-the-sixaxis-refuses-th.patch
|
||||
|
||||
|
|
@ -1334,8 +1321,6 @@ ApplyPatch pipe-limit-the-per-user-amount-of-pages-allocated-in.patch
|
|||
#rhbz 1310252 1313318
|
||||
ApplyPatch 0001-drm-i915-Pretend-cursor-is-always-on-for-ILK-style-W.patch
|
||||
|
||||
ApplyPatch 0001-arm64-account-for-sparsemem-section-alignment-when-c.patch
|
||||
|
||||
ApplyPatch 0001-cdc-acm-fix-NULL-pointer-reference.patch
|
||||
|
||||
#rhbz 1316136
|
||||
|
|
@ -1350,8 +1335,6 @@ ApplyPatch netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
|
|||
#CVE-2016-3135 rhbz 1318172 1318270
|
||||
ApplyPatch ipv4-Dont-do-expensive-useless-work-during-inetdev-des.patch
|
||||
|
||||
#rhbz 1317300 1317179
|
||||
ApplyPatch 0001-Revert-drm-radeon-call-hpd_irq_event-on-resume.patch
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2201,6 +2184,9 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Mar 16 2016 Laura Abbott <labbott@redhat.com> - 4.4.6-200
|
||||
- Linux v4.4.6
|
||||
|
||||
* Wed Mar 16 2016 Laura Abbott <labbott@redhat.com>
|
||||
- Revert patch causing radeon breakage (rhbz 1317300 1317179)
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1,3 +1,3 @@
|
|||
9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz
|
||||
dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz
|
||||
edddb33405ea1ab02b90eb9cecaa43f6 patch-4.4.5.xz
|
||||
d48f09bf61f2500d70f839e190dc7c5a patch-4.4.6.xz
|
||||
|
|
|
|||
|
|
@ -1,122 +0,0 @@
|
|||
From 8bf862739a7786ae72409220914df960a0aa80d8 Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Wed, 27 Jan 2016 12:37:52 +0100
|
||||
Subject: wext: fix message delay/ordering
|
||||
|
||||
Beniamino reported that he was getting an RTM_NEWLINK message for a
|
||||
given interface, after the RTM_DELLINK for it. It turns out that the
|
||||
message is a wireless extensions message, which was sent because the
|
||||
interface had been connected and disconnection while it was deleted
|
||||
caused a wext message.
|
||||
|
||||
For its netlink messages, wext uses RTM_NEWLINK, but the message is
|
||||
without all the regular rtnetlink attributes, so "ip monitor link"
|
||||
prints just rudimentary information:
|
||||
|
||||
5: wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc mq state DOWN group default
|
||||
link/ether 02:00:00:00:01:00 brd ff:ff:ff:ff:ff:ff
|
||||
Deleted 5: wlan1: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN group default
|
||||
link/ether 02:00:00:00:01:00 brd ff:ff:ff:ff:ff:ff
|
||||
5: wlan1: <BROADCAST,MULTICAST,UP>
|
||||
link/ether
|
||||
(from my hwsim reproduction)
|
||||
|
||||
This can cause userspace to get confused since it doesn't expect an
|
||||
RTM_NEWLINK message after RTM_DELLINK.
|
||||
|
||||
The reason for this is that wext schedules a worker to send out the
|
||||
messages, and the scheduling delay can cause the messages to get out
|
||||
to userspace in different order.
|
||||
|
||||
To fix this, have wext register a netdevice notifier and flush out
|
||||
any pending messages when netdevice state changes. This fixes any
|
||||
ordering whenever the original message wasn't sent by a notifier
|
||||
itself.
|
||||
|
||||
Cc: stable@vger.kernel.org
|
||||
Reported-by: Beniamino Galvani <bgalvani@redhat.com>
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
net/wireless/wext-core.c | 51 +++++++++++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 40 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/net/wireless/wext-core.c b/net/wireless/wext-core.c
|
||||
index c8717c1..87dd619 100644
|
||||
--- a/net/wireless/wext-core.c
|
||||
+++ b/net/wireless/wext-core.c
|
||||
@@ -342,6 +342,39 @@ static const int compat_event_type_size[] = {
|
||||
|
||||
/* IW event code */
|
||||
|
||||
+static void wireless_nlevent_flush(void)
|
||||
+{
|
||||
+ struct sk_buff *skb;
|
||||
+ struct net *net;
|
||||
+
|
||||
+ ASSERT_RTNL();
|
||||
+
|
||||
+ for_each_net(net) {
|
||||
+ while ((skb = skb_dequeue(&net->wext_nlevents)))
|
||||
+ rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL,
|
||||
+ GFP_KERNEL);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static int wext_netdev_notifier_call(struct notifier_block *nb,
|
||||
+ unsigned long state, void *ptr)
|
||||
+{
|
||||
+ /*
|
||||
+ * When a netdev changes state in any way, flush all pending messages
|
||||
+ * to avoid them going out in a strange order, e.g. RTM_NEWLINK after
|
||||
+ * RTM_DELLINK, or with IFF_UP after without IFF_UP during dev_close()
|
||||
+ * or similar - all of which could otherwise happen due to delays from
|
||||
+ * schedule_work().
|
||||
+ */
|
||||
+ wireless_nlevent_flush();
|
||||
+
|
||||
+ return NOTIFY_OK;
|
||||
+}
|
||||
+
|
||||
+static struct notifier_block wext_netdev_notifier = {
|
||||
+ .notifier_call = wext_netdev_notifier_call,
|
||||
+};
|
||||
+
|
||||
static int __net_init wext_pernet_init(struct net *net)
|
||||
{
|
||||
skb_queue_head_init(&net->wext_nlevents);
|
||||
@@ -360,7 +393,12 @@ static struct pernet_operations wext_pernet_ops = {
|
||||
|
||||
static int __init wireless_nlevent_init(void)
|
||||
{
|
||||
- return register_pernet_subsys(&wext_pernet_ops);
|
||||
+ int err = register_pernet_subsys(&wext_pernet_ops);
|
||||
+
|
||||
+ if (err)
|
||||
+ return err;
|
||||
+
|
||||
+ return register_netdevice_notifier(&wext_netdev_notifier);
|
||||
}
|
||||
|
||||
subsys_initcall(wireless_nlevent_init);
|
||||
@@ -368,17 +406,8 @@ subsys_initcall(wireless_nlevent_init);
|
||||
/* Process events generated by the wireless layer or the driver. */
|
||||
static void wireless_nlevent_process(struct work_struct *work)
|
||||
{
|
||||
- struct sk_buff *skb;
|
||||
- struct net *net;
|
||||
-
|
||||
rtnl_lock();
|
||||
-
|
||||
- for_each_net(net) {
|
||||
- while ((skb = skb_dequeue(&net->wext_nlevents)))
|
||||
- rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL,
|
||||
- GFP_KERNEL);
|
||||
- }
|
||||
-
|
||||
+ wireless_nlevent_flush();
|
||||
rtnl_unlock();
|
||||
}
|
||||
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
Loading…
Reference in New Issue