From: Paul Durrant <Paul.Durrant@citrix.com>
To: 'Juergen Gross' <jgross@suse.com>,
"xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "sstabellini@kernel.org" <sstabellini@kernel.org>,
Wei Liu <wei.liu2@citrix.com>,
Andrew Cooper <Andrew.Cooper3@citrix.com>,
"Tim (Xen.org)" <tim@xen.org>,
George Dunlap <George.Dunlap@citrix.com>,
"julien.grall@arm.com" <julien.grall@arm.com>,
"jbeulich@suse.com" <jbeulich@suse.com>,
Ian Jackson <Ian.Jackson@citrix.com>,
"dgdegra@tycho.nsa.gov" <dgdegra@tycho.nsa.gov>
Subject: Re: [PATCH v7 02/16] xen: move XENMAPSPACE_grant_table code into grant_table.c
Date: Tue, 19 Sep 2017 10:08:42 +0000 [thread overview]
Message-ID: <e189148236a64a88833e24178156aa46@AMSPEX02CL03.citrite.net> (raw)
In-Reply-To: <20170919095852.15785-3-jgross@suse.com>
> -----Original Message-----
> From: Xen-devel [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of
> Juergen Gross
> Sent: 19 September 2017 10:59
> To: xen-devel@lists.xenproject.org
> Cc: Juergen Gross <jgross@suse.com>; sstabellini@kernel.org; Wei Liu
> <wei.liu2@citrix.com>; George Dunlap <George.Dunlap@citrix.com>;
> Andrew Cooper <Andrew.Cooper3@citrix.com>; Ian Jackson
> <Ian.Jackson@citrix.com>; Tim (Xen.org) <tim@xen.org>;
> julien.grall@arm.com; jbeulich@suse.com; dgdegra@tycho.nsa.gov
> Subject: [Xen-devel] [PATCH v7 02/16] xen: move
> XENMAPSPACE_grant_table code into grant_table.c
>
> The x86 and arm versions of XENMAPSPACE_grant_table handling are nearly
> identical. Move the code into a function in grant_table.c and add an
> architecture dependant hook to handle the differences.
>
> Switch to mfn_t in order to be more type safe.
>
> Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
> ---
> V7:
> - only call gnttab_set_frame_gfn() if no error (Julien Grall)
>
> V6:
> - test rc of gnttab_map_frame() (Jan Beulich)
>
> V3:
> - update commit message
>
> V2:
> - rebased to staging
> ---
> xen/arch/arm/mm.c | 36 ++++----------------------------
> xen/arch/x86/mm.c | 43 +++++++++++----------------------------
> xen/common/grant_table.c | 39
> +++++++++++++++++++++++++++++++++++
> xen/include/asm-arm/grant_table.h | 7 +++++++
> xen/include/asm-x86/grant_table.h | 5 +++++
> xen/include/xen/grant_table.h | 3 +++
> 6 files changed, 70 insertions(+), 63 deletions(-)
>
> diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
> index 965d0573a4..940ddbeedd 100644
> --- a/xen/arch/arm/mm.c
> +++ b/xen/arch/arm/mm.c
> @@ -1231,39 +1231,11 @@ int xenmem_add_to_physmap_one(
> switch ( space )
> {
> case XENMAPSPACE_grant_table:
> - grant_write_lock(d->grant_table);
> -
> - if ( d->grant_table->gt_version == 0 )
> - d->grant_table->gt_version = 1;
> -
> - if ( d->grant_table->gt_version == 2 &&
> - (idx & XENMAPIDX_grant_table_status) )
> - {
> - idx &= ~XENMAPIDX_grant_table_status;
> - if ( idx < nr_status_frames(d->grant_table) )
> - mfn = virt_to_mfn(d->grant_table->status[idx]);
> - }
> - else
> - {
> - if ( (idx >= nr_grant_frames(d->grant_table)) &&
> - (idx < max_grant_frames) )
> - gnttab_grow_table(d, idx + 1);
> -
> - if ( idx < nr_grant_frames(d->grant_table) )
> - mfn = virt_to_mfn(d->grant_table->shared_raw[idx]);
> - }
> -
> - if ( !mfn_eq(mfn, INVALID_MFN) )
> - {
> - d->arch.grant_table_gfn[idx] = gfn;
> -
> - t = p2m_ram_rw;
> - }
> -
> - grant_write_unlock(d->grant_table);
> + rc = gnttab_map_frame(d, idx, gfn, &mfn);
> + if ( rc )
> + return rc;
>
> - if ( mfn_eq(mfn, INVALID_MFN) )
> - return -EINVAL;
> + t = p2m_ram_rw;
>
> break;
> case XENMAPSPACE_shared_info:
> diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
> index 2abec67f6a..67f583e3a7 100644
> --- a/xen/arch/x86/mm.c
> +++ b/xen/arch/x86/mm.c
> @@ -4549,40 +4549,21 @@ int xenmem_add_to_physmap_one(
> {
> struct page_info *page = NULL;
> unsigned long gfn = 0; /* gcc ... */
> - unsigned long prev_mfn, mfn = 0, old_gpfn;
> + unsigned long prev_mfn, old_gpfn;
> int rc = 0;
> + mfn_t mfn = INVALID_MFN;
> p2m_type_t p2mt;
>
> switch ( space )
> {
> case XENMAPSPACE_shared_info:
> if ( idx == 0 )
> - mfn = virt_to_mfn(d->shared_info);
> + mfn = _mfn(virt_to_mfn(d->shared_info));
> break;
> case XENMAPSPACE_grant_table:
> - grant_write_lock(d->grant_table);
> -
> - if ( d->grant_table->gt_version == 0 )
> - d->grant_table->gt_version = 1;
> -
> - if ( d->grant_table->gt_version == 2 &&
> - (idx & XENMAPIDX_grant_table_status) )
> - {
> - idx &= ~XENMAPIDX_grant_table_status;
> - if ( idx < nr_status_frames(d->grant_table) )
> - mfn = virt_to_mfn(d->grant_table->status[idx]);
> - }
> - else
> - {
> - if ( (idx >= nr_grant_frames(d->grant_table)) &&
> - (idx < max_grant_frames) )
> - gnttab_grow_table(d, idx + 1);
> -
> - if ( idx < nr_grant_frames(d->grant_table) )
> - mfn = virt_to_mfn(d->grant_table->shared_raw[idx]);
> - }
> -
> - grant_write_unlock(d->grant_table);
> + rc = gnttab_map_frame(d, idx, gpfn, &mfn);
> + if ( rc )
> + return rc;
> break;
> case XENMAPSPACE_gmfn_range:
> case XENMAPSPACE_gmfn:
> @@ -4599,8 +4580,8 @@ int xenmem_add_to_physmap_one(
> }
> if ( !get_page_from_mfn(_mfn(idx), d) )
> break;
> - mfn = idx;
> - page = mfn_to_page(_mfn(mfn));
> + mfn = _mfn(idx);
> + page = mfn_to_page(mfn);
> break;
> }
> case XENMAPSPACE_gmfn_foreign:
> @@ -4609,7 +4590,7 @@ int xenmem_add_to_physmap_one(
> break;
> }
>
> - if ( !paging_mode_translate(d) || (mfn == 0) )
> + if ( !paging_mode_translate(d) || mfn_eq(mfn, INVALID_MFN) )
> {
> rc = -EINVAL;
> goto put_both;
> @@ -4633,16 +4614,16 @@ int xenmem_add_to_physmap_one(
> goto put_both;
>
> /* Unmap from old location, if any. */
> - old_gpfn = get_gpfn_from_mfn(mfn);
> + old_gpfn = get_gpfn_from_mfn(mfn_x(mfn));
> ASSERT( old_gpfn != SHARED_M2P_ENTRY );
> if ( space == XENMAPSPACE_gmfn || space ==
> XENMAPSPACE_gmfn_range )
> ASSERT( old_gpfn == gfn );
> if ( old_gpfn != INVALID_M2P_ENTRY )
> - rc = guest_physmap_remove_page(d, _gfn(old_gpfn), _mfn(mfn),
> PAGE_ORDER_4K);
> + rc = guest_physmap_remove_page(d, _gfn(old_gpfn), mfn,
> PAGE_ORDER_4K);
>
> /* Map at new location. */
> if ( !rc )
> - rc = guest_physmap_add_page(d, gpfn, _mfn(mfn), PAGE_ORDER_4K);
> + rc = guest_physmap_add_page(d, gpfn, mfn, PAGE_ORDER_4K);
>
> put_both:
> /* In the XENMAPSPACE_gmfn, we took a ref of the gfn at the top */
> diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
> index 00ff075bd9..b0e2e4c22c 100644
> --- a/xen/common/grant_table.c
> +++ b/xen/common/grant_table.c
> @@ -3608,6 +3608,45 @@ int mem_sharing_gref_to_gfn(struct grant_table
> *gt, grant_ref_t ref,
> }
> #endif
>
> +int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn,
> + mfn_t *mfn)
> +{
> + int rc = 0;
> + struct grant_table *gt = d->grant_table;
> +
> + grant_write_lock(gt);
> +
> + if ( gt->gt_version == 0 )
> + gt->gt_version = 1;
> +
> + if ( gt->gt_version == 2 &&
> + (idx & XENMAPIDX_grant_table_status) )
> + {
> + idx &= ~XENMAPIDX_grant_table_status;
> + if ( idx < nr_status_frames(gt) )
> + *mfn = _mfn(virt_to_mfn(gt->status[idx]));
> + else
> + rc = -EINVAL;
> + }
> + else
> + {
> + if ( (idx >= nr_grant_frames(gt)) && (idx < max_grant_frames) )
> + gnttab_grow_table(d, idx + 1);
> +
> + if ( idx < nr_grant_frames(gt) )
> + *mfn = _mfn(virt_to_mfn(gt->shared_raw[idx]));
> + else
> + rc = -EINVAL;
> + }
> +
> + if ( !rc )
> + gnttab_set_frame_gfn(d, idx, gfn);
> +
> + grant_write_unlock(gt);
> +
> + return rc;
> +}
> +
> static void gnttab_usage_print(struct domain *rd)
> {
> int first = 1;
> diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-
> arm/grant_table.h
> index bc4d61a940..0a248a765a 100644
> --- a/xen/include/asm-arm/grant_table.h
> +++ b/xen/include/asm-arm/grant_table.h
> @@ -2,6 +2,7 @@
> #define __ASM_GRANT_TABLE_H__
>
> #include <xen/grant_table.h>
> +#include <xen/sched.h>
>
> #define INITIAL_NR_GRANT_FRAMES 4
>
> @@ -21,6 +22,12 @@ static inline int replace_grant_supported(void)
> return 1;
> }
>
> +static inline void gnttab_set_frame_gfn(struct domain *d, unsigned long
> idx,
> + gfn_t gfn)
> +{
> + d->arch.grant_table_gfn[idx] = gfn;
> +}
> +
> #define gnttab_create_shared_page(d, t, i) \
> do { \
> share_xen_page_with_guest( \
> diff --git a/xen/include/asm-x86/grant_table.h b/xen/include/asm-
> x86/grant_table.h
> index 33b2f88b96..c865999a33 100644
> --- a/xen/include/asm-x86/grant_table.h
> +++ b/xen/include/asm-x86/grant_table.h
> @@ -75,6 +75,11 @@ static inline void gnttab_clear_flag(unsigned int nr,
> uint16_t *st)
> asm volatile ("lock btrw %w1,%0" : "=m" (*st) : "Ir" (nr), "m" (*st));
> }
>
> +static inline void gnttab_set_frame_gfn(struct domain *d, unsigned long
> idx,
> + gfn_t gfn)
> +{
> +}
> +
> /* Foreign mappings of HHVM-guest pages do not modify the type count. */
> #define gnttab_host_mapping_get_page_type(ro, ld, rd) \
> (!(ro) && (((ld) == (rd)) || !paging_mode_external(rd)))
> diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h
> index af269a108d..43ec6c4d80 100644
> --- a/xen/include/xen/grant_table.h
> +++ b/xen/include/xen/grant_table.h
> @@ -136,4 +136,7 @@ static inline unsigned int grant_to_status_frames(int
> grant_frames)
> int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref,
> gfn_t *gfn, uint16_t *status);
>
> +int gnttab_map_frame(struct domain *d, unsigned long idx, gfn_t gfn,
> + mfn_t *mfn);
> +
> #endif /* __XEN_GRANT_TABLE_H__ */
> --
> 2.12.3
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> https://lists.xen.org/xen-devel
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-09-19 10:08 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-19 9:58 [PATCH v7 00/16] xen: better grant v2 support Juergen Gross
2017-09-19 9:58 ` [PATCH v7 01/16] xen: correct gnttab_get_status_frames() Juergen Gross
2017-09-19 9:58 ` [PATCH v7 02/16] xen: move XENMAPSPACE_grant_table code into grant_table.c Juergen Gross
2017-09-19 10:08 ` Paul Durrant [this message]
2017-09-19 15:41 ` Jan Beulich
2017-09-19 9:58 ` [PATCH v7 03/16] xen: clean up grant_table.h Juergen Gross
2017-09-19 15:55 ` Jan Beulich
[not found] ` <59C15A04020000780017D047@suse.com>
2017-09-19 16:04 ` Juergen Gross
2017-09-19 9:58 ` [PATCH v7 04/16] xen: add new domctl hypercall to set grant table resource limits Juergen Gross
2017-09-19 10:14 ` Paul Durrant
2017-09-19 10:20 ` Juergen Gross
2017-09-19 9:58 ` [PATCH v7 05/16] xen: add function for obtaining highest possible memory address Juergen Gross
2017-09-19 9:58 ` [PATCH v7 06/16] xen: add max possible mfn to struct xen_sysctl_physinfo Juergen Gross
2017-09-19 9:58 ` [PATCH v7 07/16] libxc: add libxc support for setting grant table resource limits Juergen Gross
2017-09-19 10:59 ` Ian Jackson
2017-09-19 9:58 ` [PATCH v7 08/16] tools: set grant limits for xenstore stubdom Juergen Gross
2017-09-19 9:58 ` [PATCH v7 09/16] libxl: add max possible mfn to libxl_physinfo Juergen Gross
2017-09-19 11:00 ` Ian Jackson
2017-09-19 9:58 ` [PATCH v7 10/16] xl: add global grant limit config items Juergen Gross
2017-09-19 10:59 ` Ian Jackson
2017-09-19 9:58 ` [PATCH v7 11/16] libxl: add libxl support for setting grant table resource limits Juergen Gross
2017-09-19 10:59 ` Ian Jackson
2017-09-19 9:58 ` [PATCH v7 12/16] xen: delay allocation of grant table sub structures Juergen Gross
2017-09-19 10:28 ` Paul Durrant
2017-09-19 10:35 ` Juergen Gross
2017-09-19 10:39 ` Paul Durrant
2017-09-19 9:58 ` [PATCH v7 13/16] xen/arm: move arch specific grant table bits into grant_table.c Juergen Gross
2017-09-19 10:30 ` Paul Durrant
2017-09-19 9:58 ` [PATCH v7 14/16] xen: make grant resource limits per domain Juergen Gross
2017-09-19 10:34 ` Paul Durrant
2017-09-19 9:58 ` [PATCH v7 15/16] xen: make grant table limits boot parameters dom0 only Juergen Gross
2017-09-19 9:58 ` [PATCH v7 16/16] xen: add new Xen cpuid node for max address width info Juergen Gross
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=e189148236a64a88833e24178156aa46@AMSPEX02CL03.citrite.net \
--to=paul.durrant@citrix.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=George.Dunlap@citrix.com \
--cc=Ian.Jackson@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=jbeulich@suse.com \
--cc=jgross@suse.com \
--cc=julien.grall@arm.com \
--cc=sstabellini@kernel.org \
--cc=tim@xen.org \
--cc=wei.liu2@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).