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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9F21FC6FD1C for ; Thu, 23 Mar 2023 22:28:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231504AbjCWW22 (ORCPT ); Thu, 23 Mar 2023 18:28:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35378 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229690AbjCWW2Y (ORCPT ); Thu, 23 Mar 2023 18:28:24 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C5E22055B for ; Thu, 23 Mar 2023 15:28:22 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id o2so244116plg.4 for ; Thu, 23 Mar 2023 15:28:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1679610501; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=LhVyeu4gjZ1l2xd/DlkD/uaQ5Cthgsf/bh6Nj9UFQ/Y=; b=XPyFiK6vF875qGz7HLGj4KDDAg6Cz5oPb1YpOly/pU3QuX0+va0918fStssh8nYVx7 rbl48LiZGckKfmeL9P5wCZrKm65iKPVy+hI7Pe2IuV8aB93cZnftFEJ4bQkE1zuMQlUP rb+ikD228MkcBPtVkPq2qIIUSu3EN8neoguG7GG5x1/dGHSlK8POr/EzKjNelhL9qucq 9V+pF/wtf9U3wqpLyrdPM7uvmJw9IPYGhDNEjS9kEgCiJC8AofViHqQzkoTfJGzgHiJ7 n7IOPoBRoAalokUYzL6bU7nmk0xMmLAJQVDlvXH+kGs00SrEKAljEpg2I7i3m7WpwDhH xAog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679610501; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=LhVyeu4gjZ1l2xd/DlkD/uaQ5Cthgsf/bh6Nj9UFQ/Y=; b=0cYE+KGMmuT0UkznPAzsVG0j0aoG6DUOvtOiZ98tf0/kBZ3/uZhOZKfXCjR8DwOJWU 7kXwbNc5bz5rpEVBJuNDFcWfdg6nXf7zSiUPsSIEg/EJCgN15I6k0uvMd1TO3pmXx4sA JoJimRXxbzKgzCoqwO0DIQS8PsGIj1lhsXY815XPxp+19u+RTFHzZ5t+RZhFS+L0HMDO ooxxTJ+RHnJq7LhlEZXsi+o263kOUNKZCktN87btnbvEqIbhcF8hO1U472CxFcHHZxeA LYA9D0zFAyljkjwRLi6fEsp7Zg9bnfcPcxn/J5Ooz8QZWkzX2aiLdHsyTzwTPr0cXr9P EL4g== X-Gm-Message-State: AAQBX9c+hpFe0aW6FUpguXBq8N3uOLO3fgn+V1GuYTR6k4FO5xeN9bxO igP9xAHu/1sRZnVx7aw5gv8zrQ== X-Google-Smtp-Source: AKy350bFcfcguGqIMfMrx4rzKZu3QwL4KdjmRWj7wFUzBtYdVwMvlc8b0SoYk9T99q8JDK8lpIHQww== X-Received: by 2002:a17:90b:4a8b:b0:237:99b9:c415 with SMTP id lp11-20020a17090b4a8b00b0023799b9c415mr394373pjb.38.1679610501451; Thu, 23 Mar 2023 15:28:21 -0700 (PDT) Received: from google.com (223.103.125.34.bc.googleusercontent.com. [34.125.103.223]) by smtp.gmail.com with ESMTPSA id d2-20020a17090a6f0200b0023440af7aafsm1763775pjk.9.2023.03.23.15.28.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Mar 2023 15:28:20 -0700 (PDT) Date: Thu, 23 Mar 2023 15:28:16 -0700 From: David Matlack To: Vipin Sharma Cc: seanjc@google.com, pbonzini@redhat.com, bgardon@google.com, jmattson@google.com, mizhang@google.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [Patch v4 14/18] KVM: mmu: Initialize kvm_mmu_memory_cache.gfp_zero to __GFP_ZERO by default Message-ID: References: <20230306224127.1689967-1-vipinsh@google.com> <20230306224127.1689967-15-vipinsh@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230306224127.1689967-15-vipinsh@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 06, 2023 at 02:41:23PM -0800, Vipin Sharma wrote: > Set __GFP_ZERO to gfp_zero in default initizliation of struct > kvm_mmu_memory_cache{} > > All of the users of default initialization code of struct > kvm_mmu_memory_cache{} explicitly sets gfp_zero to __GFP_ZERO. This can > be moved to common initialization logic. If that were true we could get rid of gfp_zero entirely and hard-code __GFP_ZERO in the memory allocator! mmu_shadowed_info_cache is the one that does not set __GFP_ZERO. > > Signed-off-by: Vipin Sharma > --- > arch/arm64/kvm/arm.c | 1 - > arch/arm64/kvm/mmu.c | 1 - > arch/riscv/kvm/mmu.c | 1 - > arch/riscv/kvm/vcpu.c | 1 - > arch/x86/kvm/mmu/mmu.c | 6 ------ > include/linux/kvm_types.h | 4 +++- > 6 files changed, 3 insertions(+), 11 deletions(-) > > diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c > index 2b3d88e4ace8..b4243978d962 100644 > --- a/arch/arm64/kvm/arm.c > +++ b/arch/arm64/kvm/arm.c > @@ -331,7 +331,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) > bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES); > > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_page_cache); > - vcpu->arch.mmu_page_cache.gfp_zero = __GFP_ZERO; > > /* > * Default value for the FP state, will be overloaded at load > diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c > index 8a56f071ca66..133eba96c41f 100644 > --- a/arch/arm64/kvm/mmu.c > +++ b/arch/arm64/kvm/mmu.c > @@ -904,7 +904,6 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, > if (is_protected_kvm_enabled()) > return -EPERM; > > - cache.gfp_zero = __GFP_ZERO; > size += offset_in_page(guest_ipa); > guest_ipa &= PAGE_MASK; > > diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c > index bdd8c17958dd..62550fd91c70 100644 > --- a/arch/riscv/kvm/mmu.c > +++ b/arch/riscv/kvm/mmu.c > @@ -353,7 +353,6 @@ int kvm_riscv_gstage_ioremap(struct kvm *kvm, gpa_t gpa, > phys_addr_t addr, end; > KVM_MMU_MEMORY_CACHE(pcache); > > - pcache.gfp_zero = __GFP_ZERO; > if (in_atomic) > pcache.gfp_custom = GFP_ATOMIC | __GFP_ACCOUNT; > > diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c > index bc743e9122d1..f5a96ed1e426 100644 > --- a/arch/riscv/kvm/vcpu.c > +++ b/arch/riscv/kvm/vcpu.c > @@ -164,7 +164,6 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) > /* Mark this VCPU never ran */ > vcpu->arch.ran_atleast_once = false; > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_page_cache); > - vcpu->arch.mmu_page_cache.gfp_zero = __GFP_ZERO; > bitmap_zero(vcpu->arch.isa, RISCV_ISA_EXT_MAX); > > /* Setup ISA features available to VCPU */ > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index b706087ef74e..d96afc849ee8 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -5963,14 +5963,11 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) > > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_pte_list_desc_cache); > vcpu->arch.mmu_pte_list_desc_cache.kmem_cache = pte_list_desc_cache; > - vcpu->arch.mmu_pte_list_desc_cache.gfp_zero = __GFP_ZERO; > > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_page_header_cache); > vcpu->arch.mmu_page_header_cache.kmem_cache = mmu_page_header_cache; > - vcpu->arch.mmu_page_header_cache.gfp_zero = __GFP_ZERO; > > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_shadow_page_cache); > - vcpu->arch.mmu_shadow_page_cache.gfp_zero = __GFP_ZERO; > mutex_init(&vcpu->arch.mmu_shadow_page_cache_lock); > > INIT_KVM_MMU_MEMORY_CACHE(&vcpu->arch.mmu_shadowed_info_cache); > @@ -6138,14 +6135,11 @@ int kvm_mmu_init_vm(struct kvm *kvm) > > INIT_KVM_MMU_MEMORY_CACHE(&kvm->arch.split_page_header_cache); > kvm->arch.split_page_header_cache.kmem_cache = mmu_page_header_cache; > - kvm->arch.split_page_header_cache.gfp_zero = __GFP_ZERO; > > INIT_KVM_MMU_MEMORY_CACHE(&kvm->arch.split_shadow_page_cache); > - kvm->arch.split_shadow_page_cache.gfp_zero = __GFP_ZERO; > > INIT_KVM_MMU_MEMORY_CACHE(&kvm->arch.split_desc_cache); > kvm->arch.split_desc_cache.kmem_cache = pte_list_desc_cache; > - kvm->arch.split_desc_cache.gfp_zero = __GFP_ZERO; > > return 0; > } > diff --git a/include/linux/kvm_types.h b/include/linux/kvm_types.h > index 192516eeccac..5da7953532ce 100644 > --- a/include/linux/kvm_types.h > +++ b/include/linux/kvm_types.h > @@ -99,7 +99,9 @@ struct kvm_mmu_memory_cache { > void **objects; > }; > > -#define KVM_MMU_MEMORY_CACHE_INIT() { } > +#define KVM_MMU_MEMORY_CACHE_INIT() { \ > + .gfp_zero = __GFP_ZERO, \ > +} > > #define KVM_MMU_MEMORY_CACHE(_name) \ > struct kvm_mmu_memory_cache _name = KVM_MMU_MEMORY_CACHE_INIT() > -- > 2.40.0.rc0.216.gc4246ad0f0-goog >