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 E0BCCC71136 for ; Thu, 12 Jun 2025 19:42:53 +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:To:In-Reply-To:References :Message-ID:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=AtRFh0Ey70hl6l/1Ltvy8lBRLOlLz+gnmfGfYWjxjc8=; b=Z2v+LJjU+87urr0faRX5u81Roo 2ApYIoReN3RT6h6FQWUm4RFetVCvCJvPxvClnmaGeNEIyO5x9X0AHf752Y5iQGzH3h9wEFz1bYdZG BwexczvzwhM7sPz+Em1FIPxvi/f7o1KVVs3GT2yIJ+6ut0ll4SN3S8hIue4Jg7JT8+pxeUf/4p1Fw f5kzhx4OSEfpRlemVkc1SJxOYj0RjeR8TG5ahxMHtNMHYrS3RqpG+Tdlm3BENC79RcxjECFgai/bZ K95N9aL7IdUII14rabCXo1C6lkZBSFbSwspdN/FO77WvXcLxvGtWmfoRExDN3q7XjtI3ViOSKSm0E lLivBPwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPnoy-0000000EGdB-3JCV; Thu, 12 Jun 2025 19:42:44 +0000 Received: from mx0a-0031df01.pphosted.com ([205.220.168.131]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uPiGd-0000000DVkR-2gAz for linux-arm-kernel@lists.infradead.org; Thu, 12 Jun 2025 13:46:56 +0000 Received: from pps.filterd (m0279866.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55C7klnb019621; Thu, 12 Jun 2025 13:46:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= AtRFh0Ey70hl6l/1Ltvy8lBRLOlLz+gnmfGfYWjxjc8=; b=dZoZFanLuvbFrqGn nlshuUO+Fjc9ySmmkn4wfLXL//mXLFOQGubK39WKbEBheMRSur7xC1Wrnh18YAbX jUT4nA74pv5r641DAUfnKLy/w7aiVqKDvbxGbAYmOX69MVi/p7y+eZ/ZkIBW7A2i TgRlylq+5SENpBxkMxXtggorGcsRk2QS6bv3CNh9W3lA8vL0fK2xKL1uSlRG3A+1 OSeFGA3nj+PweML5fB1gMny7BkUtaPDsRH1Cx6Y1voq6EXK3U2a253yEBd5ulhR2 dR7c5bLq8YsJ2fDJVy5UwsCoXB2gdfSDENHPdijXI/+RoYQbY1qhtMf1tnQ5yqx0 9cI+0w== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 474eqcrq9p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jun 2025 13:46:32 +0000 (GMT) Received: from nasanex01b.na.qualcomm.com (nasanex01b.na.qualcomm.com [10.46.141.250]) by NALASPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 55CDkVpr030855 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 12 Jun 2025 13:46:31 GMT Received: from nsssdc-sh01-lnx.ap.qualcomm.com (10.80.80.8) by nasanex01b.na.qualcomm.com (10.46.141.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Thu, 12 Jun 2025 06:46:27 -0700 From: Luo Jie Date: Thu, 12 Jun 2025 21:46:10 +0800 Subject: [PATCH v4 3/5] arm64: nvhe: Convert the opencoded field modify MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-ID: <20250612-field_modify-v4-3-ae4f74da45a6@quicinc.com> References: <20250612-field_modify-v4-0-ae4f74da45a6@quicinc.com> In-Reply-To: <20250612-field_modify-v4-0-ae4f74da45a6@quicinc.com> To: Yury Norov , Rasmus Villemoes , Julia Lawall , "Nicolas Palix" , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Joey Gouly , Suzuki K Poulose , Zenghui Yu CC: , , , , , , , , , , Luo Jie X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1749735973; l=1055; i=quic_luoj@quicinc.com; s=20250209; h=from:subject:message-id; bh=RQ6JRVRsPYGnPD/Etf5zFYsGdfK+yVXW3fMdn2fe+PA=; b=py8dXdWMApFsDGHzCOE0AYnCD+LUzkA/muQQlvUJ+EaQlNIZoez3TpPULkEfohxYbuOBf3qty kFUx4wH1c0kBVGx9VaRbm5yEKsI3AMjifEQNFYsElAby9wDyim1cdlI X-Developer-Key: i=quic_luoj@quicinc.com; a=ed25519; pk=pzwy8bU5tJZ5UKGTv28n+QOuktaWuriznGmriA9Qkfc= X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nasanex01b.na.qualcomm.com (10.46.141.250) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjEyMDEwNiBTYWx0ZWRfX3X8eZjf1IM2j +i7Jxhwn+k2R6uhBlqGl8860OQv4nlDvTaw0oOnlXb80b7zuU+hK5LwZwR7ZBywcr8ug4WcvfVf nUyTXYxvj7xt8Adffx6reBcpOFmEgJ+o40utzrPH+ktVDwDLXZ5Djo3gW8egwP+GQD70RyruSmS AsJMirRy5tt7xUDNfplcPwM8vQMdk1dmMpPYJl6PDGbl8Uojy1ph2SR53+a2u+plsQOrgvB3fO2 hTVBu8abzTdGcbHHyw+o0S87Kg0NUpdQ995jrJ8aCCCNzd3aI6lVm4Oyti/ugUQLe2KZPHPchkt 0J6gkWHJOIRC6JUBpdd7BPjn69bgKxlGF6SgwyHzDMdiFjHGF5DVUlEeNfjUipt7DLI4n7aDLXW DSatKW8VGAKBortwJ25DJjZMKg3+PqRN38O/+kT8TVzUP39iugvYJ4/sAUMaGwvFzuloftj2 X-Authority-Analysis: v=2.4 cv=Q7TS452a c=1 sm=1 tr=0 ts=684ada38 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=6IFa9wvqVegA:10 a=YgwN3AOMAAAA:8 a=COk6AnOGAAAA:8 a=SCSGtF1BeqTgPpDbPWsA:9 a=QEXdDO2ut3YA:10 a=ztR1XV6QG-NWxUt1dNgd:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: hWeRRxSRKAV1XyHXXPfUuaQiuUBA0QZT X-Proofpoint-ORIG-GUID: hWeRRxSRKAV1XyHXXPfUuaQiuUBA0QZT X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-06-12_09,2025-06-12_02,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 mlxscore=0 spamscore=0 mlxlogscore=434 bulkscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 impostorscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506120106 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250612_064655_683941_F3D72917 X-CRM114-Status: GOOD ( 11.92 ) 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 Replace 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 http://coccinelle.lip6.fr/ 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 dee1a406b0c2..c1dbea320131 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/memory.h +++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h @@ -37,8 +37,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; } -- 2.34.1