> -----Original Message----- > From: Roger Pau Monne [mailto:roger....@citrix.com] > Sent: 18 October 2017 12:40 > To: xen-de...@lists.xenproject.org > Cc: konrad.w...@oracle.com; boris.ostrov...@oracle.com; Roger Pau Monne > <roger....@citrix.com>; Paul Durrant <paul.durr...@citrix.com>; Jan > Beulich <jbeul...@suse.com>; Andrew Cooper > <andrew.coop...@citrix.com> > Subject: [PATCH v7 for-next 01/12] x86/pio: allow internal PIO handlers to > return RETRY > > Fix handle_pio so internal PIO handlers can return X86EMUL_RETRY and > it is properly handled by not advancing the IP. > > Signed-off-by: Roger Pau Monné <roger....@citrix.com>
I *think* this is safe. Reviewed-by: Paul Durrant <paul.durr...@citrix.com> > --- > Cc: Paul Durrant <paul.durr...@citrix.com> > Cc: Jan Beulich <jbeul...@suse.com> > Cc: Andrew Cooper <andrew.coop...@citrix.com> > --- > Note this is not an issue currently because no internal handlers > return RETRY. > --- > xen/arch/x86/hvm/io.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c > index e449b4196e..10e1e2db45 100644 > --- a/xen/arch/x86/hvm/io.c > +++ b/xen/arch/x86/hvm/io.c > @@ -157,8 +157,11 @@ bool handle_pio(uint16_t port, unsigned int size, int > dir) > break; > > case X86EMUL_RETRY: > - /* We should not advance RIP/EIP if the domain is shutting down */ > - if ( curr->domain->is_shutting_down ) > + /* > + * We should not advance RIP/EIP if the domain is shutting down or > + * if X86EMUL_RETRY has been returned by an internal handler. > + */ > + if ( curr->domain->is_shutting_down || !hvm_io_pending(curr) ) > return false; > break; > > -- > 2.13.5 (Apple Git-94) _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org https://lists.xen.org/xen-devel
