From patchwork Wed Mar 15 14:25:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 70261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2369249wrd; Wed, 15 Mar 2023 07:43:29 -0700 (PDT) X-Google-Smtp-Source: AK7set9bwPoRn4mbZlo6WmvIv6OwZAbb9A4gWbu0L+gPrFRUsCfJgJHijrlDSLd2DZFKRJsjaLwD X-Received: by 2002:a05:6a20:e688:b0:d6:837d:c535 with SMTP id mz8-20020a056a20e68800b000d6837dc535mr931609pzb.48.1678891409421; Wed, 15 Mar 2023 07:43:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678891409; cv=none; d=google.com; s=arc-20160816; b=dn+xWqMo5kK1IcEdl+qcJ7zIQu6zES0LJxogU9i7UlDQNYkQiZSDTB1VB40Nsr4mWd Ba6AzHCI9IQN56mruN4ghlKiSpSnXlJSSDTuFufF+12h3lfMFeXv0ttcGvrrf3S34jsF DUefuvvf0YwNyvuY98CQsPdU7pnUA6rMkoSE2aY2Ju4A/iJVKtqYAxjn/NOfIwe6luyY mF+NAShR7lZXKtTHAj8Y5ghU9LcIhQZCclyv+oFBbifDn29yGpnONKzerU/JjyKbxctu B3vEiyEbnYi7aWXeZO/cGBgwDWDsJueekdrOyIZJv1O64mlqX2d5wYNm2n99PUwHfPhn 8khA== 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 :message-id:date:subject:cc:to:from; bh=Ut51umcstTt1KmMA+5nfiKyx4/+yTdEIUGh6bfs4fe8=; b=kUATkhA1wq26nYldzV1sehHfB7C9K2nHMtJRX3YNMFCu9+qaUYm9jdfZJid4JZBEb0 2cukYG4jJm4zc5rRunJLJb+ISF0dHzfvrNyT2uOIB3vIHto02SDwMLGFlOL8bKlBjt7Q EqLjQ1JW9hnxyu+Xg3mfPK8tM4XpTbyOT/iIjKpQp8k2ADAYCPyf9Do3bQdF4EErviWl SavbjLKM6OTDCOIb0B5VrGatJWVARFSLw4K8U+dOqKThUMuPTFDvCozLMCRoxyW04qS/ aO8r/l8GbkTr3tpGrrOaE4fkklVmRa/J1RA5spIgyDdUXTuOKLH6p1vwnR+MkwpK+kXu FXWw== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v28-20020a63481c000000b00509461bbf1csi4832872pga.79.2023.03.15.07.43.17; Wed, 15 Mar 2023 07:43:29 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231536AbjCOOaC (ORCPT + 99 others); Wed, 15 Mar 2023 10:30:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55436 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233205AbjCOOaA (ORCPT ); Wed, 15 Mar 2023 10:30:00 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADB8B1E5CE for ; Wed, 15 Mar 2023 07:29:57 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by albert.telenet-ops.be with bizsmtp id YeVt2900b1C8whw06eVtLg; Wed, 15 Mar 2023 15:29:54 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1pcS3h-00CI8b-Fn; Wed, 15 Mar 2023 15:25:31 +0100 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1pcS4J-00D13s-Rp; Wed, 15 Mar 2023 15:25:31 +0100 From: Geert Uytterhoeven To: Andrew Morton Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Tobias Klausmann Subject: [PATCH] lib: dhry: Fix unstable smp_processor_id(_) usage Date: Wed, 15 Mar 2023 15:25:22 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,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?1760445238083060207?= X-GMAIL-MSGID: =?utf-8?q?1760445238083060207?= When running the in-kernel Dhrystone benchmark with CONFIG_DEBUG_PREEMPT=y: BUG: using smp_processor_id() in preemptible [00000000] code: bash/938 Fix this by not using smp_processor_id() directly, but instead wrapping the whole benchmark inside a get_cpu()/put_cpu() pair. This makes sure the whole benchmark is run on the same CPU core, and the reported values are consistent. Fixes: d5528cc16893f1f6 ("lib: add Dhrystone benchmark test") Reported-by: Tobias Klausmann Link: https://bugzilla.kernel.org/show_bug.cgi?id=217179 Signed-off-by: Geert Uytterhoeven --- lib/dhry_run.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/dhry_run.c b/lib/dhry_run.c index f9d33efa6d090604..f15ac666e9d38bd2 100644 --- a/lib/dhry_run.c +++ b/lib/dhry_run.c @@ -31,6 +31,7 @@ MODULE_PARM_DESC(iterations, static void dhry_benchmark(void) { + unsigned int cpu = get_cpu(); int i, n; if (iterations > 0) { @@ -45,9 +46,10 @@ static void dhry_benchmark(void) } report: + put_cpu(); if (n >= 0) - pr_info("CPU%u: Dhrystones per Second: %d (%d DMIPS)\n", - smp_processor_id(), n, n / DHRY_VAX); + pr_info("CPU%u: Dhrystones per Second: %d (%d DMIPS)\n", cpu, + n, n / DHRY_VAX); else if (n == -EAGAIN) pr_err("Please increase the number of iterations\n"); else