* [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr()
@ 2016-06-20 11:05 Jan Beulich
2016-06-20 12:17 ` Andrew Cooper
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Jan Beulich @ 2016-06-20 11:05 UTC (permalink / raw)
To: xen-devel; +Cc: George Dunlap, Andrew Cooper, Tim Deegan
[-- Attachment #1: Type: text/plain, Size: 2110 bytes --]
The very few remaining uses don't make their presence really necessary:
Simplify the two L2 ones, and open code the sole common code use.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/asm-x86/guest_pt.h
+++ b/xen/include/asm-x86/guest_pt.h
@@ -66,15 +66,10 @@ typedef struct { guest_intpte_t l2; } gu
#define PRI_gpte "08x"
-static inline paddr_t guest_l1e_get_paddr(guest_l1e_t gl1e)
-{ return ((paddr_t) gl1e.l1) & (PADDR_MASK & PAGE_MASK); }
-static inline paddr_t guest_l2e_get_paddr(guest_l2e_t gl2e)
-{ return ((paddr_t) gl2e.l2) & (PADDR_MASK & PAGE_MASK); }
-
static inline gfn_t guest_l1e_get_gfn(guest_l1e_t gl1e)
-{ return _gfn(guest_l1e_get_paddr(gl1e) >> PAGE_SHIFT); }
+{ return _gfn(gl1e.l1 >> PAGE_SHIFT); }
static inline gfn_t guest_l2e_get_gfn(guest_l2e_t gl2e)
-{ return _gfn(guest_l2e_get_paddr(gl2e) >> PAGE_SHIFT); }
+{ return _gfn(gl2e.l2 >> PAGE_SHIFT); }
static inline u32 guest_l1e_get_flags(guest_l1e_t gl1e)
{ return gl1e.l1 & 0xfff; }
@@ -126,17 +121,6 @@ typedef intpte_t guest_intpte_t;
#define PRI_gpte "016"PRIx64
-static inline paddr_t guest_l1e_get_paddr(guest_l1e_t gl1e)
-{ return l1e_get_paddr(gl1e); }
-static inline paddr_t guest_l2e_get_paddr(guest_l2e_t gl2e)
-{ return l2e_get_paddr(gl2e); }
-static inline paddr_t guest_l3e_get_paddr(guest_l3e_t gl3e)
-{ return l3e_get_paddr(gl3e); }
-#if GUEST_PAGING_LEVELS >= 4
-static inline paddr_t guest_l4e_get_paddr(guest_l4e_t gl4e)
-{ return l4e_get_paddr(gl4e); }
-#endif
-
static inline gfn_t guest_l1e_get_gfn(guest_l1e_t gl1e)
{ return _gfn(l1e_get_paddr(gl1e) >> PAGE_SHIFT); }
static inline gfn_t guest_l2e_get_gfn(guest_l2e_t gl2e)
@@ -278,7 +262,8 @@ guest_walk_to_gpa(walk_t *gw)
{
if ( !(guest_l1e_get_flags(gw->l1e) & _PAGE_PRESENT) )
return 0;
- return guest_l1e_get_paddr(gw->l1e) + (gw->va & ~PAGE_MASK);
+ return ((paddr_t)gfn_x(guest_l1e_get_gfn(gw->l1e)) << PAGE_SHIFT) +
+ (gw->va & ~PAGE_MASK);
}
/* Given a walk_t from a successful walk, return the page-order of the
[-- Attachment #2: x86-guestpt-drop-get-paddr.patch --]
[-- Type: text/plain, Size: 2155 bytes --]
x86: drop (mostly) unused guest_lNe_get_paddr()
The very few remaining uses don't make their presence really necessary:
Simplify the two L2 ones, and open code the sole common code use.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/include/asm-x86/guest_pt.h
+++ b/xen/include/asm-x86/guest_pt.h
@@ -66,15 +66,10 @@ typedef struct { guest_intpte_t l2; } gu
#define PRI_gpte "08x"
-static inline paddr_t guest_l1e_get_paddr(guest_l1e_t gl1e)
-{ return ((paddr_t) gl1e.l1) & (PADDR_MASK & PAGE_MASK); }
-static inline paddr_t guest_l2e_get_paddr(guest_l2e_t gl2e)
-{ return ((paddr_t) gl2e.l2) & (PADDR_MASK & PAGE_MASK); }
-
static inline gfn_t guest_l1e_get_gfn(guest_l1e_t gl1e)
-{ return _gfn(guest_l1e_get_paddr(gl1e) >> PAGE_SHIFT); }
+{ return _gfn(gl1e.l1 >> PAGE_SHIFT); }
static inline gfn_t guest_l2e_get_gfn(guest_l2e_t gl2e)
-{ return _gfn(guest_l2e_get_paddr(gl2e) >> PAGE_SHIFT); }
+{ return _gfn(gl2e.l2 >> PAGE_SHIFT); }
static inline u32 guest_l1e_get_flags(guest_l1e_t gl1e)
{ return gl1e.l1 & 0xfff; }
@@ -126,17 +121,6 @@ typedef intpte_t guest_intpte_t;
#define PRI_gpte "016"PRIx64
-static inline paddr_t guest_l1e_get_paddr(guest_l1e_t gl1e)
-{ return l1e_get_paddr(gl1e); }
-static inline paddr_t guest_l2e_get_paddr(guest_l2e_t gl2e)
-{ return l2e_get_paddr(gl2e); }
-static inline paddr_t guest_l3e_get_paddr(guest_l3e_t gl3e)
-{ return l3e_get_paddr(gl3e); }
-#if GUEST_PAGING_LEVELS >= 4
-static inline paddr_t guest_l4e_get_paddr(guest_l4e_t gl4e)
-{ return l4e_get_paddr(gl4e); }
-#endif
-
static inline gfn_t guest_l1e_get_gfn(guest_l1e_t gl1e)
{ return _gfn(l1e_get_paddr(gl1e) >> PAGE_SHIFT); }
static inline gfn_t guest_l2e_get_gfn(guest_l2e_t gl2e)
@@ -278,7 +262,8 @@ guest_walk_to_gpa(walk_t *gw)
{
if ( !(guest_l1e_get_flags(gw->l1e) & _PAGE_PRESENT) )
return 0;
- return guest_l1e_get_paddr(gw->l1e) + (gw->va & ~PAGE_MASK);
+ return ((paddr_t)gfn_x(guest_l1e_get_gfn(gw->l1e)) << PAGE_SHIFT) +
+ (gw->va & ~PAGE_MASK);
}
/* Given a walk_t from a successful walk, return the page-order of the
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr()
2016-06-20 11:05 [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr() Jan Beulich
@ 2016-06-20 12:17 ` Andrew Cooper
2016-06-20 12:33 ` Tim Deegan
2016-06-20 13:14 ` George Dunlap
2 siblings, 0 replies; 4+ messages in thread
From: Andrew Cooper @ 2016-06-20 12:17 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: George Dunlap, Tim Deegan
[-- Attachment #1.1: Type: text/plain, Size: 287 bytes --]
On 20/06/16 12:05, Jan Beulich wrote:
> The very few remaining uses don't make their presence really necessary:
> Simplify the two L2 ones, and open code the sole common code use.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
[-- Attachment #1.2: Type: text/html, Size: 840 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr()
2016-06-20 11:05 [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr() Jan Beulich
2016-06-20 12:17 ` Andrew Cooper
@ 2016-06-20 12:33 ` Tim Deegan
2016-06-20 13:14 ` George Dunlap
2 siblings, 0 replies; 4+ messages in thread
From: Tim Deegan @ 2016-06-20 12:33 UTC (permalink / raw)
To: Jan Beulich; +Cc: George Dunlap, xen-devel, Andrew Cooper
At 05:05 -0600 on 20 Jun (1466399104), Jan Beulich wrote:
> The very few remaining uses don't make their presence really necessary:
> Simplify the two L2 ones, and open code the sole common code use.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Tim Deegan <tim@xen.org>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr()
2016-06-20 11:05 [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr() Jan Beulich
2016-06-20 12:17 ` Andrew Cooper
2016-06-20 12:33 ` Tim Deegan
@ 2016-06-20 13:14 ` George Dunlap
2 siblings, 0 replies; 4+ messages in thread
From: George Dunlap @ 2016-06-20 13:14 UTC (permalink / raw)
To: Jan Beulich, xen-devel; +Cc: George Dunlap, Andrew Cooper, Tim Deegan
On 20/06/16 12:05, Jan Beulich wrote:
> The very few remaining uses don't make their presence really necessary:
> Simplify the two L2 ones, and open code the sole common code use.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: George Dunlap <george.dunlap@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-20 13:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-20 11:05 [PATCH] x86: drop (mostly) unused guest_lNe_get_paddr() Jan Beulich
2016-06-20 12:17 ` Andrew Cooper
2016-06-20 12:33 ` Tim Deegan
2016-06-20 13:14 ` George Dunlap
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).