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=-6.5 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 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 BC05DC2D0DB for ; Wed, 22 Jan 2020 10:30:23 +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 85CDE20828 for ; Wed, 22 Jan 2020 10:30:23 +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="PjA3L0Nh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85CDE20828 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]:39588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDHC-0005IB-Ld for qemu-devel@archiver.kernel.org; Wed, 22 Jan 2020 05:30:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58409) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuDGI-0004pG-B7 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:29:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuDGD-0004r6-4C for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:29:26 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:47436 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 1iuDGD-0004qo-14 for qemu-devel@nongnu.org; Wed, 22 Jan 2020 05:29:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579688960; 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=HfBQa3bvRtEusM8uL1yEf1Py5y4lINrJcyuREuNhrUw=; b=PjA3L0NhEPZrUf/dM69Lxvz9ffkyokGPmvznInpSbRLZChF6WSMvYACHkv6Ruhl3IY7gSt xODpxsFLCw3QeOMZ4DK7ir81LaaLqZzkriPpzL4gC52pRJpybQw46BRjj2veaU0MoP2yav eI72CiCtlTNsFIpBdHB48PBbZljgDJs= 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-316-R1qgKtwnPjiASMYNC4qsTA-1; Wed, 22 Jan 2020 05:29:17 -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 DE3E8477; Wed, 22 Jan 2020 10:29:15 +0000 (UTC) Received: from gondolin (dhcp-192-195.str.redhat.com [10.33.192.195]) by smtp.corp.redhat.com (Postfix) with ESMTP id 597BC620D8; Wed, 22 Jan 2020 10:29:12 +0000 (UTC) Date: Wed, 22 Jan 2020 11:29:10 +0100 From: Cornelia Huck To: Thomas Huth Subject: Re: [PATCH v5] target/s390x/kvm: Enable adapter interruption suppression again Message-ID: <20200122112910.5b8f74c9.cohuck@redhat.com> In-Reply-To: <20200122101437.5069-1-thuth@redhat.com> References: <20200122101437.5069-1-thuth@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: R1qgKtwnPjiASMYNC4qsTA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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: Matthew Rosato , David Hildenbrand , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 22 Jan 2020 11:14:37 +0100 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 now for the machines that support proper CPU models. > > Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1756946 > Signed-off-by: Thomas Huth > --- > v5: Use cpu_model_allowed() as suggested by David. Seems to work as far > as I can test it without PCI cards, but ping-pong migration with > "-cpu host" from/to an older version of QEMU is now not working > anymore - but I think that's kind of expected since "-cpu host" > is not migration-safe anyway. Ok, so I'll wait for test results with pci cards before queuing this :) > > target/s390x/kvm.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index 15260aeb9a..30112e529c 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -365,10 +365,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 try to enable this for > + * newer machine types if KVM_CAP_S390_AIS_MIGRATION is available. > */ > - /* kvm_vm_enable_cap(s, KVM_CAP_S390_AIS, 0); */ > + if (cpu_model_allowed() && kvm_kernel_irqchip_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; Side note: as you do not add a new _allowed() function, you don't add the clarifying comment anymore -- any value in doing so as a separate patch? And maybe stating as well that new features of that type should rely on the cpu model?