|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v7 02/15] argo: introduce the argo_op hypercall boilerplate
On Wed, Jan 30, 2019 at 8:14 PM Christopher Clark
<christopher.w.clark@xxxxxxxxx> wrote:
>
> On Fri, Jan 25, 2019 at 10:55 AM Christopher Clark
> <christopher.w.clark@xxxxxxxxx> wrote:
> >
> > On Thu, Jan 24, 2019 at 2:08 AM Julien Grall <julien.grall@xxxxxxx> wrote:
> > > [...]
> > > Sorry for noticing quite late in the process. Don't you need to add the
> > > hypercall in xen/arch/arm/traps.c?
>
> Adding this looked fine, so I've added the ARM hypercall table entry to
> this patch.
Julien, do you have any further feedback on the latest version of this patch?
Christopher
On Wed, Jan 30, 2019 at 8:28 PM Christopher Clark
<christopher.w.clark@xxxxxxxxx> wrote:
>
> Presence is gated upon CONFIG_ARGO.
>
> Registers the hypercall previously reserved for this.
> Takes 5 arguments, does nothing and returns -ENOSYS.
>
> Implementation will provide a compat ABI so COMPAT_CALL is the
> macro used in the hypercall tables.
>
> Signed-off-by: Christopher Clark <christopher.clark6@xxxxxxxxxxxxxx>
> ---
> v6 dropped Jan Acked-by due to change of implementation and commit msg
> v6 switched to COMPAT_CALL and provides compat_argo_op
> v6 feedback #3 Julien: add argo_op to the ARM hypercall table
> v2 Copyright line: add 2019
> v2 feedback #3 Jan: drop "message" from argo_message_op
> v2 feedback #3 Jan: add Acked-by
> v1 feedback #15 Jan: handle upper-halves of hypercall args
> v1 feedback #15 Jan: use unsigned where negative values impossible
>
> xen/arch/arm/traps.c | 3 +++
> xen/arch/x86/guest/hypercall_page.S | 2 +-
> xen/arch/x86/hvm/hypercall.c | 3 +++
> xen/arch/x86/hypercall.c | 3 +++
> xen/arch/x86/pv/hypercall.c | 3 +++
> xen/common/Makefile | 1 +
> xen/common/argo.c | 38
> +++++++++++++++++++++++++++++++++++++
> xen/include/public/xen.h | 2 +-
> xen/include/xen/hypercall.h | 18 ++++++++++++++++++
> 9 files changed, 71 insertions(+), 2 deletions(-)
> create mode 100644 xen/common/argo.c
>
> diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
> index 221c762..e1e8ac9 100644
> --- a/xen/arch/arm/traps.c
> +++ b/xen/arch/arm/traps.c
> @@ -1397,6 +1397,9 @@ static arm_hypercall_t arm_hypercall_table[] = {
> HYPERCALL(platform_op, 1),
> HYPERCALL_ARM(vcpu_op, 3),
> HYPERCALL(vm_assist, 2),
> +#ifdef CONFIG_ARGO
> + HYPERCALL(argo_op, 5),
> +#endif
> };
>
> #ifndef NDEBUG
> diff --git a/xen/arch/x86/guest/hypercall_page.S
> b/xen/arch/x86/guest/hypercall_page.S
> index fdd2e72..26afabf 100644
> --- a/xen/arch/x86/guest/hypercall_page.S
> +++ b/xen/arch/x86/guest/hypercall_page.S
> @@ -59,7 +59,7 @@ DECLARE_HYPERCALL(sysctl)
> DECLARE_HYPERCALL(domctl)
> DECLARE_HYPERCALL(kexec_op)
> DECLARE_HYPERCALL(tmem_op)
> -DECLARE_HYPERCALL(xc_reserved_op)
> +DECLARE_HYPERCALL(argo_op)
> DECLARE_HYPERCALL(xenpmu_op)
>
> DECLARE_HYPERCALL(arch_0)
> diff --git a/xen/arch/x86/hvm/hypercall.c b/xen/arch/x86/hvm/hypercall.c
> index 19d1263..5bb1750 100644
> --- a/xen/arch/x86/hvm/hypercall.c
> +++ b/xen/arch/x86/hvm/hypercall.c
> @@ -134,6 +134,9 @@ static const hypercall_table_t hvm_hypercall_table[] = {
> #ifdef CONFIG_TMEM
> HYPERCALL(tmem_op),
> #endif
> +#ifdef CONFIG_ARGO
> + COMPAT_CALL(argo_op),
> +#endif
> COMPAT_CALL(platform_op),
> #ifdef CONFIG_PV
> COMPAT_CALL(mmuext_op),
> diff --git a/xen/arch/x86/hypercall.c b/xen/arch/x86/hypercall.c
> index 032de8f..93e7860 100644
> --- a/xen/arch/x86/hypercall.c
> +++ b/xen/arch/x86/hypercall.c
> @@ -64,6 +64,9 @@ const hypercall_args_t hypercall_args_table[NR_hypercalls] =
> ARGS(domctl, 1),
> ARGS(kexec_op, 2),
> ARGS(tmem_op, 1),
> +#ifdef CONFIG_ARGO
> + ARGS(argo_op, 5),
> +#endif
> ARGS(xenpmu_op, 2),
> #ifdef CONFIG_HVM
> ARGS(hvm_op, 2),
> diff --git a/xen/arch/x86/pv/hypercall.c b/xen/arch/x86/pv/hypercall.c
> index 5d11911..f452dd5 100644
> --- a/xen/arch/x86/pv/hypercall.c
> +++ b/xen/arch/x86/pv/hypercall.c
> @@ -77,6 +77,9 @@ const hypercall_table_t pv_hypercall_table[] = {
> #ifdef CONFIG_TMEM
> HYPERCALL(tmem_op),
> #endif
> +#ifdef CONFIG_ARGO
> + COMPAT_CALL(argo_op),
> +#endif
> HYPERCALL(xenpmu_op),
> #ifdef CONFIG_HVM
> HYPERCALL(hvm_op),
> diff --git a/xen/common/Makefile b/xen/common/Makefile
> index 56fc201..59ac7de 100644
> --- a/xen/common/Makefile
> +++ b/xen/common/Makefile
> @@ -1,3 +1,4 @@
> +obj-$(CONFIG_ARGO) += argo.o
> obj-y += bitmap.o
> obj-y += bsearch.o
> obj-$(CONFIG_CORE_PARKING) += core_parking.o
> diff --git a/xen/common/argo.c b/xen/common/argo.c
> new file mode 100644
> index 0000000..ddc48f1
> --- /dev/null
> +++ b/xen/common/argo.c
> @@ -0,0 +1,38 @@
> +/******************************************************************************
> + * Argo : Hypervisor-Mediated data eXchange
> + *
> + * Derived from v4v, the version 2 of v2v.
> + *
> + * Copyright (c) 2010, Citrix Systems
> + * Copyright (c) 2018-2019 BAE Systems
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
> + */
> +
> +#include <xen/errno.h>
> +#include <xen/guest_access.h>
> +
> +long
> +do_argo_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg1,
> + XEN_GUEST_HANDLE_PARAM(void) arg2, unsigned long arg3,
> + unsigned long arg4)
> +{
> + return -ENOSYS;
> +}
> +
> +#ifdef CONFIG_COMPAT
> +long
> +compat_argo_op(unsigned int cmd, XEN_GUEST_HANDLE_PARAM(void) arg1,
> + XEN_GUEST_HANDLE_PARAM(void) arg2, unsigned long arg3,
> + unsigned long arg4)
> +{
> + return -ENOSYS;
> +}
> +#endif
> diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
> index 1a56871..b3f6491 100644
> --- a/xen/include/public/xen.h
> +++ b/xen/include/public/xen.h
> @@ -118,7 +118,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_ulong_t);
> #define __HYPERVISOR_domctl 36
> #define __HYPERVISOR_kexec_op 37
> #define __HYPERVISOR_tmem_op 38
> -#define __HYPERVISOR_xc_reserved_op 39 /* reserved for XenClient */
> +#define __HYPERVISOR_argo_op 39
> #define __HYPERVISOR_xenpmu_op 40
> #define __HYPERVISOR_dm_op 41
>
> diff --git a/xen/include/xen/hypercall.h b/xen/include/xen/hypercall.h
> index cc99aea..6154c48 100644
> --- a/xen/include/xen/hypercall.h
> +++ b/xen/include/xen/hypercall.h
> @@ -136,6 +136,15 @@ do_tmem_op(
> XEN_GUEST_HANDLE_PARAM(tmem_op_t) uops);
> #endif
>
> +#ifdef CONFIG_ARGO
> +extern long do_argo_op(
> + unsigned int cmd,
> + XEN_GUEST_HANDLE_PARAM(void) arg1,
> + XEN_GUEST_HANDLE_PARAM(void) arg2,
> + unsigned long arg3,
> + unsigned long arg4);
> +#endif
> +
> extern long
> do_xenoprof_op(int op, XEN_GUEST_HANDLE_PARAM(void) arg);
>
> @@ -197,6 +206,15 @@ extern int compat_multicall(
> XEN_GUEST_HANDLE_PARAM(multicall_entry_compat_t) call_list,
> uint32_t nr_calls);
>
> +#ifdef CONFIG_ARGO
> +extern long compat_argo_op(
> + unsigned int cmd,
> + XEN_GUEST_HANDLE_PARAM(void) arg1,
> + XEN_GUEST_HANDLE_PARAM(void) arg2,
> + unsigned long arg3,
> + unsigned long arg4);
> +#endif
> +
> #include <compat/hvm/dm_op.h>
>
> extern int
> --
> 2.7.4
>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |