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=-0.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=no 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 87879C43603 for ; Fri, 20 Dec 2019 16:01:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 577AB21D7E for ; Fri, 20 Dec 2019 16:01:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="NJ82iblB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727406AbfLTQBA (ORCPT ); Fri, 20 Dec 2019 11:01:00 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:34998 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727181AbfLTQBA (ORCPT ); Fri, 20 Dec 2019 11:01:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576857659; 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=l025u6fxXKxK3eWge8nzvLZFfpRbb+ibWiXZ7ykWyCA=; b=NJ82iblBVbqA1JcHPMCGQhP+QvT8aFrQjddIIzkjfKKhQAKjN6+KZaYahs6b/+ioGFA1pS eESPvwJsXoAA4CyyEt2nWR2+1LlLhOYACA8+a2xsj5x7LoodgyG4LjtF8mNt8CppTUpCgq 0Mf9rCHt85YP91bIZHhvPbbFddv9qKE= 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-416-uTYIN32MOW6V0xu7MdKMDA-1; Fri, 20 Dec 2019 11:00:58 -0500 X-MC-Unique: uTYIN32MOW6V0xu7MdKMDA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 019A6800D48; Fri, 20 Dec 2019 16:00:54 +0000 (UTC) Received: from gondolin (dhcp-192-245.str.redhat.com [10.33.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5F3DF6046B; Fri, 20 Dec 2019 16:00:47 +0000 (UTC) Date: Fri, 20 Dec 2019 17:00:45 +0100 From: Cornelia Huck To: Sean Christopherson Cc: Marc Zyngier , James Hogan , Paul Mackerras , Christian Borntraeger , Janosch Frank , Paolo Bonzini , James Morse , Julien Thierry , Suzuki K Poulose , David Hildenbrand , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-mips@vger.kernel.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kurz Subject: Re: [PATCH v2 30/45] KVM: Move vcpu alloc and init invocation to common code Message-ID: <20191220170045.725fb05c.cohuck@redhat.com> In-Reply-To: <20191220155330.GA21021@linux.intel.com> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> <20191218215530.2280-31-sean.j.christopherson@intel.com> <20191220103325.34fc2bf0.cohuck@redhat.com> <20191220155330.GA21021@linux.intel.com> Organization: Red Hat GmbH MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org On Fri, 20 Dec 2019 07:53:30 -0800 Sean Christopherson wrote: > On Fri, Dec 20, 2019 at 10:33:25AM +0100, Cornelia Huck wrote: > > On Wed, 18 Dec 2019 13:55:15 -0800 > > Sean Christopherson wrote: > > > +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? > > Yes, but only for a few patches until kvm_s390_vcpu_setup() is introduced, > at which point @rc is unconditionally set at the end. Indeed; so feel free to leave this as-is. Reviewed-by: Cornelia Huck