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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9BD61C3DA6D for ; Wed, 21 May 2025 02:25:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 194B36B007B; Tue, 20 May 2025 22:25:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 146176B0082; Tue, 20 May 2025 22:25:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 034776B0085; Tue, 20 May 2025 22:25:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id D80246B007B for ; Tue, 20 May 2025 22:25:32 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 51F97161EE4 for ; Wed, 21 May 2025 02:25:32 +0000 (UTC) X-FDA: 83465323704.30.B98E836 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 2DB89A0006 for ; Wed, 21 May 2025 02:25:30 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TUgPeHuT; spf=pass (imf15.hostedemail.com: domain of gshan@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747794330; h=from:from:sender: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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=hkRmm/Yp4BUDonwE4Xac96Ss8wcLW7noonhF13pZKss=; b=nY6QygZtms2HAaoQ4sIJQCd/Bc7Jc+/6mpzqNBzmI+I3xSviXJUpgKNBOXYfR2GGrWQRiD 9ZGeVv3WZseY9pBzTxCLw04cMJoc1KDw24xA6LiMldOG/FXqCwaE55P53YYFTyGFv0Or6b 9o60IJh1FdGdxv15ZrhH7xmo3jqkrso= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TUgPeHuT; spf=pass (imf15.hostedemail.com: domain of gshan@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=gshan@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747794330; a=rsa-sha256; cv=none; b=5sTnxCmLilwOAq4p/CbNBBQTX4onoHDcUECocYN4pSCTvMqc0oGfYacvJRUJG/MKrs7mUI bXPdW5D04R6DpfEF4edic3qJ3t6XWeLCC18bKNOfz6o9E6VNrQt7cOVCBcJ0R5e9jacNSr izGMw5XDtWgjqQ5UiIVkvisU0Go4U3w= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747794329; h=from:from: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: in-reply-to:in-reply-to:references:references; bh=hkRmm/Yp4BUDonwE4Xac96Ss8wcLW7noonhF13pZKss=; b=TUgPeHuT3IiJtFm/UW0VNevVCqfjwxw7LMGp6oh9I/z5NR+EwYHyI8sGagI7IEhA/NJv/I Kg7mHrEPaf3wnBafgTJD1oEcFL8hiE2hIVz6vfwLUFvi5PP1wXq9Ix36nQELAdwuahvWLa W/Qbkv+7IyDXDy6FIdf5HnqdG3pVCVI= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-345-skDjsmzVO5Seuu14TQ2g8A-1; Tue, 20 May 2025 22:25:26 -0400 X-MC-Unique: skDjsmzVO5Seuu14TQ2g8A-1 X-Mimecast-MFC-AGG-ID: skDjsmzVO5Seuu14TQ2g8A_1747794326 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-7370e73f690so7533290b3a.3 for ; Tue, 20 May 2025 19:25:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747794326; x=1748399126; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hkRmm/Yp4BUDonwE4Xac96Ss8wcLW7noonhF13pZKss=; b=S525606LQxI9bn7QOyDAR68pd1KFqQHvPbIri8CvDrpNJMp0i0AC9q3xk0y2JAtWcE qk3DC8q+OqKrbR9UUnWIVHzagYM+49tXsj44Qh6hKVkf07c7VNa58LkF9CkqgzybgavT Xa0IfY+p4ZxYi2qnNYZFkaDwaMV8FqUHwBwJKCXTSNrspo3EDvACpgt3Vd7WsvD0IiSN 4akEepASqStM0LiONeze8JhHYR4+VEXYccTGBPWoqSWaAKvDQahdRBRjZm3BN5ZKUhmP d+tWWS8bZNK4QROSz0oW7uF2e2+9xojN8ZHmjWJCG42l6jlSHgL7t2QwyBmV2PxLG+KM E26g== X-Forwarded-Encrypted: i=1; AJvYcCXIskL7RI9BdpGlOFW9XiOc+wtZTlUdrruyEvZ0LkNju4dne+TA8BqRJIUfcTuQwdhg2YvhqTFH6Q==@kvack.org X-Gm-Message-State: AOJu0YzHmgRwW9gM75ptHeEoOXpSPdPTBPhA38zXiNAIWsllW8yex/Fc p+f2UTQY7epvskMTuv7rpcEDRbgIMphipf9JEM7qowD5vIRffJw26RxgL6T8/Lv+GOJdSqCMqAx Y3BHgLxf0vxLt058YPN12yn1z6QkMEkU3VP1tWBHYVR5hz6kK3qDN X-Gm-Gg: ASbGncsrg94bRrNmJNd704OzVPldDlxsAtAfCP3XMg0M188gr5HGa7vQq0n35ZUtZ5r loJ+AQDYB8OH5pzQ8++M/zLsFszcI2WCapFldkJGwg/HuhD3EO6zWy4C7+oJ57vfhUw9D+OxSkL 6aFT0tzc2ZI6xtfie8jdDJ44siDAvwa39zXZrO292dz9yrNRTijMQrUErE0bbG1EuKCMJCp/BmM L2NwRh95+5aGV+3Rhul7M8FthSBTrjlcn4SM+0lRTnnlLi4RDv/dNMl8Mtyx+hDhpLYldKrGR3C kqzM4vr8wPLh X-Received: by 2002:a05:6a20:7d9c:b0:1f5:8e39:9470 with SMTP id adf61e73a8af0-216219b2560mr32316764637.31.1747794325908; Tue, 20 May 2025 19:25:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IELH1Nkj6QBFRo2UbjW4nbg/CMv3zHb63Laxsznz8iimJrWPxaDEgIYMLdZSM4BBQAJnQlmzw== X-Received: by 2002:a05:6a20:7d9c:b0:1f5:8e39:9470 with SMTP id adf61e73a8af0-216219b2560mr32316707637.31.1747794325507; Tue, 20 May 2025 19:25:25 -0700 (PDT) Received: from [192.168.68.51] ([180.233.125.65]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b26eaf8e114sm8739609a12.44.2025.05.20.19.25.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 May 2025 19:25:24 -0700 (PDT) Message-ID: Date: Wed, 21 May 2025 12:25:04 +1000 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v9 12/17] KVM: arm64: Rename variables in user_mem_abort() To: Fuad Tabba , kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, peterx@redhat.com, pankaj.gupta@amd.com, ira.weiny@intel.com References: <20250513163438.3942405-1-tabba@google.com> <20250513163438.3942405-13-tabba@google.com> From: Gavin Shan In-Reply-To: <20250513163438.3942405-13-tabba@google.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Xwkgb99d3WNoPYzvSGGsQpNzaaEjEV5OCDcRMl4HsnE_1747794326 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 2DB89A0006 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: dmht56iffh9x6jsky99m1i5dkoogwodz X-HE-Tag: 1747794330-644769 X-HE-Meta: U2FsdGVkX18xn3ZUbsM7gLUPuQ/+gu0uidqIHd0JlMyC0dx5RgxTapKitil20CwxFiSPZdeLF+iZENb9e+l1m0nf+gQZsCSj6tXCTCaoNMNqtp5GSaza50ZD5iExM5JDye7zwWtRG1KAiUgkn64y8fNxCuqj1GrlT+2dToJhVoA2TYzotutJ2OKO5CDRIOsI7vnys9tlY7D4zoRVno/Losv7yPkPZPHRlmboN63fuGfrdNN3Jt+qcvpF3wo805nBplRpi/TbMAAjA6uXDTH54Laobqn5XTQWOzL4B0tHEgdK4NtRNFimngXLF5dc73g8H6O9zrEsgY/ZMl0S7QxddmMeYEPSQshxmBC8gKNSAoPASzzO8dmTXEBvoWxsdoC8R4yxK1oGU/Efv/H2Wjz/czWW8TopcrgRwk3gxU60sxp9+NFCdeXbEfju3CH214dyo4EO8dSs3oIEl0B//SNM2mw81u7HWdPXF+iiE2zpPeDB018KIpHKs516EfDQdLNYvu1ziv0vZTbbVYweNCdW2eMXU0bKXd/vsjOIA1aY62cA/2NLTpuvljdB6lja2Sfc4yC1G+ZKHRbzgj1dajHMUJyJkcUd4/Jxm401Rt9XyFuoRhaBElMDkXfBiAzdNw2aqfk5I8W9JY9AmB+NCPEYOml8vZMwdcqGjUS5Pp9U1rr9dXaPU6HzhWPUTLR64aAB5/PGSjHytXdihU1ydpF1a/3gaJVJbC7UmyiU2WRB1tGNijUfqyV8MCUVpkmjbGGvE3yp/cfMCBhGOcAtwWn0js30DfMVd6ajD+wzFH/fVEMgYcel58ZQzCmuhldKUvR+qiu05I8Lphge9/Hu5mN5cFKUKpMMUAQwRpjDOi8J7JuYIb8Kiw3XHeoK+KzGnO57Xma1hF+Pf/OOv6MOJSrDFRyRk1vf1pYRKNP6IaM0YLa4RTHa5fDIppj1GEhchge15ce5kIrUb2KmejFZ72c U4nY5+B9 qIphc5KBdCrN04RPAI4ts0ZFXhkTaeg+oeeSFQybKwJw1FdhrlAuyZkzJw4R3YvS4JgaOFPAYPaWSgpX5Bf03GZ61Cau8qv0wGjfTn92l0irmaj6pbCsVCdOa6qdunVOjicB1J1tyOH1K/KJa5tsuENWxTjF0udISBl9G X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Fuad, On 5/14/25 2:34 AM, Fuad Tabba wrote: > Guest memory can be backed by guest_memfd or by anonymous memory. Rename > vma_shift to page_shift and vma_pagesize to page_size to ease > readability in subsequent patches. > > Suggested-by: James Houghton > Signed-off-by: Fuad Tabba > --- > arch/arm64/kvm/mmu.c | 54 ++++++++++++++++++++++---------------------- > 1 file changed, 27 insertions(+), 27 deletions(-) > > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 9865ada04a81..d756c2b5913f 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -1479,13 +1479,13 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > phys_addr_t ipa = fault_ipa; > struct kvm *kvm = vcpu->kvm; > struct vm_area_struct *vma; > - short vma_shift; > + short page_shift; > void *memcache; > gfn_t gfn; > kvm_pfn_t pfn; > bool logging_active = memslot_is_logging(memslot); > bool force_pte = logging_active || is_protected_kvm_enabled(); > - long vma_pagesize, fault_granule; > + long page_size, fault_granule; > enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R; > struct kvm_pgtable *pgt; > struct page *page; [...] > > /* > @@ -1600,9 +1600,9 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, > * ensure we find the right PFN and lay down the mapping in the right > * place. > */ > - if (vma_pagesize == PMD_SIZE || vma_pagesize == PUD_SIZE) { > - fault_ipa &= ~(vma_pagesize - 1); > - ipa &= ~(vma_pagesize - 1); > + if (page_size == PMD_SIZE || page_size == PUD_SIZE) { > + fault_ipa &= ~(page_size - 1); > + ipa &= ~(page_size - 1); > } > nit: since we're here for readability, ALIGN_DOWN() may be used: fault_ipa = ALIGN_DOWN(fault_ipa, page_size); ipa = ALIGN_DOWN(ipa, page_size); Thanks, Gavin