From patchwork Tue Apr 5 09:50:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8749141 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 264C69F3D1 for ; Tue, 5 Apr 2016 09:50:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 774E220374 for ; Tue, 5 Apr 2016 09:50:50 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A5FE620375 for ; Tue, 5 Apr 2016 09:50:49 +0000 (UTC) Received: from localhost ([::1]:35627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anNdJ-0003Wm-3s for patchwork-qemu-devel@patchwork.kernel.org; Tue, 05 Apr 2016 05:50:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54797) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anNcz-0003VG-Et for qemu-devel@nongnu.org; Tue, 05 Apr 2016 05:50:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1anNcy-00017s-Gu for qemu-devel@nongnu.org; Tue, 05 Apr 2016 05:50:29 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35495) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1anNcy-00017W-1g for qemu-devel@nongnu.org; Tue, 05 Apr 2016 05:50:28 -0400 Received: by mail-wm0-x243.google.com with SMTP id a140so2683294wma.2 for ; Tue, 05 Apr 2016 02:50:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uYbLqZsQP8Xl+oKlnAQIiEZgM7MISc12JJNUmhzseCI=; b=DyweqypzyuY2eSiw6sAedsFnotg+roG3NmHRKMIfL1nequmyPw7snL0EadzmqxV5rC 2mxfql7khytoDJGG/DjmYLhN0LFqNS0Vmy6VHPgUkCdsaBK0VVssogHbfX4BZrw7zk7e DkV38SzbzC7Jhkl6AaR2WVAeUB+tKMDaSQvqPNoFy7r9XsL284vv+nzxeS08yjsQtorT vDDQiiANEUaKWhPHsIT5Z2iExDCLPfBXCEMzyjJUmGDn2PhcczDoQo3Og8j967uvLYaY OzhBp5QGvoYMth0aJ6mtvVckb7hZIS6NT67LFGUbPGie3Aplrkh5ae3mI7aKSGN9HFol 8LtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=uYbLqZsQP8Xl+oKlnAQIiEZgM7MISc12JJNUmhzseCI=; b=B9xuw3KcEynkueFi76Myf9MMyKmmBqhufKyLXqryVOFU0Jil9ts9/wHC2hkzHQIpnU h+MvEwNUTKS4zSjmV6V3h2kRqyMPLZ2VNaeDYnBBhz8MgT7+dtERq9BIfHWdKkhZHceC Rb+Mp2V0+THWGe05if7yZ7urvTZgNp0wUcuUKxHbRsapWaNMmt4dtkJgwl7iHh79MDTO apbNgIwuPlpHNkVd9+559J9DL+Yqxag+36QekgCDeO1xrvAi2bLx4UHimzX/Zw387jcB cbysM+EocHSYqyP03sbMxCCuQQyzeMQQjiKxxokG8l0ZOI1AMfFAO/VMgPHqgnWwQSL1 M0Gg== X-Gm-Message-State: AD7BkJIFOfGJbZXgG36YJc1Jp681g71rwbhvxl+OIruZC6/2s+mxxAr2n/4AcRD3pgnQGg== X-Received: by 10.28.127.80 with SMTP id a77mr16840588wmd.84.1459849827431; Tue, 05 Apr 2016 02:50:27 -0700 (PDT) Received: from donizetti.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id ka4sm33721377wjc.47.2016.04.05.02.50.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Apr 2016 02:50:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Apr 2016 11:50:07 +0200 Message-Id: <1459849818-26649-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1459849818-26649-1-git-send-email-pbonzini@redhat.com> References: <1459849818-26649-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::243 Cc: Paolo Bonzini Subject: [Qemu-devel] [PULL 04/15] target-i386: do not pass MSR_TSC_AUX to KVM ioctls if CPUID bit is not set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP KVM does not let you read or write this MSR if the corresponding CPUID bit is not set. This in turn causes MSRs that come after MSR_TSC_AUX to be ignored by KVM_SET_MSRS. One visible symptom is that s3.flat from kvm-unit-tests fails with CPUs that do not have RDTSCP, because the SMBASE is not reset to 0x30000 after reset. Fixes: c9b8f6b6210847b4381c5b2ee172b1c7eb9985d6 Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- target-i386/kvm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 87ab969..19e2d94 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -917,6 +917,9 @@ int kvm_arch_init_vcpu(CPUState *cs) if (env->features[FEAT_1_EDX] & CPUID_MTRR) { has_msr_mtrr = true; } + if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_RDTSCP)) { + has_msr_tsc_aux = false; + } return 0; }