From: mtosatti@redhat.com
To: kvm@vger.kernel.org, ak@linux.intel.com
Cc: pbonzini@redhat.com, xiaoguangrong@linux.vnet.ibm.com,
gleb@kernel.org, avi.kivity@gmail.com
Subject: [patch 1/4] KVM: x86: add pinned parameter to page_fault methods
Date: Wed, 09 Jul 2014 16:12:51 -0300 [thread overview]
Message-ID: <20140709191611.124051299@amt.cnet> (raw)
In-Reply-To: 20140709191250.408928362@amt.cnet
[-- Attachment #1: add-pinned-parameter-to-page-fault --]
[-- Type: text/plain, Size: 3675 bytes --]
To be used by next patch.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
---
arch/x86/include/asm/kvm_host.h | 2 +-
arch/x86/kvm/mmu.c | 11 ++++++-----
arch/x86/kvm/paging_tmpl.h | 2 +-
arch/x86/kvm/x86.c | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
Index: kvm.pinned-sptes/arch/x86/include/asm/kvm_host.h
===================================================================
--- kvm.pinned-sptes.orig/arch/x86/include/asm/kvm_host.h 2014-06-18 17:27:47.579549247 -0300
+++ kvm.pinned-sptes/arch/x86/include/asm/kvm_host.h 2014-06-18 17:28:17.549456614 -0300
@@ -259,7 +259,7 @@
unsigned long (*get_cr3)(struct kvm_vcpu *vcpu);
u64 (*get_pdptr)(struct kvm_vcpu *vcpu, int index);
int (*page_fault)(struct kvm_vcpu *vcpu, gva_t gva, u32 err,
- bool prefault);
+ bool prefault, bool pin, bool *pinned);
void (*inject_page_fault)(struct kvm_vcpu *vcpu,
struct x86_exception *fault);
gpa_t (*gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t gva, u32 access,
Index: kvm.pinned-sptes/arch/x86/kvm/mmu.c
===================================================================
--- kvm.pinned-sptes.orig/arch/x86/kvm/mmu.c 2014-06-18 17:27:47.582549238 -0300
+++ kvm.pinned-sptes/arch/x86/kvm/mmu.c 2014-06-18 17:28:17.550456611 -0300
@@ -2899,7 +2899,7 @@
static void make_mmu_pages_available(struct kvm_vcpu *vcpu);
static int nonpaging_map(struct kvm_vcpu *vcpu, gva_t v, u32 error_code,
- gfn_t gfn, bool prefault)
+ gfn_t gfn, bool prefault, bool pin, bool *pinned)
{
int r;
int level;
@@ -3299,7 +3299,8 @@
}
static int nonpaging_page_fault(struct kvm_vcpu *vcpu, gva_t gva,
- u32 error_code, bool prefault)
+ u32 error_code, bool prefault, bool pin,
+ bool *pinned)
{
gfn_t gfn;
int r;
@@ -3323,7 +3324,7 @@
gfn = gva >> PAGE_SHIFT;
return nonpaging_map(vcpu, gva & PAGE_MASK,
- error_code, gfn, prefault);
+ error_code, gfn, prefault, pin, pinned);
}
static int kvm_arch_setup_async_pf(struct kvm_vcpu *vcpu, gva_t gva, gfn_t gfn)
@@ -3373,7 +3374,7 @@
}
static int tdp_page_fault(struct kvm_vcpu *vcpu, gva_t gpa, u32 error_code,
- bool prefault)
+ bool prefault, bool pin, bool *pinned)
{
pfn_t pfn;
int r;
@@ -4190,7 +4191,7 @@
int r, emulation_type = EMULTYPE_RETRY;
enum emulation_result er;
- r = vcpu->arch.mmu.page_fault(vcpu, cr2, error_code, false);
+ r = vcpu->arch.mmu.page_fault(vcpu, cr2, error_code, false, false, NULL);
if (r < 0)
goto out;
Index: kvm.pinned-sptes/arch/x86/kvm/paging_tmpl.h
===================================================================
--- kvm.pinned-sptes.orig/arch/x86/kvm/paging_tmpl.h 2014-06-18 17:27:47.583549234 -0300
+++ kvm.pinned-sptes/arch/x86/kvm/paging_tmpl.h 2014-06-18 17:28:17.550456611 -0300
@@ -687,7 +687,7 @@
* a negative value on error.
*/
static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,
- bool prefault)
+ bool prefault, bool pin, bool *pinned)
{
int write_fault = error_code & PFERR_WRITE_MASK;
int user_fault = error_code & PFERR_USER_MASK;
Index: kvm.pinned-sptes/arch/x86/kvm/x86.c
===================================================================
--- kvm.pinned-sptes.orig/arch/x86/kvm/x86.c 2014-06-18 17:27:47.586549225 -0300
+++ kvm.pinned-sptes/arch/x86/kvm/x86.c 2014-06-18 17:28:17.552456605 -0300
@@ -7415,7 +7415,7 @@
work->arch.cr3 != vcpu->arch.mmu.get_cr3(vcpu))
return;
- vcpu->arch.mmu.page_fault(vcpu, work->gva, 0, true);
+ vcpu->arch.mmu.page_fault(vcpu, work->gva, 0, true, false, NULL);
}
static inline u32 kvm_async_pf_hash_fn(gfn_t gfn)
next prev parent reply other threads:[~2014-07-09 19:17 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-09 19:12 [patch 0/4] KVM: support for pinning sptes (v2) mtosatti
2014-07-09 19:12 ` mtosatti [this message]
2014-07-09 19:12 ` [patch 2/4] KVM: MMU: allow pinning spte translations (TDP-only) mtosatti
2014-07-17 17:18 ` Nadav Amit
2014-07-17 21:38 ` Marcelo Tosatti
2014-07-24 12:16 ` Nadav Amit
2014-07-21 21:46 ` Xiao Guangrong
2014-07-22 5:26 ` Xiao Guangrong
2014-07-09 19:12 ` [patch 3/4] KVM: MMU: reload request from GET_DIRTY_LOG path mtosatti
2014-07-21 13:14 ` Gleb Natapov
2014-09-09 15:28 ` Marcelo Tosatti
2014-09-22 17:19 ` Marcelo Tosatti
2014-09-30 18:59 ` Marcelo Tosatti
2014-10-04 7:23 ` Gleb Natapov
2014-10-06 17:19 ` Marcelo Tosatti
2014-10-08 6:56 ` Gleb Natapov
2014-10-08 17:15 ` Marcelo Tosatti
2014-10-08 17:59 ` Gleb Natapov
2014-10-08 19:22 ` Marcelo Tosatti
2014-10-10 13:09 ` Gleb Natapov
2014-10-13 8:52 ` Marcelo Tosatti
2014-10-15 8:03 ` Gleb Natapov
2014-07-21 21:55 ` Xiao Guangrong
2014-09-09 15:35 ` Marcelo Tosatti
2014-07-09 19:12 ` [patch 4/4] KVM: MMU: pinned sps are not candidates for deletion mtosatti
2014-07-21 21:59 ` Xiao Guangrong
2014-09-09 15:41 ` Marcelo Tosatti
2014-09-22 17:17 ` Marcelo Tosatti
2014-09-23 5:30 ` Xiao Guangrong
2014-07-09 19:20 ` [patch 0/4] KVM: support for pinning sptes (v2) Marcelo Tosatti
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=20140709191611.124051299@amt.cnet \
--to=mtosatti@redhat.com \
--cc=ak@linux.intel.com \
--cc=avi.kivity@gmail.com \
--cc=gleb@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=xiaoguangrong@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