On Fri, 7 Aug 2020 07:15:55 -0400 Janosch Frank <frankja@xxxxxxxxxxxxx> wrote: > Test the error conditions of guest 2 Ultravisor calls, namely: > * Query Ultravisor information > * Set shared access > * Remove shared access > > Signed-off-by: Janosch Frank <frankja@xxxxxxxxxxxxx> > Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxx> > --- > lib/s390x/asm/uv.h | 74 ++++++++++++++++++++ > s390x/Makefile | 1 + > s390x/unittests.cfg | 3 + > s390x/uv-guest.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ > 4 files changed, 240 insertions(+) > create mode 100644 lib/s390x/asm/uv.h > create mode 100644 s390x/uv-guest.c (...) > +static inline int uv_call(unsigned long r1, unsigned long r2) > +{ > + int cc; > + > + /* > + * The brc instruction will take care of the cc 2/3 case where > + * we need to continue the execution because we were > + * interrupted. The inline assembly will only return on > + * success/error i.e. cc 0/1. > + */ Thanks, that is helpful. > + asm volatile( > + "0: .insn rrf,0xB9A40000,%[r1],%[r2],0,0\n" > + " brc 3,0b\n" > + " ipm %[cc]\n" > + " srl %[cc],28\n" > + : [cc] "=d" (cc) > + : [r1] "a" (r1), [r2] "a" (r2) > + : "memory", "cc"); > + return cc; > +} > + > +#endif (...) > diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c > new file mode 100644 > index 0000000..1aaf7ca > --- /dev/null > +++ b/s390x/uv-guest.c > @@ -0,0 +1,162 @@ > +/* > + * Guest Ultravisor Call tests > + * > + * Copyright (c) 2020 IBM Corp > + * > + * Authors: > + * Janosch Frank <frankja@xxxxxxxxxxxxx> > + * > + * This code is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License version 2. > + */ > + > +#include <libcflat.h> > +#include <alloc_page.h> > +#include <asm/page.h> > +#include <asm/asm-offsets.h> > +#include <asm/interrupt.h> > +#include <asm/facility.h> > +#include <asm/uv.h> > + > +static unsigned long page; > + > +static inline int share(unsigned long addr, u16 cmd) > +{ > + struct uv_cb_share uvcb = { > + .header.cmd = cmd, > + .header.len = sizeof(uvcb), > + .paddr = addr > + }; > + > + uv_call(0, (u64)&uvcb); > + return uvcb.header.rc; Any reason why you're not checking rc and cc here... > +} > + > +static inline int uv_set_shared(unsigned long addr) > +{ > + return share(addr, UVC_CMD_SET_SHARED_ACCESS); > +} > + > +static inline int uv_remove_shared(unsigned long addr) > +{ > + return share(addr, UVC_CMD_REMOVE_SHARED_ACCESS); > +} (...) > +static void test_sharing(void) > +{ > + struct uv_cb_share uvcb = { > + .header.cmd = UVC_CMD_SET_SHARED_ACCESS, > + .header.len = sizeof(uvcb) - 8, > + }; > + int cc; > + > + report_prefix_push("share"); > + cc = uv_call(0, (u64)&uvcb); > + report(cc == 1 && uvcb.header.rc == UVC_RC_INV_LEN, "length"); ...while you do it for this command (as for all the others)? > + report(uv_set_shared(page) == UVC_RC_EXECUTED, "share"); So, is that one of the cases where something is actually indicated in rc on success? Or does cc=0/1 have a different meaning for these calls? > + report_prefix_pop(); > + > + report_prefix_push("unshare"); > + uvcb.header.cmd = UVC_CMD_REMOVE_SHARED_ACCESS; > + cc = uv_call(0, (u64)&uvcb); > + report(cc == 1 && uvcb.header.rc == UVC_RC_INV_LEN, "length"); > + report(uv_remove_shared(page) == UVC_RC_EXECUTED, "unshare"); > + report_prefix_pop(); > + > + report_prefix_pop(); > +} (...)