[GIT PULL] locking/urgent for v6.11-rc7

[GIT PULL] locking/urgent for v6.11-rc7

[Borislav Petkov]

Hi Linus,

please pull the locking/urgent lineup for v6.11-rc7.

Thx.

---

The following changes since commit d33d26036a0274b472299d7dcdaa5fb34329f91b:

  rtmutex: Drop rt_mutex::wait_lock before scheduling (2024-08-15 15:38:53 +0200)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/locking_urgent_for_v6.11_rc7

for you to fetch changes up to de752774f38bb766941ed1bf910ba5a9f6cc6bf7:

  jump_label: Fix static_key_slow_dec() yet again (2024-09-06 16:29:22 +0200)

----------------------------------------------------------------
- Correct unwinding the static_call machinery when encountering an error while
  loading a module due to a mis-assumption in the static_call_del_module()
  path

- Replace a WARN_ON in the memory allocation failure path of the static_call
  module machinery which unnecessarily leads to a panic when panic_on_warn is
  set

- Fix an ordering problem in jump_label's static key reference counting code

----------------------------------------------------------------
Peter Zijlstra (1):
      jump_label: Fix static_key_slow_dec() yet again

Thomas Gleixner (2):
      static_call: Handle module init failure correctly in static_call_del_module()
      static_call: Replace pointless WARN_ON() in static_call_module_notify()

 kernel/jump_label.c         | 83 +++++++++++++++++++++++++++++----------------
 kernel/static_call_inline.c | 13 ++++++-
 2 files changed, 66 insertions(+), 30 deletions(-)


-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [GIT PULL] locking/urgent for v6.11-rc7

[Borislav Petkov]

Hi,

please ignore this one. There's still trouble with it:

https://lore.kernel.org/r/202409082005.393050e2-oliver.sang@intel.com

Thx.

On Sun, Sep 08, 2024 at 11:03:02AM +0200, Borislav Petkov wrote:
> Hi Linus,
> 
> please pull the locking/urgent lineup for v6.11-rc7.
> 
> Thx.
> 
> ---
> 
> The following changes since commit d33d26036a0274b472299d7dcdaa5fb34329f91b:
> 
>   rtmutex: Drop rt_mutex::wait_lock before scheduling (2024-08-15 15:38:53 +0200)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip tags/locking_urgent_for_v6.11_rc7
> 
> for you to fetch changes up to de752774f38bb766941ed1bf910ba5a9f6cc6bf7:
> 
>   jump_label: Fix static_key_slow_dec() yet again (2024-09-06 16:29:22 +0200)
> 
> ----------------------------------------------------------------
> - Correct unwinding the static_call machinery when encountering an error while
>   loading a module due to a mis-assumption in the static_call_del_module()
>   path
> 
> - Replace a WARN_ON in the memory allocation failure path of the static_call
>   module machinery which unnecessarily leads to a panic when panic_on_warn is
>   set
> 
> - Fix an ordering problem in jump_label's static key reference counting code
> 
> ----------------------------------------------------------------
> Peter Zijlstra (1):
>       jump_label: Fix static_key_slow_dec() yet again
> 
> Thomas Gleixner (2):
>       static_call: Handle module init failure correctly in static_call_del_module()
>       static_call: Replace pointless WARN_ON() in static_call_module_notify()
> 
>  kernel/jump_label.c         | 83 +++++++++++++++++++++++++++++----------------
>  kernel/static_call_inline.c | 13 ++++++-
>  2 files changed, 66 insertions(+), 30 deletions(-)
> 
> 
> -- 
> Regards/Gruss,
>     Boris.
> 
> https://people.kernel.org/tglx/notes-about-netiquette

-- 
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette

Re: [GIT pull] locking/urgent for v6.11-rc7

[pr-tracker-bot]

The pull request you sent on Sun,  1 Sep 2024 13:44:01 +0200 (CEST):

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2024-08-25

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/51859c5aa6daa96340a81a1ea2de1b48ccadccf1

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

[GIT pull] locking/urgent for v6.11-rc7

[Thomas Gleixner]

Linus,

please pull the latest locking/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking-urgent-2024-08-25

up to:  d33d26036a02: rtmutex: Drop rt_mutex::wait_lock before scheduling

A single fix for rt_mutex:

  The deadlock detection code drops into an infinite scheduling loop while
  still holding rt_mutex::wait_lock, which rightfully triggers a
  'scheduling in atomic' warning. Unlock it before that.


Thanks,

	tglx

------------------>
Roland Xu (1):
      rtmutex: Drop rt_mutex::wait_lock before scheduling


 kernel/locking/rtmutex.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
index 88d08eeb8bc0..fba1229f1de6 100644
--- a/kernel/locking/rtmutex.c
+++ b/kernel/locking/rtmutex.c
@@ -1644,6 +1644,7 @@ static int __sched rt_mutex_slowlock_block(struct rt_mutex_base *lock,
 }
 
 static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
+					     struct rt_mutex_base *lock,
 					     struct rt_mutex_waiter *w)
 {
 	/*
@@ -1656,10 +1657,10 @@ static void __sched rt_mutex_handle_deadlock(int res, int detect_deadlock,
 	if (build_ww_mutex() && w->ww_ctx)
 		return;
 
-	/*
-	 * Yell loudly and stop the task right here.
-	 */
+	raw_spin_unlock_irq(&lock->wait_lock);
+
 	WARN(1, "rtmutex deadlock detected\n");
+
 	while (1) {
 		set_current_state(TASK_INTERRUPTIBLE);
 		rt_mutex_schedule();
@@ -1713,7 +1714,7 @@ static int __sched __rt_mutex_slowlock(struct rt_mutex_base *lock,
 	} else {
 		__set_current_state(TASK_RUNNING);
 		remove_waiter(lock, waiter);
-		rt_mutex_handle_deadlock(ret, chwalk, waiter);
+		rt_mutex_handle_deadlock(ret, chwalk, lock, waiter);
 	}
 
 	/*