From patchwork Mon Nov 13 10:01:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 10055475 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4E5E460586 for ; Mon, 13 Nov 2017 10:02:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5A30928BED for ; Mon, 13 Nov 2017 10:02:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F344292AA; Mon, 13 Nov 2017 10:02:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0800128BED for ; Mon, 13 Nov 2017 10:02:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751665AbdKMKBa (ORCPT ); Mon, 13 Nov 2017 05:01:30 -0500 Received: from mail-pg0-f68.google.com ([74.125.83.68]:46252 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751268AbdKMKB1 (ORCPT ); Mon, 13 Nov 2017 05:01:27 -0500 Received: by mail-pg0-f68.google.com with SMTP id t10so11275049pgo.3; Mon, 13 Nov 2017 02:01:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+WGzSByr5v/+NqN1nMzxVs0wXPHnGo0cdPCdK8kuuHA=; b=JJjZYYuVSHHxtDphDhAd0bicfLd3fyP0swLe4pJ5hm/TK88Uyg7Tv9InktQyS0C4AL PbhMaw4NAnHRc99w8NOn1LjAZ1pGvT+W8BF/GA7MUN4UOFc8c9fpO/HGsm45svtTjCS5 4Kn5p5Mz5uy5caIxzI0wQkFhNhIXdbNyvarCtV+zK9JZIHYXnXuzEQkPN4GxNWeEPcLW 8D69TBkLegI+5rQEus5nR3NOFBDRk4tS72H42fPemNdICbYv7fp2FNVLKCxtmYr+HrUv cR4CizTH2CXPVYamghrQmewcxBvZSrnyTjlRNyvGv/1t/l7rDzWIXJDIo6SxuQ+Sc+/w TcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+WGzSByr5v/+NqN1nMzxVs0wXPHnGo0cdPCdK8kuuHA=; b=s6jSgYhr2LAq6gOtZOA5l5tFapGvRQIzvF4l/ZQzAsdTVw13v7ilWtkkFPFhFA/lWq xyx2wcF/9a+bM4dCopGOygaTExg4PRqKMjN3ARb3gBscD1bHH4KcUnmviuHlra6vOJ8l JKktePX3EPKD2wPn/qeSouL7SPEAiu9eoOZtnc91rSvnSgGfPKErAG7ccL13t118sMC2 5gVUIyOy43kjDCocSdB/nA4NpAoM9Kb6sP3D6mCKXXpJkdNm9Z3E0pv2ll87DYV4vI1n pOBVrQUgk27gbsjAInmPqw+QKApplxJiGgTcOEuuxjrqmNRQkkF4QOw3/ZeFKdoEAg+h JuLg== X-Gm-Message-State: AJaThX4KJx+A6T5qgAxKvEhQbGhhU+fxA1+eo2UYEBr7RKThe5WD3KWv buOUZrbGALec3TFhYXEnw0tiAg== X-Google-Smtp-Source: AGs4zMaiQhk4nTN8LMJylhWWLaxLldUeV+31qSxf1HX9UyXbx0Y9JUBMcbcOYo+xIyItDHyIvG++zg== X-Received: by 10.98.17.7 with SMTP id z7mr9347769pfi.206.1510567286179; Mon, 13 Nov 2017 02:01:26 -0800 (PST) Received: from localhost ([203.205.141.123]) by smtp.gmail.com with ESMTPSA id d9sm13365727pfk.117.2017.11.13.02.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Nov 2017 02:01:25 -0800 (PST) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Peter Zijlstra , Wanpeng Li Subject: [PATCH v5 1/4] KVM: X86: Add vCPU running/preempted state Date: Mon, 13 Nov 2017 02:01:17 -0800 Message-Id: <1510567280-19376-2-git-send-email-wanpeng.li@hotmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1510567280-19376-1-git-send-email-wanpeng.li@hotmail.com> References: <1510567280-19376-1-git-send-email-wanpeng.li@hotmail.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wanpeng Li This patch reuses the preempted field in kvm_steal_time, and will export the vcpu running/pre-empted information to the guest from host. This will enable guest to intelligently send ipi to running vcpus and set flag for pre-empted vcpus. This will prevent waiting for vcpus that are not running. Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Peter Zijlstra Signed-off-by: Wanpeng Li --- arch/x86/include/uapi/asm/kvm_para.h | 3 +++ arch/x86/kernel/kvm.c | 2 +- arch/x86/kvm/x86.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/uapi/asm/kvm_para.h b/arch/x86/include/uapi/asm/kvm_para.h index 554aa8f..bf17b30 100644 --- a/arch/x86/include/uapi/asm/kvm_para.h +++ b/arch/x86/include/uapi/asm/kvm_para.h @@ -51,6 +51,9 @@ struct kvm_steal_time { __u32 pad[11]; }; +#define KVM_VCPU_NOT_PREEMPTED (0 << 0) +#define KVM_VCPU_PREEMPTED (1 << 0) + #define KVM_CLOCK_PAIRING_WALLCLOCK 0 struct kvm_clock_pairing { __s64 sec; diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 8bb9594..1b1b641 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -608,7 +608,7 @@ __visible bool __kvm_vcpu_is_preempted(long cpu) { struct kvm_steal_time *src = &per_cpu(steal_time, cpu); - return !!src->preempted; + return !!(src->preempted & KVM_VCPU_PREEMPTED); } PV_CALLEE_SAVE_REGS_THUNK(__kvm_vcpu_is_preempted); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 03869eb..5e63033 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -2113,7 +2113,7 @@ static void record_steal_time(struct kvm_vcpu *vcpu) &vcpu->arch.st.steal, sizeof(struct kvm_steal_time)))) return; - vcpu->arch.st.steal.preempted = 0; + vcpu->arch.st.steal.preempted = KVM_VCPU_NOT_PREEMPTED; if (vcpu->arch.st.steal.version & 1) vcpu->arch.st.steal.version += 1; /* first time write, random junk */ @@ -2884,7 +2884,7 @@ static void kvm_steal_time_set_preempted(struct kvm_vcpu *vcpu) if (!(vcpu->arch.st.msr_val & KVM_MSR_ENABLED)) return; - vcpu->arch.st.steal.preempted = 1; + vcpu->arch.st.steal.preempted = KVM_VCPU_PREEMPTED; kvm_write_guest_offset_cached(vcpu->kvm, &vcpu->arch.st.stime, &vcpu->arch.st.steal.preempted,