Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp3155187ybh; Sat, 25 Jul 2020 12:54:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzAn79GvBG9J/f7YzsYEyzCqtxVH5CBGsrk15wySIL3hVyEvnALtx4XUhTcDt1bz80xXodt X-Received: by 2002:a17:906:2c02:: with SMTP id e2mr14205828ejh.64.1595706889110; Sat, 25 Jul 2020 12:54:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595706889; cv=none; d=google.com; s=arc-20160816; b=lTtQo7y7kdB4hs+e4KUZxbq5tJTruPEZfvHnFkcLS7/RPjhaw+0ZnTX+waIbMJkL93 HC0kptqbeoj6WgOnuxRL8kY5z7s8v0DIdn3yc8MQnb2KkEoSkKs30vOXl1SfLYhTqKBW omwHE9yzAfaHDIsRTUuEiDdkY8AlzXpznZ+uLEH24U2595Bm185KbRKISynIjKe0k6KY 7Pd3aeG1RfjGlDonfqL3Dq1OqVx3kaWswujMPNQhTL/zw9h9SG8lciEtT+QhZAGlQcId PY88szPFnLXJ3vGjLia+gFRVaeEJuR45wWPA0xmFmWcjZ3QNFauykOUaWaoIS2BGQc8Q 88fg== 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 :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:dkim-signature :dkim-signature:date; bh=Tzxo93bNci/t1uZYtvQ3Ar3hGAVig7CHbrWhhDAfsqY=; b=cLNUUIoL+wYiZWd1n+lavQk7zlsFahysdu0RkPOSldhULkELxcqYos5tHdPzRWQOqT jDZHK1MMB3Q/DkUo3MkCQOp6d4lCjXYQb9Qg8KHmjYnrZnrTNe3SyigaiCEwGcclE3gf Q3KBxdFenmqKm4iYNCA5tZbdGq4P+7DYNCE7/eKMYh0A6jz6EkqYnvIs3cDUS2YftUTE VDvp8/HAnYJpx174B5Qr6yfbpD1EafNFwKexGjKx5kNAfWjvYAIbFtCHsrXJFpRbj/Nh eOpPkxwp1/ZaS+pA1rKRf9iNkUn9gccxugJjzMvEcpcif7IpdqWUo8C5vcG33RpLuWo0 ZeZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linutronix.de header.s=2020 header.b=lbmvNhTj; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=wL5Ag34O; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f21si3420201ejl.329.2020.07.25.12.54.27; Sat, 25 Jul 2020 12:54:49 -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; dkim=fail header.i=@linutronix.de header.s=2020 header.b=lbmvNhTj; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=wL5Ag34O; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728014AbgGYTvs (ORCPT + 99 others); Sat, 25 Jul 2020 15:51:48 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:45680 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727997AbgGYTvs (ORCPT ); Sat, 25 Jul 2020 15:51:48 -0400 Date: Sat, 25 Jul 2020 19:51:44 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1595706705; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tzxo93bNci/t1uZYtvQ3Ar3hGAVig7CHbrWhhDAfsqY=; b=lbmvNhTjFrTQdZiGARR6IGzqB1LWkSoNRDpVrhZt2bB1FFBGOOUTnVpUGIryK+iJciFyjS msF7RTY5j/X97c4e9XMM3hGsBfy7YEAK4xZ1oF44STwv2oJyrN5QW5bxSZ7l2xTOloArbh /JBi7MIsWZaSMdGMf6zIIcAbqoDkH3z+jNKKUYBgQgrsNfc1GCRjnYMTXS5Bn+hiLO4f30 DK4br4nqbXIwX+HrSZafCWR2iXg+n5sKvG7050aOHRmpl5SOwREXb0Wuqhrvxa1pkujmvL Y4j75l/I5gsn64sqGRCXYZe/eMx70R+lhp4gd8XHhFbFL4nYt8RLCYCD8gXHPA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1595706705; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Tzxo93bNci/t1uZYtvQ3Ar3hGAVig7CHbrWhhDAfsqY=; b=wL5Ag34OfV7jeHwdAivtw2nBIBoFIPhU+jPVQh77NIEyQskG4iES5OE3HmNHGcHAlS7Rue BQCs3IR8jGQnERDA== From: "tip-bot2 for Chris Wilson" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: locking/urgent] locking/lockdep: Fix overflow in presentation of average lock-time Cc: Chris Wilson , Ingo Molnar , Peter Zijlstra , x86 , LKML In-Reply-To: <20200725185110.11588-1-chris@chris-wilson.co.uk> References: <20200725185110.11588-1-chris@chris-wilson.co.uk> MIME-Version: 1.0 Message-ID: <159570670466.4006.5604761972444184961.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the locking/urgent branch of tip: Commit-ID: a7ef9b28aa8d72a1656fa6f0a01bbd1493886317 Gitweb: https://git.kernel.org/tip/a7ef9b28aa8d72a1656fa6f0a01bbd1493886317 Author: Chris Wilson AuthorDate: Sat, 25 Jul 2020 19:51:10 +01:00 Committer: Ingo Molnar CommitterDate: Sat, 25 Jul 2020 21:47:42 +02:00 locking/lockdep: Fix overflow in presentation of average lock-time Though the number of lock-acquisitions is tracked as unsigned long, this is passed as the divisor to div_s64() which interprets it as a s32, giving nonsense values with more than 2 billion acquisitons. E.g. acquisitions holdtime-min holdtime-max holdtime-total holdtime-avg ------------------------------------------------------------------------- 2350439395 0.07 353.38 649647067.36 0.-32 Signed-off-by: Chris Wilson Signed-off-by: Ingo Molnar Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20200725185110.11588-1-chris@chris-wilson.co.uk --- kernel/locking/lockdep_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c index 5525cd3..02ef87f 100644 --- a/kernel/locking/lockdep_proc.c +++ b/kernel/locking/lockdep_proc.c @@ -423,7 +423,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt) seq_time(m, lt->min); seq_time(m, lt->max); seq_time(m, lt->total); - seq_time(m, lt->nr ? div_s64(lt->total, lt->nr) : 0); + seq_time(m, lt->nr ? div64_u64(lt->total, lt->nr) : 0); } static void seq_stats(struct seq_file *m, struct lock_stat_data *data)