From patchwork Sat Jul 29 01:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 127971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp810874vqg; Fri, 28 Jul 2023 19:43:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlFigrAUB/aK3RM01LpgI96gt3ncPSeXQ81CGPeBYm7VjxwbqrYwEB/MghXhJglijwIN1eoS X-Received: by 2002:a17:902:7406:b0:1b8:ae24:c207 with SMTP id g6-20020a170902740600b001b8ae24c207mr2839654pll.68.1690598582677; Fri, 28 Jul 2023 19:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690598582; cv=none; d=google.com; s=arc-20160816; b=T9r4oHgpNzf4b6N+FSUebJZ2ct4nrQkhfQi4pPm7FvMXoBiYyFFohuN74HPzh3ZmS7 3suVsWbcF6OnmUM0DP2Tkx2GmFK2rBrlxglYFpoiySijhQr98ZGph19gaELpbBe1+DVh TNG8XK/umqC2BhtNU9XFr9bx4KjdjrrYE852dFE4MNw+/W3ULH4DLSBHBj0SedcexZ3b Xlr+x9Wg9gJTyH82uWZ7LKa9uswC1c3W5ahzLDIG+xpT1MIvVkgbyuntTYzqpWKANeOX S9VwDZqxra6BYmK1LG4R8HhVtJ60aOzmUIEAVqPpz/oBQOkzWuyuLcurzrTi7iZu7+Im abRA== 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=yjRclKPY/9S+JAFpnnezgnJAMv3d4o18PbOAl4Gq6ok=; fh=8Mc5uyvARtESo7rBGdZxKoor3rxsuqGYA/iIBYLTTUU=; b=GIzNMCKOiSEIhDXD6h37RZYr9oNyzpOAyEjFL3lcJ8vbXGi4EljM/FGSdkNNg/glDs yarDtIRT4UELnrZh7R1KsN3WFsHe/J9/KCsk1r74qGLUqZ1s1FlbYoUZ55vApbpe5SOv YlU6djJ0RXzXKCbQeEC2oyu0P6bIPqPYT56mkn5JYRW5BLXPnyNeigfuPbFk9Yw6xutv qYs148W6NmT5X+1wE4+px6cd0Z5Q8CzvnABePK1H1D7YOUZlzfJTJCnczhFooqCZ7uB2 IqHpTWa1lY6EiqP2oI0GmAdCs0CdieVZJcZXjarqPJTsEKiMm/49QCFXXxx5CnsZzPbn gi2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20221208 header.b=caCnBKLK; 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 w5-20020a1709029a8500b001b876d46162si528336plp.38.2023.07.28.19.42.49; Fri, 28 Jul 2023 19:43:02 -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=caCnBKLK; 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 S237363AbjG2BQb (ORCPT + 99 others); Fri, 28 Jul 2023 21:16:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237213AbjG2BQX (ORCPT ); Fri, 28 Jul 2023 21:16:23 -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 5E5413C34 for ; Fri, 28 Jul 2023 18:16:21 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d1ebc896bd7so2518275276.2 for ; Fri, 28 Jul 2023 18:16:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690593380; x=1691198180; 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=yjRclKPY/9S+JAFpnnezgnJAMv3d4o18PbOAl4Gq6ok=; b=caCnBKLK7IeUNp+Z+raLFiokOC/PMzHYkMmLwjuwc30UhDYMyfbhEyZ5nbkAN7xkug KKEqQjN9iHGmf2ROn0mMx3MXFk+YuOxc8W5HM0Gs4i/dieGRnzIvxSz0qTiN9Odhjyab seK5w16gJ9mug5/WoV1dYB+JqSU4GkUKZuEOGiyzUF8SpjKRgXR1FrDI+0JENrWJtLKT 2GG1xPNuSYMeHfd3SL6QK/G/DsfLaMWwAuExeV/ZmopcHhdtiUrB6+SH9EIoA0GYXJA2 KkguPnmbdOsuwC+YTNWiz362JDyAEftoOG+Gtq8k02+XNdOvh3/R0RtWkr+0nNq2QegI I8/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690593380; x=1691198180; 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=yjRclKPY/9S+JAFpnnezgnJAMv3d4o18PbOAl4Gq6ok=; b=FE4qrH0koDxVKFoagwlxGSc4N20a3sv+2Iako/5OaZDmuBmU7p4eibrLu0ZcRgIAz4 kg7MKgMg7pV9U2yjOdpbkc2mPGwXuN1NqVthty/LSfutPhZVASLlUCFmrOCUC1dVnPC1 KlojGD8dcEYm0iKwjEmLH1EQDAm6iMAPN+FlCcY+RvYfAu0SJNE0iRmnTTCRppDygBPK N6t16UKyrov13RSYvZrded2hnqEh9one0E3lznkw0327IM9JtxUgUwT21lmqPh2aFliq asARD43kWS1zr8t2UaCPSbkT1T73SAR6GYo8L3pB7Bng/gQFRlU0ebmJO9oRiqScU4X8 cO/A== X-Gm-Message-State: ABy/qLbPuewHJnNc8x4XZRMN/maX/ou389sBE4uAE1bBLMlih8EvDSyB qeoSK9y2Y/mV+LZZFMfKmV5unzAf5xM= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:ac48:0:b0:d15:d6da:7e97 with SMTP id r8-20020a25ac48000000b00d15d6da7e97mr17043ybd.3.1690593380274; Fri, 28 Jul 2023 18:16:20 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 28 Jul 2023 18:15:51 -0700 In-Reply-To: <20230729011608.1065019-1-seanjc@google.com> Mime-Version: 1.0 References: <20230729011608.1065019-1-seanjc@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230729011608.1065019-5-seanjc@google.com> Subject: [PATCH v2 04/21] KVM: SVM: Clean up preemption toggling related to MSR_AMD64_TSC_RATIO From: Sean Christopherson To: Sean Christopherson , Paolo Bonzini , Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Maxim Levitsky 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: INBOX X-GMAIL-THRID: 1772721099233230746 X-GMAIL-MSGID: 1772721099233230746 Explicitly disable preemption when writing MSR_AMD64_TSC_RATIO only in the "outer" helper, as all direct callers of the "inner" helper now run with preemption already disabled. And that isn't a coincidence, as the outer helper requires a vCPU and is intended to be used when modifying guest state and/or emulating guest instructions, which are typically done with preemption enabled. Direct use of the inner helper should be extremely limited, as the only time KVM should modify MSR_AMD64_TSC_RATIO without a vCPU is when sanitizing the MSR for a specific pCPU (currently done when {en,dis}abling disabling SVM). The other direct caller is svm_prepare_switch_to_guest(), which does have a vCPU, but is a one-off special case: KVM is about to enter the guest on a specific pCPU and thus must have preemption disabled. Signed-off-by: Sean Christopherson --- arch/x86/kvm/svm/svm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 13f316375b14..9fc5e402636a 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -552,15 +552,11 @@ static int svm_check_processor_compat(void) static void __svm_write_tsc_multiplier(u64 multiplier) { - preempt_disable(); - if (multiplier == __this_cpu_read(current_tsc_ratio)) - goto out; + return; wrmsrl(MSR_AMD64_TSC_RATIO, multiplier); __this_cpu_write(current_tsc_ratio, multiplier); -out: - preempt_enable(); } static void svm_hardware_disable(void) @@ -1112,7 +1108,9 @@ static void svm_write_tsc_offset(struct kvm_vcpu *vcpu, u64 offset) void svm_write_tsc_multiplier(struct kvm_vcpu *vcpu, u64 multiplier) { + preempt_disable(); __svm_write_tsc_multiplier(multiplier); + preempt_enable(); } /* Evaluate instruction intercepts that depend on guest CPUID features. */