Commit 0fa809ca authored by Waiman Long's avatar Waiman Long Committed by Ingo Molnar
Browse files

locking/pvqspinlock: Extend node size when pvqspinlock is configured 



The qspinlock code supports up to 4 levels of slowpath nesting using
four per-CPU mcs_spinlock structures. For 64-bit architectures, they
fit nicely in one 64-byte cacheline.

For para-virtualized (PV) qspinlocks it needs to store more information
in the per-CPU node structure than there is space for. It uses a trick
to use a second cacheline to hold the extra information that it needs.
So PV qspinlock needs to access two extra cachelines for its information
whereas the native qspinlock code only needs one extra cacheline.

Freshly added counter profiling of the qspinlock code, however, revealed
that it was very rare to use more than two levels of slowpath nesting.
So it doesn't make sense to penalize PV qspinlock code in order to have
four mcs_spinlock structures in the same cacheline to optimize for a case
in the native qspinlock code that rarely happens.

Extend the per-CPU node structure to have two more long words when PV
qspinlock locks are configured to hold the extra data that it needs.

As a result, the PV qspinlock code will enjoy the same benefit of using
just one extra cacheline like the native counterpart, for most cases.

[ mingo: Minor changelog edits. ]

Signed-off-by: default avatarWaiman Long <longman@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Link: http://lkml.kernel.org/r/1539697507-28084-2-git-send-email-longman@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1222109a

kernel/locking/qspinlock.c

+26 −8
Original line number Diff line number Diff line
@@ -74,12 +74,24 @@ 
 */



#include "mcs_spinlock.h"

#define MAX_NODES	4



/*

 * On 64-bit architectures, the mcs_spinlock structure will be 16 bytes in

 * size and four of them will fit nicely in one 64-byte cacheline. For

 * pvqspinlock, however, we need more space for extra data. To accommodate

 * that, we insert two more long words to pad it up to 32 bytes. IOW, only

 * two of them can fit in a cacheline in this case. That is OK as it is rare

 * to have more than 2 levels of slowpath nesting in actual use. We don't

 * want to penalize pvqspinlocks to optimize for a rare case in native

 * qspinlocks.

 */

struct qnode {

	struct mcs_spinlock mcs;

#ifdef CONFIG_PARAVIRT_SPINLOCKS

#define MAX_NODES	8

#else

#define MAX_NODES	4

	long reserved[2];

#endif

};



/*

 * The pending bit spinning loop count.
@@ -101,7 +113,7 @@ 
 *

 * PV doubles the storage and uses the second cacheline for PV state.

 */

static DEFINE_PER_CPU_ALIGNED(struct mcs_spinlock, mcs_nodes[MAX_NODES]);

static DEFINE_PER_CPU_ALIGNED(struct qnode, qnodes[MAX_NODES]);



/*

 * We must be able to distinguish between no-tail and the tail at 0:0,
@@ -126,7 +138,13 @@ static inline __pure struct mcs_spinlock *decode_tail(u32 tail) 
	int cpu = (tail >> _Q_TAIL_CPU_OFFSET) - 1;

	int idx = (tail &  _Q_TAIL_IDX_MASK) >> _Q_TAIL_IDX_OFFSET;



	return per_cpu_ptr(&mcs_nodes[idx], cpu);

	return per_cpu_ptr(&qnodes[idx].mcs, cpu);

}



static inline __pure

struct mcs_spinlock *grab_mcs_node(struct mcs_spinlock *base, int idx)

{

	return &((struct qnode *)base + idx)->mcs;

}



#define _Q_LOCKED_PENDING_MASK (_Q_LOCKED_MASK | _Q_PENDING_MASK)
@@ -390,11 +408,11 @@ void queued_spin_lock_slowpath(struct qspinlock *lock, u32 val) 
queue:

	qstat_inc(qstat_lock_slowpath, true);

pv_queue:

	node = this_cpu_ptr(&mcs_nodes[0]);

	node = this_cpu_ptr(&qnodes[0].mcs);

	idx = node->count++;

	tail = encode_tail(smp_processor_id(), idx);



	node += idx;

	node = grab_mcs_node(node, idx);



	/*

	 * Keep counts of non-zero index values:
@@ -534,7 +552,7 @@ release: 
	/*

	 * release the node

	 */

	__this_cpu_dec(mcs_nodes[0].count);

	__this_cpu_dec(qnodes[0].mcs.count);

}

EXPORT_SYMBOL(queued_spin_lock_slowpath);

kernel/locking/qspinlock_paravirt.h

+1 −3
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ enum vcpu_state { 


struct pv_node {

	struct mcs_spinlock	mcs;

	struct mcs_spinlock	__res[3];



	int			cpu;

	u8			state;

};
@@ -281,7 +279,7 @@ static void pv_init_node(struct mcs_spinlock *node) 
{

	struct pv_node *pn = (struct pv_node *)node;



	BUILD_BUG_ON(sizeof(struct pv_node) > 5*sizeof(struct mcs_spinlock));

	BUILD_BUG_ON(sizeof(struct pv_node) > sizeof(struct qnode));



	pn->cpu = smp_processor_id();

	pn->state = vcpu_running;

CRA Git | Maintained and supported by SUSTech CRA and CCSE