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 BC6A4F4484C for ; Fri, 10 Apr 2026 12:19:26 +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:Content-Type:MIME-Version: References:Subject:Cc: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=P2IEyAEzLrLcDKf1D+hPXmSP/5CZZgHCZVdt+e9rGY8=; b=OEksEtYWQNWuq9 tIL7Nx5Qq/bMA4DRvXgnjoa5iwpyJfkjnEXY5duxgjJCtfwI1oRVQA22oHAWeihL0p/p0MhsSB0X5 jw+UJQ4Vq3d+cuX9HvpIq1j6OU9qK/Qq64kSXIGuptwzjilM0mEJjDdz9PqlE7UTFke0GSsYsw/s0 Bd1UNXMEcK4oksw201CD34qsX6ojbG6zftDomT6/GT2YvMj2mBohow9+y7o+NlZQMKp4/+i2cyLAJ 2LCmjB0t1mzF7twAijltOVBZCm68KDQaGtQhj+Er+R2qIIabOpoZiw8R8xDYldoZ0RFLKNOJIqJSt oHPhvTeH4i24FSLLCDGw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1wBApV-0000000C9mv-1YHK; Fri, 10 Apr 2026 12:19:21 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1wBApQ-0000000C9fz-1320; Fri, 10 Apr 2026 12:19:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 65ACF44037; Fri, 10 Apr 2026 12:19:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BE3EC2BC87; Fri, 10 Apr 2026 12:19:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775823555; bh=qtG4jYoFMBUH8Rv5LkkLsBrvbBwuDbTX1269QfkLCzw=; h=Date:From:To:Cc:Subject:References:From; b=pacXAmHLAMseTev4RAQUAZDfRzJFeJXjwMW3x14w8vUm7ybikBbtslQQu96s/8Sq0 a3pcIexn/gzfbwI2qYLuXSTx/gSXbmVwhuUFKfTY31pSFVH71nhoebkIPAnwJfmArK tPmJiCD8oWRaoY6EByg0L3DGpV75oKKW/C5lmUUCoaSznEsjUHpS9yyQByZ5hUlH3x P8NYw39byMTR2ebfPveTfvTFbDgwqYFvegEj7/kJQbjlvVeppRrN8YtOduabfxNT6E Yw4oV6JDjGSLEpWghPJGJFmnCci2PXJh9wjpVWvhGUbODkplfUDbeuEJIVIN1zibiF mC2OEaJT1jHhg== Date: Fri, 10 Apr 2026 14:19:12 +0200 Message-ID: <20260410120318.187521447@kernel.org> User-Agent: quilt/0.68 From: Thomas Gleixner To: LKML Cc: x86@kernel.org, Lu Baolu , iommu@lists.linux.dev, Arnd Bergmann , 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 Subject: [patch 09/38] iommu/vt-d: Use sched_clock() instead of get_cycles() References: <20260410120044.031381086@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260410_051916_466710_345DB849 X-CRM114-Status: GOOD ( 12.37 ) 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 the timeout from get_cycles() is a historical leftover without any functional requirement. Use ktime_get() instead. Signed-off-by: Thomas Gleixner Cc: x86@kernel.org Cc: Lu Baolu Cc: iommu@lists.linux.dev --- arch/x86/include/asm/iommu.h | 3 --- drivers/iommu/intel/dmar.c | 4 ++-- drivers/iommu/intel/iommu.h | 8 ++++++-- 3 files changed, 8 insertions(+), 7 deletions(-) --- a/arch/x86/include/asm/iommu.h +++ b/arch/x86/include/asm/iommu.h @@ -18,9 +18,6 @@ extern bool x86_swiotlb_enable; #define x86_swiotlb_enable false #endif -/* 10 seconds */ -#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000) - static inline int __init arch_rmrr_sanity_check(struct acpi_dmar_reserved_memory *rmrr) { --- a/drivers/iommu/intel/dmar.c +++ b/drivers/iommu/intel/dmar.c @@ -1606,9 +1606,9 @@ void qi_flush_pasid_cache(struct intel_i */ void dmar_disable_qi(struct intel_iommu *iommu) { + ktime_t start_time = ktime_get(); unsigned long flags; u32 sts; - cycles_t start_time = get_cycles(); if (!ecap_qis(iommu->ecap)) return; @@ -1624,7 +1624,7 @@ void dmar_disable_qi(struct intel_iommu */ while ((readl(iommu->reg + DMAR_IQT_REG) != readl(iommu->reg + DMAR_IQH_REG)) && - (DMAR_OPERATION_TIMEOUT > (get_cycles() - start_time))) + (DMAR_OPERATION_TIMEOUT > (ktime_get() - start_time))) cpu_relax(); iommu->gcmd &= ~DMA_GCMD_QIE; --- a/drivers/iommu/intel/iommu.h +++ b/drivers/iommu/intel/iommu.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -360,14 +361,17 @@ /* PERFINTRSTS_REG */ #define DMA_PERFINTRSTS_PIS ((u32)1) +#define DMAR_OPERATION_TIMEOUT (((ktime_t)10) * NSEC_PER_SEC) + #define IOMMU_WAIT_OP(iommu, offset, op, cond, sts) \ do { \ - cycles_t start_time = get_cycles(); \ + ktime_t start_time = ktime_get(); \ + \ while (1) { \ sts = op(iommu->reg + offset); \ if (cond) \ break; \ - if (DMAR_OPERATION_TIMEOUT < (get_cycles() - start_time))\ + if (DMAR_OPERATION_TIMEOUT < (ktime_get() - start_time))\ panic("DMAR hardware is malfunctioning\n"); \ cpu_relax(); \ } \