x86/hvm: remove default ioreq server (again)
PATCH v4 1/1 x86/hvm: remove default ioreq server (again)
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.
The previous version of this patch caused a QEMU build failure. This has been fixed by extending the #ifdef around deprecated HVM_PARAM declarations to __XEN_TOOLS__ as well as __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()". It is now added to the new deprecated sets introduced by this patch.
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg00270.html
---
Cc: Andrew Cooper <[email protected]>
Cc: Jan Beulich <[email protected]>
v4:
- Re-base.
- Pull deprecated params up to the top of the header.
- Fix build failure and extend commit comment noting this.
- Drop Andrew's A-b due to re-work.
v3:
- Add HVM_PARAM_DM_DOMAIN to deprecated sets and #ifdef in params.h.
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 | 38 +++--------- xen/arch/x86/hvm/ioreq.c | 122 +++++---------------------------------- xen/include/asm-x86/hvm/domain.h | 1 - xen/include/asm-x86/hvm/ioreq.h | 4 +- xen/include/public/hvm/params.h | 12 ++-- 6 files changed, 36 insertions(+), 143 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 +9 -29
@@ -4084,12 +4084,16 @@ 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_DM_DOMAIN : +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 :
@@ -4254,9 +4258,6 @@ static int hvmop_set_param( d->arch.hvm.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 ;
@@ -4364,13 +4365,11 @@ 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_DM_DOMAIN :case HVM_PARAM_BUFIOREQ_EVTCHN : + rc = -ENODATA ; +break ;/* The remaining parameters should not be read by the guest. */ default :if ( d == current->domain )
@@ -4424,25 +4423,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.params[a.index];break ;
xen/arch/x86/hvm/ioreq.c +16 -106
345 lines not on this page · raw message
xen/include/asm-x86/hvm/domain.h +0 -1
@@ -90,7 +90,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 +8 -4
@@ -25,6 +25,14 @@#include "hvm_op.h" +/* These parameters are deprecated and their meaning is undefined. */ +#if defined(__XEN__) || defined(__XEN_TOOLS__) + +#define HVM_PARAM_DM_DOMAIN 13 +#define HVM_PARAM_BUFIOREQ_EVTCHN 26 + +#endif /* defined(__XEN__) || defined(__XEN_TOOLS__) */ +/* * Parameter space for HVMOP_{set,get}_param. */
@@ -83,7 +91,6 @@#define HVM_PARAM_IOREQ_PFN 5#define HVM_PARAM_BUFIOREQ_PFN 6 -#define HVM_PARAM_BUFIOREQ_EVTCHN 26#if defined(__i386__) || defined(__x86_64__)
@@ -181,9 +188,6 @@/* Identity-map page directory used by Intel EPT when CR0.PG=0. */ #define HVM_PARAM_IDENT_PT 12 -/* Device Model domain, defaults to 0. */ -#define HVM_PARAM_DM_DOMAIN 13 -/* ACPI S state: currently support S0 and S3 on x86. */ #define HVM_PARAM_ACPI_S_STATE 14
Signature · 7 lines
2.11.0 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 19 lines
Quoted 1 line
Quoted 1 line · On 03.09.18 at 18:46, <[email protected]> wrote:
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.
The previous version of this patch caused a QEMU build failure. This has been fixed by extending the #ifdef around deprecated
HVM_PARAMdeclarations to__XEN_TOOLS__as well as__XEN__.NOTE: The removal of the special case for
HVM_PARAM_DM_DOMAINin
hvm_allow_set_param()is not directly related to removal of default ioreq servers. It could have been cleaned up at any time after commit9a422c03"x86/hvm: stop passing explicit domid tohvm_create_ioreq_server()". It is now added to the new deprecated sets introduced by this patch.
Quoted 3 lines
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg00270.html
Signed-off-by Paul Durrant <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel