From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xen.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <JBeulich@suse.com>
Subject: [PATCH 3/7] x86/mm: Misc cleanup to {create, replace}_grant_host_mapping()
Date: Tue, 12 Sep 2017 13:14:42 +0100 [thread overview]
Message-ID: <1505218486-4416-4-git-send-email-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <1505218486-4416-1-git-send-email-andrew.cooper3@citrix.com>
The purpose of this patch is solely to simplify the resulting diff of later
changes.
* Factor out curr and currd at the start of the functions.
* Rename pte to nl1e.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
CC: Wei Liu <wei.liu2@citrix.com>
---
xen/arch/x86/mm.c | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index d5aba96..a848d7d 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -4125,19 +4125,21 @@ static int destroy_grant_va_mapping(
int create_grant_pv_mapping(uint64_t addr, unsigned long frame,
unsigned int flags, unsigned int cache_flags)
{
- l1_pgentry_t pte;
+ struct vcpu *curr = current;
+ l1_pgentry_t nl1e;
- pte = l1e_from_pfn(frame, grant_to_pte_flags(flags, cache_flags));
+ nl1e = l1e_from_pfn(frame, grant_to_pte_flags(flags, cache_flags));
if ( flags & GNTMAP_contains_pte )
- return create_grant_pte_mapping(addr, pte, current);
- return create_grant_va_mapping(addr, pte, current);
+ return create_grant_pte_mapping(addr, nl1e, curr);
+ return create_grant_va_mapping(addr, nl1e, curr);
}
int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
uint64_t new_addr, unsigned int flags)
{
struct vcpu *curr = current;
+ struct domain *currd = curr->domain;
l1_pgentry_t *pl1e, ol1e;
mfn_t gl1mfn;
struct page_info *l1pg;
@@ -4149,7 +4151,7 @@ int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
* also open-code relevant parts of adjust_guest_l1e(). Don't mirror
* available and cachability flags, though.
*/
- if ( !is_pv_32bit_domain(curr->domain) )
+ if ( !is_pv_32bit_domain(currd) )
grant_pte_flags |= (grant_pte_flags & _PAGE_USER)
? _PAGE_GLOBAL
: _PAGE_GUEST_KERNEL | _PAGE_USER;
@@ -4158,7 +4160,7 @@ int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
{
if ( !new_addr )
return destroy_grant_pte_mapping(addr, frame, grant_pte_flags,
- curr->domain);
+ currd);
return GNTST_general_error;
}
@@ -4174,7 +4176,7 @@ int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
return GNTST_general_error;
}
- if ( !get_page_from_mfn(gl1mfn, current->domain) )
+ if ( !get_page_from_mfn(gl1mfn, currd) )
{
unmap_domain_page(pl1e);
return GNTST_general_error;
@@ -4214,7 +4216,7 @@ int replace_grant_pv_mapping(uint64_t addr, unsigned long frame,
rc = replace_grant_va_mapping(addr, frame, grant_pte_flags, ol1e, curr);
if ( rc )
- put_page_from_l1e(ol1e, curr->domain);
+ put_page_from_l1e(ol1e, currd);
return rc;
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-09-12 12:14 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-12 12:14 [PATCH 0/7] x86/mm: Post XSA-234 cleanup Andrew Cooper
2017-09-12 12:14 ` [PATCH 1/7] x86/mm: Improvements to PV l1e mapping helpers Andrew Cooper
2017-09-12 12:29 ` Wei Liu
2017-09-12 15:22 ` Jan Beulich
2017-09-12 12:14 ` [PATCH 2/7] x86/mm: Factor out the grant flags to pte flags conversion logic Andrew Cooper
2017-09-12 13:28 ` Wei Liu
2017-09-12 15:25 ` Jan Beulich
2017-09-12 12:14 ` Andrew Cooper [this message]
2017-09-12 13:40 ` [PATCH 3/7] x86/mm: Misc cleanup to {create, replace}_grant_host_mapping() Wei Liu
2017-09-12 15:25 ` Jan Beulich
2017-09-12 12:14 ` [PATCH 4/7] x86/mm: Combine create_grant_{pte, va}_mapping() Andrew Cooper
2017-09-12 14:04 ` Wei Liu
2017-09-12 15:31 ` Jan Beulich
2017-09-12 12:14 ` [PATCH 5/7] x86/mm: Carve steal_linear_address() out of replace_grant_host_mapping() Andrew Cooper
2017-09-12 14:19 ` Wei Liu
2017-09-12 15:41 ` Jan Beulich
2017-09-12 12:14 ` [PATCH 6/7] x86/mm: Combine {destroy, replace}_grant_{pte, va}_mapping() Andrew Cooper
2017-09-12 14:58 ` Wei Liu
2017-09-12 16:30 ` Andrew Cooper
2017-09-12 16:32 ` Wei Liu
2017-09-12 16:36 ` Andrew Cooper
2017-09-12 16:37 ` Wei Liu
2017-09-12 15:46 ` Jan Beulich
2017-09-12 12:14 ` [PATCH 7/7] x86/mm: Prevent 32bit PV guests using out-of-range linear addresses Andrew Cooper
2017-09-12 15:50 ` Jan Beulich
2017-09-12 16:04 ` Andrew Cooper
2017-09-13 8:28 ` 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=1505218486-4416-4-git-send-email-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.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).