From nobody Mon May 6 11:08:26 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579259621; cv=none; d=zohomail.com; s=zohoarc; b=E6SoPYivpJkrxgV2egkBbZeuZuDq3JSOlKEkmcao4MFJwt6Q1D29oG1FALRtklX/Go5v6XC+m3lXdMjaZjGOl7JLv4QEsnByOhhScn0MGNoPjVhisrxip55oqXM3n6WwjtSADe1QgLF1uLo87Y8HubQq4ar6CPKfuA78fgIHuMY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579259621; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=DQoeUs8RjX3SvhRvCAQ+pSnjH1DKZnNp7o9RSzUgDyA=; b=Cic52nf70I9ck+WceXDSCVBWh9Nr9j174cvsjMkBSfEKuQJNg2jTG7VKiRkKOsosQxqoyVBZMtKryIa4OhDr3lZNkQdOrMwiQwHVuMqmMawA31gQnUExBvjDfNiQm8ny8n3nC47XhEcxO9Q6T9IxzzoJ7KiswcUBgfKF6gijOEk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579259621785247.56881100764917; Fri, 17 Jan 2020 03:13:41 -0800 (PST) Received: from localhost ([::1]:55552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isPZM-0005Av-Ey for importer@patchew.org; Fri, 17 Jan 2020 06:13:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60874) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1isPXg-0003qv-Nz for qemu-devel@nongnu.org; Fri, 17 Jan 2020 06:11:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1isPXd-000681-LC for qemu-devel@nongnu.org; Fri, 17 Jan 2020 06:11:56 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:32520 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1isPXd-00066r-He for qemu-devel@nongnu.org; Fri, 17 Jan 2020 06:11:53 -0500 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-417-dCR3BLhDP2q2wwLUV06e6w-1; Fri, 17 Jan 2020 06:11:52 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D028C1005516; Fri, 17 Jan 2020 11:11:50 +0000 (UTC) Received: from localhost (dhcp-192-245.str.redhat.com [10.33.192.245]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6287F845B2; Fri, 17 Jan 2020 11:11:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579259513; 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; bh=DQoeUs8RjX3SvhRvCAQ+pSnjH1DKZnNp7o9RSzUgDyA=; b=G7hRgtTK5y2pIWelMWljjMDFkgjELTJ4V/TyY2lQjM+Y8zm0Vfr21e2N67BJvbsLF+0Ve3 oVs0cAyL2v747OdlbKIHEnm/pZxE/3SkN64LW9kdQC2ADoq5EFlqSmOMT0hTuEKkfij2iC XGXUUGsH87kpdRndWe7z2cN0xyIEs28= From: Cornelia Huck To: Halil Pasic , Christian Borntraeger Subject: [PATCH v2] s390x: adapter routes error handling Date: Fri, 17 Jan 2020 12:11:47 +0100 Message-Id: <20200117111147.5006-1-cohuck@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: dCR3BLhDP2q2wwLUV06e6w-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Thomas Huth , Paolo Bonzini , qemu-s390x@nongnu.org, Cornelia Huck , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" If the kernel irqchip has been disabled, we don't want the {add,release}_adapter_routes routines to call any kvm_irqchip_* interfaces, as they may rely on an irqchip actually having been created. Just take a quick exit in that case instead. Also initialize routes->gsi[] with -1 in the virtio-ccw handling, to make sure we don't trip over other errors, either. (Nobody else uses the gsi array in that structure.) Fixes: d426d9fba8ea ("s390x/virtio-ccw: wire up irq routing and irqfds") Signed-off-by: Cornelia Huck Acked-by: Christian Borntraeger Reviewed-by: Thomas Huth --- v1->v2: - also initialize the gsi array with -1 --- hw/intc/s390_flic_kvm.c | 8 ++++++++ hw/s390x/virtio-ccw.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c index dddd33ea61c8..44b7960ebcc8 100644 --- a/hw/intc/s390_flic_kvm.c +++ b/hw/intc/s390_flic_kvm.c @@ -331,6 +331,10 @@ static int kvm_s390_add_adapter_routes(S390FLICState *= fs, int ret, i; uint64_t ind_offset =3D routes->adapter.ind_offset; =20 + if (!kvm_gsi_routing_enabled()) { + return -ENOSYS; + } + for (i =3D 0; i < routes->num_routes; i++) { ret =3D kvm_irqchip_add_adapter_route(kvm_state, &routes->adapter); if (ret < 0) { @@ -358,6 +362,10 @@ static void kvm_s390_release_adapter_routes(S390FLICSt= ate *fs, { int i; =20 + if (!kvm_gsi_routing_enabled()) { + return; + } + for (i =3D 0; i < routes->num_routes; i++) { if (routes->gsi[i] >=3D 0) { kvm_irqchip_release_virq(kvm_state, routes->gsi[i]); diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 6580ce5907dd..13f57e7b67f1 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -697,6 +697,7 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *= dev, Error **errp) CCWDeviceClass *ck =3D CCW_DEVICE_GET_CLASS(ccw_dev); SubchDev *sch; Error *err =3D NULL; + int i; =20 sch =3D css_create_sch(ccw_dev->devno, errp); if (!sch) { @@ -717,6 +718,9 @@ static void virtio_ccw_device_realize(VirtioCcwDevice *= dev, Error **errp) ccw_dev->sch =3D sch; dev->indicators =3D NULL; dev->revision =3D -1; + for (i =3D 0; i < ADAPTER_ROUTES_MAX_GSI; i++) { + dev->routes.gsi[i] =3D -1; + } css_sch_build_virtual_schib(sch, 0, VIRTIO_CCW_CHPID_TYPE); =20 trace_virtio_ccw_new_device( --=20 2.21.1