x86/hvm: remove default ioreq server
PATCH v3 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()". 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: Jan Beulich <[email protected]>
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 | 123 +++++---------------------------------- xen/include/asm-x86/hvm/domain.h | 1 - xen/include/asm-x86/hvm/ioreq.h | 4 +- xen/include/public/hvm/params.h | 9 +-- 6 files changed, 33 insertions(+), 144 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
@@ -4093,12 +4093,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 :
@@ -4263,9 +4267,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 +4374,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 )
@@ -4433,25 +4432,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 +5 -4
@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif #if defined(__i386__) || defined(__x86_64__)
@@ -181,9 +185,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 15 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[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.
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 4 lines
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg00270.html
Signed-off-by Paul Durrant <[email protected]>Acked-by Andrew Cooper <[email protected]>
with one more cosmetic adjustment:
Quoted 4 lines
xen/include/public/hvm/params.h +0
-0@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4
xen/include/public/hvm/params.h line 90
Quoted 10 lines
xen/include/public/hvm/params.h +5
-1#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif
The comment was only partly switched to plural.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 22 lines
-----Original Message-----
From: Jan Beulich [mailto:[email protected]]
Sent: 08 August 2018 11:11
To: Paul Durrant <[email protected]>
Cc: xen-devel <[email protected]>
Subject: Re: [PATCH v3] x86/hvm: remove default ioreq serverQuoted 15 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[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.
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 7 lines
Quoted 1 line
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-
08/msg00270.html
Quoted 3 lines
Signed-off-by Paul Durrant <[email protected]>Acked-by Andrew Cooper <[email protected]>Reviewed-by Jan Beulich <[email protected]>
Thanks.
Quoted 7 lines
with one more cosmetic adjustment:
Quoted 5 lines
xen/include/public/hvm/params.h +0
-0@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4
Quoted 12 lines
xen/include/public/hvm/params.h line 90
Quoted 9 lines
xen/include/public/hvm/params.h +5
-1#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif The comment was only partly switched to plural.
Oh, so it was. I guess this can be fixed on commit unless you'd prefer I send a v4.
Paul
Quoted 2 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 23 lines
Quoted 10 lines
Quoted 1 line · On 08.08.18 at 12:39, <[email protected]> wrote:
From: Jan Beulich [mailto:[email protected]]
Sent: 08 August 2018 11:11Quoted 6 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[email protected]> wrote:
xen/include/public/hvm/params.h +0
-0@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4Quoted 12 lines
xen/include/public/hvm/params.h line 90
Quoted 9 lines
xen/include/public/hvm/params.h +5
-1#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif The comment was only partly switched to plural.
Quoted 2 lines
Oh, so it was. I guess this can be fixed on commit unless you'd prefer I send a v4.
Oh, of course it can - I meant to say so, but then forgot.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 21 lines · Jan Beulich
Quoted 21 lines
Quoted 21 lines
Quoted 1 line · On 08.08.18 at 12:39, <[email protected]> wrote:
From: Jan Beulich [mailto:[email protected]]
Sent: 08 August 2018 11:11Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[email protected]> wrote:
xen/include/public/hvm/params.h +0
-0@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4xen/include/public/hvm/params.h line 90
Quoted 10 lines
xen/include/public/hvm/params.h +5
-1#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif The comment was only partly switched to plural.
Quoted 3 lines
Quoted 2 lines
Oh, so it was. I guess this can be fixed on commit unless you'd prefer I send a v4.
Oh, of course it can - I meant to say so, but then forgot.
One note however. This patch cannot be committed until the associated patch is committed into qemu-trad, which is waiting on IanJ as the maintainer of that tree.
~Andrew
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 23 lines
Quoted 1 line
Quoted 1 line · On 08.08.18 at 13:38, <[email protected]> wrote:
Quoted 21 lines · Jan Beulich
Quoted 21 lines
Quoted 21 lines
Quoted 1 line · On 08.08.18 at 12:39, <[email protected]> wrote:
From: Jan Beulich [mailto:[email protected]]
Sent: 08 August 2018 11:11Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[email protected]> wrote:
xen/include/public/hvm/params.h +0
-0@@ -81,9 +81,13 @@#define HVM_PARAM_PAE_ENABLED 4xen/include/public/hvm/params.h line 90
Quoted 10 lines
xen/include/public/hvm/params.h +5
-1#define HVM_PARAM_IOREQ_PFN 5 -#define HVM_PARAM_BUFIOREQ_PFN 6 + +#ifdef __XEN__ +/* These parameters is deprecated and its meaning is undefined */ +#define HVM_PARAM_DM_DOMAIN 13#define HVM_PARAM_BUFIOREQ_EVTCHN 26 +#endif The comment was only partly switched to plural.
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
Oh, so it was. I guess this can be fixed on commit unless you'd prefer I send a v4.
Oh, of course it can - I meant to say so, but then forgot.
One note however. This patch cannot be committed until the associated patch is committed into qemu-trad, which is waiting on IanJ as the maintainer of that tree.
And not just committed, but also has passed that other push gate.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 15 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[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.
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 4 lines
[1] https://lists.xenproject.org/archives/html/xen-devel/2018-08/msg00270.html
Signed-off-by Paul Durrant <[email protected]>Acked-by Andrew Cooper <[email protected]>
I'm afraid this change is responsible for osstest finding
In file included from /home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_backend.h:4:0,
from /home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/hw/block/xen_disk.c:28:
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h: In function 'xen_get_default_ioreq_server_info':/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: error: 'HVM_PARAM_BUFIOREQ_EVTCHN' undeclared (first use in this function)
rc = xc_get_hvm_param(xen_xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
^/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: note: each undeclared identifier is reported only once for each function it appears in /home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/rules.mak:69: recipe for target 'hw/block/xen_disk.o' failed
make: *** [hw/block/xen_disk.o] Error 1
I guess I'm going to revert it for now.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 44 lines
-----Original Message-----
From: Xen-devel [mailto:[email protected]] On Behalf Of Jan Beulich
Sent: 27 August 2018 14:22
To: Paul Durrant <[email protected]>
Cc: xen-devel <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3] x86/hvm: remove default ioreq serverQuoted 8 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[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.
Quoted 8 lines
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.[1] https://lists.xenproject.org/archives/html/xen-devel/2018-
08/msg00270.html
Quoted 3 lines
Signed-off-by Paul Durrant <[email protected]>Acked-by Andrew Cooper <[email protected]>I'm afraid this change is responsible for osstest finding
In file included from
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_backend.h:4:0,from /home/osstest/build.126771.build-amd64/xen/tools/qemu-
xen-dir/hw/block/xen_disk.c:28:/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h: In function 'xen_get_default_ioreq_server_info':/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: error:
'HVM_PARAM_BUFIOREQ_EVTCHN' undeclared (first use in this function)
rc = xc_get_hvm_param(xen_xc, dom,HVM_PARAM_BUFIOREQ_EVTCHN,^
Quoted 9 lines
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: note: each undeclared identifier is reported only once for each function it appears in/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/rules.mak:69: recipe for target 'hw/block/xen_disk.o' failed
make: *** [hw/block/xen_disk.o] Error 1I guess I'm going to revert it for now.
To unblock things, fair enough, but the code in question is protected by '#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40600' so I don't understand why osstest is hitting this.
Paul
Quoted 8 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 61 lines
-----Original Message-----
From: Xen-devel [mailto:[email protected]] On Behalf Of Paul Durrant
Sent: 03 September 2018 10:50
To: 'Jan Beulich' <[email protected]>
Cc: xen-devel <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3] x86/hvm: remove default ioreq serverQuoted 2 lines
-----Original Message-----
From: Xen-devel [mailto:[email protected]] OnBehalf
Quoted 41 lines
Of Jan Beulich
Sent: 27 August 2018 14:22
To: Paul Durrant <[email protected]>
Cc: xen-devel <[email protected]>
Subject: Re: [Xen-devel] [PATCH v3] x86/hvm: remove default ioreq serverQuoted 8 lines
Quoted 1 line
Quoted 1 line · On 07.08.18 at 17:42, <[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.
Quoted 8 lines
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.[1] https://lists.xenproject.org/archives/html/xen-devel/2018-
08/msg00270.html
Quoted 3 lines
Signed-off-by Paul Durrant <[email protected]>Acked-by Andrew Cooper <[email protected]>I'm afraid this change is responsible for osstest finding
In file included from
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_backend.h:4:0,from /home/osstest/build.126771.build-amd64/xen/tools/qemu-
xen-dir/hw/block/xen_disk.c:28:/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h: In function 'xen_get_default_ioreq_server_info':/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: error:
'HVM_PARAM_BUFIOREQ_EVTCHN' undeclared (first use in this function)
rc = xc_get_hvm_param(xen_xc, dom,HVM_PARAM_BUFIOREQ_EVTCHN,Quoted 3 lines
^
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/include/hw/xen/xen_common.h:412:40: note: each undeclaredidentifier
Quoted 5 lines
is reported only once for each function it appears in
/home/osstest/build.126771.build-amd64/xen/tools/qemu-xen-dir/rules.mak:69: recipe for target 'hw/block/xen_disk.o' failed
make: *** [hw/block/xen_disk.o] Error 1
Quoted 6 lines
Quoted 2 lines
I guess I'm going to revert it for now.
To unblock things, fair enough, but the code in question is protected by '#if
CONFIG_XEN_CTRL_INTERFACE_VERSION< 40600' so I don't understand why osstest is hitting this.
Nope. My misreading... there's an uncommented #endif in there. I'll add the param definitions back into the header and make sure the get calls fail instead.
Paul
Paul
Quoted 7 lines
Paul
Quoted 4 lines
Jan
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel