From patchwork Thu May 18 17:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mingwei Zhang X-Patchwork-Id: 96002 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp667798vqo; Thu, 18 May 2023 10:30:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5ZJIIDwu1vmAQIhnGnpQpoQ/0/8HS/QlqZgQvQuA3ccJHVr/df0+Z1E6vpF8tYYb0L3Yne X-Received: by 2002:a05:6a00:23c3:b0:646:9232:df8 with SMTP id g3-20020a056a0023c300b0064692320df8mr6998483pfc.15.1684431040743; Thu, 18 May 2023 10:30:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684431040; cv=none; d=google.com; s=arc-20160816; b=XmI9ResSbMDJp4RPm/OHK5XbFwG+takT7dwuFeXGQFhKrXU2DR6+aZM/NBPQKPLZ1t +KFdT6Jm7uW/9+DhaWXXHL/DLBBlX5Y5X/ClzMCXlsyNeKM4U3QpW4/ii3+eEUefk+4L ULJd5LRGQscL/qkfgBzbLiPOnUuUdzD8QtDgSN7Q7RhWzKEZFipS/2o7dqs8ardWawOj Dl80yZBOUdQyyIvXsJ+dzw7bnyASUInOAVl5kcISgSYj/QqszxD2A5ohDvV4FJdGujiq O0O/QXM/2PMB1+hdLM0Y5lqIcb2FqsjdME7frbAhx4/6SQ7puSZX85WgdYhBOgjBLNxL EwLw== 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=Ha8ZfG9WtE0dPySJ/+ise1++4XlMqEuz3CNRHMvVR+0=; b=ncr7suyCV25ImSoKlQU9xSLaoBml7DqBGUknNwyBLvZeDy+nccrTiclh3+dLNBQ7cj 90Nahdv0hcJC5321qRWx6WAJaHnR/esN5OQHeskNcc2eLQTcQ+/glEIv5kEXu8oZUN74 ghuvh2wljCBWcuz3DBvJTF+IlYs0DVtpRg3PHiszO1d5cWanBiCMC2anKtRnSzcodmLJ IFdjlWkJId9grYALABSVHV87Hfys0LapeQtNWD2+YfbfEChfrlBd006OalL+NcLsuIJ5 NIYJwWh70tJ7h/dlnFlu8HqvBgA9eS5g7pED/XBi4175tzNMiW7Fc8Pe3TG1DPchZ0CR 9iYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=qzfeyf3T; 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 i64-20020a638743000000b00534873a6643si47200pge.329.2023.05.18.10.30.24; Thu, 18 May 2023 10:30:40 -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=qzfeyf3T; 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 S229780AbjERRHB (ORCPT + 99 others); Thu, 18 May 2023 13:07:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45884 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229783AbjERRG7 (ORCPT ); Thu, 18 May 2023 13:06:59 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CB8E199 for ; Thu, 18 May 2023 10:06:57 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id 41be03b00d2f7-51b7810ec2cso1327740a12.1 for ; Thu, 18 May 2023 10:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1684429616; x=1687021616; h=cc:to:from:subject:message-id:mime-version:date:reply-to:from:to:cc :subject:date:message-id:reply-to; bh=Ha8ZfG9WtE0dPySJ/+ise1++4XlMqEuz3CNRHMvVR+0=; b=qzfeyf3TraFs/hFscOCnvXugA2E4VTI4Q3PHtq6vDUuGOQTnPx0hInkmMb/PjG8OJy VYXZVZ2B22J/881K+e94rxIdxhhTyhktiCwSCM1sFJ4dsorZa2Jlmdh8gYktLew/WF2s PuEoOPbZucxfKL2YafxmKGa/X1AhHnJwdjdBDZuV7HXFnsORktauKpaA2t8e52hVYA4+ gINZm4lxoMVTva2NXkus25VId9dRJLkLDhg+hZ5L66aQ2WZOPr5ydekR0H40s3Ilx1jS 9o35oqjQbu1R9jDkBUhlhMjMS7l3zszK+JyY9zz+T45hWhOHvD64X7SIywIqib/WPnGp jNog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684429616; x=1687021616; 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=Ha8ZfG9WtE0dPySJ/+ise1++4XlMqEuz3CNRHMvVR+0=; b=N2D8DLFcR11g69HX9l96bFhGZgjuzO0UVZdlmdWB4pi5ZZSbXs7CWtqqmLUE8q4DbX NFq2ueUtftRwl+VAjkD2axoTj2NPeX1RB1cYA37v4QGg3QguxuGcG15EWMKxSFIu1yV3 NofrrISKvyqsbeO7EWZ+HFDlW4UyayzsAdczGfPZ4Vw5UhgCTdiC1ma4uyGgmruTN9Ro GyIo2og/dH4HeWQt9O+QPqYXCyXQgNUp5gr/oKOxCpfba1DsXA54UFBnn4D7kLf4PWiS YIvTBcSemAEV+IIoLuY61uiejx4Z0Ki7rNWephW6BiX920lEnumFzYOrHfxn3YID2rs0 Pfww== X-Gm-Message-State: AC+VfDw4hncuyAAsTniGfQqQ8leYfZH2KGjyuVgCyITzxH3vHCCUDIt8 XJtjpvjmepW0sXE512bB3I6en9T0lZlK X-Received: from mizhang-super.c.googlers.com ([34.105.13.176]) (user=mizhang job=sendgmr) by 2002:a63:465e:0:b0:52c:4227:aa61 with SMTP id v30-20020a63465e000000b0052c4227aa61mr479850pgk.6.1684429616582; Thu, 18 May 2023 10:06:56 -0700 (PDT) Reply-To: Mingwei Zhang Date: Thu, 18 May 2023 17:06:53 +0000 Mime-Version: 1.0 X-Mailer: git-send-email 2.40.1.698.g37aff9b760-goog Message-ID: <20230518170653.704562-1-mizhang@google.com> Subject: [PATCH] KVM: SVM: Remove TSS reloading code after VMEXIT From: Mingwei Zhang To: Sean Christopherson , Paolo Bonzini Cc: "H. Peter Anvin" , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Venkatesh Srinivas , 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=ham 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?1766253963036956380?= X-GMAIL-MSGID: =?utf-8?q?1766253963036956380?= Remove TSS reloading code after VMEXIT since upstream KVM after [1] has already been using VMLOAD to load host segment state (including TSS). Therefore, reload_tss() becomes redundant. Because of that, also remove the relevant data field tss_desc in svm_cpu_data as well as its data structure definition. [1] commit e79b91bb3c91 ("KVM: SVM: use vmsave/vmload for saving/restoring additionalhost state") Reported-by: Venkatesh Srinivas Suggested-by: Jim Mattson Tested-by: Mingwei Zhang Signed-off-by: Mingwei Zhang --- arch/x86/kvm/svm/svm.c | 24 ------------------------ arch/x86/kvm/svm/svm.h | 1 - 2 files changed, 25 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index eb308c9994f9..cfbe00360908 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -240,15 +240,6 @@ static u8 rsm_ins_bytes[] = "\x0f\xaa"; static unsigned long iopm_base; -struct kvm_ldttss_desc { - u16 limit0; - u16 base0; - unsigned base1:8, type:5, dpl:2, p:1; - unsigned limit1:4, zero0:3, g:1, base2:8; - u32 base3; - u32 zero1; -} __attribute__((packed)); - DEFINE_PER_CPU(struct svm_cpu_data, svm_data); /* @@ -584,7 +575,6 @@ static int svm_hardware_enable(void) struct svm_cpu_data *sd; uint64_t efer; - struct desc_struct *gdt; int me = raw_smp_processor_id(); rdmsrl(MSR_EFER, efer); @@ -597,9 +587,6 @@ static int svm_hardware_enable(void) sd->next_asid = sd->max_asid + 1; sd->min_asid = max_sev_asid + 1; - gdt = get_current_gdt_rw(); - sd->tss_desc = (struct kvm_ldttss_desc *)(gdt + GDT_ENTRY_TSS); - wrmsrl(MSR_EFER, efer | EFER_SVME); wrmsrl(MSR_VM_HSAVE_PA, sd->save_area_pa); @@ -3453,14 +3440,6 @@ static int svm_handle_exit(struct kvm_vcpu *vcpu, fastpath_t exit_fastpath) return svm_invoke_exit_handler(vcpu, exit_code); } -static void reload_tss(struct kvm_vcpu *vcpu) -{ - struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu); - - sd->tss_desc->type = 9; /* available 32/64-bit TSS */ - load_TR_desc(); -} - static void pre_svm_run(struct kvm_vcpu *vcpu) { struct svm_cpu_data *sd = per_cpu_ptr(&svm_data, vcpu->cpu); @@ -4064,9 +4043,6 @@ static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu) svm_vcpu_enter_exit(vcpu, spec_ctrl_intercepted); - if (!sev_es_guest(vcpu->kvm)) - reload_tss(vcpu); - if (!static_cpu_has(X86_FEATURE_V_SPEC_CTRL)) x86_spec_ctrl_restore_host(svm->virt_spec_ctrl); diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index f44751dd8d5d..18af7e712a5a 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -303,7 +303,6 @@ struct svm_cpu_data { u32 max_asid; u32 next_asid; u32 min_asid; - struct kvm_ldttss_desc *tss_desc; struct page *save_area; unsigned long save_area_pa;