Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp3999385ybg; Sun, 7 Jun 2020 18:01:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxneOxthskbRtHBUbKbMeEDoHj5rlWfDIe9H29ygs1hQe47u7qmGtS6IW1w8CD/extmtRy4 X-Received: by 2002:aa7:c5c7:: with SMTP id h7mr17154561eds.177.1591578084891; Sun, 07 Jun 2020 18:01:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591578084; cv=none; d=google.com; s=arc-20160816; b=V0qhxqaKyCt+Y6eAoX09D5MKz0HPBCeDipbztFiYsryfi6JnCgNjLC3ntv+sfXegiK WrffDaglfKXNL8Q+LZcnAV+J8y+cgizKvE0hJUNsFZuldMNNod9AbG/1tWdEAlu9EV7l H/IX8bMxtHsC9WgPFp7aBn5gxGwoDcX7vr75FtwXjw/xgdr42sCbGzPuwwOFNYGju3rN crXU4tZHjb9PSUa7XBbeo2GaBub+sLnfK1jwjQ/UcxnW0R8NnkYhS4UspK1ywodG8uHD f5sV68Vkgh50cCucVPGkC4Lfel+nfscOKzka7mbVtb2w6X3Tj0d15KxD/Bww3dUyDyP7 Wfvw== 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=CDI0SLA0ZZoGf/8Opv+ISSpOplWC22RKZ0q2sCfdXbZ6mooo5aFqsSfnfzTcsmN5cj 2QjnJacmJcXSZQhi5l80JVrKNYg0bfgKCY5OmO89OB/ANa+Q0gl8qMOTNytdGREI7p64 wDO18QUYHYs/QF/pE4nLugq1+O1SwkDWyBn4OPl8lGLH23rJyg9GSQLMPlvgSxFDt12I P9vWGMB6KDjIa8DxAi/Ya03BDwOATAnLFu5D3r1wn0xkXdCOXb0jzoH2z19/dGSbwAOa V1qhqI4kYih6JlA+0GcshDUQA9ETKbslJa4PZ27KW8Ms9R/DZHqJtNfvCi6lC0a3DnKe XAWQ== 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 o23si7998269edr.538.2020.06.07.18.01.01; Sun, 07 Jun 2020 18:01:24 -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 S1729006AbgFHA6r (ORCPT + 99 others); Sun, 7 Jun 2020 20:58:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728973AbgFHA6p (ORCPT ); Sun, 7 Jun 2020 20:58:45 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12767C08C5C3; Sun, 7 Jun 2020 17:58:45 -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 1ji67b-0000x8-F9; Mon, 08 Jun 2020 02:58:39 +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 v2 14/18] iocost: Use sequence counter with associated spinlock Date: Mon, 8 Jun 2020 02:57:25 +0200 Message-Id: <20200608005729.1874024-15-a.darwish@linutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200608005729.1874024-1-a.darwish@linutronix.de> References: <20200519214547.352050-1-a.darwish@linutronix.de> <20200608005729.1874024-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