From: Wei Liu <wei.liu2@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>
Subject: [PATCH v6 7/9] x86/mm: provide put_page_type_ptpg{, _preemptible}
Date: Tue, 13 Feb 2018 20:04:06 +0000 [thread overview]
Message-ID: <20180213200408.5463-8-wei.liu2@citrix.com> (raw)
In-Reply-To: <20180213200408.5463-1-wei.liu2@citrix.com>
And replace open-coded _put_page_type where the parent table parameter
is not null.
This is in preparation for code movement in which various
put_page_from_lNe will be moved to pv/mm.c.
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
xen/arch/x86/mm.c | 28 ++++++++++++++++++----------
xen/include/asm-x86/mm.h | 2 ++
2 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index db6b703c56..e004350e83 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -1137,9 +1137,6 @@ get_page_from_l4e(
return rc;
}
-static int _put_page_type(struct page_info *page, bool preemptible,
- struct page_info *ptpg);
-
void put_page_from_l1e(l1_pgentry_t l1e, struct domain *l1e_owner)
{
unsigned long pfn = l1e_get_pfn(l1e);
@@ -1223,7 +1220,7 @@ static int put_page_from_l2e(l2_pgentry_t l2e, unsigned long pfn)
else
{
struct page_info *pg = l2e_get_page(l2e);
- int rc = _put_page_type(pg, false, mfn_to_page(_mfn(pfn)));
+ int rc = put_page_type_ptpg(pg, mfn_to_page(_mfn(pfn)));
ASSERT(!rc);
put_page(pg);
@@ -1259,7 +1256,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
if ( unlikely(partial > 0) )
{
ASSERT(!defer);
- return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
+ return put_page_type_ptpg_preemptible(pg, mfn_to_page(_mfn(pfn)));
}
if ( defer )
@@ -1269,7 +1266,7 @@ static int put_page_from_l3e(l3_pgentry_t l3e, unsigned long pfn,
return 0;
}
- rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
+ rc = put_page_type_ptpg_preemptible(pg, mfn_to_page(_mfn(pfn)));
if ( likely(!rc) )
put_page(pg);
@@ -1289,7 +1286,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
if ( unlikely(partial > 0) )
{
ASSERT(!defer);
- return _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
+ return put_page_type_ptpg_preemptible(pg, mfn_to_page(_mfn(pfn)));
}
if ( defer )
@@ -1299,7 +1296,7 @@ static int put_page_from_l4e(l4_pgentry_t l4e, unsigned long pfn,
return 0;
}
- rc = _put_page_type(pg, true, mfn_to_page(_mfn(pfn)));
+ rc = put_page_type_ptpg_preemptible(pg, mfn_to_page(_mfn(pfn)));
if ( likely(!rc) )
put_page(pg);
}
@@ -2722,6 +2719,17 @@ int put_page_type_preemptible(struct page_info *page)
return _put_page_type(page, true, NULL);
}
+int put_page_type_ptpg_preemptible(struct page_info *page,
+ struct page_info *ptpg)
+{
+ return _put_page_type(page, true, ptpg);
+}
+
+int put_page_type_ptpg(struct page_info *page, struct page_info *ptpg)
+{
+ return _put_page_type(page, false, ptpg);
+}
+
int get_page_type_preemptible(struct page_info *page, unsigned long type)
{
ASSERT(!current->arch.old_guest_table);
@@ -2736,8 +2744,8 @@ int put_old_guest_table(struct vcpu *v)
if ( !v->arch.old_guest_table )
return 0;
- switch ( rc = _put_page_type(v->arch.old_guest_table, true,
- v->arch.old_guest_ptpg) )
+ switch ( rc = put_page_type_ptpg_preemptible(v->arch.old_guest_table,
+ v->arch.old_guest_ptpg) )
{
case -EINTR:
case -ERESTART:
diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index f6399f531b..9f30b37d29 100644
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -371,8 +371,10 @@ int page_lock(struct page_info *page);
void page_unlock(struct page_info *page);
void put_page_type(struct page_info *page);
+int put_page_type_ptpg(struct page_info *page, struct page_info *ptpg);
int get_page_type(struct page_info *page, unsigned long type);
int put_page_type_preemptible(struct page_info *page);
+int put_page_type_ptpg_preemptible(struct page_info *page, struct page_info *ptpg);
int get_page_type_preemptible(struct page_info *page, unsigned long type);
int put_old_guest_table(struct vcpu *);
int get_page_from_l1e(
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2018-02-13 20:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-13 20:03 [PATCH v6 0/9] x86: refactor mm.c Wei Liu
2018-02-13 20:04 ` [PATCH v6 1/9] x86/mm: add pv prefix to {alloc, free}_page_type Wei Liu
2018-03-08 17:03 ` Jan Beulich
2018-03-08 17:05 ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 2/9] x86/mm: move disallow masks to pv/mm.h Wei Liu
2018-02-13 20:04 ` [PATCH v6 3/9] x86/mm: add disallow_mask parameter to get_page_from_l1e Wei Liu
2018-03-13 15:54 ` Jan Beulich
2018-03-19 12:10 ` Tim Deegan
2018-02-13 20:04 ` [PATCH v6 4/9] x86/mm: add pv prefix to _put_final_page_type Wei Liu
2018-03-13 15:55 ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 5/9] x86/mm: factor out pv_dec_linear_pt Wei Liu
2018-03-13 15:59 ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 6/9] x86/mm: export set_tlbflush_timestamp Wei Liu
2018-03-13 16:06 ` Jan Beulich
2018-02-13 20:04 ` Wei Liu [this message]
2018-03-13 16:10 ` [PATCH v6 7/9] x86/mm: provide put_page_type_ptpg{, _preemptible} Jan Beulich
2018-03-13 16:17 ` Jan Beulich
2018-02-13 20:04 ` [PATCH v6 8/9] x86/mm: move PV code to pv/mm.c Wei Liu
2018-02-13 20:04 ` [PATCH v6 9/9] x86/mm: remove now unused inclusion of pv/mm.h Wei Liu
2018-03-08 12:17 ` [PATCH v6 0/9] x86: refactor mm.c Wei Liu
2018-03-08 12:36 ` Jan Beulich
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=20180213200408.5463-8-wei.liu2@citrix.com \
--to=wei.liu2@citrix.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=xen-devel@lists.xenproject.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).