]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: PPC: e500: Fix build error due to using kmalloc_obj() with wrong type
authorSean Christopherson <seanjc@google.com>
Tue, 3 Mar 2026 19:03:38 +0000 (11:03 -0800)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 11 Mar 2026 17:41:10 +0000 (18:41 +0100)
Fix a build error in kvmppc_e500_tlb_init() that was introduced by the
conversion to use kzalloc_objs(), as KVM confusingly uses the size of the
structure that is one and only field in tlbe_priv:

  arch/powerpc/kvm/e500_mmu.c:923:33: error: assignment to 'struct tlbe_priv *'
    from incompatible pointer type 'struct tlbe_ref *' [-Wincompatible-pointer-types]
  923 |         vcpu_e500->gtlb_priv[0] = kzalloc_objs(struct tlbe_ref,
      |                                 ^

KVM has been flawed since commit 0164c0f0c404 ("KVM: PPC: e500: clear up
confusion between host and guest entries"), but the issue went unnoticed
until kmalloc_obj() came along and enforced types, as "struct tlbe_priv"
was just a wrapper of "struct tlbe_ref" (why on earth the two ever existed
separately...).

Fixes: 69050f8d6d07 ("treewide: Replace kmalloc with kmalloc_obj for non-scalar types")
Cc: Kees Cook <kees@kernel.org>
Reviewed-by: Christophe Leroy (CS GROUP) <chleroy@kernel.org>
Link: https://patch.msgid.link/20260303190339.974325-2-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/powerpc/kvm/e500_mmu.c

index 48580c85f23b0e8465cccf0ca00f4363aa73d946..75ed1496ead52ff6fc1bed51c6a7a97be0b4eb89 100644 (file)
@@ -920,12 +920,12 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
        vcpu_e500->gtlb_offset[0] = 0;
        vcpu_e500->gtlb_offset[1] = KVM_E500_TLB0_SIZE;
 
-       vcpu_e500->gtlb_priv[0] = kzalloc_objs(struct tlbe_ref,
+       vcpu_e500->gtlb_priv[0] = kzalloc_objs(struct tlbe_priv,
                                               vcpu_e500->gtlb_params[0].entries);
        if (!vcpu_e500->gtlb_priv[0])
                goto free_vcpu;
 
-       vcpu_e500->gtlb_priv[1] = kzalloc_objs(struct tlbe_ref,
+       vcpu_e500->gtlb_priv[1] = kzalloc_objs(struct tlbe_priv,
                                               vcpu_e500->gtlb_params[1].entries);
        if (!vcpu_e500->gtlb_priv[1])
                goto free_vcpu;