From: "tip-bot2 for Wanpeng Li" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
Wanpeng Li <wanpengli@tencent.com>,
Sean Christopherson <seanjc@google.com>,
Christian Borntraeger <borntraeger@de.ibm.com>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] context_tracking: Move guest exit vtime accounting to separate helpers
Date: Thu, 06 May 2021 12:14:05 -0000 [thread overview]
Message-ID: <162030324513.29796.12806725485526292547.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210505002735.1684165-3-seanjc@google.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 88d8220bbf06dd8045b2ac4be1046290eaa7773a
Gitweb: https://git.kernel.org/tip/88d8220bbf06dd8045b2ac4be1046290eaa7773a
Author: Wanpeng Li <wanpengli@tencent.com>
AuthorDate: Tue, 04 May 2021 17:27:29 -07:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Wed, 05 May 2021 22:54:11 +02:00
context_tracking: Move guest exit vtime accounting to separate helpers
Provide separate vtime accounting functions for guest exit instead of
open coding the logic within the context tracking code. This will allow
KVM x86 to handle vtime accounting slightly differently when using
tick-based accounting.
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Wanpeng Li <wanpengli@tencent.com>
Co-developed-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Link: https://lore.kernel.org/r/20210505002735.1684165-3-seanjc@google.com
---
include/linux/context_tracking.h | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index b8c7313..4f45562 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -137,15 +137,20 @@ static __always_inline void context_tracking_guest_exit(void)
__context_tracking_exit(CONTEXT_GUEST);
}
-static __always_inline void guest_exit_irqoff(void)
+static __always_inline void vtime_account_guest_exit(void)
{
- context_tracking_guest_exit();
-
- instrumentation_begin();
if (vtime_accounting_enabled_this_cpu())
vtime_guest_exit(current);
else
current->flags &= ~PF_VCPU;
+}
+
+static __always_inline void guest_exit_irqoff(void)
+{
+ context_tracking_guest_exit();
+
+ instrumentation_begin();
+ vtime_account_guest_exit();
instrumentation_end();
}
@@ -166,12 +171,17 @@ static __always_inline void guest_enter_irqoff(void)
static __always_inline void context_tracking_guest_exit(void) { }
+static __always_inline void vtime_account_guest_exit(void)
+{
+ vtime_account_kernel(current);
+ current->flags &= ~PF_VCPU;
+}
+
static __always_inline void guest_exit_irqoff(void)
{
instrumentation_begin();
/* Flush the guest cputime we spent on the guest */
- vtime_account_kernel(current);
- current->flags &= ~PF_VCPU;
+ vtime_account_guest_exit();
instrumentation_end();
}
#endif /* CONFIG_VIRT_CPU_ACCOUNTING_GEN */
next prev parent reply other threads:[~2021-05-06 12:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 0:27 [PATCH v4 0/8] KVM: Fix tick-based accounting for x86 guests Sean Christopherson
2021-05-05 0:27 ` [PATCH v4 1/8] context_tracking: Move guest exit context tracking to separate helpers Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Wanpeng Li
2021-05-05 0:27 ` [PATCH v4 2/8] context_tracking: Move guest exit vtime accounting " Sean Christopherson
2021-05-06 12:14 ` tip-bot2 for Wanpeng Li [this message]
2021-05-05 0:27 ` [PATCH v4 3/8] KVM: x86: Defer vtime accounting 'til after IRQ handling Sean Christopherson
2021-05-05 20:14 ` Thomas Gleixner
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Wanpeng Li
2021-05-05 0:27 ` [PATCH v4 4/8] sched/vtime: Move vtime accounting external declarations above inlines Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Sean Christopherson
2021-05-05 0:27 ` [PATCH v4 5/8] sched/vtime: Move guest enter/exit vtime accounting to vtime.h Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Sean Christopherson
2021-05-05 0:27 ` [PATCH v4 6/8] context_tracking: Consolidate guest enter/exit wrappers Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Sean Christopherson
2021-05-05 0:27 ` [PATCH v4 7/8] context_tracking: KVM: Move guest enter/exit wrappers to KVM's domain Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Sean Christopherson
2021-05-05 0:27 ` [PATCH v4 8/8] KVM: x86: Consolidate guest enter/exit logic to common helpers Sean Christopherson
2021-05-06 12:14 ` [tip: x86/urgent] " tip-bot2 for Sean Christopherson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162030324513.29796.12806725485526292547.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=borntraeger@de.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=wanpengli@tencent.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).