mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-05-01 03:00:57 +02:00
pentoo-sources: bump to 5.10.23
This commit is contained in:
parent
b695a6562f
commit
edc3ef7706
7 changed files with 87 additions and 10 deletions
|
|
@ -1,6 +1,6 @@
|
|||
DIST genpatches-5.10-22.base.tar.xz 554876 BLAKE2B 18d2a41fea4a8a95983a71185248f9fd27d2f4e8863419eaae66cf826ecd74218e0563804262368f3d23bee1f835b18869644af734f0baa8d1266a37ff495061 SHA512 7fca3a5fcd35425b0d6aa37cd0eb1146c6fec8ae5f4a462f058180057e956a4316a26a0c0600780014ffe2f632cf64f135f8d0b337ca6642a949c3654783a4c0
|
||||
DIST genpatches-5.10-22.experimental.tar.xz 17824 BLAKE2B a05cdc918c9f37fd78f2a61e02ccaf22efc31a72131db6c4b4d3ae1edc1d49c1cb58917b77a3a7a5c6b866616980a8247bef3c80a35103b2a044ff1e86daa741 SHA512 6d0b9f07095e219ddf4bb2e590ac50bd28494c3ec42f58318f889856e6110e6cf9a20ecdde19699a3303867287edef60d448f426d8389a58117fa97435e2005a
|
||||
DIST genpatches-5.10-22.extras.tar.xz 1772 BLAKE2B 3a72d1838aca6ca79985e06d9efc44a10bc3e766431c2ebca64b773c96be52cf27f121331585030e334d2eb7d1415deb34f42c265619b16186fb406baa12bd23 SHA512 81559580dda2d4ecbe693eb25d9d537f0d3dc3a01c1a863f17eff3b0e890a2850bdbb7ed5e856bf6b9c7dde944dd771710a8b64812391b5a3c214cc0e2c8538f
|
||||
DIST genpatches-5.10-26.base.tar.xz 780252 BLAKE2B d3da07e58183e25210b0a14dc5cdb4eaaa4e0ad6e6955f9e99ff06b6575af24d2710a63781fb7fb3c9f0b142c6198c0853c71ab63f3ea1ff07c4eb405fad4cb3 SHA512 c5d73387e6caa2140f1e5c48763132797d98abae0e64911f0bf1bece03440462ccc793a2ed4ae5916235b570aace12e9ba7b625cdaf71a9802956f0ad2836c1e
|
||||
DIST genpatches-5.10-26.experimental.tar.xz 17812 BLAKE2B 37a68871008d76143d14ad2ad016c68da80c48463fc7bb1d1e8bf67274fd118295686bb7dcd9b0c8cf492828d05917e8ee05ade6b813e8f64346329613c3580a SHA512 1839dd0c3621f001d9024eeb38435003032512971cc070626cc12fa30508c68a01c7ce68ff1895dc601556c2aa33c646e4be3e92536f02727be3f8717bb17958
|
||||
DIST genpatches-5.10-26.extras.tar.xz 1772 BLAKE2B d6e02010a72510e5c18b80102f2383002acf45b645c34d35b31234d6da9ad7b38ed70837bfbb3563c9c3871121ec4638bdebeaaaf225b3f3c6d50dd30ba30547 SHA512 8e1c534b5160553f0fafe542953a3f229082cf541f744038831c2aba1cc061a8ba14713155cb98245ca99e62514619ab6969bd8f61c3886d65c65b67e410ff0a
|
||||
DIST genpatches-5.4-51.base.tar.xz 1747452 BLAKE2B f93a14ea424bc1256e7b8ff34b8aae19f81d4e084ef0e8058f6dc25d776e78705e5e983b45bd24288c1c30b2456a61e349a20ea3bd8275d4e5eeb0fee0a7553b SHA512 4d1ee62f2a8931e97d7be5abfcccfe08ca9687e27abb553148f03d7d8672a35c7c3b1541555e4976e7405ba4782f170acff60b0588a0dda356a2771fe2bc17e4
|
||||
DIST genpatches-5.4-51.experimental.tar.xz 6700 BLAKE2B 1233655d1e963de741102e34b5ed6cab6678bfc2f62113887fd5ad083d563526c28253e2a434146852111fef9f7584107943e14258c4bc9177ab6e824937c33c SHA512 755e7df09207690e1838bc6fd16e7e797023b452557d2bc72d569198a961f70831add03a8043c2da63ca4b363ad5be3f29cd28ac68c8496ee7c2b7c98cf0f941
|
||||
DIST genpatches-5.4-51.extras.tar.xz 1768 BLAKE2B b464b9c9ac573b159211c51f9b131ee02f3a009dac6faa1a7f6d123a8070370074cdafe36e9b9e3dd7fbe66ebed290c0372088689425b49c687e79619641fd44 SHA512 5d77b35bfb5af8d0449c543b687a62139c4efdbaba1c75701a44a88c7446ae9a766babb3687d5a26cf8fde1e8b5b7c6f861631b1db9a81afc7dee8240345c7b0
|
||||
|
|
|
|||
|
|
@ -0,0 +1,76 @@
|
|||
From eadf7c43781bb0c33333211d0b842ab5c576f3ba Mon Sep 17 00:00:00 2001
|
||||
From: Johannes Berg <johannes.berg@intel.com>
|
||||
Date: Wed, 10 Mar 2021 21:50:04 +0100
|
||||
Subject: [PATCH] nl80211: fix locking for wireless device netns change
|
||||
|
||||
We have all the network interfaces marked as netns-local
|
||||
since the only reasonable thing to do right now is to set
|
||||
a whole device, including all netdevs, into a different
|
||||
network namespace. For this reason, we also have our own
|
||||
way of changing the network namespace.
|
||||
|
||||
Unfortunately, the RTNL locking changes broke this, and
|
||||
it now results in many RTNL assertions. The trivial fix
|
||||
for those (just hold RTNL for the changes) however leads
|
||||
to deadlocks in the cfg80211 netdev notifier.
|
||||
|
||||
Since we only need the wiphy, and that's still protected
|
||||
by the RTNL, add a new NL80211_FLAG_NO_WIPHY_MTX flag to
|
||||
the nl80211 ops and use it to _not_ take the wiphy mutex
|
||||
but only the RTNL. This way, the notifier does all the
|
||||
work necessary during unregistration/registration of the
|
||||
netdevs from the old and in the new namespace.
|
||||
|
||||
Change-Id: I5fc6cf6676f800ab8008e03bbea9c3349b02d804
|
||||
Reported-by: Sid Hayn <sidhayn@gmail.com>
|
||||
Fixes: a05829a7222e ("cfg80211: avoid holding the RTNL when calling the driver")
|
||||
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
||||
---
|
||||
net/wireless/nl80211.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
|
||||
index 521d36bb0803..ae6097fff133 100644
|
||||
--- a/net/wireless/nl80211.c
|
||||
+++ b/net/wireless/nl80211.c
|
||||
@@ -14789,6 +14789,7 @@ static int nl80211_set_tid_config(struct sk_buff *skb,
|
||||
#define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\
|
||||
NL80211_FLAG_CHECK_NETDEV_UP)
|
||||
#define NL80211_FLAG_CLEAR_SKB 0x20
|
||||
+#define NL80211_FLAG_NO_WIPHY_MTX 0x40
|
||||
|
||||
static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
|
||||
struct genl_info *info)
|
||||
@@ -14840,7 +14841,7 @@ static int nl80211_pre_doit(const struct genl_ops *ops, struct sk_buff *skb,
|
||||
info->user_ptr[0] = rdev;
|
||||
}
|
||||
|
||||
- if (rdev) {
|
||||
+ if (rdev && !(ops->internal_flags & NL80211_FLAG_NO_WIPHY_MTX)) {
|
||||
wiphy_lock(&rdev->wiphy);
|
||||
/* we keep the mutex locked until post_doit */
|
||||
__release(&rdev->wiphy.mtx);
|
||||
@@ -14865,7 +14866,8 @@ static void nl80211_post_doit(const struct genl_ops *ops, struct sk_buff *skb,
|
||||
}
|
||||
}
|
||||
|
||||
- if (info->user_ptr[0]) {
|
||||
+ if (info->user_ptr[0] &&
|
||||
+ !(ops->internal_flags & NL80211_FLAG_NO_WIPHY_MTX)) {
|
||||
struct cfg80211_registered_device *rdev = info->user_ptr[0];
|
||||
|
||||
/* we kept the mutex locked since pre_doit */
|
||||
@@ -15329,7 +15331,9 @@ static const struct genl_small_ops nl80211_small_ops[] = {
|
||||
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
||||
.doit = nl80211_wiphy_netns,
|
||||
.flags = GENL_UNS_ADMIN_PERM,
|
||||
- .internal_flags = NL80211_FLAG_NEED_WIPHY,
|
||||
+ .internal_flags = NL80211_FLAG_NEED_WIPHY |
|
||||
+ NL80211_FLAG_NEED_RTNL |
|
||||
+ NL80211_FLAG_NO_WIPHY_MTX,
|
||||
},
|
||||
{
|
||||
.cmd = NL80211_CMD_GET_SURVEY,
|
||||
--
|
||||
2.29.2
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 5.10.19-pentoo Kernel Configuration
|
||||
# Linux/x86 5.10.23-pentoo Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 10.2.0-r5 p6) 10.2.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
|
@ -249,6 +249,7 @@ CONFIG_USERMODE_DRIVER=y
|
|||
# CONFIG_BPF_PRELOAD is not set
|
||||
# CONFIG_USERFAULTFD is not set
|
||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
|
||||
CONFIG_KCMP=y
|
||||
CONFIG_RSEQ=y
|
||||
# CONFIG_DEBUG_RSEQ is not set
|
||||
# CONFIG_EMBEDDED is not set
|
||||
|
|
@ -7281,8 +7282,6 @@ CONFIG_SND_SOC_SOF_INTEL_PCI=m
|
|||
CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
|
||||
CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
|
||||
CONFIG_SND_SOC_SOF_INTEL_COMMON=m
|
||||
CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
|
||||
CONFIG_SND_SOC_SOF_BROADWELL=m
|
||||
CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
|
||||
CONFIG_SND_SOC_SOF_MERRIFIELD=m
|
||||
CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
|
||||
|
|
@ -1 +1 @@
|
|||
config-amd64-5.10.19
|
||||
config-amd64-5.10.23
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Linux/x86 5.10.19-pentoo Kernel Configuration
|
||||
# Linux/x86 5.10.23-pentoo Kernel Configuration
|
||||
#
|
||||
CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 10.2.0-r5 p6) 10.2.0"
|
||||
CONFIG_CC_IS_GCC=y
|
||||
|
|
@ -233,6 +233,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
|
|||
CONFIG_USERMODE_DRIVER=y
|
||||
CONFIG_USERFAULTFD=y
|
||||
CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
|
||||
CONFIG_KCMP=y
|
||||
CONFIG_RSEQ=y
|
||||
# CONFIG_DEBUG_RSEQ is not set
|
||||
CONFIG_EMBEDDED=y
|
||||
|
|
@ -1 +1 @@
|
|||
config-x86-5.10.19
|
||||
config-x86-5.10.23
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
EAPI="6"
|
||||
ETYPE="sources"
|
||||
K_WANT_GENPATCHES="base extras experimental"
|
||||
K_GENPATCHES_VER="22"
|
||||
K_GENPATCHES_VER="26"
|
||||
|
||||
inherit kernel-2
|
||||
detect_version
|
||||
|
|
@ -36,6 +36,7 @@ src_unpack() {
|
|||
eapply -s "${FILESDIR}/4008_cfg80211-change-netdev-rtnl-lock.patch"
|
||||
eapply -s "${FILESDIR}/4009_virt_wifi-fix-dealock-on-rtnl.patch"
|
||||
eapply -s "${FILESDIR}/4010_rtnl-locking-fixes.patch"
|
||||
eapply -s "${FILESDIR}/4011_nl80211-fix-locking-netns-change.patch"
|
||||
#experimental penpatches
|
||||
#if use pentoo-experimental; then
|
||||
#eapply -s "${FILESDIR}/4597-huge-usb-exp.patch"
|
||||
Loading…
Reference in a new issue