From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B5C9FF44847 for ; Fri, 10 Apr 2026 12:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:cc:Content-Type:MIME-Version :References:Subject:To:From:Message-ID:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: List-Owner; bh=95Xzu/wrSKdgPqpES5U3P7913oi5C0HtUtRZ8A2JYug=; b=BtqxNOqArE3bOC xYesMSt2xSTBOMjT/oQD4y90/eltBF4+cSgxag/wlnaJ6bsYGzM5NieiJWIoN7qbf97wFo1YzowcZ tAhQABcPK4uQptclIWXZDZKv+0/WcjraargH/untjyX7xvJ+AeoBdecg3TgvnLuPLdgUG8qKBtwTv yZwUHTfXt/YxsBuKQESswDtbcXRXorpBjtnL1hyj+2Y/ExlYsmff0yW0aoISkYpeIGks4pcTNHXh6 cu1p38Uaq8LqL9L8weqVJ2kESz2YMxiCenNNTr1xYzxaH8pmx+e6CvQLiEf8F0g7G6/Zcf1LrZ3Tf UhwxHZa+pfYbqaKjbNog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wBApe-0000000C9zL-3CfQ; Fri, 10 Apr 2026 12:19:30 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wBApZ-0000000C9tO-3GA6; Fri, 10 Apr 2026 12:19:27 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 5633E444F1; Fri, 10 Apr 2026 12:19:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A057C2BCB3; Fri, 10 Apr 2026 12:19:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775823565; bh=tLIpqPCaUi8Lfeqau43+rfn7UZ8vuvPykTPYNUPuuyU=; h=Date:From:To:Subject:References:cc:From; b=uunn/bCqpDYdqH3aqiI0+2U/qm27AeTQwxnXbKYibcvcv2ZEX2J7abPlER3gpmuTw CBdP5mMh40n2zp7Tno2Q99U//gHXFdOV0IBNQapDNZb3rSYwBD5TySsxa/Td7SLyaZ p+uL6Iv9jGq9ZtmZnt8i06X/J571L31cWnZuiDLMRsOKbpHdih8iJDMdVxjdr+94oH +kfrO2pFRZtB2b/jp8TX3WQWaL7ksYC/uaT6tTAybV37imt1fhiAkDjh2EPTnuViku 1P4aDmEJtrdQSxbhtiFRIYbjrzGEHTE4V2Fb8MxeAUFtdhNoavN7essScQIWwWoRqs j/BFBM5JmmtDw== Date: Fri, 10 Apr 2026 14:19:21 +0200 Message-ID: <20260410120318.320727701@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Subject: [patch 11/38] misc: sgi-gru: Remove get_cycles() [ab]use References: <20260410120044.031381086@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 cc: Arnd Bergmann , x86@kernel.org, Lu Baolu , iommu@lists.linux.dev, Michael Grzeschik , netdev@vger.kernel.org, linux-wireless@vger.kernel.org, Herbert Xu , linux-crypto@vger.kernel.org, Vlastimil Babka , linux-mm@kvack.org, David Woodhouse , Bernie Thompson , linux-fbdev@vger.kernel.org, "Theodore Tso" , linux-ext4@vger.kernel.org, Andrew Morton , Uladzislau Rezki , Marco Elver , Dmitry Vyukov , kasan-dev@googlegroups.com, Andrey Ryabinin , Thomas Sailer , linux-hams@vger.kernel.org, "Jason A. Donenfeld" , Richard Henderson , linux-alpha@vger.kernel.org, Russell King , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Huacai Chen , loongarch@lists.linux.dev, Geert Uytterhoeven , linux-m68k@lists.linux-m68k.org, Dinh Nguyen , Jonas Bonn , linux-openrisc@vger.kernel.org, Helge Deller , linux-parisc@vger.kernel.org, Michael Ellerman , linuxppc-dev@lists.ozlabs.org, Paul Walmsley , linux-riscv@lists.infradead.org, Heiko Carstens , linux-s390@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260410_051925_875886_0027D855 X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Calculating a timeout from get_cycles() is a historical leftover without any functional requirement. Use ktime_get() instead. Signed-off-by: Thomas Gleixner --- drivers/misc/sgi-gru/gruhandles.c | 20 ++++++++------------ drivers/misc/sgi-gru/grukservices.c | 3 ++- drivers/misc/sgi-gru/grutlbpurge.c | 5 ++--- 3 files changed, 12 insertions(+), 16 deletions(-) --- a/drivers/misc/sgi-gru/gruhandles.c +++ b/drivers/misc/sgi-gru/gruhandles.c @@ -6,26 +6,22 @@ */ #include +#include #include "gru.h" #include "grulib.h" #include "grutables.h" -/* 10 sec */ #include -#include -#define GRU_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) -#define CLKS2NSEC(c) ((c) * 1000000 / tsc_khz) + +#define GRU_OPERATION_TIMEOUT_NSEC (((ktime_t)10 * NSEC_PER_SEC)) /* Extract the status field from a kernel handle */ #define GET_MSEG_HANDLE_STATUS(h) (((*(unsigned long *)(h)) >> 16) & 3) struct mcs_op_statistic mcs_op_statistics[mcsop_last]; -static void update_mcs_stats(enum mcs_op op, unsigned long clks) +static void update_mcs_stats(enum mcs_op op, unsigned long nsec) { - unsigned long nsec; - - nsec = CLKS2NSEC(clks); atomic_long_inc(&mcs_op_statistics[op].count); atomic_long_add(nsec, &mcs_op_statistics[op].total); if (mcs_op_statistics[op].max < nsec) @@ -58,21 +54,21 @@ static void report_instruction_timeout(v static int wait_instruction_complete(void *h, enum mcs_op opc) { + ktime_t start_time = ktime_get(); int status; - unsigned long start_time = get_cycles(); while (1) { cpu_relax(); status = GET_MSEG_HANDLE_STATUS(h); if (status != CCHSTATUS_ACTIVE) break; - if (GRU_OPERATION_TIMEOUT < (get_cycles() - start_time)) { + if (GRU_OP_TIMEOUT_NSEC < (ktime_get() - start_time)) { report_instruction_timeout(h); - start_time = get_cycles(); + start_time = ktime_get(); } } if (gru_options & OPT_STATS) - update_mcs_stats(opc, get_cycles() - start_time); + update_mcs_stats(opc, (unsigned long)(ktime_get() - start_time)); return status; } --- a/drivers/misc/sgi-gru/grukservices.c +++ b/drivers/misc/sgi-gru/grukservices.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "gru.h" #include "grulib.h" @@ -1106,7 +1107,7 @@ static int quicktest3(unsigned long arg) int ret = 0; memset(buf2, 0, sizeof(buf2)); - memset(buf1, get_cycles() & 255, sizeof(buf1)); + memset(buf1, get_random_u32() & 255, sizeof(buf1)); gru_copy_gpa(uv_gpa(buf2), uv_gpa(buf1), BUFSIZE); if (memcmp(buf1, buf2, BUFSIZE)) { printk(KERN_DEBUG "GRU:%d quicktest3 error\n", smp_processor_id()); --- a/drivers/misc/sgi-gru/grutlbpurge.c +++ b/drivers/misc/sgi-gru/grutlbpurge.c @@ -22,13 +22,12 @@ #include #include #include +#include #include #include "gru.h" #include "grutables.h" #include -#define gru_random() get_cycles() - /* ---------------------------------- TLB Invalidation functions -------- * get_tgh_handle * @@ -49,7 +48,7 @@ static inline int get_off_blade_tgh(stru int n; n = GRU_NUM_TGH - gru->gs_tgh_first_remote; - n = gru_random() % n; + n = get_random_u32() % n; n += gru->gs_tgh_first_remote; return n; }