From patchwork Thu Apr 1 15:19:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 12178237 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 E08BDC433ED for ; Thu, 1 Apr 2021 15:29:22 +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 45F5D6136B for ; Thu, 1 Apr 2021 15:29:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 45F5D6136B 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]:59120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRzG5-0000Dx-EH for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 11:29:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRz7g-0007zp-Ck for qemu-devel@nongnu.org; Thu, 01 Apr 2021 11:20:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:34062) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRz7d-0005OY-Ld for qemu-devel@nongnu.org; Thu, 01 Apr 2021 11:20:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617290435; 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=eouiSVEHA2DpldbG4KgKOboFwtCaoy3z9k7jDn2b9vI=; b=HnMw06BM9E1FEZbl9AbET+9pcO9/nirbLIVGzU1pyu+4DW57WeLE0o1OtciYu2kDxrFong qAUPtDfs6W1L/afM3OGj++UvFaCWNSzZSt6t2AcZY+Ptx4uk/Q+MfV/57Us2pmrY5gP+vh hX8Xj2O//fg1p21SrvBiqHtMc/pvW3k= 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-377-tI7loeUmPveAWXLcvWAkXg-1; Thu, 01 Apr 2021 11:20:28 -0400 X-MC-Unique: tI7loeUmPveAWXLcvWAkXg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4531018C89E6; Thu, 1 Apr 2021 15:20:27 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.194.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D7851001281; Thu, 1 Apr 2021 15:20:12 +0000 (UTC) From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 1/2] i386: Add 'kvm-asyncpf-int' to kvm_default_props array Date: Thu, 1 Apr 2021 17:19:56 +0200 Message-Id: <20210401151957.408028-2-vkuznets@redhat.com> In-Reply-To: <20210401151957.408028-1-vkuznets@redhat.com> References: <20210401151957.408028-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "Michael S. Tsirkin" , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Just like all other KVM PV features, 'kvm-asyncpf-int' needs to be added to all CPU models when KVM is enabled or the feature will always remain 'off' unless specified explicitly on the command line. Signed-off-by: Vitaly Kuznetsov --- target/i386/cpu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 6b3e9467f177..c7f8a8a8fec0 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -4244,6 +4244,7 @@ static PropValue kvm_default_props[] = { { "kvmclock", "on" }, { "kvm-nopiodelay", "on" }, { "kvm-asyncpf", "on" }, + { "kvm-asyncpf-int", "on" }, { "kvm-steal-time", "on" }, { "kvm-pv-eoi", "on" }, { "kvmclock-stable-bit", "on" }, From patchwork Thu Apr 1 15:19:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 12178235 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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 BC737C433B4 for ; Thu, 1 Apr 2021 15:28:12 +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 0533261350 for ; Thu, 1 Apr 2021 15:28:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0533261350 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]:56954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRzEw-0007kt-Ts for qemu-devel@archiver.kernel.org; Thu, 01 Apr 2021 11:28:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRz7a-0007vK-W5 for qemu-devel@nongnu.org; Thu, 01 Apr 2021 11:20:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:32712) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRz7Z-0005N6-9v for qemu-devel@nongnu.org; Thu, 01 Apr 2021 11:20:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1617290432; 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=dTyQBYhxzQqR27Ruc5JaZXlCCIo/O+xYlXi1OCqM+Qw=; b=YMYujoLGmsEpIWE9XkypxpmNPc/Bl2Or2nZBuqf9Me6eyZZ9kkkGWiaBvuVb52JduSdxCc ojS8xALcGF0YCGXhLVn2TZ10xdHYpTVIEfBLX44RQB4yOdQSCWFpYURoBzNnPTa6cGLXTq qO1F7cYIWEaTkHtjF0R3vS/4mrBLE7M= 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-2-JBxRCuv6N4KOz_yQkkkR2A-1; Thu, 01 Apr 2021 11:20:30 -0400 X-MC-Unique: JBxRCuv6N4KOz_yQkkkR2A-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B58D86B9FC; Thu, 1 Apr 2021 15:20:29 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.194.76]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0A0010074E1; Thu, 1 Apr 2021 15:20:27 +0000 (UTC) From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/2] i386: Disable 'kvm-asyncpf-int' feature for machine types <= 5.1 Date: Thu, 1 Apr 2021 17:19:57 +0200 Message-Id: <20210401151957.408028-3-vkuznets@redhat.com> In-Reply-To: <20210401151957.408028-1-vkuznets@redhat.com> References: <20210401151957.408028-1-vkuznets@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=vkuznets@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: "Michael S. Tsirkin" , Richard Henderson , Eduardo Habkost , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 'kvm-asyncpf-int' was implemented in QEMU-5.2 so older machine types should have it disabled to make migration to an older QEMU which does not support this feature possible. The issue went unnoticed probably because we also forgot to add 'kvm-asyncpf-int' to 'kvm_default_props[]' so it was rarely enabled. Fixes: db5daafab2 ("target/i386: support KVM_FEATURE_ASYNC_PF_INT") Signed-off-by: Vitaly Kuznetsov --- hw/i386/pc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 8a84b25a031e..04d5f76bf133 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -103,6 +103,7 @@ const size_t pc_compat_5_2_len = G_N_ELEMENTS(pc_compat_5_2); GlobalProperty pc_compat_5_1[] = { { "ICH9-LPC", "x-smi-cpu-hotplug", "off" }, + { TYPE_X86_CPU, "kvm-asyncpf-int", "off" }, { TYPE_X86_CPU, "kvm-msi-ext-dest-id", "off" }, }; const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1);