From patchwork Sat Feb 5 08:16:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonardo Bras X-Patchwork-Id: 12736009 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AB8ADC433EF for ; Sat, 5 Feb 2022 08:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239233AbiBEIRj (ORCPT ); Sat, 5 Feb 2022 03:17:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:28233 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231174AbiBEIRg (ORCPT ); Sat, 5 Feb 2022 03:17:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644049055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FpyU/hxiwc/MJkJ493/UIfJTOWcNrra/dJYpmK9ChNI=; b=B9lxYcVnIUVBsu+Nh1PMqiv+SCdA9RtLMaqHVUPF1ZmJS+HK/kEG3sqnyRlA6Odta4JToK qkcqd2GGWRopzn54Pz/SnCQDUys/9nCznlNBrlDQFd9jCLuqPbsYg3M1zX1SlFoPLmITGi 18FITSkDFIMZlBLFC/dgbmRjeN3qFt8= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-395-vuULJ65KO_2T538fyVCcUQ-1; Sat, 05 Feb 2022 03:17:34 -0500 X-MC-Unique: vuULJ65KO_2T538fyVCcUQ-1 Received: by mail-oo1-f71.google.com with SMTP id n30-20020a4a611e000000b002e519f04f8cso4747435ooc.7 for ; Sat, 05 Feb 2022 00:17:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FpyU/hxiwc/MJkJ493/UIfJTOWcNrra/dJYpmK9ChNI=; b=Zgd5jqS9FB5beyX3txrzCQMoQXg3KiK7TupvMNaGE5Q3leJ3NYKRAeM3SC7x9WD+sy k+NkvyWLi5DAlQ+D0w2UYLg+9Fa3Z+bQXGfjvrl62P8y1Wsx0rdSFY2y94kVGfgFVowh vBUO2+abfRb2aqqCkoB1WPkekYp/YhW2QhLfz7jfinTLFc2meDJ8zZWZyIoYCF1/KL/2 Ieo3gRRiFZV4z/Sx7DpjNZsVOjpnxEXBZDY5yG+bAamm9NVxkPbN/V9z+7oNQvSONd49 NRSvnMGGrG8QGRs2acbHIVkuGMTse6eMyYWAZo44xu+hOLq79eu4hvqDHvLJL/0bEx4R 2zyA== X-Gm-Message-State: AOAM5325VhZsELD64QVkQoW/hbvwkrId54csHi+uNKNZUxKnZgRuPbev ML/53cLqxIvQRb6NWHJ2X8jV9rYH3iO+1LdwOYqTVsEhwzCnFdpCNNNhnZPg+QTHz/U2fD8lg4k H/B0ZDyi3NJEF X-Received: by 2002:a9d:69d1:: with SMTP id v17mr887845oto.220.1644049053552; Sat, 05 Feb 2022 00:17:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxHZ8nTlggoeWG+zBTopeYthpriHxLKpwl/g0wOeOS85juAdDUPbrfh3I9zvgK9dj3l9+vEyA== X-Received: by 2002:a9d:69d1:: with SMTP id v17mr887837oto.220.1644049053352; Sat, 05 Feb 2022 00:17:33 -0800 (PST) Received: from localhost.localdomain ([2804:431:c7f0:b1af:f10e:1643:81f3:16df]) by smtp.gmail.com with ESMTPSA id bg34sm1708795oob.14.2022.02.05.00.17.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 00:17:32 -0800 (PST) From: Leonardo Bras To: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" Cc: Leonardo Bras , kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 1/2] x86/kvm/fpu: Mask guest fpstate->xfeatures with guest_supported_xcr0 Date: Sat, 5 Feb 2022 05:16:58 -0300 Message-Id: <20220205081658.562208-2-leobras@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220205081658.562208-1-leobras@redhat.com> References: <20220205081658.562208-1-leobras@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org During host/guest switch (like in kvm_arch_vcpu_ioctl_run()), the kernel swaps the fpu between host/guest contexts, by using fpu_swap_kvm_fpstate(). When xsave feature is available, the fpu swap is done by: - xsave(s) instruction, with guest's fpstate->xfeatures as mask, is used to store the current state of the fpu registers to a buffer. - xrstor(s) instruction, with (fpu_kernel_cfg.max_features & XFEATURE_MASK_FPSTATE) as mask, is used to put the buffer into fpu regs. For xsave(s) the mask is used to limit what parts of the fpu regs will be copied to the buffer. Likewise on xrstor(s), the mask is used to limit what parts of the fpu regs will be changed. The mask for xsave(s), the guest's fpstate->xfeatures, is defined on kvm_arch_vcpu_create(), which (in summary) sets it to all features supported by the cpu which are enabled on kernel config. This means that xsave(s) will save to guest buffer all the fpu regs contents the cpu has enabled when the guest is paused, even if they are not used. This would not be an issue, if xrstor(s) would also do that. xrstor(s)'s mask for host/guest swap is basically every valid feature contained in kernel config, except XFEATURE_MASK_PKRU. Accordingto kernel src, it is instead switched in switch_to() and flush_thread(). Then, the following happens with a host supporting PKRU starts a guest that does not support it: 1 - Host has XFEATURE_MASK_PKRU set. 1st switch to guest, 2 - xsave(s) fpu regs to host fpustate (buffer has XFEATURE_MASK_PKRU) 3 - xrstor(s) guest fpustate to fpu regs (fpu regs have XFEATURE_MASK_PKRU) 4 - guest runs, then switch back to host, 5 - xsave(s) fpu regs to guest fpstate (buffer now have XFEATURE_MASK_PKRU) 6 - xrstor(s) host fpstate to fpu regs. On 5, even though the guest does not support PKRU, it does have the flag set on guest fpstate, which is transferred to userspace via vcpu ioctl KVM_GET_XSAVE. This becomes a problem when the user decides on migrating the above guest to another machine that does not support PKRU: The new host restores guest's fpu regs to as they were before (xrstor(s)), but since the new host don't support PKRU, a general-protection exception ocurs in xrstor(s) and that crashes the guest. This can be solved by making the guest's fpstate->xfeatures only hold values compatible to guest_supported_xcr0. This way, on 5 the only flags saved by xsave(s) will be the ones compatible to guest requirements, and thus there will be no issue during migration. Signed-off-by: Leonardo Bras --- arch/x86/kvm/cpuid.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 28be02adc669..8ce481cc0f9b 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -296,6 +296,9 @@ static void kvm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.guest_supported_xcr0 = cpuid_get_supported_xcr0(vcpu->arch.cpuid_entries, vcpu->arch.cpuid_nent); + /* Mask out features unsupported by guest */ + vcpu->arch.guest_fpu.fpstate->xfeatures &= vcpu->arch.guest_supported_xcr0; + kvm_update_pv_runtime(vcpu); vcpu->arch.maxphyaddr = cpuid_query_maxphyaddr(vcpu);