From patchwork Wed Apr 5 00:45:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 79421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp254520vqo; Tue, 4 Apr 2023 18:02:43 -0700 (PDT) X-Google-Smtp-Source: AKy350a13lXUnakKOsyuuCPPqqjphCCRu1fK1SNfYA6LBu817dG21RfPBpsVejLIYw7vZj07HBRj X-Received: by 2002:aa7:9809:0:b0:625:e728:4c5f with SMTP id e9-20020aa79809000000b00625e7284c5fmr3891079pfl.22.1680656562948; Tue, 04 Apr 2023 18:02:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680656562; cv=none; d=google.com; s=arc-20160816; b=HFk7vTYMirkOXth69rStHI4dkRtJ/zpizcU/LRFhXmvMgoD7prrXs0/h5PL+yzSSRa zfe5JzlzQ3eiTp/PnVodKoT8pyPXWfLYyvDda719IILS0JvQqXqmJwknMw8de2ZQ8RT3 oPMLFpok24Hmzyqbq9CI8UCrCdS/9NAhbRMhazvqflbZjrgIWhQ0X5k1//qdcBeVpQUl qFXlbx+EUky5gov1h6S2gQn0UQvnUKknug1nD1GuO1zxHN82wUQjpKwnwcFfhodeNllC Jf5KjlnX3CJEWMLHY4S3crYk3MnmNKbxZGAE7rK+v7sPLC+KER2wTkm6UknKJDSEIzTP qhwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=vzwiHRIkx/Ofvz49IPzfAACO6Ci51KB/Wu9lsV23c8g=; b=wpFbZelt0/jiGDXOF2CazAitoVdcMFe1po8Zy7SgHUis09e085DMXmDI2RA65iwn19 y6Xo5jEX7uPNmXextwFr2s71GLsekSV2bMCIUsVs/smI+9GDG8gxj/xwGLMXsYidvZux v32IjvT+rCsBI0W0caMMeOH5m+TmtdWGRsQ82Z76V7hRlP+KIVUsLmvAR4qim+cSlvOe 3EGMjl/sCpCYrJUh7NTog71L7lkWrjptiBG3eSZOeajXaJqQN8gE4MbG3LT1petyCwlC SiSd5cqS76jw1GMI2pTsjxFlR0n92CSiC4FZszUDQQfxG8fk/VkMVZxp9o+OoS9g/1qQ OZoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=X0zmknsM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y4-20020aa79424000000b00622ae306420si11004341pfo.279.2023.04.04.18.00.44; Tue, 04 Apr 2023 18:02:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=X0zmknsM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236712AbjDEApc (ORCPT + 99 others); Tue, 4 Apr 2023 20:45:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236697AbjDEAp2 (ORCPT ); Tue, 4 Apr 2023 20:45:28 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 591AF4693 for ; Tue, 4 Apr 2023 17:45:27 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-54629ed836aso203154577b3.10 for ; Tue, 04 Apr 2023 17:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; t=1680655526; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=vzwiHRIkx/Ofvz49IPzfAACO6Ci51KB/Wu9lsV23c8g=; b=X0zmknsMe5WLmMccyTXLQG3HEv612eXVzRKnN8/ZIqgA8C5+68PswLGyJ75lEjdwSj /IwI8QPPL+nr5lUO/s+891Kfua4dDnvza+lYmwYBldQ5ZnX0hv5Oh466FPYtu/Xfkv7l qgt4UJ5HXVn84Bwp9qgZJ/ZZ7cvR0HWr91GfS7vyN6kiVjLhZCcetdNgou3W25U1vyKO uik15E6ZrTFRRDX2dNDoVW7qUM7d8srDSbxz57O2ANlIrfkURmz5fAbR5XnGMKP/jp+5 XyLhAU80vOo7FONqF1G8S8E4pXyPBBrrSBZUbYocQ5kd39SZikffdZIgR6NX/1n+R8s+ NeUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680655526; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vzwiHRIkx/Ofvz49IPzfAACO6Ci51KB/Wu9lsV23c8g=; b=RQbWh1/cb50O12BMNxuBouPWKQzI4Gd5Dwxj+LnsDUPROjFteSXac4WQuf+yypBlg2 EycEHBQ/fjye9hZ9NW3ny6I0p63/oRZ9jru7imL0zjoFgbkY6BawDYjDoi1SQ1ZvuCEJ J1SrXUhiRCJ+R4zk7LBsQj9P9HUvyaGcoUZQmCFSMo3vwQmhJPPfNqTBRyASKSemW26N 1wawr2YYqLK6VwvLwyq3vPPnXtCdSAv9HXtLUnSCtYVtgbrIwOweYfBjVJCbhbVOSaeC xFGs1Z6tkdfe1Tb2e976qyp4wSWS/sbRSuhIZKe2rPsGxGPkr5fqc+xOBuu90rot8H2F toRw== X-Gm-Message-State: AAQBX9dGoW/PJQiryrXS+rOzkDV3wrCXt5Cce9/HAS2rWNGx7v+pJku9 62L8aNiWZ9teTqzIWJ7ghagTqvibGp0= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:cacf:0:b0:b77:158d:b3a0 with SMTP id a198-20020a25cacf000000b00b77158db3a0mr777440ybg.6.1680655526560; Tue, 04 Apr 2023 17:45:26 -0700 (PDT) Reply-To: Sean Christopherson Date: Tue, 4 Apr 2023 17:45:16 -0700 In-Reply-To: <20230405004520.421768-1-seanjc@google.com> Mime-Version: 1.0 References: <20230405004520.421768-1-seanjc@google.com> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog Message-ID: <20230405004520.421768-3-seanjc@google.com> Subject: [PATCH v4 2/6] KVM: x86: Filter out XTILE_CFG if XTILE_DATA isn't permitted From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Aaron Lewis , Mingwei Zhang , Jim Mattson X-Spam-Status: No, score=-7.7 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762296136361990693?= X-GMAIL-MSGID: =?utf-8?q?1762296136361990693?= Filter out XTILE_CFG from the supported XCR0 reported to userspace if the current process doesn't have access to XTILE_DATA. Attempting to set XTILE_CFG in XCR0 will #GP if XTILE_DATA is also not set, and so keeping XTILE_CFG as supported results in explosions if userspace feeds KVM_GET_SUPPORTED_CPUID back into KVM and the guest doesn't sanity check CPUID. Fixes: 445ecdf79be0 ("kvm: x86: Exclude unpermitted xfeatures at KVM_GET_SUPPORTED_CPUID") Reported-by: Aaron Lewis Signed-off-by: Sean Christopherson --- arch/x86/kvm/x86.h | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index b6c6988d99b5..3402d69820da 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -3,6 +3,7 @@ #define ARCH_X86_KVM_X86_H #include +#include #include #include #include "kvm_cache_regs.h" @@ -325,7 +326,22 @@ extern bool enable_pmu; */ static inline u64 kvm_get_filtered_xcr0(void) { - return kvm_caps.supported_xcr0 & xstate_get_guest_group_perm(); + u64 permitted_xcr0 = kvm_caps.supported_xcr0; + + BUILD_BUG_ON(XFEATURE_MASK_USER_DYNAMIC != XFEATURE_MASK_XTILE_DATA); + + if (permitted_xcr0 & XFEATURE_MASK_USER_DYNAMIC) { + permitted_xcr0 &= xstate_get_guest_group_perm(); + + /* + * Treat XTILE_CFG as unsupported if the current process isn't + * allowed to use XTILE_DATA, as attempting to set XTILE_CFG in + * XCR0 without setting XTILE_DATA is architecturally illegal. + */ + if (!(permitted_xcr0 & XFEATURE_MASK_XTILE_DATA)) + permitted_xcr0 &= ~XFEATURE_MASK_XTILE_CFG; + } + return permitted_xcr0; } static inline bool kvm_mpx_supported(void)