FAILED: patch "[PATCH] tracing: Disable interrupt or preemption before acquiring" failed to apply to 5.4-stable tree

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

c0a581d7126c ("tracing: Disable interrupt or preemption before acquiring arch_spinlock_t")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From c0a581d7126c0bbc96163276f585fd7b4e4d8d0e Mon Sep 17 00:00:00 2001
From: Waiman Long <[email protected]>
Date: Thu, 22 Sep 2022 10:56:22 -0400
Subject: [PATCH] tracing: Disable interrupt or preemption before acquiring
arch_spinlock_t

It was found that some tracing functions in kernel/trace/trace.c acquire an arch_spinlock_t with preemption and irqs enabled. An example is the tracing_saved_cmdlines_size_read() function which intermittently causes a "BUG: using smp_processor_id() in preemptible" warning when the LTP read_all_proc test is run.

That can be problematic in case preemption happens after acquiring the lock. Add the necessary preemption or interrupt disabling code in the appropriate places before acquiring an arch_spinlock_t.

The convention here is to disable preemption for trace_cmdline_lock and interupt for max_lock.

Link https://lkml.kernel.org/r/[email protected] open here

Cc Peter Zijlstra <[email protected]>

Cc Ingo Molnar <[email protected]>

Cc Will Deacon <[email protected]>

Cc Boqun Feng <[email protected]>

Cc [email protected]

Fixes a35873a0993b ("tracing: Add conditional snapshot")

Fixes 939c7a4f04fc ("tracing: Introduce saved_cmdlines_size file")

Suggested-by Steven Rostedt <[email protected]>

Signed-off-by Waiman Long <[email protected]>

Signed-off-by Steven Rostedt (Google) <[email protected]>

kernel/trace/trace.c +23 -0

index d3005279165d..aed7ea6e6045 100644
@@ -1193,12 +1193,14 @@ void *tracing_cond_snapshot_data(struct trace_array *tr)
  {
  	void *cond_data = NULL;
 
+	local_irq_disable();
  	arch_spin_lock(&tr->max_lock);
 
  	if (tr->cond_snapshot)
  		cond_data = tr->cond_snapshot->cond_data;
 
  	arch_spin_unlock(&tr->max_lock);
+	local_irq_enable();
 
  	return cond_data;
  }

@@ -1334,9 +1336,11 @@ int tracing_snapshot_cond_enable(struct trace_array *tr, void *cond_data,
  		goto fail_unlock;
  	}
 
+	local_irq_disable();
  	arch_spin_lock(&tr->max_lock);
  	tr->cond_snapshot = cond_snapshot;
  	arch_spin_unlock(&tr->max_lock);
+	local_irq_enable();
 
  	mutex_unlock(&trace_types_lock);
 

@@ -1363,6 +1367,7 @@ int tracing_snapshot_cond_disable(struct trace_array *tr)
  {
  	int ret = 0;
 
+	local_irq_disable();
  	arch_spin_lock(&tr->max_lock);
 
  	if (!tr->cond_snapshot)

@@ -1373,6 +1378,7 @@ int tracing_snapshot_cond_disable(struct trace_array *tr)
  	}
 
  	arch_spin_unlock(&tr->max_lock);
+	local_irq_enable();
 
  	return ret;
  }

@@ -2200,6 +2206,11 @@ static size_t tgid_map_max;
 
  #define SAVED_CMDLINES_DEFAULT 128
  #define NO_CMDLINE_MAP UINT_MAX
+/*
+ * Preemption must be disabled before acquiring trace_cmdline_lock.
+ * The various trace_arrays' max_lock must be acquired in a context
+ * where interrupt is disabled.
+ */
  static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
  struct saved_cmdlines_buffer {
  	unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];

@@ -2412,7 +2423,11 @@ static int trace_save_cmdline(struct task_struct *tsk)
  	 * the lock, but we also don't want to spin
  	 * nor do we want to disable interrupts,
  	 * so if we miss here, then better luck next time.
+	 *
+	 * This is called within the scheduler and wake up, so interrupts
+	 * had better been disabled and run queue lock been held.
  	 */
+	lockdep_assert_preemption_disabled();
  	if (!arch_spin_trylock(&trace_cmdline_lock))
  		return 0;
 

@@ -5890,9 +5905,11 @@ tracing_saved_cmdlines_size_read(struct file *filp, char __user *ubuf,
  	char buf[64];
  	int r;
 
+	preempt_disable();
  	arch_spin_lock(&trace_cmdline_lock);
  	r = scnprintf(buf, sizeof(buf), "%u\n", savedcmd->cmdline_num);
  	arch_spin_unlock(&trace_cmdline_lock);
+	preempt_enable();
 
  	return simple_read_from_buffer(ubuf, cnt, ppos, buf, r);
  }

@@ -5917,10 +5934,12 @@ static int tracing_resize_saved_cmdlines(unsigned int val)
  		return -ENOMEM;
  	}
 
+	preempt_disable();
  	arch_spin_lock(&trace_cmdline_lock);
  	savedcmd_temp = savedcmd;
  	savedcmd = s;
  	arch_spin_unlock(&trace_cmdline_lock);
+	preempt_enable();
  	free_saved_cmdlines_buffer(savedcmd_temp);
 
  	return 0;

@@ -6373,10 +6392,12 @@ int tracing_set_tracer(struct trace_array *tr, const char *buf)
 
  #ifdef CONFIG_TRACER_SNAPSHOT
  	if (t->use_max_tr) {
+		local_irq_disable();
  		arch_spin_lock(&tr->max_lock);
  		if (tr->cond_snapshot)
  			ret = -EBUSY;
  		arch_spin_unlock(&tr->max_lock);
+		local_irq_enable();
  		if (ret)
  			goto out;
  	}

@@ -7436,10 +7457,12 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt,
  		goto out;
  	}
 
+	local_irq_disable();
  	arch_spin_lock(&tr->max_lock);
  	if (tr->cond_snapshot)
  		ret = -EBUSY;
  	arch_spin_unlock(&tr->max_lock);
+	local_irq_enable();
  	if (ret)
  		goto out;
 

Quoted 9 lines · On 10/16/22 11:37, [email protected] wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

c0a581d7126c ("tracing: Disable interrupt or preemption before acquiring arch_spinlock_t")

Quoted 3 lines

thanks,

greg k-h

You just have to remove the lockdep_assert_preemption_disabled() line as this macro isn't defined in v5.4. It is a debug statement and its removal won't have any functional impact.

Quoted 8 lines · Waiman Long

Quoted 7 lines · On 10/16/22 11:37, [email protected] wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

Quoted 8 lines

Quoted 5 lines

c0a581d7126c ("tracing: Disable interrupt or preemption before acquiring arch_spinlock_t")

thanks,

greg k-h

You just have to remove the lockdep_assert_preemption_disabled() line as this macro isn't defined in v5.4. It is a debug statement and its removal won't have any functional impact.

Wonderful, can you please submit a fixed up version like this so that I can apply it?

thanks,

greg k-h

Quoted 17 lines · Greg KH

Quoted 16 lines · Waiman Long

Quoted 5 lines · On 10/16/22 11:37, [email protected] wrote:

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines

Possible dependencies:

c0a581d7126c ("tracing: Disable interrupt or preemption before acquiring arch_spinlock_t")

thanks,

greg k-h

You just have to remove the lockdep_assert_preemption_disabled() line as this macro isn't defined in v5.4. It is a debug statement and its removal won't have any functional impact.

Quoted 6 lines

Wonderful, can you please submit a fixed up version like this so that I can apply it?

thanks,

greg k-h

Sure. See the attached patch.