Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1471405

[PATCH 5/6] KVM: PPC: e500: Use kmalloc_array() in kvmppc_e500_tlb_init()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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);
 	if (!vcpu_e500->gtlb_arch)
 		return -ENOMEM;
 
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] KVM: PPC: e500: Fine-tuning for two function  implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:20 +0200
  [PATCH 5/6] KVM: PPC: e500: Use kmalloc_array() in  kvmppc_e500_tlb_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:20 +0200
    Re: [PATCH 5/6] KVM: PPC: e500: Use kmalloc_array() in  kvmppc_e500_tlb_init() Julia Lawall <julia.lawall@lip6.fr> - 2016-08-28 19:50 +0200
  [PATCH 2/6] KVM: PPC: e500: Less function calls in  kvm_vcpu_ioctl_config_tlb() after error detection SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:20 +0200
  [PATCH 4/6] KVM: PPC: e500: Replace kzalloc() calls by kcalloc() in  two functions SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:20 +0200
  [PATCH 1/6] KVM: PPC: e500: Use kmalloc_array() in  kvm_vcpu_ioctl_config_tlb() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:20 +0200
  [PATCH 3/6] KVM: PPC: e500: Delete an unnecessary initialisation in  kvm_vcpu_ioctl_config_tlb() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:30 +0200
  [PATCH 6/6] KVM: PPC: e500: Rename jump labels in  kvmppc_e500_tlb_init() SF Markus Elfring <elfring@users.sourceforge.net> - 2016-08-28 19:30 +0200
    Re: [PATCH 6/6] KVM: PPC: e500: Rename jump labels in  kvmppc_e500_tlb_init() Julia Lawall <julia.lawall@lip6.fr> - 2016-08-28 19:50 +0200

csiph-web