From patchwork Tue Feb 14 18:46:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingwei Zhang X-Patchwork-Id: 57176 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3142809wrn; Tue, 14 Feb 2023 10:49:08 -0800 (PST) X-Google-Smtp-Source: AK7set/sFIU4vTBnVTikarymiBS+CcGIRbaBy410gfoPEp1bQyoblXMInAwsflK/1KYYSEtJC2Ow X-Received: by 2002:a17:903:41c6:b0:198:d004:bfa0 with SMTP id u6-20020a17090341c600b00198d004bfa0mr4716824ple.15.1676400548041; Tue, 14 Feb 2023 10:49:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676400548; cv=none; d=google.com; s=arc-20160816; b=dfk+0HdMlswadz4AJDkgFxYHMWYbuP8hm9SYdi52vo9pJpczaHvHPOTxz8B3JLlTxl GX9T/UfMIwhlS739QM9glG3TnpN2+Oe0Af2t1LmuB+6xdHm8lCDaQY/qN0fZukrTmg2m jiU9jAryFeE1lJuDnZy+bOOv02FLiOHh5XzbCn7z5ysbS57lAGE1pnqLd/EiNLXMULRQ TotfWphCZdxw80a45GL6O8Y+80NR5UQUHzR2xaOvngmJVj+tipADq5FBuPYMsG7fCS/a vuCr7gkoHjCToIqJfxp76ZByW+InLc+Wq2B7qd7nYJLjLXKOICL5uOQp3q02h0+uzevc abJg== 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=7uxY5HEkDwcZZuAHavQWO22Vrq80QNHmWiRNorTGn5M=; b=bH/75Xtsqo/0tNa/FQcuXXF8HYNYCSEz5VC+aDDm0No2i5Vdz6nApbnM96AsrCkiey kmVPjh20W/8DyjozbuTxTvP8N2Gd7zAzb6KQgFV5kWOYk8iwop1fLGUvDQgrst+DauKA 9DWJcqBDg9ZcjlZxxOleuJz9eOsA+4RCqVpHY25iZbRASeoKM/KfpnGAUwtwQD0gpGRd cR3fap5cu3i+5NhEYZcQfibdqEpei9WumzW9RR38ng/QT9UCf9JlPAtooKUceMI1/0m4 YLGDetA6q00b6pPu6za6J5NDISyIVYQrcfIsVYM/a/Z15SLAdbiyUeFtVfxaanUi4NJn NN6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="k6jyHH/f"; 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 bg10-20020a1709028e8a00b0019a70a85e91si12159763plb.88.2023.02.14.10.48.55; Tue, 14 Feb 2023 10:49:08 -0800 (PST) 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="k6jyHH/f"; 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 S233363AbjBNSql (ORCPT + 99 others); Tue, 14 Feb 2023 13:46:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233358AbjBNSqc (ORCPT ); Tue, 14 Feb 2023 13:46:32 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 010A63018B for ; Tue, 14 Feb 2023 10:46:28 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id i14-20020a17090aee8e00b00233f1a535e0so2692751pjz.0 for ; Tue, 14 Feb 2023 10:46:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; 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=7uxY5HEkDwcZZuAHavQWO22Vrq80QNHmWiRNorTGn5M=; b=k6jyHH/fo402XGiKzCkPmNeQxvWT/0j/dzTZ3oRJINHoyfJjHfah2NgP/YbXYVBSMS r4rrwYLddzVocM0gztsCewVyiyPhV6bpdtxJId4hmcPrCqpo+MD82WyjmVOa1r0hF+CT SFmTR7MX6CWLebu8+IrY9TauVnMb7u/FQo6tNfKEZar9wtt8PjAm6E+nQ0BIiBUakE4x K4+A+tXmINfBvTS6yDjgHeb993ZzPFb+Zs8rCUYRl05n6uylqcERYPRrBGuTabqiP4HZ AVOHw3689Megm8h2j9fsXtg8yJfvPT1IKVPil1j0oG9ESksT7qLq6VTjgzh+zo4LY8e2 WPLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=7uxY5HEkDwcZZuAHavQWO22Vrq80QNHmWiRNorTGn5M=; b=0GvfJMwy3l45ZV5OpU7/zTP0ll4+zNgaWxh9CI0Ayq8a7qPq70kToyH9BatZjAis4x 0t0Q7HyFb4AzbMxItR7EkvLnI1UghaHQ9KOkK5sCvSC/+3maq3RYmsiJAHI7b3rPcvDr DEZZNaYcC1VHbQpRb+vcfrsF/O8TYaBdf9f5+5o1YgqNhtKwjioqFeBUMCyxtGHie0G9 PlP+DoCRPZuEx2/oj0oE3hncHY0gmfCPnNxn3RsZ6bvmIsnfE4nbOSKSWPkhqCHPsN// tLY3PLQPfHN5yqf8So0h4z8WOVe1FBHH3QMVQ/MvNwVsEvx9kEuzf4CI6N1FcemhBOkl GgYA== X-Gm-Message-State: AO0yUKX30ejFRHt2nnF6nBlfI2eQu1Xs/8rfVKdWwQgkgNI5ciKTW/Ci dl0KePcj9bsv9tXdFgrGPTHuN+YSG7Gy X-Received: from mizhang-super.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1071]) (user=mizhang job=sendgmr) by 2002:a17:90a:c7:b0:234:5380:7f80 with SMTP id v7-20020a17090a00c700b0023453807f80mr778pjd.1.1676400388078; Tue, 14 Feb 2023 10:46:28 -0800 (PST) Reply-To: Mingwei Zhang Date: Tue, 14 Feb 2023 18:46:04 +0000 In-Reply-To: <20230214184606.510551-1-mizhang@google.com> Mime-Version: 1.0 References: <20230214184606.510551-1-mizhang@google.com> X-Mailer: git-send-email 2.39.1.581.gbfd45094c4-goog Message-ID: <20230214184606.510551-6-mizhang@google.com> Subject: [PATCH v2 5/7] KVM: selftests: Fix the checks to XFD_ERR using and operation From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Mingwei Zhang , Jim Mattson , Venkatesh Srinivas , Aaron Lewis , "Chang S. Bae" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,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?1757833381187451589?= X-GMAIL-MSGID: =?utf-8?q?1757833381187451589?= Fix the checks to XFD_ERR using logical AND operation because XFD_ERR might contain more information in the future. According Intel SDM Vol 1. 13.14: "Specifically, the MSR is loaded with the logical AND of the IA32_XFD MSR and the bitmap corresponding to the state component(s) required by the faulting instruction." So fix the check by using AND instead of '=='. Signed-off-by: Mingwei Zhang --- tools/testing/selftests/kvm/x86_64/amx_test.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/amx_test.c b/tools/testing/selftests/kvm/x86_64/amx_test.c index 44c907215343..bd8bd9936f8e 100644 --- a/tools/testing/selftests/kvm/x86_64/amx_test.c +++ b/tools/testing/selftests/kvm/x86_64/amx_test.c @@ -216,10 +216,10 @@ void guest_nm_handler(struct ex_regs *regs) /* Check if #NM is triggered by XFEATURE_MASK_XTILEDATA */ GUEST_SYNC(7); GUEST_ASSERT((get_cr0() & X86_CR0_TS) == 0); - GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) == XFEATURE_MASK_XTILEDATA); + GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) & XFEATURE_MASK_XTILEDATA); GUEST_ASSERT(rdmsr(MSR_IA32_XFD) & XFEATURE_MASK_XTILEDATA); GUEST_SYNC(8); - GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) == XFEATURE_MASK_XTILEDATA); + GUEST_ASSERT(rdmsr(MSR_IA32_XFD_ERR) & XFEATURE_MASK_XTILEDATA); GUEST_ASSERT(rdmsr(MSR_IA32_XFD) & XFEATURE_MASK_XTILEDATA); /* Clear xfd_err */ wrmsr(MSR_IA32_XFD_ERR, 0);