From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5002C432C0 for ; Mon, 25 Nov 2019 21:16:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 651FE2071E for ; Mon, 25 Nov 2019 21:16:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="PNT826XB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726985AbfKYVQX (ORCPT ); Mon, 25 Nov 2019 16:16:23 -0500 Received: from aserp2120.oracle.com ([141.146.126.78]:50898 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbfKYVQX (ORCPT ); Mon, 25 Nov 2019 16:16:23 -0500 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAPL9Ymc180598; Mon, 25 Nov 2019 21:15:22 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2019-08-05; bh=p3Wi/BFyCUYN/k/NNDN0T1rUQO/lWb4IED/Qx7zwXdM=; b=PNT826XBGRHtmPF2ttXEKmRIiNpIlDlmRjbleYvfDhZTAjhTK9jvoz8jOZMm1l0kktkF YQ8qW28/2UN6+tvTkWdMIbFvxTqotuFio3yw9eNBsJujBH1vl4woBbPfuLNzEb7ZUTOB +YffBh9zoFHGbjLBagtAXnpCD9qSKLaDSz8tkjEukTNaEF2luvo/9XDZ8a3pRIE09SlO C6PHpOTJS6/R/fkfE261rBWlIvF0Qo+isBdxAK3MrZ/4jku6OCpEzo4PemUoGuZPUhui BaDmaP0vo2NJpi98++Z+P0rI+TWcLRig+z7ry1JqUyVyItKzRK6ogTAT3jnjKXaiU1AQ CQ== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 2wevqq2c6h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Nov 2019 21:15:22 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xAPL8Rtl041317; Mon, 25 Nov 2019 21:15:21 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userp3020.oracle.com with ESMTP id 2wfewb4m08-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 25 Nov 2019 21:15:21 +0000 Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id xAPLFI2O027507; Mon, 25 Nov 2019 21:15:18 GMT Received: from neelam.us.oracle.com (/10.152.128.16) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 25 Nov 2019 13:15:18 -0800 From: Alex Kogan To: linux@armlinux.org.uk, peterz@infradead.org, mingo@redhat.com, will.deacon@arm.com, arnd@arndb.de, longman@redhat.com, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, bp@alien8.de, hpa@zytor.com, x86@kernel.org, guohanjun@huawei.com, jglauber@marvell.com Cc: steven.sistare@oracle.com, daniel.m.jordan@oracle.com, alex.kogan@oracle.com, dave.dice@oracle.com, rahul.x.yadav@oracle.com Subject: [PATCH v7 5/5] locking/qspinlock: Introduce the shuffle reduction optimization into CNA Date: Mon, 25 Nov 2019 16:07:09 -0500 Message-Id: <20191125210709.10293-6-alex.kogan@oracle.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20191125210709.10293-1-alex.kogan@oracle.com> References: <20191125210709.10293-1-alex.kogan@oracle.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9452 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911250171 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9452 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001 definitions=main-1911250171 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This optimization reduces the probability threads will be shuffled between the main and secondary queues when the secondary queue is empty. It is helpful when the lock is only lightly contended. Signed-off-by: Alex Kogan Reviewed-by: Steve Sistare --- kernel/locking/qspinlock_cna.h | 50 ++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 8 deletions(-) diff --git a/kernel/locking/qspinlock_cna.h b/kernel/locking/qspinlock_cna.h index dcb2bcfd2d94..f1eef6bece7b 100644 --- a/kernel/locking/qspinlock_cna.h +++ b/kernel/locking/qspinlock_cna.h @@ -4,6 +4,7 @@ #endif #include +#include /* * Implement a NUMA-aware version of MCS (aka CNA, or compact NUMA-aware lock). @@ -50,7 +51,7 @@ struct cna_node { struct mcs_spinlock mcs; int numa_node; u32 encoded_tail; - u32 pre_scan_result; /* 0, 1 or encoded tail */ + u32 pre_scan_result; /* 0, 1, 2 or encoded tail */ u32 intra_count; }; @@ -60,6 +61,34 @@ struct cna_node { */ extern int intra_node_handoff_threshold; +/* + * Controls the probability for enabling the scan of the main queue when + * the secondary queue is empty. The chosen value reduces the amount of + * unnecessary shuffling of threads between the two waiting queues when + * the contention is low, while responding fast enough and enabling + * the shuffling when the contention is high. + */ +#define SHUFFLE_REDUCTION_PROB_ARG (7) + +/* Per-CPU pseudo-random number seed */ +static DEFINE_PER_CPU(u32, seed); + +/* + * Return false with probability 1 / 2^@num_bits. + * Intuitively, the larger @num_bits the less likely false is to be returned. + * @num_bits must be a number between 0 and 31. + */ +static bool probably(unsigned int num_bits) +{ + u32 s; + + s = this_cpu_read(seed); + s = next_pseudo_random32(s); + this_cpu_write(seed, s); + + return s & ((1 << num_bits) - 1); +} + static void __init cna_init_nodes_per_cpu(unsigned int cpu) { struct mcs_spinlock *base = per_cpu_ptr(&qnodes[0].mcs, cpu); @@ -72,11 +101,11 @@ static void __init cna_init_nodes_per_cpu(unsigned int cpu) cn->numa_node = numa_node; cn->encoded_tail = encode_tail(cpu, i); /* - * @encoded_tail has to be larger than 1, so we do not confuse + * @encoded_tail has to be larger than 2, so we do not confuse * it with other valid values for @locked or @pre_scan_result - * (0 or 1) + * (0, 1 or 2) */ - WARN_ON(cn->encoded_tail <= 1); + WARN_ON(cn->encoded_tail <= 2); } } @@ -234,12 +263,13 @@ __always_inline u32 cna_pre_scan(struct qspinlock *lock, struct cna_node *cn = (struct cna_node *)node; /* - * setting @pre_scan_result to 1 indicates that no post-scan + * setting @pre_scan_result to 1 or 2 indicates that no post-scan * should be made in cna_pass_lock() */ cn->pre_scan_result = - cn->intra_count == intra_node_handoff_threshold ? - 1 : cna_scan_main_queue(node, node); + (node->locked <= 1 && probably(SHUFFLE_REDUCTION_PROB_ARG)) ? + 1 : cn->intra_count == intra_node_handoff_threshold ? + 2 : cna_scan_main_queue(node, node); return 0; } @@ -253,12 +283,15 @@ static inline void cna_pass_lock(struct mcs_spinlock *node, u32 scan = cn->pre_scan_result; + if (scan == 1) + goto pass_lock; + /* * check if a successor from the same numa node has not been found in * pre-scan, and if so, try to find it in post-scan starting from the * node where pre-scan stopped (stored in @pre_scan_result) */ - if (scan > 1) + if (scan > 2) scan = cna_scan_main_queue(node, decode_tail(scan)); if (!scan) { /* if found a successor from the same numa node */ @@ -281,5 +314,6 @@ static inline void cna_pass_lock(struct mcs_spinlock *node, tail_2nd->next = next; } +pass_lock: arch_mcs_pass_lock(&next_holder->locked, val); } -- 2.21.0 (Apple Git-122.2)