Received: by 2002:a25:868d:0:0:0:0:0 with SMTP id z13csp37047ybk; Tue, 19 May 2020 14:52:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxZYaZUBAvV2lQbfiJi6vsb7gWglkRK/DzwnUT1jjrzfR3qc1c5yJyRhKFbZ8KFvOYhMZlQ X-Received: by 2002:aa7:c9c9:: with SMTP id i9mr758891edt.166.1589925156309; Tue, 19 May 2020 14:52:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589925156; cv=none; d=google.com; s=arc-20160816; b=nOdRLKm0xiIb+GP7iUSAZbldYGK++NYqtdklNlI8Qx9vLa7AkrRbOThWZ7oe/yoq3J DigwRr76S5lUILf8xud7MWvUwABE5zm633ZCruIDpN8wHTFWdIUTcFew6fG291GqSVxJ 5r48d8tmk6hBMGGheawenzp/eoNxSiRpq1Gqgi18mR5aB6z0mZUwHdbM/neQzKydtXAi JIHSPvwkyxpJmjGzPBPxOydZNSAsJDRuOKiDiMbq+sQvQKlo+8xlvLJXWGzECiJgabpx Zd4c3v7jkmhac/OKv+AoUVA8sBo9mEguC4FhKKVkzubZoKlqJ0Dhb0GGEZhCr31V63gQ ILvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=t4BPOlqWWKx85v33tXwE++q2jUF/7Bf26vLvZF/P+OE=; b=FuOgw4vzRTsvlSRckLp8V89cTxx1KmTq0O/hHeFrYhM4qLr6okPm7496BeZLZSYT25 cD0Tkb8esiYVt1vv/ihH9TEd84jvDAwFWLrT1ZBBkdYp14ScfuWCPoi+GhbNLkhvmqz3 0qsfdyrgaeh0S4WWu6xQe/4qZZCX5MiWbPGpmt1IMhXAH+n5Jr6NvmxaAeVR9pSfSoem /XGY9Sm9x+MwoP8lZXTvdA42ipToXZHGdTTZb1AlQP8xWxs5+oUGuciQBEGIN1RFr87U eRfDiv0SeIModEDP1W0Pu/OlVHyp0ecD6gmbQYAi3ChJsjDB3ly0hBp8YB6Uheg7HYYT 6Fig== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t25si660606ejt.70.2020.05.19.14.52.13; Tue, 19 May 2020 14:52:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728629AbgESVsJ (ORCPT + 99 others); Tue, 19 May 2020 17:48:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728566AbgESVsI (ORCPT ); Tue, 19 May 2020 17:48:08 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04A1EC08C5C0; Tue, 19 May 2020 14:48:08 -0700 (PDT) Received: from [5.158.153.53] (helo=debian-buster-darwi.lab.linutronix.de.) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1jbA5H-0002w4-Gd; Tue, 19 May 2020 23:47:35 +0200 From: "Ahmed S. Darwish" To: Peter Zijlstra , Ingo Molnar , Will Deacon Cc: Thomas Gleixner , "Paul E. McKenney" , "Sebastian A. Siewior" , Steven Rostedt , LKML , "Ahmed S. Darwish" , Jens Axboe , linux-block@vger.kernel.org Subject: [PATCH v1 21/25] iocost: Use sequence counter with associated spinlock Date: Tue, 19 May 2020 23:45:43 +0200 Message-Id: <20200519214547.352050-22-a.darwish@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519214547.352050-1-a.darwish@linutronix.de> References: <20200519214547.352050-1-a.darwish@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A sequence counter write side critical section must be protected by some form of locking to serialize writers. A plain seqcount_t does not contain the information of which lock must be held when entering a write side critical section. Use the new seqcount_spinlock_t data type, which allows to associate a spinlock with the sequence counter. This enables lockdep to verify that the spinlock used for writer serialization is held when the write side critical section is entered. If lockdep is disabled this lock association is compiled out and has neither storage size nor runtime overhead. Signed-off-by: Ahmed S. Darwish --- block/blk-iocost.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 7c1fe605d0d6..8029a9e8fa55 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c @@ -405,7 +405,7 @@ struct ioc { enum ioc_running running; atomic64_t vtime_rate; - seqcount_t period_seqcount; + seqcount_spinlock_t period_seqcount; u32 period_at; /* wallclock starttime */ u64 period_at_vtime; /* vtime starttime */ @@ -872,7 +872,6 @@ static void ioc_now(struct ioc *ioc, struct ioc_now *now) static void ioc_start_period(struct ioc *ioc, struct ioc_now *now) { - lockdep_assert_held(&ioc->lock); WARN_ON_ONCE(ioc->running != IOC_RUNNING); write_seqcount_begin(&ioc->period_seqcount); @@ -1958,7 +1957,7 @@ static int blk_iocost_init(struct request_queue *q) ioc->running = IOC_IDLE; atomic64_set(&ioc->vtime_rate, VTIME_PER_USEC); - seqcount_init(&ioc->period_seqcount); + seqcount_spinlock_init(&ioc->period_seqcount, &ioc->lock); ioc->period_at = ktime_to_us(ktime_get()); atomic64_set(&ioc->cur_period, 0); atomic_set(&ioc->hweight_gen, 0); -- 2.20.1