From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756010AbcH1RrF (ORCPT ); Sun, 28 Aug 2016 13:47:05 -0400 Received: from mail3-relais-sop.national.inria.fr ([192.134.164.104]:37801 "EHLO mail3-relais-sop.national.inria.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755716AbcH1Rqw (ORCPT ); Sun, 28 Aug 2016 13:46:52 -0400 X-IronPort-AV: E=Sophos;i="5.28,592,1464645600"; d="scan'208";a="191307449" Date: Sun, 28 Aug 2016 19:46:47 +0200 (CEST) From: Julia Lawall X-X-Sender: jll@hadrien To: SF Markus Elfring cc: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Alexander Graf , Benjamin Herrenschmidt , Michael Ellerman , Paolo Bonzini , Paul Mackerras , =?ISO-8859-2?Q?Radim_Kr=E8m=E1=F8?= , LKML , kernel-janitors@vger.kernel.org Subject: Re: [PATCH 5/6] KVM: PPC: e500: Use kmalloc_array() in kvmppc_e500_tlb_init() In-Reply-To: Message-ID: References: <566ABCD9.1060404@users.sourceforge.net> User-Agent: Alpine 2.10 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 28 Aug 2016, SF Markus Elfring wrote: > From: Markus Elfring > Date: Sun, 28 Aug 2016 18:40:08 +0200 > > * A multiplication for the size determination of a memory allocation > indicated that an array data structure should be processed. > Thus use the corresponding function "kmalloc_array". > > * Replace the specification of a data structure by a pointer dereference > to make the corresponding size determination a bit safer according to > the Linux coding style convention. > > Signed-off-by: Markus Elfring > --- > arch/powerpc/kvm/e500_mmu.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c > index 2be2afc4..0a2eeb1 100644 > --- a/arch/powerpc/kvm/e500_mmu.c > +++ b/arch/powerpc/kvm/e500_mmu.c > @@ -905,8 +905,6 @@ static int vcpu_mmu_init(struct kvm_vcpu *vcpu, > int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) > { > struct kvm_vcpu *vcpu = &vcpu_e500->vcpu; > - int entry_size = sizeof(struct kvm_book3e_206_tlb_entry); > - int entries = KVM_E500_TLB0_SIZE + KVM_E500_TLB1_SIZE; > > if (e500_mmu_host_init(vcpu_e500)) > goto err; > @@ -921,7 +919,10 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500) > vcpu_e500->gtlb_params[1].ways = KVM_E500_TLB1_SIZE; > vcpu_e500->gtlb_params[1].sets = 1; > > - vcpu_e500->gtlb_arch = kmalloc(entries * entry_size, GFP_KERNEL); > + vcpu_e500->gtlb_arch = kmalloc_array(KVM_E500_TLB0_SIZE + > + KVM_E500_TLB1_SIZE, > + sizeof(*vcpu_e500->gtlb_arch), > + GFP_KERNEL); There are changes here that are not mentioned in the commit log. julia > if (!vcpu_e500->gtlb_arch) > return -ENOMEM; > > -- > 2.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >