Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp413736pxa; Fri, 21 Aug 2020 10:26:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyS6QZPcg6P+9vnWlFLX7jJnCTSIBMdGr6t+xgdU+bI+kitxBLUJiNMfVWzS7SS+LHiap+i X-Received: by 2002:a17:906:c7d2:: with SMTP id dc18mr4088300ejb.135.1598030767262; Fri, 21 Aug 2020 10:26:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598030767; cv=none; d=google.com; s=arc-20160816; b=uDHg/DwWBdgJqpdVXD34QFVZYwPVvQUk7NNGPyA62fqsizedEwuj1gEn1G4PbP/BiE FVmylc9rZUCYVuhtoewwzEsNsnjWLsRbN5HqJod7vX37x/74NtwdnP8lq4cyC2emZ9+S 2uRUYgIfeShYPamkn1zhlsAk8gL/kcA6w9BYrkvUBtEzjKB81Vm/HEillYn+piXBw+5J DdsiHniS89MCV6Ndgss1049dG19OUZ0AEfSXF2/J2Ki8I1UYOP9xRw8bqMYbbotdjHRC leaDjFzV14BncOA+Et4yD7sfRDygyODEuQ/ggwdoTZuUiBmqPJpQIoik5u/ZRG/q61xw aGbA== 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 :dkim-signature; bh=ot70UjBRB/fjGg2Vndt3y8YuVH76CMcUvYgm2ViyZcI=; b=hhHObavOxracaqAG0xj3lT/uiHOG89W81mtymHIj132Cmzye6EibJsj7bpgyZQBoSy 9XBG+RgbianqmDzWSNnoagPqbYFBr/6Ad+HId3xLb5noS8HBWiYIuGj0owrljbxfy2RM y5Jn8uruCC1bH96JW5amu4tynd8ClfhEdybRB5F500ZoYYWcddMJLqz0OoOf3eTbbjQD uHLlO8BT6BN+eoSXE/2cZrDNE1dglCRJhp++ytffq7RtUY9LP4YZMdG9uYZRjLwgJVZk BNpvjs/NmE6M3EKl1zRf0XPyACVGpzSyHYBI12f/WG6EsCshivkOPQp5u5xo2kRF0UIs 13eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=R6YoUlsH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b19si1619644ejk.429.2020.08.21.10.25.43; Fri, 21 Aug 2020 10:26:07 -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=pass header.i=@kernel.org header.s=default header.b=R6YoUlsH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729095AbgHURYl (ORCPT + 99 others); Fri, 21 Aug 2020 13:24:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:48180 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727936AbgHUQP3 (ORCPT ); Fri, 21 Aug 2020 12:15:29 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5ACB72224D; Fri, 21 Aug 2020 16:15:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1598026529; bh=v9gQOf2yho3wnn66sqsWT+5Vz7QPb2gaJkVZZU4Booc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R6YoUlsHdyCMkuvPsyweMoB+4W7nujsh/lNxCFfUrjwVlqd11F5Sby/v5VEB95H5Q 7xcVXWHxuwgXewVPF5Aqjv3Hk1jpf+rXhNwbLbPx/c0xL/0UhtuuC+xalP+PIEZ6sX GzIodVZgV0EivefPtgC8qDi6tcsbaYRcgjuLxNVc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chris Wilson , Ingo Molnar , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.8 51/62] locking/lockdep: Fix overflow in presentation of average lock-time Date: Fri, 21 Aug 2020 12:14:12 -0400 Message-Id: <20200821161423.347071-51-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821161423.347071-1-sashal@kernel.org> References: <20200821161423.347071-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson [ Upstream commit a7ef9b28aa8d72a1656fa6f0a01bbd1493886317 ] 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 Signed-off-by: Sasha Levin --- 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 5525cd3ba0c83..02ef87f50df29 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) -- 2.25.1