From nobody Tue Feb 10 06:08:33 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1596800019; cv=none; d=zohomail.com; s=zohoarc; b=m5j7vn/psL9DD6ftp3HqEjiJ0KTbBjI+PHObkETAlj0L2iERor+8pb/dl5pGj6eqQZ8rxAzLHon3DnDKlaKGViCJkGpO1lHoePLM30Cpz0bHizFDAxcIw0xcIXA3T5sO0F5vycNMioxwhhEWqiN+DhJS2JCKF+MC9hkWNVmIV/s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596800019; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1YdgCk2ZtWhpTjxdOmfFnUbyKl77d3K/pGQ5eMKsupg=; b=KYfr8MytOci+bFNxZ1X33XOaUWsuZVKfD/Bl/fNO/5YNh9gTT+mHE0VJouCYLiOhZGatZCWGnNpQlv4LQwA7zqjRX8P+EBpGlgshKdqSpkp7nu8CYTpjlbHhc3LKztdiHDHa7K3CNub0NPpUQg47+t8g5uKCcc8EoL846H67YUs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596800019455240.08294573581497; Fri, 7 Aug 2020 04:33:39 -0700 (PDT) Received: from localhost ([::1]:60706 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k40d0-0006ev-5Y for importer@patchew.org; Fri, 07 Aug 2020 07:33:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56494) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k40bu-0004qi-U4 for qemu-devel@nongnu.org; Fri, 07 Aug 2020 07:32:30 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28296 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k40bt-0000yZ-98 for qemu-devel@nongnu.org; Fri, 07 Aug 2020 07:32:30 -0400 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-217-xw6S0ZzGPnO_GuPFDdmsBg-1; Fri, 07 Aug 2020 07:32:24 -0400 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 8F29B1005504; Fri, 7 Aug 2020 11:32:23 +0000 (UTC) Received: from bahia.lan (ovpn-112-38.ams2.redhat.com [10.36.112.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E7C06FEDC; Fri, 7 Aug 2020 11:32:22 +0000 (UTC) X-MC-Unique: xw6S0ZzGPnO_GuPFDdmsBg-1 Subject: [PATCH v3 for-5.2 3/3] spapr/xive: Convert KVM device fd checks to assert() From: Greg Kurz To: David Gibson Date: Fri, 07 Aug 2020 13:32:21 +0200 Message-ID: <159679994169.876294.11026653581505077112.stgit@bahia.lan> In-Reply-To: <159679991916.876294.8967140647442842745.stgit@bahia.lan> References: <159679991916.876294.8967140647442842745.stgit@bahia.lan> User-Agent: StGit/0.21 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=groug@kaod.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kaod.org Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=207.211.31.120; envelope-from=groug@kaod.org; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/07 02:21:37 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Henrique Barboza , qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9dric_Le_Goater?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" All callers guard these functions with an xive_in_kernel() helper. Make it clear that they are only to be called when the KVM XIVE device exists. Note that the check on xive is dropped in kvmppc_xive_disconnect(). It really cannot be NULL since it comes from set_active_intc() which only passes pointers to allocated objects. Signed-off-by: Greg Kurz Reviewed-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater --- v2: Take the helper name change into account in the changelog --- hw/intc/spapr_xive_kvm.c | 35 +++++++---------------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/hw/intc/spapr_xive_kvm.c b/hw/intc/spapr_xive_kvm.c index 6130882be678..82a6f99f022d 100644 --- a/hw/intc/spapr_xive_kvm.c +++ b/hw/intc/spapr_xive_kvm.c @@ -79,10 +79,7 @@ void kvmppc_xive_cpu_set_state(XiveTCTX *tctx, Error **e= rrp) uint64_t state[2]; int ret; =20 - /* The KVM XIVE device is not in use yet */ - if (xive->fd =3D=3D -1) { - return; - } + assert(xive->fd !=3D -1); =20 /* word0 and word1 of the OS ring. */ state[0] =3D *((uint64_t *) &tctx->regs[TM_QW1_OS]); @@ -101,10 +98,7 @@ void kvmppc_xive_cpu_get_state(XiveTCTX *tctx, Error **= errp) uint64_t state[2] =3D { 0 }; int ret; =20 - /* The KVM XIVE device is not in use */ - if (xive->fd =3D=3D -1) { - return; - } + assert(xive->fd !=3D -1); =20 ret =3D kvm_get_one_reg(tctx->cs, KVM_REG_PPC_VP_STATE, state); if (ret !=3D 0) { @@ -156,10 +150,7 @@ void kvmppc_xive_cpu_connect(XiveTCTX *tctx, Error **e= rrp) unsigned long vcpu_id; int ret; =20 - /* The KVM XIVE device is not in use */ - if (xive->fd =3D=3D -1) { - return; - } + assert(xive->fd !=3D -1); =20 /* Check if CPU was hot unplugged and replugged. */ if (kvm_cpu_is_enabled(tctx->cs)) { @@ -245,10 +236,7 @@ int kvmppc_xive_source_reset_one(XiveSource *xsrc, int= srcno, Error **errp) SpaprXive *xive =3D SPAPR_XIVE(xsrc->xive); uint64_t state =3D 0; =20 - /* The KVM XIVE device is not in use */ - if (xive->fd =3D=3D -1) { - return -ENODEV; - } + assert(xive->fd !=3D -1); =20 if (xive_source_irq_is_lsi(xsrc, srcno)) { state |=3D KVM_XIVE_LEVEL_SENSITIVE; @@ -592,10 +580,7 @@ static void kvmppc_xive_change_state_handler(void *opa= que, int running, =20 void kvmppc_xive_synchronize_state(SpaprXive *xive, Error **errp) { - /* The KVM XIVE device is not in use */ - if (xive->fd =3D=3D -1) { - return; - } + assert(xive->fd !=3D -1); =20 /* * When the VM is stopped, the sources are masked and the previous @@ -622,10 +607,7 @@ int kvmppc_xive_pre_save(SpaprXive *xive) { Error *local_err =3D NULL; =20 - /* The KVM XIVE device is not in use */ - if (xive->fd =3D=3D -1) { - return 0; - } + assert(xive->fd !=3D -1); =20 /* EAT: there is no extra state to query from KVM */ =20 @@ -845,10 +827,7 @@ void kvmppc_xive_disconnect(SpaprInterruptController *= intc) XiveSource *xsrc; size_t esb_len; =20 - /* The KVM XIVE device is not in use */ - if (!xive || xive->fd =3D=3D -1) { - return; - } + assert(xive->fd !=3D -1); =20 /* Clear the KVM mapping */ xsrc =3D &xive->source;