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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8DB6FC43603 for ; Fri, 20 Dec 2019 09:33:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5FD682146E for ; Fri, 20 Dec 2019 09:33:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VziVZJkO"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dmfoYz46" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5FD682146E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=j1dDE1PZrCXj5/vR6m27UQNF0n6YkqsKV+rK4aaTwvE=; b=VziVZJkOThO9Gd 0HR14yS1R7HcTCPj6DZZ4/yCgnBzTpaMi83s+t+kWIq/jOdPFLEEf87iMRRkwogmE96qIA8kOEzST az6ERdDWoJMdtu+33Kbz4758MdQNCY1bTodLFD5lqEcA2VRNIEi0infizLLcxhYDMp5yOurWeBFsg 4n4A6cWFXBnqjXZJOIV50+sy7GdCsiiZbuTNZDB5cmS3JyCATdT95xvRCTxvxJ4yR4K31RCzxHmpQ zKSRwTQj60OIOdDW4saMlR4xXIc/X3wxJdhaVr0QEG9lHS57yjRy5FwuBtZsU5+c9zIjpEjhUugMj BgNkQasElHm+j7lOmjXA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iiEfM-0000jB-Ct; Fri, 20 Dec 2019 09:33:48 +0000 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120] helo=us-smtp-1.mimecast.com) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iiEfJ-0000i6-1B for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2019 09:33:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576834423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kARvpg6EeSn47uf+HJvOWWm63eTYV3jwqH0aHeRURHY=; b=dmfoYz46vqGDwzCGWVXsIk7DJL75u101QNyfXVFnhsbvnkRG/jGbI60XZR8UYR2B82cquP vC2qZ3Too5AMHq+B+fcpMd3z/xA3GrR75oI0IkdzPhG3xjYotEymY1oTgQEfwsvAEUwL/o d++1lYbeESfG61eRHrfEca3zcIeCeLg= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-63-euuv6RBAMwGCsT-Q338LuQ-1; Fri, 20 Dec 2019 04:33:41 -0500 X-MC-Unique: euuv6RBAMwGCsT-Q338LuQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 444D1911EB; Fri, 20 Dec 2019 09:33:38 +0000 (UTC) Received: from gondolin (dhcp-192-245.str.redhat.com [10.33.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82CC560BF3; Fri, 20 Dec 2019 09:33:27 +0000 (UTC) Date: Fri, 20 Dec 2019 10:33:25 +0100 From: Cornelia Huck To: Sean Christopherson Subject: Re: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code Message-ID: <20191220103325.34fc2bf0.cohuck@redhat.com> In-Reply-To: <20191218215530.2280-31-sean.j.christopherson@intel.com> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> <20191218215530.2280-31-sean.j.christopherson@intel.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191220_013345_161503_C07E3DF6 X-CRM114-Status: GOOD ( 17.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Wanpeng Li , Janosch Frank , kvm@vger.kernel.org, Suzuki K Poulose , Marc Zyngier , Joerg Roedel , David Hildenbrand , linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Mackerras , Christian Borntraeger , Greg Kurz , James Morse , linux-arm-kernel@lists.infradead.org, James Hogan , Paolo Bonzini , Vitaly Kuznetsov , kvmarm@lists.cs.columbia.edu, Julien Thierry , Jim Mattson Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Wed, 18 Dec 2019 13:55:15 -0800 Sean Christopherson wrote: > Now that all architectures tightly couple vcpu allocation/free with the > mandatory calls to kvm_{un}init_vcpu(), move the sequences verbatim to > common KVM code. > > Move both allocation and initialization in a single patch to eliminate > thrash in arch specific code. The bisection benefits of moving the two > pieces in separate patches is marginal at best, whereas the odds of > introducing a transient arch specific bug are non-zero. > > Acked-by: Christoffer Dall > Signed-off-by: Sean Christopherson > --- > arch/mips/kvm/mips.c | 33 ++++++--------------------------- > arch/powerpc/kvm/powerpc.c | 27 ++++----------------------- > arch/s390/kvm/kvm-s390.c | 31 +++++-------------------------- > arch/x86/kvm/x86.c | 28 ++-------------------------- > include/linux/kvm_host.h | 2 +- > virt/kvm/arm/arm.c | 29 ++--------------------------- > virt/kvm/kvm_main.c | 21 ++++++++++++++++++--- > 7 files changed, 38 insertions(+), 133 deletions(-) (...) > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index 8543d338a06a..2ed76584ebd9 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -2530,9 +2530,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) > if (vcpu->kvm->arch.use_cmma) > kvm_s390_vcpu_unsetup_cmma(vcpu); > free_page((unsigned long)(vcpu->arch.sie_block)); > - > - kvm_vcpu_uninit(vcpu); > - kmem_cache_free(kvm_vcpu_cache, vcpu); > } > > static void kvm_free_vcpus(struct kvm *kvm) > @@ -3014,29 +3011,15 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) > return 0; > } > > -struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, > - unsigned int id) > +int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) > { > - struct kvm_vcpu *vcpu; > struct sie_page *sie_page; > int rc; > > - rc = -ENOMEM; > - > - vcpu = kmem_cache_zalloc(kvm_vcpu_cache, GFP_KERNEL); > - if (!vcpu) > - goto out; > - > - rc = kvm_vcpu_init(vcpu, kvm, id); > - if (rc) > - goto out_free_cpu; > - > - rc = -ENOMEM; > - > BUILD_BUG_ON(sizeof(struct sie_page) != 4096); > sie_page = (struct sie_page *) get_zeroed_page(GFP_KERNEL); > if (!sie_page) > - goto out_uninit_vcpu; > + return -ENOMEM; > > vcpu->arch.sie_block = &sie_page->sie_block; > vcpu->arch.sie_block->itdba = (unsigned long) &sie_page->itdb; > @@ -3087,15 +3070,11 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm, > vcpu->arch.sie_block); > trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block); > > - return vcpu; > + return 0; > + > out_free_sie_block: > free_page((unsigned long)(vcpu->arch.sie_block)); > -out_uninit_vcpu: > - kvm_vcpu_uninit(vcpu); > -out_free_cpu: > - kmem_cache_free(kvm_vcpu_cache, vcpu); > -out: > - return ERR_PTR(rc); > + return rc; This is getting a bit hard to follow across the patches, but I think rc is now only set for ucontrol guests. So this looks correct right now, but feels a bit brittle... should we maybe init rc to 0 and always return rc instead? > } > > int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) Otherwise, looks good. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel