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=-11.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 72876C4363D for ; Tue, 22 Sep 2020 16:11:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1835622206 for ; Tue, 22 Sep 2020 16:11:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="harirGNQ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726641AbgIVQLQ (ORCPT ); Tue, 22 Sep 2020 12:11:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20481 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726589AbgIVQLP (ORCPT ); Tue, 22 Sep 2020 12:11:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600791074; 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: in-reply-to:in-reply-to:references:references; bh=2KAvH+M7InWHGZ8h2RXvyVCY6dO0SbQbWk5J1DnV0bM=; b=harirGNQUdz+lCar1gEVpARyPFmneEXdqtnA6lMBNvhKBBXb6lnXCqBvFavu/c9dWTiRQJ d7P49t1/wkFx2MDHKVzDNYEnCGfPTnFF9ti3+Tug/ehYPgTLSnP47R4iOlbqgw5Z+tIh7t RBgetKSMv2tE2a9S0E37bBOOfSSomcE= 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-303-d4KZUKdyPvCollwvLM8drg-1; Tue, 22 Sep 2020 12:11:06 -0400 X-MC-Unique: d4KZUKdyPvCollwvLM8drg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0465C10BBEC8; Tue, 22 Sep 2020 16:11:05 +0000 (UTC) Received: from localhost (unknown [10.10.67.5]) by smtp.corp.redhat.com (Postfix) with ESMTP id B54EF5C1DC; Tue, 22 Sep 2020 16:10:55 +0000 (UTC) Date: Tue, 22 Sep 2020 12:10:55 -0400 From: Eduardo Habkost To: Vitaly Kuznetsov Cc: qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , 1896263@bugs.launchpad.net, kvm@vger.kernel.org, Paolo Bonzini , Richard Henderson , Marcelo Tosatti , Laurent Vivier , Stefan Hajnoczi Subject: Re: [PATCH] i386: Don't try to set MSR_KVM_ASYNC_PF_EN if kernel-irqchip=off Message-ID: <20200922161055.GY57321@habkost.net> References: <20200922151455.1763896-1-ehabkost@redhat.com> <87v9g5es9n.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87v9g5es9n.fsf@vitty.brq.redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org On Tue, Sep 22, 2020 at 05:38:12PM +0200, Vitaly Kuznetsov wrote: > Eduardo Habkost writes: > > > This addresses the following crash when running Linux v5.8 > > with kernel-irqchip=off: > > > > qemu-system-x86_64: error: failed to set MSR 0x4b564d02 to 0x0 > > qemu-system-x86_64: ../target/i386/kvm.c:2714: kvm_buf_set_msrs: Assertion `ret == cpu->kvm_msr_buf->nmsrs' failed. > > > > There is a kernel-side fix for the issue too (kernel commit > > d831de177217 "KVM: x86: always allow writing '0' to > > MSR_KVM_ASYNC_PF_EN"), but it's nice to simply not trigger > > the bug if running an older kernel. > > > > Fixes: https://bugs.launchpad.net/bugs/1896263 > > Signed-off-by: Eduardo Habkost > > --- > > target/i386/kvm.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/target/i386/kvm.c b/target/i386/kvm.c > > index 9efb07e7c83..1492f41349f 100644 > > --- a/target/i386/kvm.c > > +++ b/target/i386/kvm.c > > @@ -2818,7 +2818,12 @@ static int kvm_put_msrs(X86CPU *cpu, int level) > > kvm_msr_entry_add(cpu, MSR_IA32_TSC, env->tsc); > > kvm_msr_entry_add(cpu, MSR_KVM_SYSTEM_TIME, env->system_time_msr); > > kvm_msr_entry_add(cpu, MSR_KVM_WALL_CLOCK, env->wall_clock_msr); > > - if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF)) { > > + /* > > + * Some kernel versions (v5.8) won't let MSR_KVM_ASYNC_PF_EN to be set > > + * at all if kernel-irqchip=off, so don't try to set it in that case. > > + */ > > + if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_ASYNC_PF) && > > + kvm_irqchip_in_kernel()) { > > kvm_msr_entry_add(cpu, MSR_KVM_ASYNC_PF_EN, env->async_pf_en_msr); > > } > > if (env->features[FEAT_KVM] & (1 << KVM_FEATURE_PV_EOI)) { > > I'm not sure kvm_irqchip_in_kernel() was required before we switched to > interrupt-based APF (as we were always injecting #PF) but with > kernel-5.8+ this should work. [...] Were guests able to set MSR_KVM_ASYNC_PF_EN to non-zero with kernel-irqchip=off on hosts running Linux <= 5.7? I am assuming kvm-asyncpf never worked with kernel-irqchip=off (and enabling it by default with kernel-irqchip=off was a mistake). > [...] We'll need to merge this with > > https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg02963.html > (queued by Paolo) and > https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg06196.html > which fixes a bug in it. > > as kvm_irqchip_in_kernel() should go around both KVM_FEATURE_ASYNC_PF > and KVM_FEATURE_ASYNC_PF_INT I believe. Shouldn't we just disallow kvm-asyncpf-int=on if kernel-irqchip=off? -- Eduardo