[PATCH 7/9] KVM: VMX: abstract ple_window modifiers

[Radim KrÄmÃÅ]

They were almost identical and thus merged with a loathable macro.

Signed-off-by: Radim KrÄmÃÅ <rkrcmar@xxxxxxxxxx>
---
 This solution is hopefully more acceptable than function pointers.

 arch/x86/kvm/vmx.c | 53 +++++++++++++++++++----------------------------------
 1 file changed, 19 insertions(+), 34 deletions(-)

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index a236a9f..c6cfb71 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -5694,42 +5694,27 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 out:
 	return ret;
 }
-
-static void grow_ple_window(struct kvm_vcpu *vcpu)
-{
-	struct vcpu_vmx *vmx = to_vmx(vcpu);
-	int old = vmx->ple_window;
-	int new;
-
-	if (ple_window_grow < 1)
-		new = ple_window;
-	else if (ple_window_grow < ple_window)
-		new = old * ple_window_grow;
-	else
-		new = old + ple_window_grow;
-
-	vmx->ple_window = min(new, ple_window_max);
-
-	trace_kvm_ple_window_grow(vcpu->vcpu_id, vmx->ple_window, old);
+#define make_ple_window_modifier(type, oplt, opge, cmp, bound) \
+static void type##_ple_window(struct kvm_vcpu *vcpu) \
+{ \
+	struct vcpu_vmx *vmx = to_vmx(vcpu); \
+	int old = vmx->ple_window; \
+	int new; \
+\
+	if (ple_window_##type < 1) \
+		new = ple_window; \
+	else if (ple_window_##type < ple_window) \
+		new = old oplt ple_window_##type; \
+	else \
+		new = old opge ple_window_##type; \
+\
+	vmx->ple_window = cmp(new, bound); \
+\
+	trace_kvm_ple_window_##type(vcpu->vcpu_id, vmx->ple_window, old); \
 }
 
-static void shrink_ple_window(struct kvm_vcpu *vcpu)
-{
-	struct vcpu_vmx *vmx = to_vmx(vcpu);
-	int old = vmx->ple_window;
-	int new;
-
-	if (ple_window_shrink < 1)
-		new = ple_window;
-	else if (ple_window_shrink < ple_window)
-		new = old / ple_window_shrink;
-	else
-		new = old - ple_window_shrink;
-
-	vmx->ple_window = max(new, ple_window);
-
-	trace_kvm_ple_window_shrink(vcpu->vcpu_id, vmx->ple_window, old);
-}
+make_ple_window_modifier(grow,   *, +, min, ple_window_max)
+make_ple_window_modifier(shrink, /, -, max, ple_window)
 
 /*
  * Indicate a busy-waiting vcpu in spinlock. We do not enable the PAUSE
-- 
2.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/