[PATCH] p2m: move p2m-common.h inclusion point

[PATCH] p2m: move p2m-common.h inclusion point

[Jan Beulich]

The header is (hence its name) supposed to be a helper for the per-arch
p2m.h files. It was never supposed to be included directly, and for the
purpose of putting common function declarations into the common header
it is more helpful if things like p2m_t are already available at the
inclusion point.

Take the opportunity and also ditch a duplicate public/memory.h from the
ARM header.

Signed-off-by: Jan Beulich <jbeulich@suse.com>

--- a/xen/drivers/vpci/header.c
+++ b/xen/drivers/vpci/header.c
@@ -17,12 +17,12 @@
  * License along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/p2m-common.h>
 #include <xen/sched.h>
 #include <xen/softirq.h>
 #include <xen/vpci.h>
 
 #include <asm/event.h>
+#include <asm/p2m.h>
 
 #define MAPPABLE_BAR(x)                                                 \
     ((x)->type == VPCI_BAR_MEM32 || (x)->type == VPCI_BAR_MEM64_LO ||   \
--- a/xen/include/asm-arm/p2m.h
+++ b/xen/include/asm-arm/p2m.h
@@ -7,8 +7,6 @@
 #include <xen/mem_access.h>
 #include <public/vm_event.h> /* for vm_event_response_t */
 #include <public/memory.h>
-#include <xen/p2m-common.h>
-#include <public/memory.h>
 
 #define paddr_bits PADDR_BITS
 
@@ -144,6 +142,12 @@ typedef enum {
                             (P2M_RAM_TYPES | P2M_GRANT_TYPES |  \
                              p2m_to_mask(p2m_map_foreign)))
 
+/* All common type definitions should live ahead of this inclusion. */
+#ifdef _XEN_P2M_COMMON_H
+# error "xen/p2m-common.h should not be included directly"
+#endif
+#include <xen/p2m-common.h>
+
 static inline
 void p2m_altp2m_check(struct vcpu *v, uint16_t idx)
 {
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -27,7 +27,6 @@
 #define _XEN_ASM_X86_P2M_H
 
 #include <xen/paging.h>
-#include <xen/p2m-common.h>
 #include <xen/mem_access.h>
 #include <asm/mem_sharing.h>
 #include <asm/page.h>    /* for pagetable_t */
@@ -368,6 +367,12 @@ struct p2m_domain {
 /* get host p2m table */
 #define p2m_get_hostp2m(d)      ((d)->arch.p2m)
 
+/* All common type definitions should live ahead of this inclusion. */
+#ifdef _XEN_P2M_COMMON_H
+# error "xen/p2m-common.h should not be included directly"
+#endif
+#include <xen/p2m-common.h>
+
 /*
  * Updates vCPU's n2pm to match its np2m_base in VMCx12 and returns that np2m.
  */





_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] p2m: move p2m-common.h inclusion point

[Paul Durrant]

> -----Original Message-----
> From: Jan Beulich [mailto:JBeulich@suse.com]
> Sent: 05 October 2018 11:14
> To: xen-devel <xen-devel@lists.xenproject.org>
> Cc: Julien Grall <julien.grall@arm.com>; Andrew Cooper
> <Andrew.Cooper3@citrix.com>; Paul Durrant <Paul.Durrant@citrix.com>; Wei
> Liu <wei.liu2@citrix.com>; George Dunlap <George.Dunlap@citrix.com>; Ian
> Jackson <Ian.Jackson@citrix.com>; Stefano Stabellini
> <sstabellini@kernel.org>; Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>;
> Tim (Xen.org) <tim@xen.org>
> Subject: [PATCH] p2m: move p2m-common.h inclusion point
> 
> The header is (hence its name) supposed to be a helper for the per-arch
> p2m.h files. It was never supposed to be included directly, and for the
> purpose of putting common function declarations into the common header
> it is more helpful if things like p2m_t are already available at the
> inclusion point.
> 
> Take the opportunity and also ditch a duplicate public/memory.h from the
> ARM header.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

I suppose you could now drop the 'forward enum declaration' part of my patch now that it is no longer forwards (depending on which is committed first of course).

Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

> 
> --- a/xen/drivers/vpci/header.c
> +++ b/xen/drivers/vpci/header.c
> @@ -17,12 +17,12 @@
>   * License along with this program; If not, see
> <http://www.gnu.org/licenses/>.
>   */
> 
> -#include <xen/p2m-common.h>
>  #include <xen/sched.h>
>  #include <xen/softirq.h>
>  #include <xen/vpci.h>
> 
>  #include <asm/event.h>
> +#include <asm/p2m.h>
> 
>  #define MAPPABLE_BAR(x)                                                 \
>      ((x)->type == VPCI_BAR_MEM32 || (x)->type == VPCI_BAR_MEM64_LO ||   \
> --- a/xen/include/asm-arm/p2m.h
> +++ b/xen/include/asm-arm/p2m.h
> @@ -7,8 +7,6 @@
>  #include <xen/mem_access.h>
>  #include <public/vm_event.h> /* for vm_event_response_t */
>  #include <public/memory.h>
> -#include <xen/p2m-common.h>
> -#include <public/memory.h>
> 
>  #define paddr_bits PADDR_BITS
> 
> @@ -144,6 +142,12 @@ typedef enum {
>                              (P2M_RAM_TYPES | P2M_GRANT_TYPES |  \
>                               p2m_to_mask(p2m_map_foreign)))
> 
> +/* All common type definitions should live ahead of this inclusion. */
> +#ifdef _XEN_P2M_COMMON_H
> +# error "xen/p2m-common.h should not be included directly"
> +#endif
> +#include <xen/p2m-common.h>
> +
>  static inline
>  void p2m_altp2m_check(struct vcpu *v, uint16_t idx)
>  {
> --- a/xen/include/asm-x86/p2m.h
> +++ b/xen/include/asm-x86/p2m.h
> @@ -27,7 +27,6 @@
>  #define _XEN_ASM_X86_P2M_H
> 
>  #include <xen/paging.h>
> -#include <xen/p2m-common.h>
>  #include <xen/mem_access.h>
>  #include <asm/mem_sharing.h>
>  #include <asm/page.h>    /* for pagetable_t */
> @@ -368,6 +367,12 @@ struct p2m_domain {
>  /* get host p2m table */
>  #define p2m_get_hostp2m(d)      ((d)->arch.p2m)
> 
> +/* All common type definitions should live ahead of this inclusion. */
> +#ifdef _XEN_P2M_COMMON_H
> +# error "xen/p2m-common.h should not be included directly"
> +#endif
> +#include <xen/p2m-common.h>
> +
>  /*
>   * Updates vCPU's n2pm to match its np2m_base in VMCx12 and returns that
> np2m.
>   */
> 
> 
> 


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] p2m: move p2m-common.h inclusion point

[Jan Beulich]

>>> On 05.10.18 at 12:21, <Paul.Durrant@citrix.com> wrote:
>>  -----Original Message-----
>> From: Jan Beulich [mailto:JBeulich@suse.com]
>> Sent: 05 October 2018 11:14
>> To: xen-devel <xen-devel@lists.xenproject.org>
>> Cc: Julien Grall <julien.grall@arm.com>; Andrew Cooper
>> <Andrew.Cooper3@citrix.com>; Paul Durrant <Paul.Durrant@citrix.com>; Wei
>> Liu <wei.liu2@citrix.com>; George Dunlap <George.Dunlap@citrix.com>; Ian
>> Jackson <Ian.Jackson@citrix.com>; Stefano Stabellini
>> <sstabellini@kernel.org>; Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>;
>> Tim (Xen.org) <tim@xen.org>
>> Subject: [PATCH] p2m: move p2m-common.h inclusion point
>> 
>> The header is (hence its name) supposed to be a helper for the per-arch
>> p2m.h files. It was never supposed to be included directly, and for the
>> purpose of putting common function declarations into the common header
>> it is more helpful if things like p2m_t are already available at the
>> inclusion point.
>> 
>> Take the opportunity and also ditch a duplicate public/memory.h from the
>> ARM header.
>> 
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> I suppose you could now drop the 'forward enum declaration' part of my patch 
> now that it is no longer forwards (depending on which is committed first of 
> course).

Yeah, that's the purpose of the patch. I have a respective note in
here, for the case that yours goes in further (I mean to see whether
I can commit more of your series later today, but for now I'm fighting
build problems after Wei's CONFIG_HVM disable series).

> Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

Thanks.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] p2m: move p2m-common.h inclusion point

[Julien Grall]

Hi,

On 10/05/2018 11:14 AM, Jan Beulich wrote:
> The header is (hence its name) supposed to be a helper for the per-arch
> p2m.h files. It was never supposed to be included directly, and for the
> purpose of putting common function declarations into the common header
> it is more helpful if things like p2m_t are already available at the
> inclusion point.
> 
> Take the opportunity and also ditch a duplicate public/memory.h from the
> ARM header.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Julien Grall <julien.grall@arm.com>

Cheers,

-- 
Julien Grall

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] p2m: move p2m-common.h inclusion point

[Jan Beulich]

>>> On 05.10.18 at 12:21, <Paul.Durrant@citrix.com> wrote:
>>  -----Original Message-----
>> From: Jan Beulich [mailto:JBeulich@suse.com]
>> Sent: 05 October 2018 11:14
>> To: xen-devel <xen-devel@lists.xenproject.org>
>> Cc: Julien Grall <julien.grall@arm.com>; Andrew Cooper
>> <Andrew.Cooper3@citrix.com>; Paul Durrant <Paul.Durrant@citrix.com>; Wei
>> Liu <wei.liu2@citrix.com>; George Dunlap <George.Dunlap@citrix.com>; Ian
>> Jackson <Ian.Jackson@citrix.com>; Stefano Stabellini
>> <sstabellini@kernel.org>; Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>;
>> Tim (Xen.org) <tim@xen.org>
>> Subject: [PATCH] p2m: move p2m-common.h inclusion point
>> 
>> The header is (hence its name) supposed to be a helper for the per-arch
>> p2m.h files. It was never supposed to be included directly, and for the
>> purpose of putting common function declarations into the common header
>> it is more helpful if things like p2m_t are already available at the
>> inclusion point.
>> 
>> Take the opportunity and also ditch a duplicate public/memory.h from the
>> ARM header.
>> 
>> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> 
> I suppose you could now drop the 'forward enum declaration' part of my patch 
> now that it is no longer forwards (depending on which is committed first of 
> course).

Could you remind me which patch and/or header this was in?
I can't seem to be able to locate it ...

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Ping: [PATCH] p2m: move p2m-common.h inclusion point

[Jan Beulich]

>>> On 05.10.18 at 12:14, <JBeulich@suse.com> wrote:
> The header is (hence its name) supposed to be a helper for the per-arch
> p2m.h files. It was never supposed to be included directly, and for the
> purpose of putting common function declarations into the common header
> it is more helpful if things like p2m_t are already available at the
> inclusion point.
> 
> Take the opportunity and also ditch a duplicate public/memory.h from the
> ARM header.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Can I get an ack or otherwise from one of you two, please?

Thanks, Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Re: [PATCH] p2m: move p2m-common.h inclusion point

[George Dunlap]

On 10/05/2018 11:14 AM, Jan Beulich wrote:
> The header is (hence its name) supposed to be a helper for the per-arch
> p2m.h files. It was never supposed to be included directly, and for the
> purpose of putting common function declarations into the common header
> it is more helpful if things like p2m_t are already available at the
> inclusion point.
> 
> Take the opportunity and also ditch a duplicate public/memory.h from the
> ARM header.
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: George Dunlap <george.dunlap@citrix.com>

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel