From: "Radim Krčmář" <rkrcmar@redhat.com>
To: kvm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Gleb Natapov <gleb@kernel.org>,
Raghavendra KT <raghavendra.kt@linux.vnet.ibm.com>,
Vinod Chegu <chegu_vinod@hp.com>, Hui-Zhi <hui-zhi.zhao@hp.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Subject: [PATCH v2 6/6] KVM: VMX: runtime knobs for dynamic PLE window
Date: Wed, 20 Aug 2014 22:53:17 +0200 [thread overview]
Message-ID: <1408567997-21222-7-git-send-email-rkrcmar@redhat.com> (raw)
In-Reply-To: <1408567997-21222-1-git-send-email-rkrcmar@redhat.com>
ple_window is updated on every vmentry, so there is no reason to have it
read-only anymore.
ple_window* weren't writable to prevent runtime overflow races;
they are prevented by a seqlock.
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
---
arch/x86/kvm/vmx.c | 48 +++++++++++++++++++++++++++++++++++++-----------
1 file changed, 37 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index f63ac5d..bd73fa1 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -132,24 +132,29 @@ module_param(nested, bool, S_IRUGO);
#define KVM_VMX_DEFAULT_PLE_WINDOW_MAX \
INT_MAX / KVM_VMX_DEFAULT_PLE_WINDOW_GROW
+static struct kernel_param_ops param_ops_ple_t;
+#define param_check_ple_t(name, p) __param_check(name, p, int)
+
+static DEFINE_SEQLOCK(ple_window_seqlock);
+
static int ple_gap = KVM_VMX_DEFAULT_PLE_GAP;
module_param(ple_gap, int, S_IRUGO);
static int ple_window = KVM_VMX_DEFAULT_PLE_WINDOW;
-module_param(ple_window, int, S_IRUGO);
+module_param(ple_window, ple_t, S_IRUGO | S_IWUSR);
/* Default doubles per-vcpu window every exit. */
static int ple_window_grow = KVM_VMX_DEFAULT_PLE_WINDOW_GROW;
-module_param(ple_window_grow, int, S_IRUGO);
+module_param(ple_window_grow, ple_t, S_IRUGO | S_IWUSR);
/* Default resets per-vcpu window every exit to ple_window. */
static int ple_window_shrink = KVM_VMX_DEFAULT_PLE_WINDOW_SHRINK;
-module_param(ple_window_shrink, int, S_IRUGO);
+module_param(ple_window_shrink, int, S_IRUGO | S_IWUSR);
/* Default is to compute the maximum so we can never overflow. */
static int ple_window_actual_max = KVM_VMX_DEFAULT_PLE_WINDOW_MAX;
static int ple_window_max = KVM_VMX_DEFAULT_PLE_WINDOW_MAX;
-module_param(ple_window_max, int, S_IRUGO);
+module_param(ple_window_max, ple_t, S_IRUGO | S_IWUSR);
extern const ulong vmx_return;
@@ -5730,13 +5735,19 @@ static void modify_ple_window(struct kvm_vcpu *vcpu, int grow)
struct vcpu_vmx *vmx = to_vmx(vcpu);
int old = vmx->ple_window;
int new;
+ unsigned seq;
- if (grow)
- new = __grow_ple_window(old)
- else
- new = __shrink_ple_window(old, ple_window_shrink, ple_window);
+ do {
+ seq = read_seqbegin(&ple_window_seqlock);
- vmx->ple_window = max(new, ple_window);
+ if (grow)
+ new = __grow_ple_window(old);
+ else
+ new = __shrink_ple_window(old, ple_window_shrink,
+ ple_window);
+
+ vmx->ple_window = max(new, ple_window);
+ } while (read_seqretry(&ple_window_seqlock, seq));
trace_kvm_ple_window(grow, vcpu->vcpu_id, vmx->ple_window, old);
}
@@ -5750,6 +5761,23 @@ static void update_ple_window_actual_max(void)
ple_window_grow, INT_MIN);
}
+static int param_set_ple_t(const char *arg, const struct kernel_param *kp)
+{
+ int ret;
+
+ write_seqlock(&ple_window_seqlock);
+ ret = param_set_int(arg, kp);
+ update_ple_window_actual_max();
+ write_sequnlock(&ple_window_seqlock);
+
+ return ret;
+}
+
+static struct kernel_param_ops param_ops_ple_t = {
+ .set = param_set_ple_t,
+ .get = param_get_int,
+};
+
/*
* Indicate a busy-waiting vcpu in spinlock. We do not enable the PAUSE
* exiting, so only get here on cpu with PAUSE-Loop-Exiting.
@@ -9153,8 +9181,6 @@ static int __init vmx_init(void)
} else
kvm_disable_tdp();
- update_ple_window_actual_max();
-
return 0;
out7:
--
2.0.4
next prev parent reply other threads:[~2014-08-20 20:54 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-20 20:53 [PATCH v2 0/6] Dynamic Pause Loop Exiting window Radim Krčmář
2014-08-20 20:53 ` [PATCH v2 1/6] KVM: add kvm_arch_sched_in Radim Krčmář
2014-08-21 8:29 ` Paolo Bonzini
2014-08-21 11:38 ` Radim Krčmář
2014-08-21 12:27 ` Paolo Bonzini
2014-08-21 12:50 ` Radim Krčmář
2014-08-21 13:25 ` Paolo Bonzini
2014-08-20 20:53 ` [PATCH v2 2/6] KVM: x86: introduce sched_in to kvm_x86_ops Radim Krčmář
2014-08-20 20:53 ` [PATCH v2 3/6] KVM: VMX: make PLE window per-VCPU Radim Krčmář
2014-08-21 8:25 ` Paolo Bonzini
2014-08-21 11:38 ` Radim Krčmář
2014-08-20 20:53 ` [PATCH v2 4/6] KVM: VMX: dynamise PLE window Radim Krčmář
2014-08-21 8:24 ` Paolo Bonzini
2014-08-21 11:47 ` Radim Krčmář
2014-08-21 8:26 ` Paolo Bonzini
2014-08-21 11:54 ` Radim Krčmář
2014-08-21 12:29 ` Paolo Bonzini
2014-08-21 12:42 ` Radim Krčmář
2014-08-21 13:18 ` Paolo Bonzini
2014-08-21 13:46 ` Radim Krčmář
2014-08-20 20:53 ` [PATCH v2 5/6] KVM: trace kvm_ple_window Radim Krčmář
2014-08-21 8:29 ` Paolo Bonzini
2014-08-21 11:56 ` Radim Krčmář
2014-08-21 13:22 ` Paolo Bonzini
2014-08-21 13:49 ` Radim Krčmář
2014-08-20 20:53 ` Radim Krčmář [this message]
2014-08-21 6:49 ` [PATCH v2 0/6] Dynamic Pause Loop Exiting window Zhao, Hui-Zhi (Steven, HPservers-Core-OE-PSC)
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=1408567997-21222-7-git-send-email-rkrcmar@redhat.com \
--to=rkrcmar@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=chegu_vinod@hp.com \
--cc=gleb@kernel.org \
--cc=hui-zhi.zhao@hp.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=raghavendra.kt@linux.vnet.ibm.com \
/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).