From nobody Wed Sep 17 15:42:37 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0669DC4167B for ; Sat, 17 Dec 2022 18:57:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230362AbiLQS4x (ORCPT ); Sat, 17 Dec 2022 13:56:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230034AbiLQSzi (ORCPT ); Sat, 17 Dec 2022 13:55:38 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2CDAF257; Sat, 17 Dec 2022 10:55:37 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:32 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303332; 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; bh=U2nuVVwlgknR7c20H19gyaTMlpo/vf3YwyYK63vf2Cs=; b=szyZ8ibfqc//YUpVObIFf2MC76VCweYywUSi6bNfq60jZbIhXoZMCf33/B8xkmgQBdhsIf kqU+VXUhaWMAkFGUi2IkTPJI7KrPJdMFV3n7W1bX+ugLpHnPaZF5xDn5yUWjqb5FdAH+RX 3aY3g3QOelmxGIfC2sMmRlhOeYDlTXJaB9I/XPUnGvqgB5rHa5OMRCw7WrI897Ld94cbhs vd7LIbxkom3psOg90XTbxOfM8YXBtKP8W/W7ayWwS+xoPubBPaASUo1gbSRaPU6f/gX3gC P7JPSvrDBu6SXIF6uG62dn/l+CjyKgHdFaVXW/qG6CCVQ4tZB3JID4EOmm6FZw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303332; 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; bh=U2nuVVwlgknR7c20H19gyaTMlpo/vf3YwyYK63vf2Cs=; b=jyfK7Py3EThkvJXJ1bOIO6oRUOV5esNuioLSFUzNVHkLjgXxv/497cRdYW3FcuhpDHYdk6 8kAlwB+husO95tCw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86_64: Remove pointless set_64bit() usage Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167130333218.4906.13606513137061485071.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: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/mm branch of tip: Commit-ID: 9ee850acd25dc290d3cad2707e99380e372ad490 Gitweb: https://git.kernel.org/tip/9ee850acd25dc290d3cad2707e99380e3= 72ad490 Author: Peter Zijlstra AuthorDate: Fri, 21 Oct 2022 14:11:38 +02:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:27 -08:00 x86_64: Remove pointless set_64bit() usage The use of set_64bit() in X86_64 only code is pretty pointless, seeing how it's a direct assignment. Remove all this nonsense. [nathanchance: unbreak irte] Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221022114425.168036718%40infradead.org --- arch/um/include/asm/pgtable-3level.h | 8 -------- arch/x86/include/asm/cmpxchg_64.h | 5 ----- drivers/iommu/intel/irq_remapping.c | 13 +++++-------- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgt= able-3level.h index cb896e6..8a5032e 100644 --- a/arch/um/include/asm/pgtable-3level.h +++ b/arch/um/include/asm/pgtable-3level.h @@ -58,11 +58,7 @@ #define pud_populate(mm, pud, pmd) \ set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd))) =20 -#ifdef CONFIG_64BIT -#define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval= )) -#else #define set_pud(pudptr, pudval) (*(pudptr) =3D (pudval)) -#endif =20 static inline int pgd_newpage(pgd_t pgd) { @@ -71,11 +67,7 @@ static inline int pgd_newpage(pgd_t pgd) =20 static inline void pgd_mkuptodate(pgd_t pgd) { pgd_val(pgd) &=3D ~_PAGE_NE= WPAGE; } =20 -#ifdef CONFIG_64BIT -#define set_pmd(pmdptr, pmdval) set_64bit((u64 *) (pmdptr), pmd_val(pmdval= )) -#else #define set_pmd(pmdptr, pmdval) (*(pmdptr) =3D (pmdval)) -#endif =20 static inline void pud_clear (pud_t *pud) { diff --git a/arch/x86/include/asm/cmpxchg_64.h b/arch/x86/include/asm/cmpxc= hg_64.h index 250187a..0d3beb2 100644 --- a/arch/x86/include/asm/cmpxchg_64.h +++ b/arch/x86/include/asm/cmpxchg_64.h @@ -2,11 +2,6 @@ #ifndef _ASM_X86_CMPXCHG_64_H #define _ASM_X86_CMPXCHG_64_H =20 -static inline void set_64bit(volatile u64 *ptr, u64 val) -{ - *ptr =3D val; -} - #define arch_cmpxchg64(ptr, o, n) \ ({ \ BUILD_BUG_ON(sizeof(*(ptr)) !=3D 8); \ diff --git a/drivers/iommu/intel/irq_remapping.c b/drivers/iommu/intel/irq_= remapping.c index 5962bb5..5d17616 100644 --- a/drivers/iommu/intel/irq_remapping.c +++ b/drivers/iommu/intel/irq_remapping.c @@ -173,7 +173,6 @@ static int modify_irte(struct irq_2_iommu *irq_iommu, index =3D irq_iommu->irte_index + irq_iommu->sub_handle; irte =3D &iommu->ir_table->base[index]; =20 -#if defined(CONFIG_HAVE_CMPXCHG_DOUBLE) if ((irte->pst =3D=3D 1) || (irte_modified->pst =3D=3D 1)) { bool ret; =20 @@ -187,11 +186,9 @@ static int modify_irte(struct irq_2_iommu *irq_iommu, * same as the old value. */ WARN_ON(!ret); - } else -#endif - { - set_64bit(&irte->low, irte_modified->low); - set_64bit(&irte->high, irte_modified->high); + } else { + WRITE_ONCE(irte->low, irte_modified->low); + WRITE_ONCE(irte->high, irte_modified->high); } __iommu_flush_cache(iommu, irte, sizeof(*irte)); =20 @@ -249,8 +246,8 @@ static int clear_entries(struct irq_2_iommu *irq_iommu) end =3D start + (1 << irq_iommu->irte_mask); =20 for (entry =3D start; entry < end; entry++) { - set_64bit(&entry->low, 0); - set_64bit(&entry->high, 0); + WRITE_ONCE(entry->low, 0); + WRITE_ONCE(entry->high, 0); } bitmap_release_region(iommu->ir_table->bitmap, index, irq_iommu->irte_mask);