Commit d2ba6e9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'trace-rv-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace 

Pull runtime verifier fix from Steven Rostedt:

 - Fix multiple definition of __pcpu_unique_da_mon_this

   After refactoring monitors, we used static per-cpu variables with the
   same names across different per-cpu monitors. This is explicitly
   disallowed for modules on some architectures (alpha) or if
   CONFIG_DEBUG_FORCE_WEAK_PER_CPU is enabled (e.g. Fedora's debug
   kernel). Make sure all those variables have different names to avoid
   compilation issues.

* tag 'trace-rv-7.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  rv: Fix multiple definition of __pcpu_unique_da_mon_this
parents 189f164e 75f3cf0d

include/rv/da_monitor.h

+11 −5
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
#include <linux/bug.h>

#include <linux/sched.h>



/*

 * Per-cpu variables require a unique name although static in some

 * configurations (e.g. CONFIG_DEBUG_FORCE_WEAK_PER_CPU or alpha modules).

 */

#define DA_MON_NAME CONCATENATE(da_mon_, MONITOR_NAME)



static struct rv_monitor rv_this;



static void react(enum states curr_state, enum events event)
@@ -183,14 +189,14 @@ static inline bool da_event(struct da_monitor *da_mon, struct task_struct *tsk, 
/*

 * global monitor (a single variable)

 */

static struct da_monitor da_mon_this;

static struct da_monitor DA_MON_NAME;



/*

 * da_get_monitor - return the global monitor address

 */

static struct da_monitor *da_get_monitor(void)

{

	return &da_mon_this;

	return &DA_MON_NAME;

}



/*
@@ -223,14 +229,14 @@ static inline void da_monitor_destroy(void) { } 
/*

 * per-cpu monitor variables

 */

static DEFINE_PER_CPU(struct da_monitor, da_mon_this);

static DEFINE_PER_CPU(struct da_monitor, DA_MON_NAME);



/*

 * da_get_monitor - return current CPU monitor address

 */

static struct da_monitor *da_get_monitor(void)

{

	return this_cpu_ptr(&da_mon_this);

	return this_cpu_ptr(&DA_MON_NAME);

}



/*
@@ -242,7 +248,7 @@ static void da_monitor_reset_all(void) 
	int cpu;



	for_each_cpu(cpu, cpu_online_mask) {

		da_mon = per_cpu_ptr(&da_mon_this, cpu);

		da_mon = per_cpu_ptr(&DA_MON_NAME, cpu);

		da_monitor_reset(da_mon);

	}

}