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 6D7F0C369B2 for ; Thu, 17 Apr 2025 11:25:21 +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:In-Reply-To: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:List-Owner; bh=zs/X+FKBXpATF3RR4EHqimFG0PhOPkUkpooJNjtBNYU=; b=Pay4alOhsm0PIqmceIl8Gkxjdd LRFnPxvyKlANbhU+XTbm0bgGSWRB5X34ulUcyO+TVEROnY1jwKU+mRw8EPrHQMhKYny3D8E7WXttO 0xsDap+2mCqkwB+YpJQSvKwCK4Y4bmJRwbPJHnZmXPvZCunnHhF2FT1rsgqA8QcRpaS3n49/eBkd6 Fg1w12CybgF9Yf5Bo164+LzZ247zNhYNnvbFXeWgHf1xqODyhe2O9V4CTZTVoO6vhi4siLkaDmP8R IN5T9gHWAzhEhdjaAdD5S51o9LsjHhBtwoUDWzHzGOSlmmRwsV4ii5+HmVkJYqPUUImlO5UE3gdZE GpJdsN9w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5NMk-0000000CmnJ-3PRa; Thu, 17 Apr 2025 11:25:10 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1u5NKt-0000000CmXa-1Krn for linux-arm-kernel@lists.infradead.org; Thu, 17 Apr 2025 11:23:16 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 47B705C5158; Thu, 17 Apr 2025 11:20:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDB31C4CEE4; Thu, 17 Apr 2025 11:23:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1744888994; bh=7B70yJ4SRDrrXhm/q/EaJyQoxUqPWnLWl6ATh4yqNHg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=R0m/wNfLNfos3JG0Gq0YguHhHEbc6iV0N78lLqtliDi4TJjftl0F+8NzdKtM51Bly GLnWNv8W1PpDij5CZ8JuRVkZ96hhLCYPDuEAy/Mm1YL7qQEK6Vu1S4f8hXcSfZpzq4 y2Qk/IsUhIw1tOjPF280+jrfoQETLD34nSNunLH87yUT3QvnN8SeNjzBf3N1LL5uxc zBqirpQcjS/mhyCUiQpwBpczn5LwlkYWVr2uGuv1JfW6CEJrICixBm5stTvnGBq8S+ KtpuJfYn1bWjbXfbUJWQRnZqm3c4OAcAkEHUd/miRM1Eio0KdfMXeQArMjkpHehdRy LqjjO+Ycgllvw== Received: from sofa.misterjones.org ([185.219.108.64] helo=goblin-girl.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1u5NKp-006Ohy-Fj; Thu, 17 Apr 2025 12:23:11 +0100 Date: Thu, 17 Apr 2025 12:23:10 +0100 Message-ID: <86r01rjald.wl-maz@kernel.org> From: Marc Zyngier To: Luo Jie Cc: Yury Norov , Rasmus Villemoes , Julia Lawall , "Nicolas\ Palix" , Catalin Marinas , Will Deacon , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu , , , , , , , , , , Subject: Re: [PATCH v3 4/6] arm64: nvhe: Convert the opencoded field modify In-Reply-To: <20250417-field_modify-v3-4-6f7992aafcb7@quicinc.com> References: <20250417-field_modify-v3-0-6f7992aafcb7@quicinc.com> <20250417-field_modify-v3-4-6f7992aafcb7@quicinc.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/29.4 (aarch64-unknown-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: quic_luoj@quicinc.com, yury.norov@gmail.com, linux@rasmusvillemoes.dk, Julia.Lawall@inria.fr, nicolas.palix@imag.fr, catalin.marinas@arm.com, will@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com, linux-kernel@vger.kernel.org, cocci@inria.fr, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, andrew@lunn.ch, quic_kkumarcs@quicinc.com, quic_linchen@quicinc.com, quic_leiwei@quicinc.com, quic_suruchia@quicinc.com, quic_pavir@quicinc.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250417_042315_468060_60642385 X-CRM114-Status: GOOD ( 20.65 ) 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 On Thu, 17 Apr 2025 11:47:11 +0100, Luo Jie wrote: > > Replaced below code with the wrapper FIELD_MODIFY(MASK, ®, val) > - reg &= ~MASK; > - reg |= FIELD_PREP(MASK, val); > The semantic patch that makes this change is available > in scripts/coccinelle/misc/field_modify.cocci. > > More information about semantic patching is available at > https://coccinelle.gitlabpages.inria.fr/website > > Signed-off-by: Luo Jie > --- > arch/arm64/kvm/hyp/include/nvhe/memory.h | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h > index 34233d586060..b2af748964d0 100644 > --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h > +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h > @@ -30,8 +30,7 @@ enum pkvm_page_state { > static inline enum kvm_pgtable_prot pkvm_mkstate(enum kvm_pgtable_prot prot, > enum pkvm_page_state state) > { > - prot &= ~PKVM_PAGE_STATE_PROT_MASK; > - prot |= FIELD_PREP(PKVM_PAGE_STATE_PROT_MASK, state); > + FIELD_MODIFY(PKVM_PAGE_STATE_PROT_MASK, &prot, state); > return prot; > } Following up on my suggestion to *not* add anything new, this patch could be written as: diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h index 34233d5860607..08cb6ba0e0716 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -30,9 +30,8 @@ enum pkvm_page_state { static inline enum kvm_pgtable_prot pkvm_mkstate(enum kvm_pgtable_prot prot, enum pkvm_page_state state) { - prot &= ~PKVM_PAGE_STATE_PROT_MASK; - prot |= FIELD_PREP(PKVM_PAGE_STATE_PROT_MASK, state); - return prot; + u64 p = prot; + return u64_replace_bits(p, state, PKVM_PAGE_STATE_PROT_MASK); } static inline enum pkvm_page_state pkvm_getstate(enum kvm_pgtable_prot prot) M. -- Without deviation from the norm, progress is not possible.