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 1A335C2D0CD for ; Wed, 21 May 2025 09:58:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 441E86B0082; Wed, 21 May 2025 05:58:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3F2836B0088; Wed, 21 May 2025 05:58:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3089C6B0089; Wed, 21 May 2025 05:58:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 17E236B0082 for ; Wed, 21 May 2025 05:58:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id B1A31E63E3 for ; Wed, 21 May 2025 09:58:07 +0000 (UTC) X-FDA: 83466464214.04.73E5B35 Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by imf16.hostedemail.com (Postfix) with ESMTP id 110DF180002 for ; Wed, 21 May 2025 09:58:05 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KIXGPvUw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of tabba@google.com designates 209.85.160.175 as permitted sender) smtp.mailfrom=tabba@google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747821486; a=rsa-sha256; cv=none; b=0ONp0GGQvHSooSQVYRBU5NJzDzVJLCZVEx46kcvflUtmzWHYvfHf22I9vKEE53qpPGO534 AsQ7x4H5E0LQoQD2L/VNTbb5JsgpaWaEZb858Ab53q0TgTAWjN5Dl69oiCDyflnhUrCgr5 Bq/Uvbc1JxrzKMNQ3mfddt4izv0KqXQ= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=KIXGPvUw; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf16.hostedemail.com: domain of tabba@google.com designates 209.85.160.175 as permitted sender) smtp.mailfrom=tabba@google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747821486; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ad5tTssSvvJSV/hIQ2/yoAH3fpDKHmC0VyQ1XWz8SsY=; b=vBMv54IFMWZmEEYFUXtPFpHqARjt3OPwMNKC6+fxgj/in28Eun2+vfRGyIgVHjKdLPfDV1 Ox8ZU8JkBJ10J3o+XLwVBYYFvBtwBTHLUnXl+QF26p17GwBGG24PrB+TTuWaj2zH+Xz0Oy LcUABy/zXn+XAJHKLAWeX5cdwTWVVDk= Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-48b7747f881so1381911cf.1 for ; Wed, 21 May 2025 02:58:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747821485; x=1748426285; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ad5tTssSvvJSV/hIQ2/yoAH3fpDKHmC0VyQ1XWz8SsY=; b=KIXGPvUwcvunb76mFkXDGCdtYqnoDr0yoxkv6LNC/8+2zqoYhXZB2YMXiPx7Eh/NS6 /BAQ3TzTDmRdnYqnzOJQwFztvsTSYHqkS3AOFFsz0yIDv8sftdPW08hN8DOLgGYboDy/ jXn3kLctjrlk4Lno1hoqj5RBkzowJeZYq77g50lofL4FRJG4fBLFOiRSRsReiZ+flII7 JNM2pkAFzbgWJpgQfOnN46eI0WOqs/zEKohGieVmXxCDofiMtKjXGJr7BlI5fvAzn5pJ DOie3qv9JxXAOz4OQiI2CjC3oLgstjYKgvLVwuvbimbZLIfRIp5oZxZQk4gtpV8N5Y2m gfXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747821485; x=1748426285; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ad5tTssSvvJSV/hIQ2/yoAH3fpDKHmC0VyQ1XWz8SsY=; b=mmwQ6CyyoyPWx6djpWBhDtDNr9rlUSgIpaluz7ULvaQGSk4QHylN7m/JTNmT/IU8uw MQW8NaQfb/DPmoZ0yPuI6T0NvnkGgFafy46mxxpclsJzPFyM9KdBSs/NrQFBfzSxAmw7 RHpLswEiiDevD/e5TBjuj6vUSEymyOesgL9K6X9MHJsuhvgMO/v+SIAl3tA+lRV5uXqI NYEo6ShgT/7Rs07IXUj4TGkPkajHUnmGipE6HuT0scRlowQJWCstKzrJegFeEO0yo3i/ fhDa9lJAWaqjt8u4Nu84W8CqgYaKCQV3uw4IlnI6BGtWHWXflgybdBufLIzoMs6LPyzb Qziw== X-Forwarded-Encrypted: i=1; AJvYcCWXb5xE84TMMkmBWlI0G00vMhlkO5HRfwTbUVYXYq28N2H8K8XsB+D9boXHZ8WwhAP7Cj9hm72CvA==@kvack.org X-Gm-Message-State: AOJu0YxPhvHrkvLZg6TqEqX2XGPN3L1AS4obcgl7rURONC0YmX9IJl0t 4jnG/DU6pBY/RdPq+K01uv9sp/ldrae0rEv4gekAC5XodqccSETs/K777Ej4ujga0prRL8pkyNQ pybUIXsqFVQ66fhf9Bih0InbY4TZeVNt+PJdTHuvG X-Gm-Gg: ASbGnctyC7bFmL/YEUpUSmXRhlaPMZFVyoA+4mo+zo+JM703CnCEhxPTt1o5IvADp8e A91rizWoii6CbB+azUOo7GUqSDBiIEEDUpPonsMh57+AcFbUq6krY/d5d+9bv53N+AB/05HMA8Z DUTIbDbozUf/ANcG8SwyTLs/4zSPM0NQ9z/EXmi7AmMjxCOtRrt0Mn9ehLP1ebU9mjnwCVY+LQ/ S2ia7Om7Fs= X-Google-Smtp-Source: AGHT+IHYpY3Q9g3JOq11dLs1LUtNSXh9tz4zLNdyFUWuBFtv/7x94Am0WXGexcTYuCAAK3RlpzJYkCP2ifAlrCMkLPI= X-Received: by 2002:ac8:7f4c:0:b0:48a:5b89:473b with SMTP id d75a77b69052e-49600c85c06mr14582151cf.7.1747821484573; Wed, 21 May 2025 02:58:04 -0700 (PDT) MIME-Version: 1.0 References: <20250513163438.3942405-1-tabba@google.com> <20250513163438.3942405-13-tabba@google.com> In-Reply-To: From: Fuad Tabba Date: Wed, 21 May 2025 10:57:28 +0100 X-Gm-Features: AX0GCFuVxsTCj98Zq8bTXqyVrhdO3LELJGYKoRJOWR5nfIgy9REIGN4QCBpniz0 Message-ID: Subject: Re: [PATCH v9 12/17] KVM: arm64: Rename variables in user_mem_abort() To: Gavin Shan Cc: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org, 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 Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 110DF180002 X-Rspam-User: X-Stat-Signature: owcbdws4pcmdy1hrowcqnehw74qihhc9 X-HE-Tag: 1747821485-73484 X-HE-Meta: U2FsdGVkX188hwMGM/TRyH89AwzAd2dPut5bNepQfMMant8KnistCe1IukYO4d2VOPM6D3ihDCn+lnNFEMF/8LHNu1yXIq1o9ORZZQD2Gwg7DkqtXWhQ9dlC4THSkkWJW8QMNuTE9diD7xhdqbfye8Y01Umd0/5Jf/tAb9m9ixneAYWf2EuJrGHaj+IQkCrsOtLAabsnEO2bzGleyxrOwN37btWgFJxQRAwKu8QfkvKE0iWhO1sjYIM7/uipbQ2C49AcgbkUYInrtaQJXlwHVM3snaHrMyJWEhpx82dF3X5vzE3adVhpv5iuphqCba114Ks6B93g7pe1jpPjqERpXnWIAKY33Dl7dUE3VosfuUHLfLC4sON+q9oE841SbAFG2Vc0uelZjaDMx/5YR1nHEAHNautxd61N0gQn5JGOre+ufl+WmPQJyIYLaQFGWxiF/CSzh9h6wjOSc+d7YAU56EkJkVcSOoF10UE3udmU3QqNQYtytUvEdtd8yTU1hc0n6wdP20maQAL18apXuVSqxVVjAAxlayqgNmAAbLOEtkxbbsz3vbD/0+xlHFZFrwPYrmEmMp+XnguO3vWgnhXg6zFRIux/Z0VJJPmNutulOrt8rMnlmXLBQoI8zBuhl9q8FD0Fxfh3sibAn0EsMnH2z5N1TJjKOPJUJzos95MK82rabjcCL8m1jJdRRLlmguZjU76M5KZ4DRwqMi2J9S/P8IJwnCfAhXcuJ/fc1ScTGbQUUiQmEgihdLudLOC6ATvVeqFRyhEYTNCIKodWrMnIiU+st7nGAWcyek+nEBw67DhRFK3bxv1sjvNWLVDRk7X2+JpO6KNoCGNhog14xqiOzk0mj2iJ0spUKSxdoz3rKT+iA8HUWL+UiInWqX5gmOtpT2cLBEyClrT2oX7p8jN2Lxz6gLO6ki3jnk17kge1qWVBHrdA8+tixQBTI3vEDKmwm/5rC+09VDMrzJPoGfe QaZVRSLw cUe3spS1CdzFJCmvalyCOi71r2yv9CdFNyDjH5Z8RkvxBpvhC69Ex/M6dLQ== 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 Gavin, On Wed, 21 May 2025 at 03:25, Gavin Shan wrote: > > 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); Yes, but that would be a change beyond just renaming. I could introduce another patch to do that. Thanks, /fuad > Thanks, > Gavin >