From patchwork Thu Nov 3 18:29:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Waiman Long X-Patchwork-Id: 15095 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp698794wru; Thu, 3 Nov 2022 11:32:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6GR0PKlv8WTAvuRHptDSmP/LP+GPndjO190SUJ0oB/bjiuiAsx5yFWK2yndCbZ68LeVfi3 X-Received: by 2002:a17:902:ebce:b0:186:9905:11bf with SMTP id p14-20020a170902ebce00b00186990511bfmr32134251plg.110.1667500366318; Thu, 03 Nov 2022 11:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667500366; cv=none; d=google.com; s=arc-20160816; b=eGCNja+AicBElzSNo/s1tsiot0NN+qeQEwNQhRapRQTy5CIxz/HfRnz54+0NvdQlIU OR71I5JvwuDBTxXGNyS+F4kW+M9z1sROkyFcvsipfHJdILor8OgturtbU3qdsndaKtJU efZfQCrPnoikSd37IzqEApCbGcGCjB5kpSXqdIuic57LWqd6EBSCcUZsxkLOG8WAW6yN Nwna3+OnplAeVszNlfn9Az8uKJmJngXcpO6wssx593ubhEJ4VOS9De466idYoQTD3vLQ gzA1BwDL6i4EFkfhqIVpMPdzjq9yz6hj+85ouOQeFOZ+k/5jAc6a6eM5pHj69S7249Ls luFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fs9hdEnSlUloTwUQc2bLSSOzYbdrDiXiodQGEMzW6HM=; b=zMpedy+N7oQYja7wtnbWMXTNNUrf2lxSaiZkwS/q/baKdraHTr6W2xDBAdRRMQeI0p AbRFEYRRj1uxUlJrhY8uuzk5LOM8cm6RIiOzvZNel5Eli2lKDDwDf8KqGAbVLj7Q/RNn EHm8ufJjRQ+0aGAPBZZT4FiLI6F6h0VnIDbU5GUxikf0VQRAMuzHRbH6d27wJ6Gis852 Ks+n9qdLIUmjMuC3RPkd8uf8F7py8AM79MWsBfo81g7BisaNGx+AUFhROZZWSPEoZgki X8K8bhj6OWnnAIuZJD9TuwBE8zHFSvhs1Fo3h2v7xT2dPJvxLe0WifJbTEdquIniLm5s 1RQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TIkAx75O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z6-20020a170902d54600b00179f3da346bsi1548551plf.39.2022.11.03.11.32.32; Thu, 03 Nov 2022 11:32:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TIkAx75O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231714AbiKCScJ (ORCPT + 99 others); Thu, 3 Nov 2022 14:32:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231805AbiKCSbn (ORCPT ); Thu, 3 Nov 2022 14:31:43 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8948265DD for ; Thu, 3 Nov 2022 11:29:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667500191; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fs9hdEnSlUloTwUQc2bLSSOzYbdrDiXiodQGEMzW6HM=; b=TIkAx75Om3g/2yjvD4PvJgt19GTFMFyyM/x9zoljXKhkVqXiRL94p/UlggAwJE7Lo815p9 9q40CApCbLMRwXa72B5sXEzkBo+gI42MFaVW1uoy9DwdLk8MwtLPw0jG9S/+Qs3Y6o7oRZ /0T9mnpLqLVUXH55AYcvM+t4BxhyPZ0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-668-DW_knKuvPDiczMYT1b9sUw-1; Thu, 03 Nov 2022 14:29:46 -0400 X-MC-Unique: DW_knKuvPDiczMYT1b9sUw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23DE68027EC; Thu, 3 Nov 2022 18:29:46 +0000 (UTC) Received: from llong.com (unknown [10.22.33.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id B32481121325; Thu, 3 Nov 2022 18:29:45 +0000 (UTC) From: Waiman Long To: Peter Zijlstra , Ingo Molnar , Will Deacon , Boqun Feng Cc: linux-kernel@vger.kernel.org, john.p.donnelly@oracle.com, Hillf Danton , Mukesh Ojha , =?utf-8?b?VGluZzExIFdhbmcg546L5am3?= , Waiman Long Subject: [PATCH v5 6/6] locking/rwsem: Update handoff lock events tracking Date: Thu, 3 Nov 2022 14:29:36 -0400 Message-Id: <20221103182936.217120-7-longman@redhat.com> In-Reply-To: <20221103182936.217120-1-longman@redhat.com> References: <20221103182936.217120-1-longman@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748500863861474159?= X-GMAIL-MSGID: =?utf-8?q?1748500863861474159?= With the new direct rwsem lock handoff, the corresponding handoff lock events are updated to also track the number of secondary lock handoffs in rwsem_down_read_slowpath() to see how prevalent those handoff events are. The number of primary lock handoffs in the unlock paths is (rwsem_handoff_read + rwsem_handoff_write - rwsem_handoff_rslow). After running a 96-thread rwsem microbenchmark with equal number of readers and writers on a 2-socket 96-thread system for 40s, the following handoff stats were obtained: rwsem_handoff_read=189 rwsem_handoff_rslow=1 rwsem_handoff_write=6678 rwsem_handoff_wspin=6681 The number of primary handoffs was 6866, whereas there was only one secondary handoff for this test run. Signed-off-by: Waiman Long --- kernel/locking/lock_events_list.h | 6 ++++-- kernel/locking/rwsem.c | 9 +++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/locking/lock_events_list.h b/kernel/locking/lock_events_list.h index 97fb6f3f840a..04d101767c2c 100644 --- a/kernel/locking/lock_events_list.h +++ b/kernel/locking/lock_events_list.h @@ -63,7 +63,9 @@ LOCK_EVENT(rwsem_rlock) /* # of read locks acquired */ LOCK_EVENT(rwsem_rlock_steal) /* # of read locks by lock stealing */ LOCK_EVENT(rwsem_rlock_fast) /* # of fast read locks acquired */ LOCK_EVENT(rwsem_rlock_fail) /* # of failed read lock acquisitions */ -LOCK_EVENT(rwsem_rlock_handoff) /* # of read lock handoffs */ LOCK_EVENT(rwsem_wlock) /* # of write locks acquired */ LOCK_EVENT(rwsem_wlock_fail) /* # of failed write lock acquisitions */ -LOCK_EVENT(rwsem_wlock_handoff) /* # of write lock handoffs */ +LOCK_EVENT(rwsem_handoff_read) /* # of read lock handoffs */ +LOCK_EVENT(rwsem_handoff_write) /* # of write lock handoffs */ +LOCK_EVENT(rwsem_handoff_rslow) /* # of handoffs in read slowpath */ +LOCK_EVENT(rwsem_handoff_wspin) /* # of handoff spins in write slowpath */ diff --git a/kernel/locking/rwsem.c b/kernel/locking/rwsem.c index c9f24ed8757d..84bdb4fd18c3 100644 --- a/kernel/locking/rwsem.c +++ b/kernel/locking/rwsem.c @@ -469,10 +469,8 @@ static void rwsem_mark_wake(struct rw_semaphore *sem, * force the issue. */ if (time_after(jiffies, waiter->timeout)) { - if (!(oldcount & RWSEM_FLAG_HANDOFF)) { + if (!(oldcount & RWSEM_FLAG_HANDOFF)) adjustment -= RWSEM_FLAG_HANDOFF; - lockevent_inc(rwsem_rlock_handoff); - } WRITE_ONCE(waiter->handoff_state, HANDOFF_REQUESTED); } @@ -677,7 +675,6 @@ static inline bool rwsem_try_write_lock(struct rw_semaphore *sem, */ if (new & RWSEM_FLAG_HANDOFF) { WRITE_ONCE(first->handoff_state, HANDOFF_REQUESTED); - lockevent_inc(rwsem_wlock_handoff); return false; } @@ -1011,10 +1008,12 @@ static void rwsem_handoff(struct rw_semaphore *sem, long adj, wake_type = RWSEM_WAKE_ANY; adj += RWSEM_WRITER_LOCKED; atomic_long_set(&sem->owner, (long)waiter->task); + lockevent_inc(rwsem_handoff_write); } else { wake_type = RWSEM_WAKE_READ_OWNED; adj += RWSEM_READER_BIAS; __rwsem_set_reader_owned(sem, waiter->task); + lockevent_inc(rwsem_handoff_read); } atomic_long_add(adj, &sem->count); rwsem_mark_wake(sem, wake_type, wake_q); @@ -1123,6 +1122,7 @@ rwsem_down_read_slowpath(struct rw_semaphore *sem, long count, unsigned int stat if (rwsem_first_waiter(sem)->type == RWSEM_WAITING_FOR_READ) adjustment = 0; rwsem_handoff(sem, adjustment, &wake_q); + lockevent_inc(rwsem_handoff_rslow); if (!adjustment) { raw_spin_unlock_irq(&sem->wait_lock); @@ -1253,6 +1253,7 @@ rwsem_down_write_slowpath(struct rw_semaphore *sem, int state) if (handoff == HANDOFF_REQUESTED) { rwsem_spin_on_owner(sem); handoff = READ_ONCE(waiter.handoff_state); + lockevent_inc(rwsem_handoff_wspin); } if (handoff == HANDOFF_GRANTED)