From nobody Sun May 3 11:10:16 2026 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 8A5D4C433F5 for ; Sun, 29 May 2022 15:15:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230514AbiE2PPU (ORCPT ); Sun, 29 May 2022 11:15:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229741AbiE2PPS (ORCPT ); Sun, 29 May 2022 11:15:18 -0400 Received: from jari.cn (unknown [218.92.28.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 085EB1A821 for ; Sun, 29 May 2022 08:15:13 -0700 (PDT) Received: by ajax-webmail-localhost.localdomain (Coremail) ; Sun, 29 May 2022 23:09:36 +0800 (GMT+08:00) X-Originating-IP: [182.148.15.20] Date: Sun, 29 May 2022 23:09:36 +0800 (GMT+08:00) X-CM-HeaderCharset: UTF-8 From: "XueBing Chen" To: mpe@ellerman.id.au, benh@kernel.crashing.org, paulus@samba.org, npiggin@gmail.com, farosas@linux.ibm.com, bharata@linux.ibm.com, aneesh.kumar@linux.ibm.com Cc: aik@ozlabs.ru, nathan@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH] KVM: PPC: Book3S HV Nested: clean up warnings found by checkpatch X-Priority: 3 X-Mailer: Coremail Webmail Server Version XT6.0.1 build 20210329(c53f3fee) Copyright (c) 2002-2022 www.mailtech.cn mispb-4e503810-ca60-4ec8-a188-7102c18937cf-zhkzyfz.cn Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Message-ID: <45da8ea8.a92.181105d91bc.Coremail.chenxuebing@jari.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: AQAAfwAHEW+wjJNinyY6AA--.671W X-CM-SenderInfo: hfkh05pxhex0nj6mt2flof0/1tbiAQABCmFEYxsmlgACsl X-Coremail-Antispam: 1Ur529EdanIXcx71UUUUU7IcSsGvfJ3iIAIbVAYjsxI4VWxJw CS07vEb4IE77IF4wCS07vE1I0E4x80FVAKz4kxMIAIbVAFxVCaYxvI4VCIwcAKzIAtYxBI daVFxhVjvjDU= Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Clean up a handful of checkpatch warnings: - WARNING: Prefer 'long' over 'long int' as the int is unnecessary - WARNING: Missing a blank line after declarations - WARNING: Prefer 'unsigned int *' to bare use of 'unsigned *' - WARNING: unnecessary whitespace before a quoted newline - WARNING: please, no spaces at the start of a line - WARNING: Comparisons should place the constant on the right side of the test Signed-off-by: XueBing Chen --- arch/powerpc/kvm/book3s_hv_nested.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_nested.c b/arch/powerpc/kvm/book3s_= hv_nested.c index 9d373f8963ee..af56958b0a28 100644 --- a/arch/powerpc/kvm/book3s_hv_nested.c +++ b/arch/powerpc/kvm/book3s_hv_nested.c @@ -288,7 +288,7 @@ static void load_l2_hv_regs(struct kvm_vcpu *vcpu, =20 long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) { - long int err, r; + long err, r; struct kvm_nested_guest *l2; struct pt_regs l2_regs, saved_l1_regs; struct hv_guest_state l2_hv =3D {0}, saved_l1_hv; @@ -430,7 +430,7 @@ long kvmhv_enter_nested_guest(struct kvm_vcpu *vcpu) =20 long kvmhv_nested_init(void) { - long int ptb_order; + long ptb_order; unsigned long ptcr; long rc; =20 @@ -646,6 +646,7 @@ static void kvmhv_update_ptbl_cache(struct kvm_nested_g= uest *gp) ptbl_addr =3D (kvm->arch.l1_ptcr & PRTB_MASK) + (gp->l1_lpid << 4); if (gp->l1_lpid < (1ul << ((kvm->arch.l1_ptcr & PRTS_MASK) + 8))) { int srcu_idx =3D srcu_read_lock(&kvm->srcu); + ret =3D kvm_read_guest(kvm, ptbl_addr, &ptbl_entry, sizeof(ptbl_entry)); srcu_read_unlock(&kvm->srcu, srcu_idx); @@ -849,7 +850,7 @@ static struct kvm_nested_guest *kvmhv_find_nested(struc= t kvm *kvm, int lpid) } =20 pte_t *find_kvm_nested_guest_pte(struct kvm *kvm, unsigned long lpid, - unsigned long ea, unsigned *hshift) + unsigned long ea, unsigned int *hshift) { struct kvm_nested_guest *gp; pte_t *pte; @@ -859,7 +860,7 @@ pte_t *find_kvm_nested_guest_pte(struct kvm *kvm, unsig= ned long lpid, return NULL; =20 VM_WARN(!spin_is_locked(&kvm->mmu_lock), - "%s called with kvm mmu_lock not held \n", __func__); + "%s called with kvm mmu_lock not held\n", __func__); pte =3D __find_linux_pte(gp->shadow_pgtable, ea, NULL, hshift); =20 return pte; @@ -1003,6 +1004,7 @@ void kvmhv_remove_nest_rmap_range(struct kvm *kvm, =20 for (; gfn < end_gfn; gfn++) { unsigned long *rmap =3D &memslot->arch.rmap[gfn]; + kvmhv_remove_nest_rmap_list(kvm, rmap, hpa, addr_mask); } } @@ -1475,7 +1477,7 @@ static inline int kvmppc_radix_shift_to_level(int shi= ft) } =20 /* called with gp->tlb_lock held */ -static long int __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu, +static long __kvmhv_nested_page_fault(struct kvm_vcpu *vcpu, struct kvm_nested_guest *gp) { struct kvm *kvm =3D vcpu->kvm; @@ -1491,7 +1493,7 @@ static long int __kvmhv_nested_page_fault(struct kvm_= vcpu *vcpu, unsigned int shift, l1_shift, level; bool writing =3D !!(dsisr & DSISR_ISSTORE); bool kvm_ro =3D false; - long int ret; + long ret; =20 if (!gp->l1_gr_to_hr) { kvmhv_update_ptbl_cache(gp); @@ -1614,7 +1616,8 @@ static long int __kvmhv_nested_page_fault(struct kvm_= vcpu *vcpu, if (shift > l1_shift) { u64 mask; unsigned int actual_shift =3D PAGE_SHIFT; - if (PMD_SHIFT < l1_shift) + + if (l1_shift > PMD_SHIFT) actual_shift =3D PMD_SHIFT; mask =3D (1UL << shift) - (1UL << actual_shift); pte =3D __pte(pte_val(pte) | (gpa & mask)); @@ -1644,10 +1647,10 @@ static long int __kvmhv_nested_page_fault(struct kv= m_vcpu *vcpu, return RESUME_GUEST; } =20 -long int kvmhv_nested_page_fault(struct kvm_vcpu *vcpu) +long kvmhv_nested_page_fault(struct kvm_vcpu *vcpu) { struct kvm_nested_guest *gp =3D vcpu->arch.nested; - long int ret; + long ret; =20 mutex_lock(&gp->tlb_lock); ret =3D __kvmhv_nested_page_fault(vcpu, gp); --=20 2.36.1