From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4103A159C9B for ; Wed, 14 Aug 2024 15:18:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BFADE2A07; Wed, 14 Aug 2024 15:18:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 56F5AE2A07 for ; Wed, 14 Aug 2024 15:18:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9ED98335CB9 for ; Wed, 14 Aug 2024 15:18:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3B9B1E6F for ; Wed, 14 Aug 2024 15:18:40 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1723648693.7acf5823d708e0a03078c1e068cd7b10f00c8465.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:6.10 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 2950_jump-label-fix.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 7acf5823d708e0a03078c1e068cd7b10f00c8465 X-VCS-Branch: 6.10 Date: Wed, 14 Aug 2024 15:18:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bdd71f2c-44a9-4e2c-a09c-df85ab56367c X-Archives-Hash: ca3f7e070bc2ba2dc42732d3951008c9 commit: 7acf5823d708e0a03078c1e068cd7b10f00c8465 Author: Mike Pagano gentoo org> AuthorDate: Wed Aug 14 15:18:13 2024 +0000 Commit: Mike Pagano gentoo org> CommitDate: Wed Aug 14 15:18:13 2024 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=7acf5823 Remove redundant patch Removed: 2950_jump-label-fix.patch Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 ---- 2950_jump-label-fix.patch | 57 ----------------------------------------------- 2 files changed, 61 deletions(-) diff --git a/0000_README b/0000_README index 04764583..46799647 100644 --- a/0000_README +++ b/0000_README @@ -95,10 +95,6 @@ Patch: 2920_sign-file-patch-for-libressl.patch From: https://bugs.gentoo.org/717166 Desc: sign-file: full functionality with modern LibreSSL -Patch: 2950_jump-label-fix.patch -From: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/ -Desc: jump_label: Fix a regression - Patch: 2990_libbpf-v2-workaround-Wmaybe-uninitialized-false-pos.patch From: https://lore.kernel.org/bpf/ Desc: libbpf: workaround -Wmaybe-uninitialized false positive diff --git a/2950_jump-label-fix.patch b/2950_jump-label-fix.patch deleted file mode 100644 index 1a5fdf7a..00000000 --- a/2950_jump-label-fix.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 224fa3552029a3d14bec7acf72ded8171d551b88 Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra -Date: Wed, 31 Jul 2024 12:43:21 +0200 -Subject: jump_label: Fix the fix, brown paper bags galore - -Per the example of: - - !atomic_cmpxchg(&key->enabled, 0, 1) - -the inverse was written as: - - atomic_cmpxchg(&key->enabled, 1, 0) - -except of course, that while !old is only true for old == 0, old is -true for everything except old == 0. - -Fix it to read: - - atomic_cmpxchg(&key->enabled, 1, 0) == 1 - -such that only the 1->0 transition returns true and goes on to disable -the keys. - -Fixes: 83ab38ef0a0b ("jump_label: Fix concurrency issues in static_key_slow_dec()") -Reported-by: Darrick J. Wong -Signed-off-by: Peter Zijlstra (Intel) -Tested-by: Darrick J. Wong -Link: https://lkml.kernel.org/r/20240731105557.GY33588@noisy.programming.kicks-ass.net ---- - kernel/jump_label.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/kernel/jump_label.c b/kernel/jump_label.c -index 4ad5ed8adf9691..6dc76b590703ed 100644 ---- a/kernel/jump_label.c -+++ b/kernel/jump_label.c -@@ -236,7 +236,7 @@ void static_key_disable_cpuslocked(struct static_key *key) - } - - jump_label_lock(); -- if (atomic_cmpxchg(&key->enabled, 1, 0)) -+ if (atomic_cmpxchg(&key->enabled, 1, 0) == 1) - jump_label_update(key); - jump_label_unlock(); - } -@@ -289,7 +289,7 @@ static void __static_key_slow_dec_cpuslocked(struct static_key *key) - return; - - guard(mutex)(&jump_label_mutex); -- if (atomic_cmpxchg(&key->enabled, 1, 0)) -+ if (atomic_cmpxchg(&key->enabled, 1, 0) == 1) - jump_label_update(key); - else - WARN_ON_ONCE(!static_key_slow_try_dec(key)); --- -cgit 1.2.3-korg -