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=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 4650EC43603 for ; Fri, 20 Dec 2019 15:56:17 +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 192B121D7E for ; Fri, 20 Dec 2019 15:56:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lswaPmLH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 192B121D7E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.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:In-Reply-To:MIME-Version:References: 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=YKvniQaMQuQd3c70NCVsAPEBwfEK+qnAZmqusfpQVHA=; b=lswaPmLHAXg+8z nA+F3av1M2xYy69y0IQoIkFsGBO6D61C4BRdsKCuxa90u+x57aQEGUjdzRnxPLV14pCbl1h65CtAA DG2uB4YA1UCisbiaFFFfuqXGjc7HcL5xgz1oBcr63McRBfg7l3C9g0GjuJfOTyHhKvKFWf+Kj+LK0 rSn3DBli2DUoUuvbUYIYKM9QKkIwXNmUGOwK3VBxuSZ+TDC/xN1Or3vmoCTq7C6Ce/BIs2FYGWYOy 15nJDhbrUVQ3B1wo4uX2Nrn7SRyHx824Rts5Z4DU7bGwfaeQCPhF3RnQ05VstkD2Vz64RAf5fKky+ 133ScwuSWd0B4c7WwguQ==; 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 1iiKdO-0001GO-SJ; Fri, 20 Dec 2019 15:56:10 +0000 Received: from mga05.intel.com ([192.55.52.43]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iiKdM-0001FY-C1 for linux-arm-kernel@lists.infradead.org; Fri, 20 Dec 2019 15:56:09 +0000 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Dec 2019 07:56:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,336,1571727600"; d="scan'208";a="241535997" Received: from sjchrist-coffee.jf.intel.com (HELO linux.intel.com) ([10.54.74.202]) by fmsmga004.fm.intel.com with ESMTP; 20 Dec 2019 07:56:07 -0800 Date: Fri, 20 Dec 2019 07:56:07 -0800 From: Sean Christopherson To: Cornelia Huck Subject: Re: [PATCH v2 35/45] KVM: s390: Manually invoke vcpu setup during kvm_arch_vcpu_create() Message-ID: <20191220155607.GB20453@linux.intel.com> References: <20191218215530.2280-1-sean.j.christopherson@intel.com> <20191218215530.2280-36-sean.j.christopherson@intel.com> <20191220110445.3a42041a.cohuck@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20191220110445.3a42041a.cohuck@redhat.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191220_075608_416555_8FA47094 X-CRM114-Status: GOOD ( 14.82 ) 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 Fri, Dec 20, 2019 at 11:04:45AM +0100, Cornelia Huck wrote: > On Wed, 18 Dec 2019 13:55:20 -0800 > Sean Christopherson wrote: > > > Rename kvm_arch_vcpu_setup() to kvm_s390_vcpu_setup() and manually call > > the new function during kvm_arch_vcpu_create(). Define an empty > > kvm_arch_vcpu_setup() as it's still required for compilation. This > > is effectively a nop as kvm_arch_vcpu_create() and kvm_arch_vcpu_setup() > > are called back-to-back by common KVM code. Obsoleting > > kvm_arch_vcpu_setup() paves the way for its removal. > > > > Note, gmap_remove() is now called if setup fails, as s390 was previously > > freeing it via kvm_arch_vcpu_destroy(), which is called by common KVM > > code if kvm_arch_vcpu_setup() fails. > > Yes, this looks like the only thing that needs to be undone > (sca_add_vcpu() is done later in the process.) > > Maybe mention that gmap_remove() is for ucontrol only? I was confused > for a moment :) Will do. Would it also make sense to open code __kvm_ucontrol_vcpu_init() in a separate patch immediately preceding this change? That'd make it a little more obvious why gmap_remove() is called, and it would eliminate the "uninit" verbiage in the label, e.g.: if (kvm_is_ucontrol(vcpu->kvm)) { vcpu->arch.gmap = gmap_create(current->mm, -1UL); if (!vcpu->arch.gmap) { rc = -ENOMEM; goto out_free_sie_block; } vcpu->arch.gmap->private = vcpu->kvm; } VM_EVENT(kvm, 3, "create cpu %d at 0x%pK, sie block at 0x%pK", id, vcpu, vcpu->arch.sie_block); trace_kvm_s390_create_vcpu(id, vcpu, vcpu->arch.sie_block); rc = kvm_s390_vcpu_setup(vcpu); if (rc) goto out_free_ucontrol_gmap; return 0; out_free_ucontrol_gmap: if (kvm_is_ucontrol(vcpu->kvm)) gmap_remove(vcpu->arch.gmap); out_free_sie_block: free_page((unsigned long)(vcpu->arch.sie_block)); return rc; } _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel