x86/hvm: remove default ioreq server
PATCH v2 1/1 x86/hvm: remove default ioreq server
My recent patch [1] to qemu-xen-traditional removes the last use of the 'default' ioreq server in Xen. (This is a catch-all ioreq server that is used if no explicitly registered I/O range is targetted).
This patch can be applied once that patch is committed, to remove the (>100 lines of) redundant code in Xen.
NOTE: The removal of the special case for HVM_PARAM_DM_DOMAIN in
hvm_allow_set_param() is not directly related to removal of default ioreq servers. It could have been cleaned up at any time after commit 9a422c03 "x86/hvm: stop passing explicit domid to hvm_create_ioreq_server()".
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg00270.html
---
Cc: Jan Beulich <[email protected]>
v2:
- Disallow reads or writes of HVM_PARAM_BUFIOREQ_EVTCHN and mark it as deprecated in the header.
- Updated commit comment w.r.t. HVM_PARAM_DM_DOMAIN change.
--- xen/arch/x86/hvm/dm.c | 2 +- xen/arch/x86/hvm/hvm.c | 36 +++--------- xen/arch/x86/hvm/ioreq.c | 123 +++++---------------------------------- xen/include/asm-x86/hvm/domain.h | 1 - xen/include/asm-x86/hvm/ioreq.h | 4 +- xen/include/public/hvm/params.h | 5 +- 6 files changed, 30 insertions(+), 141 deletions(-)
xen/arch/x86/hvm/dm.c +1 -1
@@ -411,7 +411,7 @@ static int dm_op(const struct dmop_args *op_args)if ( data->pad[0 ] || data->pad[1 ] || data->pad[2 ] )break ; - rc =hvm_create_ioreq_server (d, false, data->handle_bufioreq, + rc =hvm_create_ioreq_server (d, data->handle_bufioreq, &data->id);break ; }
xen/arch/x86/hvm/hvm.c +7 -29
@@ -4093,12 +4093,15 @@ static int hvm_allow_set_param(struct domain *d,case HVM_PARAM_CONSOLE_EVTCHN :case HVM_PARAM_X87_FIP_WIDTH :break ; +/* The following parameters are deprecated. */ +case HVM_PARAM_BUFIOREQ_EVTCHN : + rc = -EPERM ; +break ;/* * The following parameters must not be set by the guest * since the domain may need to be paused. */ case HVM_PARAM_IDENT_PT : -case HVM_PARAM_DM_DOMAIN :case HVM_PARAM_ACPI_S_STATE :/* The remaining parameters should not be set by the guest. */ default :
@@ -4263,9 +4266,6 @@ static int hvmop_set_param( d->arch.hvm_domain.params[HVM_PARAM_NESTEDHVM] ) rc = -EINVAL ;break ; -case HVM_PARAM_BUFIOREQ_EVTCHN : - rc = -EINVAL ; -break ;case HVM_PARAM_TRIPLE_FAULT_REASON :if ( a.value >SHUTDOWN_MAX ) rc = -EINVAL ;
@@ -4373,13 +4373,10 @@ static int hvm_allow_get_param(struct domain *d,case HVM_PARAM_ALTP2M :case HVM_PARAM_X87_FIP_WIDTH :break ; -/* -* The following parameters must not be read by the guest -* since the domain may need to be paused. -*/ -case HVM_PARAM_IOREQ_PFN : -case HVM_PARAM_BUFIOREQ_PFN : +/* The following parameters are deprecated. */ case HVM_PARAM_BUFIOREQ_EVTCHN : + rc = -ENODATA ; +break ;/* The remaining parameters should not be read by the guest. */ default :if ( d == current->domain )
@@ -4433,25 +4430,6 @@ static int hvmop_get_param(case HVM_PARAM_X87_FIP_WIDTH : a.value = d->arch.x87_fip_width;break ; -case HVM_PARAM_IOREQ_PFN : -case HVM_PARAM_BUFIOREQ_PFN : -case HVM_PARAM_BUFIOREQ_EVTCHN : -/* -* It may be necessary to create a default ioreq server here, -* because legacy versions of QEMU are not aware of the new API for -* explicit ioreq server creation. However, if the domain is not -* under construction then it will not be QEMU querying the -* parameters and thus the query should not have that side-effect. -*/ -if ( !d->creation_finished ) - { - rc =hvm_create_ioreq_server (d, true, -HVM_IOREQSRV_BUFIOREQ_LEGACY ,NULL ); -if ( rc !=0 && rc != -EEXIST ) - goto out; - } - -/*FALLTHRU*/ default : a.value = d->arch.hvm_domain.params[a.index];break ;
xen/arch/x86/hvm/ioreq.c +16 -107
346 lines not on this page · raw message
xen/include/asm-x86/hvm/domain.h +0 -1
@@ -97,7 +97,6 @@ struct hvm_pi_ops { };#define MAX_NR_IOREQ_SERVERS 8 -#define DEFAULT_IOSERVID 0struct hvm_domain {/* Guest page range used for non-default ioreq servers */
xen/include/asm-x86/hvm/ioreq.h +2 -2
@@ -23,8 +23,8 @@ bool hvm_io_pending(struct vcpu *v);bool handle_hvm_io_completion (struct vcpu *v);bool is_ioreq_server_page (struct domain *d,const struct page_info *page); -int hvm_create_ioreq_server (struct domain *d,bool is_default, -int bufioreq_handling,ioservid_t *id); +int hvm_create_ioreq_server (struct domain *d,int bufioreq_handling, +ioservid_t *id);int hvm_destroy_ioreq_server (struct domain *d,ioservid_t id); int hvm_get_ioreq_server_info(struct domain *d, ioservid_t id, unsigned long *ioreq_gfn,
xen/include/public/hvm/params.h +4 -1
@@ -81,9 +81,12 @@#define HVM_PARAM_PAE_ENABLED 4#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* This parameter is deprecated and its meaning is undefined */ #define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif #if defined(__i386__) || defined(__x86_64__)
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 10 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 16:02, <[email protected]> wrote:
xen/arch/x86/hvm/hvm.c +3
-0@@ -4093,12 +4093,15 @@ static int hvm_allow_set_param(struct domain *d,case HVM_PARAM_CONSOLE_EVTCHN :case HVM_PARAM_X87_FIP_WIDTH :break ; +/* The following parameters are deprecated. */ +case HVM_PARAM_BUFIOREQ_EVTCHN : + rc = -EPERM ;
xen/arch/x86/hvm/hvm.c static int hvm_allow_set_param(struct domain *d, · line 4107
Quoted 10 lines
xen/arch/x86/hvm/hvm.c +1
-1+break ;/* * The following parameters must not be set by the guest * since the domain may need to be paused. */ case HVM_PARAM_IDENT_PT : -case HVM_PARAM_DM_DOMAIN :case HVM_PARAM_ACPI_S_STATE :/* The remaining parameters should not be set by the guest. */ default :
So why again don't you add DM_DOMAIN alongside BUFIOREQ_EVTCHN above (and remove it from hvm_set_param()), and then also to hvm_allow_get_param()'s new deprecated group, plus respective treatment in public/hvm/params.h? I can't find any use of this except in the get/set functions here, and your qemu-trad patch removes the sole use ("set" request) there.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 29 lines
-----Original Message-----
From: Jan Beulich [mailto:[email protected]]
Sent: 07 August 2018 15:31
To: Paul Durrant <[email protected]>
Cc: xen-devel <[email protected]>
Subject: Re: [PATCH v2] x86/hvm: remove default ioreq serverxen/arch/x86/hvm/hvm.c static int hvm_allow_set_param(struct domain
Quoted 4 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 16:02, <[email protected]> wrote:
xen/arch/x86/hvm/hvm.c +0
-0@@ -4093,12 +4093,15 @@ static int hvm_allow_set_param(struct domain*d,
Quoted 6 lines
xen/arch/x86/hvm/hvm.c +3
-0case HVM_PARAM_CONSOLE_EVTCHN :case HVM_PARAM_X87_FIP_WIDTH :break ; +/* The following parameters are deprecated. */ +case HVM_PARAM_BUFIOREQ_EVTCHN : + rc = -EPERM ;xen/arch/x86/hvm/hvm.c static int hvm_allow_set_param(struct domain *d, · line 4107
Quoted 10 lines
xen/arch/x86/hvm/hvm.c +1
-1+break ;/* * The following parameters must not be set by the guest * since the domain may need to be paused. */ case HVM_PARAM_IDENT_PT : -case HVM_PARAM_DM_DOMAIN :case HVM_PARAM_ACPI_S_STATE :/* The remaining parameters should not be set by the guest. */ default :
Quoted 7 lines
So why again don't you add
DM_DOMAINalongsideBUFIOREQ_EVTCHNabove (and remove it fromhvm_set_param()), and then also to hvm_allow_get_param()'s new deprecated group, plus respective treatment inpublic/hvm/params.h? I can't find any use of this except in the get/set functions here, and your qemu-trad patch removes the sole use ("set" request) there.
Ok, yes I'll add it too.
Paul
Quoted 2 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel