On Thu, Jan 30, 2020 at 05:01:15PM -0500, Alex Kogan wrote:
> > +/*
> > + * cna_order_queue - scan the primary queue looking for the first lock node on
> > + * the same NUMA node as the lock holder and move any skipped nodes onto the
> > + * secondary queue.
> Oh man, you took out the ascii figure I was working so hard to put in. Oh well.
Right; sorry about that. The reason it's gone is that it was mostly
identical to the one higher up in the file and didn't consider all
cases this code deals with.
Instead I gifted you cna_splice_head() :-)
> > + *
> > + * Returns 0 if a matching node is found; otherwise return the encoded pointer
> > + * to the last element inspected (such that a subsequent scan can continue there).
> > + *
> > + * The worst case complexity of the scan is O(n), where n is the number
> > + * of current waiters. However, the amortized complexity is close to O(1),
> > + * as the immediate successor is likely to be running on the same node once
> > + * threads from other nodes are moved to the secondary queue.
> > + *
> > + * XXX does not compute; given equal contention it should average to O(nr_nodes).
> Let me try to convince you. Under contention, the immediate waiter would be
> a local one. So the scan would typically take O(1) steps. We need to consider
> the extra work/steps we take to move nodes to the secondary queue. The
> number of such nodes is O(n) (to be more precise, it is O(n-m), where m
> is nr_cpus_per_node), and we spend a constant amount of work, per node,
> to scan those nodes and move them to the secondary queue. So in 2^thresholds
> lock handovers, we scan 2^thresholds x 1 + n-m nodes. Assuming
> 2^thresholds > n, the amortized complexity of this function then is O(1).
There is no threshold in this patch. That's the next patch, and
I've been procrastinating on that one, mostly also because of the
'reasonable' claim without data.
But Ah!, I think I see, after nr_cpus tries, all remote waiters are on
the secondary queue and only local waiters will remain. That will indeed
depress the average a lot.
> > + */
> > +static u32 cna_order_queue(struct mcs_spinlock *node,
> > + struct mcs_spinlock *iter)
> > +{
> > + struct cna_node *cni = (struct cna_node *)READ_ONCE(iter->next);
> > + struct cna_node *cn = (struct cna_node *)node;
> > + int nid = cn->numa_node;
> > + struct cna_node *last;
> > +
> > + /* find any next waiter on 'our' NUMA node */
> > + for (last = cn;
> > + cni && cni->numa_node != nid;
> > + last = cni, cni = (struct cna_node *)READ_ONCE(cni->mcs.next))
> > + ;
> > +
> > + if (!cna)
> Should be ‘cni’
Yeah, I think the build robots told me the same; in any case, that's
already fixed in the version you can find in my queue.git thing.
> > + return last->encoded_tail; /* continue from here */
> > +
> > + if (last != cn) /* did we skip any waiters? */
> > + cna_splice_tail(node, node->next, (struct mcs_spinlock *)last);
> > +
> > + return 0;
> > +}
> > +
> > +/*
> > + * cna_splice_head -- splice the entire secondary queue onto the head of the
> > + * primary queue.
> > + */
> > +static cna_splice_head(struct qspinlock *lock, u32 val,
> > + struct mcs_spinlock *node, struct mcs_spinlock *next)
> Missing return value type (struct mcs_spinlock *).
Yeah, robots beat you again.
> > +{
> > + struct mcs_spinlock *head_2nd, *tail_2nd;
> > +
> > + tail_2nd = decode_tail(node->locked);
> > + head_2nd = tail_2nd->next;
> I understand that you are trying to avoid repeating those two lines
> in both places this function is called from, but you do it at the cost
> of adding the following unnecessary if-statement, and in general this function
> looks clunky.
Let me show you the current form:
/*
* cna_splice_head -- splice the entire secondary queue onto the head of the
* primary queue.
*
* Returns the new primary head node or NULL on failure.
*/
static struct mcs_spinlock *
cna_splice_head(struct qspinlock *lock, u32 val,
struct mcs_spinlock *node, struct mcs_spinlock *next)
{
struct mcs_spinlock *head_2nd, *tail_2nd;
u32 new;
tail_2nd = decode_tail(node->locked);
head_2nd = tail_2nd->next;
if (!next) {
/*
* When the primary queue is empty; our tail becomes the primary tail.
*/
/*
* Speculatively break the secondary queue's circular link; such that when
* the secondary tail becomes the primary tail it all works out.
*/
tail_2nd->next = NULL;
/*
* tail_2nd->next = NULL xchg_tail(lock, tail)
*
* cmpxchg_release(&lock, val, new) WRITE_ONCE(prev->next, node);
*
* Such that if the cmpxchg() succeeds, our stores won't collide.
*/
new = ((struct cna_node *)tail_2nd)->encoded_tail | _Q_LOCKED_VAL;
if (!atomic_try_cmpxchg_release(&lock->val, &val, new)) {
/*
* Note; when this cmpxchg fails due to concurrent
* queueing of a new waiter, then we'll try again in
* cna_pass_lock() if required.
*
* Restore the secondary queue's circular link.
*/
tail_2nd->next = head_2nd;
return NULL;
}
} else {
/*
* If the primary queue is not empty; the primary tail doesn't need
* to change and we can simply link our tail to the old head.
*/
tail_2nd->next = next;
}
/* That which was the secondary queue head, is now the primary queue head */
return head_2nd;
}
The function as a whole is self-contained and consistent, it deals with
the splice 2nd to 1st queue, for all possible cases. You only have to
think about the list splice in one place, here, instead of two places.
I don't think it will actually result in more branches emitted; the
compiler should be able to use value propagation to eliminate stuff.
> > +static inline bool cna_try_clear_tail(struct qspinlock *lock, u32 val,
> > + struct mcs_spinlock *node)
> > +{
> > + struct mcs_spinlock *next;
> > +
> > + /*
> > + * We're here because the primary queue is empty; check the secondary
> > + * queue for remote waiters.
> > + */
> > + if (node->locked > 1) {
> > + /*
> > + * When there are waiters on the secondary queue move them back
> > + * onto the primary queue and let them rip.
> > + */
> > + next = cna_splice_head(lock, val, node, NULL);
> > + if (next) {
> And, again, this if-statement is here only because you moved the rest of the code
> into cna_splice_head(). Perhaps, with cna_extract_2dary_head_tail() you can
> bring that code back?
I don't see the objection, you already had a branch there, from the
cmpxchg(), this is the same branch, the compiler should fold the lot. We
can add an __always_inline if you're worried.
> > + arch_mcs_pass_lock(&head_2nd->locked, 1);
> Should be next->locked. Better yet, ‘next' should be called ‘head_2nd’.
Yeah, fixed already. Those damn build bots figured it didn't compile.
> > + return true;
> > + }
> > +
> > + return false;
> > + }
> > +
> > + /* Both queues empty. */
> > + return __try_clear_tail(lock, val, node);
> > +}
> > +
> > +static inline void cna_pass_lock(struct mcs_spinlock *node,
> > + struct mcs_spinlock *next)
> > +{
> > + struct cna_node *cn = (struct cna_node *)node;
> > + u32 partial_order = cn->partial_order;
> > + u32 val = _Q_LOCKED_VAL;
> > +
> > + /* cna_wait_head_or_lock() left work for us. */
> > + if (partial_order) {
> > + partial_order = cna_order_queue(node, decode_tail(partial_order));
> > +
> > + if (!partial_order) {
> > + /*
> > + * We found a local waiter; reload @next in case we called
> > + * cna_order_queue() above.
> > + */
> > + next = node->next;
> > + val |= node->locked; /* preseve secondary queue */
> This is wrong. node->locked can be 0, 1 or an encoded tail at this point, and
> the latter case will be handled incorrectly.
>
> Should be
> if (node->locked) val = node->locked;
> instead.
I'm confused, who cares about the locked bit when it has an encoded tail on?
The generic code only cares about it being !0, and the cna code always
checks if it has a tail (>1 , <=1) first.
