From patchwork Tue May 9 03:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingwei Zhang X-Patchwork-Id: 91355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2593995vqo; Mon, 8 May 2023 20:29:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7OhrG95aVi8VIw1iUP9Lt4CDqYCd9pG/0gQyd+hOE54I5sdCfZBACsRpDjIkavi7k5H3eU X-Received: by 2002:a05:6a00:198a:b0:643:791b:892d with SMTP id d10-20020a056a00198a00b00643791b892dmr15909819pfl.18.1683602969186; Mon, 08 May 2023 20:29:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683602969; cv=none; d=google.com; s=arc-20160816; b=KeEbq5vZqoj7Vw71xV4nagqhfsyyFRNDKQh9fsRB8nm0KnDEGi3bUUnhVHn6mjNwkG FsAUghW+mnZ676JsPd+xVcwqLUvILoWVehLHwLhNp87H0MyhSXz/QhFrlusRGsw4SjZN b8H7XlCDqLyEDH55eiPy+YDfDLeOHIDjjeI663QEFkpvUZRsfKuZDjEVsw5niDwLTeLz ZGetoxJ60Ow/415SCasPkMi/M4CDZsEJx5V+7MNXq61HcEr33i8p7kKr2s/hSUGEC4iN 2yBNmtP5tXp0ueuj9rbBzcbQEKd9JJpthR6TKS+NKybPZ1s/6zhOI9xni5wggSZDECry tmjQ== 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:mime-version:date :reply-to:dkim-signature; bh=dpR8Y6nIPqOi37Vpixye2m/ShUW0PmFinpaY55RFLko=; b=y6tNCRLrRckAcQWyfabLiTHR+KFmYGCxt8eHhh2DKvdKNu2lEfufUxTiewyvb4YJbn 6MpRF/PHP4livQjPzH4mukkXvm7tdh4DIuugNru9R+VtZcRVMfDnFZJxA8gV/ydSam14 F/ttghrw0kmpjlrZYYMB4cvaqG4y+zvHRnZShhg9+ixE6lXaDvAaIuJSVxV5o3e4pw+Z rP8fUoRK7Y21w/Bjx/r1S6M6iirZHPuunR/GgUicHZEVPbEMnbF1TospssBtghq//8nU T4dAiHdM49Jachxquoij0boIrzBGh5CNbQ/Rw6tG2/Zc7Hbgm4pze0hn9OyDZTMSOk1M SXog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=IynTJ+Lr; 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 g187-20020a6252c4000000b006434e20d01asi1417811pfb.199.2023.05.08.20.29.15; Mon, 08 May 2023 20:29:29 -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=20221208 header.b=IynTJ+Lr; 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 S234047AbjEIDX4 (ORCPT + 99 others); Mon, 8 May 2023 23:23:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56872 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbjEIDXx (ORCPT ); Mon, 8 May 2023 23:23:53 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 778DC61BF for ; Mon, 8 May 2023 20:23:52 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-ba5fd33fdacso116443276.3 for ; Mon, 08 May 2023 20:23:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1683602631; x=1686194631; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=dpR8Y6nIPqOi37Vpixye2m/ShUW0PmFinpaY55RFLko=; b=IynTJ+LrrQ/irCAS/yQpEIpoCR0SK5m22p9JNDAzBLi+UWDI2PIlonD9wh6D8TX1Gs koKXf9fpViApnKPuDBCww3vgPUI0gaeQDQuanMrmQl7bmK2BgkqVRuFpnBoz1AiRIQ7j /HhMcc981NAvCoQ5onPD7grsJuZeBQHH7eP6eTh/5zdItygwqC+98uKBtYwx/kt3Trna vFSWLbmTkeBfhC37qsMcECicf6fOUS9wqPTOq+rpybJo+2kiWs5kbT+GzYUQz0JmtPjH Vg6RD18kCPf0J3izsTE4eRl0qYBMuNSNWrl/yomA59dGbU92JeUxgbCiiz6sZT9FhT1P M6uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683602631; x=1686194631; h=cc:to:from:subject:message-id:mime-version:date:reply-to :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=dpR8Y6nIPqOi37Vpixye2m/ShUW0PmFinpaY55RFLko=; b=l77MQQIxU5s2JxKt7P5scSaA1kriiv9H7LkdoAx7KTFxcbL7+uSN79eCZc5VC0CPon 5OAX+OyVyIvyF+cio3bUA7JgZa9G+FY0VxSYBEiIP4J3uTSqOtQweIbv+F/jyVJT1c+F EqEW6cZh6EBWmW5CNEhzylEqaNaFjRvqSaT7F8ZqHLUuCK36qoMcYrpqtgk6KWJw3Wj0 6YiNOxEHS6kvqAjXvML6GbBv2ItRkT074Q/vTyplz7eky2sqSlh7JQrqMKbT6Fywi38Q fZQBfzyq2Ogcy90RbM718rvm6COjToJcSymjuzGq6bTZ6xXx3f0btIO9nPSaHi7HO58M VTag== X-Gm-Message-State: AC+VfDzBjetturjezA9irVBXLLrxC5v6isBEO87h5hFmL2apiKZ53s8Y qyBGl6tlFgV4lzjrLXSzfQXcjXACTlPC X-Received: from mizhang-super.c.googlers.com ([35.247.89.60]) (user=mizhang job=sendgmr) by 2002:a25:d34b:0:b0:b8f:47c4:58ed with SMTP id e72-20020a25d34b000000b00b8f47c458edmr8078755ybf.9.1683602631765; Mon, 08 May 2023 20:23:51 -0700 (PDT) Reply-To: Mingwei Zhang Date: Tue, 9 May 2023 03:23:48 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.521.gf1e218fcd8-goog Message-ID: <20230509032348.1153070-1-mizhang@google.com> Subject: [PATCH v3] KVM: VMX: add MSR_IA32_TSX_CTRL into msrs_to_save From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: "H. Peter Anvin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Jim Mattson , Mingwei Zhang 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,T_SCC_BODY_TEXT_LINE,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?1765385667185669654?= X-GMAIL-MSGID: =?utf-8?q?1765385667185669654?= Add MSR_IA32_TSX_CTRL into msrs_to_save[] to explicitly tell userspace to save/restore the register value during migration. Missing this may cause userspace that relies on KVM ioctl(KVM_GET_MSR_INDEX_LIST) fail to port the value to the target VM. In addition, there is no need to add MSR_IA32_TSX_CTRL when ARCH_CAP_TSX_CTRL_MSR is not supported in kvm_get_arch_capabilities(). So add the checking in kvm_probe_msr_to_save(). Fixes: c11f83e0626b ("KVM: vmx: implement MSR_IA32_TSX_CTRL disable RTM functionality") Reported-by: Jim Mattson Signed-off-by: Mingwei Zhang Reviewed-by: Xiaoyao Li Reviewed-by: Jim Mattson --- arch/x86/kvm/x86.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 237c483b1230..c8accbd6c861 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1431,7 +1431,7 @@ static const u32 msrs_to_save_base[] = { #endif MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA, MSR_IA32_FEAT_CTL, MSR_IA32_BNDCFGS, MSR_TSC_AUX, - MSR_IA32_SPEC_CTRL, + MSR_IA32_SPEC_CTRL, MSR_IA32_TSX_CTRL, MSR_IA32_RTIT_CTL, MSR_IA32_RTIT_STATUS, MSR_IA32_RTIT_CR3_MATCH, MSR_IA32_RTIT_OUTPUT_BASE, MSR_IA32_RTIT_OUTPUT_MASK, MSR_IA32_RTIT_ADDR0_A, MSR_IA32_RTIT_ADDR0_B, @@ -7077,6 +7077,10 @@ static void kvm_probe_msr_to_save(u32 msr_index) if (!kvm_cpu_cap_has(X86_FEATURE_XFD)) return; break; + case MSR_IA32_TSX_CTRL: + if (!(kvm_get_arch_capabilities() & ARCH_CAP_TSX_CTRL_MSR)) + return; + break; default: break; }