diff mbox series

[v5,1/7] x86: move some xen mm function declarations

Message ID 3b373c553a15dfdcd26c21e4f39c30404c7c2fa9.1578397252.git.hongyxia@amazon.com (mailing list archive)
State New, archived
Headers show
Series Add alternative API for XEN PTEs | expand

Commit Message

Xia, Hongyan Jan. 7, 2020, 12:06 p.m. UTC
From: Wei Liu <wei.liu2@citrix.com>

They were put into page.h but mm.h is more appropriate.

The real reason is that I will be adding some new functions which
takes mfn_t. It turns out it is a bit difficult to do in page.h.

No functional change.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

---
Changed since v3:
- move Xen PTE API declarations next to do_page_walk().
---
 xen/include/asm-x86/mm.h   | 5 +++++
 xen/include/asm-x86/page.h | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

Comments

Wei Liu Jan. 7, 2020, 12:13 p.m. UTC | #1
On Tue, Jan 07, 2020 at 12:06:43PM +0000, Hongyan Xia wrote:
> From: Wei Liu <wei.liu2@citrix.com>
> 
> They were put into page.h but mm.h is more appropriate.
> 
> The real reason is that I will be adding some new functions which
> takes mfn_t. It turns out it is a bit difficult to do in page.h.
> 
> No functional change.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> Acked-by: Jan Beulich <jbeulich@suse.com>

I will commit this trivial patch soon-ish to reduce Honyan's patch queue
length.

Shout if your disagree.

Wei.
Jan Beulich Jan. 7, 2020, 1:09 p.m. UTC | #2
On 07.01.2020 13:13, Wei Liu wrote:
> On Tue, Jan 07, 2020 at 12:06:43PM +0000, Hongyan Xia wrote:
>> From: Wei Liu <wei.liu2@citrix.com>
>>
>> They were put into page.h but mm.h is more appropriate.
>>
>> The real reason is that I will be adding some new functions which
>> takes mfn_t. It turns out it is a bit difficult to do in page.h.
>>
>> No functional change.
>>
>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>> Acked-by: Jan Beulich <jbeulich@suse.com>
> 
> I will commit this trivial patch soon-ish to reduce Honyan's patch queue
> length.

Looks like I simply forgot every time I went through my list of
pending (for the various stages of processing) patches. I guess
patches 3 and 4 are also independent of patch 2 and hence could
go in as well.

Jan
Wei Liu Jan. 7, 2020, 1:37 p.m. UTC | #3
On Tue, Jan 07, 2020 at 02:09:05PM +0100, Jan Beulich wrote:
> On 07.01.2020 13:13, Wei Liu wrote:
> > On Tue, Jan 07, 2020 at 12:06:43PM +0000, Hongyan Xia wrote:
> >> From: Wei Liu <wei.liu2@citrix.com>
> >>
> >> They were put into page.h but mm.h is more appropriate.
> >>
> >> The real reason is that I will be adding some new functions which
> >> takes mfn_t. It turns out it is a bit difficult to do in page.h.
> >>
> >> No functional change.
> >>
> >> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> >> Acked-by: Jan Beulich <jbeulich@suse.com>
> > 
> > I will commit this trivial patch soon-ish to reduce Honyan's patch queue
> > length.
> 
> Looks like I simply forgot every time I went through my list of
> pending (for the various stages of processing) patches. I guess
> patches 3 and 4 are also independent of patch 2 and hence could
> go in as well.

Sure. I pushed all three patches (1, 3 and 4).

Wei.
Xia, Hongyan Jan. 7, 2020, 1:48 p.m. UTC | #4
On Tue, 2020-01-07 at 14:09 +0100, Jan Beulich wrote:
> ...
> 
> Looks like I simply forgot every time I went through my list of
> pending (for the various stages of processing) patches. I guess
> patches 3 and 4 are also independent of patch 2 and hence could
> go in as well.

If so, looks like patch 7/7 is also in a committable state?

Hongyan
Wei Liu Jan. 7, 2020, 2:03 p.m. UTC | #5
On Tue, Jan 07, 2020 at 01:48:41PM +0000, Xia, Hongyan wrote:
> On Tue, 2020-01-07 at 14:09 +0100, Jan Beulich wrote:
> > ...
> > 
> > Looks like I simply forgot every time I went through my list of
> > pending (for the various stages of processing) patches. I guess
> > patches 3 and 4 are also independent of patch 2 and hence could
> > go in as well.
> 
> If so, looks like patch 7/7 is also in a committable state?

Looks like so. I will commit that one as well.

Thanks for putting in the effort to upstream these patches, Hongyan.

Wei.
diff mbox series

Patch

diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
index 1479ba6703..2ca8882ad0 100644
--- a/xen/include/asm-x86/mm.h
+++ b/xen/include/asm-x86/mm.h
@@ -579,6 +579,11 @@  void update_cr3(struct vcpu *v);
 int vcpu_destroy_pagetables(struct vcpu *);
 void *do_page_walk(struct vcpu *v, unsigned long addr);
 
+/* Allocator functions for Xen pagetables. */
+void *alloc_xen_pagetable(void);
+void free_xen_pagetable(void *v);
+l1_pgentry_t *virt_to_xen_l1e(unsigned long v);
+
 int __sync_local_execstate(void);
 
 /* Arch-specific portion of memory_op hypercall. */
diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index c1e92937c0..05a8b1efa6 100644
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -345,11 +345,6 @@  void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t);
 
 #ifndef __ASSEMBLY__
 
-/* Allocator functions for Xen pagetables. */
-void *alloc_xen_pagetable(void);
-void free_xen_pagetable(void *v);
-l1_pgentry_t *virt_to_xen_l1e(unsigned long v);
-
 /* Convert between PAT/PCD/PWT embedded in PTE flags and 3-bit cacheattr. */
 static inline unsigned int pte_flags_to_cacheattr(unsigned int flags)
 {