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=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham 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 A809CC33CB1 for ; Thu, 16 Jan 2020 12:29:15 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 7191A20748 for ; Thu, 16 Jan 2020 12:29:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Iqx3DFPD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7191A20748 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40997 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is4Gw-0000YA-Gm for qemu-devel@archiver.kernel.org; Thu, 16 Jan 2020 07:29:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34271) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1is4Fw-000828-KJ for qemu-devel@nongnu.org; Thu, 16 Jan 2020 07:28:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1is4Fv-0003IF-8C for qemu-devel@nongnu.org; Thu, 16 Jan 2020 07:28:12 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:30182 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 1is4Fv-0003Hz-26 for qemu-devel@nongnu.org; Thu, 16 Jan 2020 07:28:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579177690; 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:autocrypt:autocrypt; bh=/RYiatNKVDFyV08ubrXjM+Vf0oDqdzCuuxF06rG8yRc=; b=Iqx3DFPDYWkHi4wrykPGiAoNKLzVcOpHXNIENAV8GhI6qyiMkBObwJA6Bjjh0EL31Q8nGU XB76hdH3QG9cTfvRnQXPmsXPF5IusYyZ2qrtYoSK4kFggELs4S2J06I2kRCHbzlMkC1ePh vhWPD8FjZ83hTG7YHrX47FgDrZCIjYc= 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-318-uoaOqyNtNsCjo76ke3_7fw-1; Thu, 16 Jan 2020 07:28:07 -0500 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 03F59DB21; Thu, 16 Jan 2020 12:28:06 +0000 (UTC) Received: from [10.36.116.136] (ovpn-116-136.ams2.redhat.com [10.36.116.136]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9F1AE811FA; Thu, 16 Jan 2020 12:28:04 +0000 (UTC) Subject: Re: [PATCH] target/s390x/kvm: Enable adapter interruption suppression again To: Thomas Huth , Cornelia Huck , Christian Borntraeger , qemu-devel@nongnu.org References: <20200116122026.5804-1-thuth@redhat.com> <7c5da42a-2de0-d9e6-f838-f2b0757cbcaa@redhat.com> <6d489327-b37d-73ae-6706-03f1e4c6b495@redhat.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 Organization: Red Hat GmbH Message-ID: Date: Thu, 16 Jan 2020 13:28:03 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.1 MIME-Version: 1.0 In-Reply-To: <6d489327-b37d-73ae-6706-03f1e4c6b495@redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: uoaOqyNtNsCjo76ke3_7fw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Halil Pasic , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 16.01.20 13:26, Thomas Huth wrote: > On 16/01/2020 13.23, David Hildenbrand wrote: >> On 16.01.20 13:20, Thomas Huth wrote: >>> The AIS feature has been disabled late in the v2.10 development >>> cycle since there were some issues with migration (see commit >>> 3f2d07b3b01ea61126b - "s390x/ais: for 2.10 stable: disable ais >>> facility"). We originally wanted to enable it again for newer >>> machine types, but apparently we forgot to do this so far. Let's >>> do it for the new s390-ccw-virtio-5.0 machine now. >>> >>> Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1756946 >>> Signed-off-by: Thomas Huth >>> --- >>> hw/s390x/s390-virtio-ccw.c | 4 ++++ >>> include/hw/s390x/s390-virtio-ccw.h | 4 ++++ >>> target/s390x/kvm.c | 11 ++++++++--- >>> 3 files changed, 16 insertions(+), 3 deletions(-) >>> >>> diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c >>> index e7eadd14e8..6f43136396 100644 >>> --- a/hw/s390x/s390-virtio-ccw.c >>> +++ b/hw/s390x/s390-virtio-ccw.c >>> @@ -456,6 +456,7 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) >>> s390mc->cpu_model_allowed = true; >>> s390mc->css_migration_enabled = true; >>> s390mc->hpage_1m_allowed = true; >>> + s390mc->kvm_ais_allowed = true; >>> mc->init = ccw_init; >>> mc->reset = s390_machine_reset; >>> mc->hot_add_cpu = s390_hot_add_cpu; >>> @@ -662,6 +663,9 @@ static void ccw_machine_4_2_instance_options(MachineState *machine) >>> >>> static void ccw_machine_4_2_class_options(MachineClass *mc) >>> { >>> + S390CcwMachineClass *s390mc = S390_MACHINE_CLASS(mc); >>> + >>> + s390mc->kvm_ais_allowed = false; >>> ccw_machine_5_0_class_options(mc); >>> compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); >>> } >>> diff --git a/include/hw/s390x/s390-virtio-ccw.h b/include/hw/s390x/s390-virtio-ccw.h >>> index 8aa27199c9..f142d379c6 100644 >>> --- a/include/hw/s390x/s390-virtio-ccw.h >>> +++ b/include/hw/s390x/s390-virtio-ccw.h >>> @@ -21,6 +21,9 @@ >>> #define S390_MACHINE_CLASS(klass) \ >>> OBJECT_CLASS_CHECK(S390CcwMachineClass, (klass), TYPE_S390_CCW_MACHINE) >>> >>> +#define S390_CCW_MACHINE_OBJ_GET_CLASS(obj) \ >>> + OBJECT_GET_CLASS(S390CcwMachineClass, obj, TYPE_S390_CCW_MACHINE) >>> + >>> typedef struct S390CcwMachineState { >>> /*< private >*/ >>> MachineState parent_obj; >>> @@ -40,6 +43,7 @@ typedef struct S390CcwMachineClass { >>> bool cpu_model_allowed; >>> bool css_migration_enabled; >>> bool hpage_1m_allowed; >>> + bool kvm_ais_allowed; >>> } S390CcwMachineClass; >>> >>> /* runtime-instrumentation allowed by the machine */ >>> diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c >>> index 15260aeb9a..4c1c8c0208 100644 >>> --- a/target/s390x/kvm.c >>> +++ b/target/s390x/kvm.c >>> @@ -329,6 +329,8 @@ static void ccw_machine_class_foreach(ObjectClass *oc, void *opaque) >>> >>> int kvm_arch_init(MachineState *ms, KVMState *s) >>> { >>> + S390CcwMachineClass *smc = S390_CCW_MACHINE_OBJ_GET_CLASS(ms); >>> + >>> object_class_foreach(ccw_machine_class_foreach, TYPE_S390_CCW_MACHINE, >>> false, NULL); >>> >>> @@ -365,10 +367,13 @@ int kvm_arch_init(MachineState *ms, KVMState *s) >>> /* >>> * The migration interface for ais was introduced with kernel 4.13 >>> * but the capability itself had been active since 4.12. As migration >>> - * support is considered necessary let's disable ais in the 2.10 >>> - * machine. >>> + * support is considered necessary we only enable this for newer >>> + * machine types and if KVM_CAP_S390_AIS_MIGRATION is available. >>> */ >>> - /* kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); */ >>> + if (smc->kvm_ais_allowed && >>> + kvm_check_extension(s, KVM_CAP_S390_AIS_MIGRATION)) { >>> + kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); >>> + } >>> >>> kvm_set_max_memslot_size(KVM_SLOT_MAX_BYTES); >>> return 0; >>> >> >> We have ri_allowed(), cpu_model_allowed(), hpage_1m_allowed(). >> >> Care to create a similar wrapper? > > Honestly, why do we need these wrappers at all? They look cumbersome to > me. I'd rather remove them in case they are not urgently needed (so far > I don't see the point... could someone enlighten me why we have them?). I assume to minimize the number of places you have to lookup the machine/machine class. -- Thanks, David / dhildenb