s390x: css: pv: css test adaptation for PV
v3 cover s390x: css: pv: css test adaptation for PV
Hi all,
To adapt the CSS I/O tests to protected virtualisation we need utilities to:
1- allocate the I/O buffers in a private page using (patch 2)
It must be in a dedicated page to avoid exporting code or guest private data to the host.
2- share the I/O buffers with the host (patch 1)
This patch uses the page allocator reworked by Claudio.
The 2 first patches are the implementation of the tools, patch 3 is the modification of the css.c test for PV.
regards,
Pierre
Pierre Morel (3):
s390x: pv: implement routine to share/unshare memory
s390x: define UV compatible I/O allocation
s390x: css: pv: css test adaptation for PV
lib/s390x/asm/uv.h | 38 ++++++++++++++++++++++++++++++++ lib/s390x/css.h | 3 +-- lib/s390x/css_lib.c | 28 +++++++----------------- lib/s390x/malloc_io.c | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/s390x/malloc_io.h | 18 ++++++++++++++++ s390x/Makefile | 1 + s390x/css.c | 35 ++++++++++++++++++++---------- 7 files changed, 140 insertions(+), 33 deletions(-) create mode 100644 lib/s390x/malloc_io.c create mode 100644 lib/s390x/malloc_io.h
Signature · 19 lines
2.17.1 changelog: from v2: - use the page allocator reworked by Claudio from v1: - add the kvm-unit-test header - correct checks for errors on Set/Remove Shared Access - Add report for uv Set/Remove Shared Access - zero the allocated I/O page before use - free the page on error.
PATCH v3 1/3 s390x: pv: implement routine to share/unshare memory
When communicating with the host we need to share part of the memory.
Let's implement the ultravisor calls for this.
--- lib/s390x/asm/uv.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
lib/s390x/asm/uv.h +38 -0
@@ -71,4 +71,42 @@ static inline int uv_call(unsigned long r1, unsigned long r2)return cc; } +static inline int share (unsigned long addr,u16 cmd) +{ +struct uv_cb_share uvcb = { + .header.cmd = cmd, + .header.len =sizeof (uvcb), + .paddr = addr + }; +int cc; + + cc =uv_call (0 , (u64)&uvcb); +if (!cc && (uvcb.header.rc ==0x0001 )) +return 0 ; + +report_info ("cc %d response code: %04x" , cc, uvcb.header.rc); +return -1 ; +} + +/* +* Guest 2 request to the Ultravisor to make a page shared with the +* hypervisor for IO. +* +* @addr: Real or absolute address of the page to be shared +*/ +static inline int uv_set_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_SET_SHARED_ACCESS ); +} + +/* +* Guest 2 request to the Ultravisor to make a page unshared. +* +* @addr: Real or absolute address of the page to be unshared +*/ +static inline int uv_remove_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_REMOVE_SHARED_ACCESS ); +} +#endif
Signature · 1 line
2.17.1
Re: [kvm-unit-tests PATCH v3 1/3] s390x: pv: implement routine to share/unshare memory
Quoted 21 lines · Pierre Morel
When communicating with the host we need to share part of the memory.
Let's implement the ultravisor calls for this.
Signed-off-by Pierre Morel <[email protected]>Suggested-by Janosch Frank <[email protected]>Acked-by Cornelia Huck <[email protected]>--- lib/s390x/asm/uv.h | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+)lib/s390x/asm/uv.h +1
-0@@ -71,4 +71,42 @@ static inline int uv_call(unsigned long r1, unsigned long r2)return cc; } +static inline int share (unsigned long addr,u16 cmd)
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 84
Quoted 10 lines
lib/s390x/asm/uv.h +10
-0+{ +struct uv_cb_share uvcb = { + .header.cmd = cmd, + .header.len =sizeof (uvcb), + .paddr = addr + }; +int cc; + + cc =uv_call (0 , (u64)&uvcb); +if (!cc && (uvcb.header.rc ==0x0001 ))
You can drop the innermost parentheses.
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 95
Quoted 11 lines
lib/s390x/asm/uv.h +11
-0+return 0 ; + +report_info ("cc %d response code: %04x" , cc, uvcb.header.rc); +return -1 ; +} + +/* +* Guest 2 request to the Ultravisor to make a page shared with the +* hypervisor for IO. +* +* @addr: Real or absolute address of the page to be shared
When is it real, and when is it absolute?
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 105
Quoted 10 lines
lib/s390x/asm/uv.h +10
-0+*/ +static inline int uv_set_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_SET_SHARED_ACCESS ); +} + +/* +* Guest 2 request to the Ultravisor to make a page unshared. +* +* @addr: Real or absolute address of the page to be unshared
dito
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 112
Quoted 7 lines
lib/s390x/asm/uv.h +6
-0+*/ +static inline int uv_remove_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_REMOVE_SHARED_ACCESS ); +} +#endif
Apart from the nits:
Re: [kvm-unit-tests PATCH v3 1/3] s390x: pv: implement routine to share/unshare memory
Quoted 26 lines · Thomas Huth
Quoted 25 lines · Pierre Morel
When communicating with the host we need to share part of the memory.
Let's implement the ultravisor calls for this.
Signed-off-by Pierre Morel <[email protected]>Suggested-by Janosch Frank <[email protected]>Acked-by Cornelia Huck <[email protected]>---
lib/s390x/asm/uv.h| 38 ++++++++++++++++++++++++++++++++++++++1 file changed, 38 insertions(+)lib/s390x/asm/uv.h +5
-0@@ -71,4 +71,42 @@ static inline int uv_call(unsigned long r1, unsigned long r2) return cc; } +static inline int share (unsigned long addr,u16 cmd) +{ + struct uv_cb_share uvcb = { + .header.cmd = cmd, + .header.len = sizeof(uvcb),
Quoted 8 lines
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 84
Quoted 6 lines
lib/s390x/asm/uv.h +6
-0+ .paddr = addr + }; + int cc; + + cc = uv_call(0, (u64)&uvcb); + if (!cc && (uvcb.header.rc == 0x0001))You can drop the innermost parentheses.
OK.
Quoted 14 lines
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 95
Quoted 12 lines
lib/s390x/asm/uv.h +11
-0+ return 0; + + report_info("cc %d response code: %04x", cc, uvcb.header.rc); + return -1; +} + +/* +* Guest 2 request to the Ultravisor to make a page shared with the +* hypervisor for IO. +* +* @addr: Real or absolute address of the page to be shared When is it real, and when is it absolute?
It only depends on the prefixing, the call can use both.
Quoted 23 lines
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 105
Quoted 11 lines
lib/s390x/asm/uv.h +10
-0+*/ +static inline int uv_set_shared (unsigned long addr) +{ + return share(addr, UVC_CMD_SET_SHARED_ACCESS); +} + +/* +* Guest 2 request to the Ultravisor to make a page unshared. +* +* @addr: Real or absolute address of the page to be unshared dito
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 112
Quoted 7 lines
lib/s390x/asm/uv.h +6
-0+*/ +static inline int uv_remove_shared (unsigned long addr) +{ + return share(addr, UVC_CMD_REMOVE_SHARED_ACCESS); +} + #endifApart from the nits:
Quoted 2 lines
Acked-by Thomas Huth <[email protected]>
Thanks thomas for reviewing.
Regards,
Pierre
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen
Re: [kvm-unit-tests PATCH v3 1/3] s390x: pv: implement routine to share/unshare memory
In reply to Thomas HuthOn Wed, 20 Jan 2021 11:48:52 +0100
Thomas Huth <[email protected]> wrote:
[...]
Quoted 7 lines
Quoted 5 lines
+/*
+ * Guest 2 request to the Ultravisor to make a page shared with the
+ * hypervisor for IO.
+ *
+ * @addr: Real or absolute address of the page to be sharedWhen is it real, and when is it absolute?
as far as we are concerned, it's unpredictable
this means that a guest should avoid sharing any prefix (or reverse prefix) pages.
Quoted 4 lines
Quoted 4 lines
+ */
lib/s390x/asm/uv.h +3
-0+static inline int uv_set_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_SET_SHARED_ACCESS );
Quoted 8 lines
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 105
Quoted 6 lines
lib/s390x/asm/uv.h +6
-0+} + +/* +* Guest 2 request to the Ultravisor to make a page unshared. +* +* @addr: Real or absolute address of the page to be unshared dito
same
Quoted 11 lines
lib/s390x/asm/uv.h static inline int uv_call(unsigned long r1, unsigned long r2) · line 112
Quoted 7 lines
+ */
lib/s390x/asm/uv.h +5
-0+static inline int uv_remove_shared (unsigned long addr) +{ +return share (addr,UVC_CMD_REMOVE_SHARED_ACCESS ); +} +#endif Apart from the nits:
Acked-by Thomas Huth <[email protected]>
PATCH v3 2/3 s390x: define UV compatible I/O allocation
In reply to Pierre MorelTo centralize the memory allocation for I/O we define the alloc_io_page/free_io_page functions which share the I/O memory with the host in case the guest runs with protected virtualization.
--- lib/s390x/malloc_io.c | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/s390x/malloc_io.h | 18 ++++++++++++++++ s390x/Makefile | 1 + 3 files changed, 69 insertions(+) create mode 100644 lib/s390x/malloc_io.c create mode 100644 lib/s390x/malloc_io.h
lib/s390x/malloc_io.c new file +50 -0
@@ -0,0 +1,50 @@ +/* +* I/O page allocation +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2. +* +* Using this interface provide host access to the allocated pages in +* case the guest is a secure guest. +* This is needed for I/O buffers. +* +*/ +#include <libcflat.h> +#include <asm/page.h> +#include <asm/uv.h> +#include <malloc_io.h> +#include <alloc_page.h> +#include <asm/facility.h> + +void *alloc_io_page (int size) +{ +void *p; + +assert (size <=PAGE_SIZE ); + + p =alloc_pages_flags (1 ,AREA_DMA31 ); +if (!p) +return NULL ; +memset (p,0 ,PAGE_SIZE ); + +if (!test_facility (158 )) +return p; + +if (uv_set_shared ((unsigned long )p) ==0 ) +return p; + +free_pages (p); +return NULL ; +} + +void free_io_page (void *p) +{ +if (test_facility (158 )) +uv_remove_shared ((unsigned long )p); +free_pages (p); +}
lib/s390x/malloc_io.h new file +18 -0
@@ -0,0 +1,18 @@ +/* +* I/O allocations +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2. +*/ +#ifndef _S390X_MALLOC_IO_H_ +#define _S390X_MALLOC_IO_H_ + +void *alloc_io_page (int size); +void free_io_page (void *p); + +#endif /* _S390X_MALLOC_IO_H_ */
s390x/Makefile +1 -0
@@ -63,6 +63,7 @@ cflatobjs += lib/s390x/smp.o cflatobjs += lib/s390x/vm.o cflatobjs += lib/s390x/css_dump.o cflatobjs += lib/s390x/css_lib.o +cflatobjs += lib/s390x/malloc_io.o OBJDIRS += lib/s390x
Signature · 1 line
2.17.1
Re: [kvm-unit-tests PATCH v3 2/3] s390x: define UV compatible I/O allocation
Quoted 20 lines · Pierre Morel
To centralize the memory allocation for I/O we define the alloc_io_page/free_io_page functions which share the I/O memory with the host in case the guest runs with protected virtualization.
Signed-off-by Pierre Morel <[email protected]>--- lib/s390x/malloc_io.c | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/s390x/malloc_io.h | 18 ++++++++++++++++ s390x/Makefile | 1 + 3 files changed, 69 insertions(+)create mode 100644
lib/s390x/malloc_io.c
create mode 100644lib/s390x/malloc_io.hlib/s390x/malloc_io.c new file +0
-0
lib/s390x/malloc_io.c line 10
Quoted 10 lines
lib/s390x/malloc_io.c new file +10
-0@@ -0,0 +1,50 @@ +/* +* I/O page allocation +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2.
Janosch recently started to introduce SPDX identifieres to the s390x code, so I think it would be good to use them here, too.
Quoted 7 lines
lib/s390x/malloc_io.c new file +7
-0+* Using this interface provide host access to the allocated pages in +* case the guest is a secure guest. +* This is needed for I/O buffers. +* +*/ +#include <libcflat.h> +#include <asm/page.h>
lib/s390x/malloc_io.c line 28
Quoted 10 lines
lib/s390x/malloc_io.c new file +10
-0+#include <asm/uv.h> +#include <malloc_io.h> +#include <alloc_page.h> +#include <asm/facility.h> + +void *alloc_io_page (int size) +{ +void *p; + +assert (size <=PAGE_SIZE );
Apart from the assert() statement, the size parameter seems to be completely unused. It's also weird to have the function named alloc_something_page() and then have a parameter that takes bytes. Thus I'd suggest to either drop the size parameter completely, or to rename the function to alloc_io_mem and then to alloc multiple pages below in case the size is bigger than PAGE_SIZE. Or maybe even to name the function alloc_io_pages and then use "int num_pages" as a parameter, allowing to allocate multiple pages at once?
Quoted 29 lines
lib/s390x/malloc_io.c new file +22
-0+ + p =alloc_pages_flags (1 ,AREA_DMA31 ); +if (!p) +return NULL ; +memset (p,0 ,PAGE_SIZE ); + +if (!test_facility (158 )) +return p; + +if (uv_set_shared ((unsigned long )p) ==0 ) +return p; + +free_pages (p); +return NULL ; +} + +void free_io_page (void *p) +{ +if (test_facility (158 )) +uv_remove_shared ((unsigned long )p); +free_pages (p); +}lib/s390x/malloc_io.h new file +1
-0@@ -0,0 +1,18 @@ +/*
lib/s390x/malloc_io.h line 11
Quoted 10 lines
lib/s390x/malloc_io.h new file +10
-0+* I/O allocations +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2. +*/
Please also add SPDX license information here.
Thomas
Re: [kvm-unit-tests PATCH v3 2/3] s390x: define UV compatible I/O allocation
Quoted 45 lines · Thomas Huth
Quoted 20 lines · Pierre Morel
To centralize the memory allocation for I/O we define the alloc_io_page/free_io_page functions which share the I/O memory with the host in case the guest runs with protected virtualization.
Signed-off-by Pierre Morel <[email protected]>---
lib/s390x/malloc_io.c| 50 +++++++++++++++++++++++++++++++++++++++++++lib/s390x/malloc_io.h| 18 ++++++++++++++++
s390x/Makefile | 1 +3 files changed, 69 insertions(+)create mode 100644
lib/s390x/malloc_io.c
create mode 100644lib/s390x/malloc_io.hlib/s390x/malloc_io.c new file +0
-0lib/s390x/malloc_io.c line 10
Quoted 10 lines
lib/s390x/malloc_io.c new file +10
-0@@ -0,0 +1,50 @@ +/* +* I/O page allocation +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2. Janosch recently started to introduce SPDX identifieres to the s390x code, so I think it would be good to use them here, too.
Quoted 11 lines
lib/s390x/malloc_io.c new file +11
-0+* Using this interface provide host access to the allocated pages in +* case the guest is a secure guest. +* This is needed for I/O buffers. +* +*/ +#include <libcflat.h> +#include <asm/page.h> +#include <asm/uv.h> +#include <malloc_io.h> +#include <alloc_page.h> +#include <asm/facility.h>
Quoted 8 lines
lib/s390x/malloc_io.c line 28
Quoted 6 lines
lib/s390x/malloc_io.c new file +6
-0+ +void *alloc_io_page (int size) +{ + void *p; + + assert(size <= PAGE_SIZE);Apart from the
assert()statement, the size parameter seems to be completely unused. It's also weird to have the function named
right.
Quoted 1 line
alloc_something_page()and then have a parameter that takes bytes. Thus I'd suggest to either drop the size parameter completely, or to rename the function toalloc_io_memand then to alloc multiple pages below in case the size is bigger thanPAGE_SIZE. Or maybe even to name the functionalloc_io_pagesand then use "intnum_pages" as a parameter, allowing to allocate multiple pages at once?
OK, may bet using order as with the alloc_pages_flags would be fine. Then I will need a new flag in the pages.
Quoted 3 lines
lib/s390x/malloc_io.c line 29
Quoted 3 lines
lib/s390x/malloc_io.c new file +2
-0+ + p = alloc_pages_flags(1, AREA_DMA31);
humm 0 here (Claudio)
Quoted 30 lines
Quoted 30 lines
lib/s390x/malloc_io.c new file +20
-0+ if (!p) + return NULL; + memset(p, 0, PAGE_SIZE); + + if (!test_facility(158)) + return p; + + if (uv_set_shared((unsigned long)p) == 0) + return p; + + free_pages(p); + return NULL; +} + +void free_io_page (void *p) +{ + if (test_facility(158)) + uv_remove_shared((unsigned long)p); + free_pages(p); +}lib/s390x/malloc_io.h new file +4
-0@@ -0,0 +1,18 @@ +/* +* I/O allocations +* +* Copyright (c) 2021 IBM Corp
Quoted 8 lines
lib/s390x/malloc_io.h line 11
Quoted 7 lines
lib/s390x/malloc_io.h new file +7
-0+* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License version 2. +*/ Please also add SPDX license information here.
Will do.
Thanks for reviewing,
Pierre
Quoted 3 lines
Thomas
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen
Re: [kvm-unit-tests PATCH v3 2/3] s390x: define UV compatible I/O allocation
In reply to Pierre MorelQuoted 39 lines · On Tue, 19 Jan 2021 20:52:23 +0100 Pierre Morel <[email protected]> wrote:
To centralize the memory allocation for I/O we define the alloc_io_page/free_io_page functions which share the I/O memory with the host in case the guest runs with protected virtualization.
Signed-off-by Pierre Morel <[email protected]>--- lib/s390x/malloc_io.c | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/s390x/malloc_io.h | 18 ++++++++++++++++ s390x/Makefile | 1 + 3 files changed, 69 insertions(+) create mode 100644 lib/s390x/malloc_io.c create mode 100644 lib/s390x/malloc_io.hlib/s390x/malloc_io.c new file +9
-0@@ -0,0 +1,50 @@ +/* +* I/O page allocation +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2.
+ *
+ * Using this interface provide host access to the allocated pages in
+ * case the guest is a secure guest.
+ * This is needed for I/O buffers.
+ *
+ */lib/s390x/malloc_io.c new file +2
-0+#include <libcflat.h> +#include <asm/page.h>
lib/s390x/malloc_io.c line 28
Quoted 10 lines
lib/s390x/malloc_io.c new file +10
-0+#include <asm/uv.h> +#include <malloc_io.h> +#include <alloc_page.h> +#include <asm/facility.h> + +void *alloc_io_page (int size) +{ +void *p; + +assert (size <=PAGE_SIZE );
I agree with Thomas here, remove size, or use it as a page count or page order.
lib/s390x/malloc_io.c line 30
Quoted 1 line
lib/s390x/malloc_io.c new file +1
-0+ p =alloc_pages_flags (1 ,AREA_DMA31 );
you are allocating 2 pages here...
lib/s390x/malloc_io.c line 33
Quoted 3 lines
lib/s390x/malloc_io.c new file +3
-0+if (!p) +return NULL ; +memset (p,0 ,PAGE_SIZE );
...and then clearing only one
but since you did not specify FLAG_DONTZERO, the page has been cleared already by the allocator
Quoted 54 lines
lib/s390x/malloc_io.c new file +17
-0+ +if (!test_facility (158 )) +return p; + +if (uv_set_shared ((unsigned long )p) ==0 ) +return p; + +free_pages (p); +return NULL ; +} + +void free_io_page (void *p) +{ +if (test_facility (158 )) +uv_remove_shared ((unsigned long )p); +free_pages (p); +}lib/s390x/malloc_io.h new file +9
-0@@ -0,0 +1,18 @@ +/* +* I/O allocations +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2.
+ */lib/s390x/malloc_io.h new file +7
-0+#ifndef _S390X_MALLOC_IO_H_ +#define _S390X_MALLOC_IO_H_ + +void *alloc_io_page (int size); +void free_io_page (void *p); + +#endif /* _S390X_MALLOC_IO_H_ */ s390x/Makefile +1
-0@@ -63,6 +63,7 @@ cflatobjs += lib/s390x/smp.o cflatobjs += lib/s390x/vm.o cflatobjs += lib/s390x/css_dump.o cflatobjs += lib/s390x/css_lib.o +cflatobjs += lib/s390x/malloc_io.o OBJDIRS += lib/s390x
Re: [kvm-unit-tests PATCH v3 2/3] s390x: define UV compatible I/O allocation
Quoted 56 lines · Claudio Imbrenda
Quoted 39 lines · On Tue, 19 Jan 2021 20:52:23 +0100 Pierre Morel <[email protected]> wrote:
To centralize the memory allocation for I/O we define the alloc_io_page/free_io_page functions which share the I/O memory with the host in case the guest runs with protected virtualization.
Signed-off-by Pierre Morel <[email protected]>--- lib/s390x/malloc_io.c | 50 +++++++++++++++++++++++++++++++++++++++++++ lib/s390x/malloc_io.h | 18 ++++++++++++++++ s390x/Makefile | 1 + 3 files changed, 69 insertions(+)create mode 100644
lib/s390x/malloc_io.c
create mode 100644lib/s390x/malloc_io.hlib/s390x/malloc_io.c new file +9
-0@@ -0,0 +1,50 @@ +/* +* I/O page allocation +* +* Copyright (c) 2021 IBM Corp +* +* Authors: +* Pierre Morel <[email protected]> +* +* This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2.
+ *
+ * Using this interface provide host access to the allocated pages in
+ * case the guest is a secure guest.
+ * This is needed for I/O buffers.
+ *
+ */lib/s390x/malloc_io.c new file +2
-0+#include <libcflat.h> +#include <asm/page.h> lib/s390x/malloc_io.c line 28
Quoted 10 lines
lib/s390x/malloc_io.c new file +10
-0+#include <asm/uv.h> +#include <malloc_io.h> +#include <alloc_page.h> +#include <asm/facility.h> + +void *alloc_io_page (int size) +{ +void *p; + +assert (size <=PAGE_SIZE );I agree with Thomas here, remove size, or use it as a page count or page order.
Quoted 3 lines
lib/s390x/malloc_io.c line 30
Quoted 1 line
lib/s390x/malloc_io.c new file +1
-0+ p =alloc_pages_flags (1 ,AREA_DMA31 );you are allocating 2 pages here...
humm, yes, forgot to change this as I changed to your interface.
Thanks for the reviewing,
Pierre
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen
PATCH v3 3/3 s390x: css: pv: css test adaptation for PV
In reply to Pierre MorelWe want the tests to automatically work with or without protected virtualisation.
To do this we need to share the I/O memory with the host.
Let's replace all static allocations with dynamic allocations to clearly separate shared and private memory.
--- lib/s390x/css.h | 3 +-- lib/s390x/css_lib.c | 28 ++++++++-------------------- s390x/css.c | 35 ++++++++++++++++++++++++----------- 3 files changed, 33 insertions(+), 33 deletions(-)
lib/s390x/css.h +1 -2
@@ -283,8 +283,7 @@ int css_enable(int schid, int isc);/* Library functions */ int start_ccw1_chain (unsigned int sid,struct ccw1 *ccw); -int start_single_ccw (unsigned int sid,int code,void *data,int count, -unsigned char flags); +struct ccw1 *ccw_alloc (int code,void *data,int count,unsigned char flags);void css_irq_io (void );int css_residual_count (unsigned int schid);
lib/s390x/css_lib.c +8 -20
@@ -18,6 +18,7 @@#include <asm/time.h> #include <asm/arch_def.h> +#include <malloc_io.h> #include <css.h> static struct schib schib;
@@ -202,33 +203,20 @@ int start_ccw1_chain(unsigned int sid, struct ccw1 *ccw)return ssch (sid, &orb); } -/* -* In the future, we want to implement support for CCW chains; -* for that, we will need to work with ccw1 pointers. -*/ -static struct ccw1 unique_ccw; - -int start_single_ccw (unsigned int sid,int code,void *data,int count, -unsigned char flags) +struct ccw1 *ccw_alloc (int code,void *data,int count,unsigned char flags) { -int cc; -struct ccw1 *ccw = &unique_ccw; +struct ccw1 *ccw; + + ccw =alloc_io_page (sizeof (*ccw)); +if (!ccw) +return NULL ; -report_prefix_push ("start_subchannel" ); -/* Build the CCW chain with a single CCW */ ccw->code = code; ccw->flags = flags; ccw->count = count; ccw->data_address = (int )(unsigned long )data; - cc =start_ccw1_chain (sid, ccw); -if (cc) { -report (0 ,"cc = %d" , cc); -report_prefix_pop (); -return cc; - } -report_prefix_pop (); -return 0 ; +return ccw; }/* wait_and_check_io_completion:
s390x/css.c +24 -11
@@ -17,13 +17,15 @@#include <interrupt.h> #include <asm/arch_def.h> +#include <malloc_io.h> #include <css.h> +#include <asm/barrier.h> #define DEFAULT_CU_TYPE 0x3832/* virtio-ccw */ static unsigned long cu_type =DEFAULT_CU_TYPE ;static int test_device_sid; -static struct senseid senseid; +static struct senseid *senseid;static void test_enumerate (void ) {
@@ -57,6 +59,7 @@ static void test_enable(void)*/ static void test_sense (void ) { +struct ccw1 *ccw;int ret;int len;
@@ -80,9 +83,15 @@ static void test_sense(void) lowcore_ptr->io_int_param =0 ; -memset (&senseid,0 ,sizeof (senseid)); - ret =start_single_ccw (test_device_sid,CCW_CMD_SENSE_ID , - &senseid,sizeof (senseid),CCW_F_SLI ); + senseid =alloc_io_page (sizeof (*senseid)); +if (!senseid) + goto error_senseid; + + ccw =ccw_alloc (CCW_CMD_SENSE_ID , senseid,sizeof (*senseid),CCW_F_SLI ); +if (!ccw) + goto error_ccw; + + ret =start_ccw1_chain (test_device_sid, ccw);if (ret) goto error;
@@ -97,7 +106,7 @@ static void test_sense(void)if (ret <0 ) {report_info ("no valid residual count" ); }else if (ret !=0 ) { - len =sizeof (senseid) - ret; + len =sizeof (*senseid) - ret;if (ret && len <CSS_SENSEID_COMMON_LEN ) {report (0 ,"transferred a too short length: %d" , ret); goto error;
@@ -105,21 +114,25 @@ static void test_sense(void)report_info ("transferred a shorter length: %d" , len); } -if (senseid.reserved !=0xff ) { -report (0 ,"transferred garbage: 0x%02x" , senseid.reserved); +if (senseid->reserved !=0xff ) { +report (0 ,"transferred garbage: 0x%02x" , senseid->reserved); goto error; }report_prefix_pop ();report_info ("reserved 0x%02x cu_type 0x%04x cu_model 0x%02x dev_type 0x%04x dev_model 0x%02x" , - senseid.reserved, senseid.cu_type, senseid.cu_model, - senseid.dev_type, senseid.dev_model); + senseid->reserved, senseid->cu_type, senseid->cu_model, + senseid->dev_type, senseid->dev_model); -report (senseid.cu_type == cu_type,"cu_type expected 0x%04x got 0x%04x" , - (uint16_t ) cu_type, senseid.cu_type); +report (senseid->cu_type == cu_type,"cu_type expected 0x%04x got 0x%04x" , + (uint16_t ) cu_type, senseid->cu_type); error: +free_io_page (ccw); +error_ccw: +free_io_page (senseid); +error_senseid:unregister_io_int_func (css_irq_io); }
Signature · 1 line
2.17.1
Quoted 9 lines · Pierre Morel
We want the tests to automatically work with or without protected virtualisation.
To do this we need to share the I/O memory with the host.Let's replace all static allocations with dynamic allocations to clearly separate shared and private memory.
Signed-off-by Pierre Morel <[email protected]>---
[...]
Quoted 30 lines
s390x/css.c +4
-1@@ -17,13 +17,15 @@#include <interrupt.h> #include <asm/arch_def.h> +#include <malloc_io.h> #include <css.h> +#include <asm/barrier.h> #define DEFAULT_CU_TYPE 0x3832/* virtio-ccw */ static unsigned long cu_type =DEFAULT_CU_TYPE ;static int test_device_sid; -static struct senseid senseid; +static struct senseid *senseid;static void test_enumerate (void ) {@@ -57,6 +59,7 @@ static void test_enable(void)*/ static void test_sense (void ) { +struct ccw1 *ccw;int ret;int len;
s390x/css.c static void test_sense(void) · line 86
Quoted 7 lines
s390x/css.c +1
-3@@ -80,9 +83,15 @@ static void test_sense(void) lowcore_ptr->io_int_param =0 ; -memset (&senseid,0 ,sizeof (senseid)); - ret =start_single_ccw (test_device_sid,CCW_CMD_SENSE_ID , - &senseid,sizeof (senseid),CCW_F_SLI ); + senseid =alloc_io_page (sizeof (*senseid));
Would it make sense to move the above alloc_io_page into the ccw_alloc() function, too?
s390x/css.c static void test_sense(void) · line 96
Quoted 10 lines
s390x/css.c +8
-0+if (!senseid) + goto error_senseid; + + ccw =ccw_alloc (CCW_CMD_SENSE_ID , senseid,sizeof (*senseid),CCW_F_SLI ); +if (!ccw) + goto error_ccw; + + ret =start_ccw1_chain (test_device_sid, ccw);if (ret) goto error;
I think you should add a "report(0, ...)" or report_abort() in front of all three gotos above - otherwise the problems might go unnoticed.
Quoted 32 lines
s390x/css.c +6
-7@@ -97,7 +106,7 @@ static void test_sense(void)if (ret <0 ) {report_info ("no valid residual count" ); }else if (ret !=0 ) { - len =sizeof (senseid) - ret; + len =sizeof (*senseid) - ret;if (ret && len <CSS_SENSEID_COMMON_LEN ) {report (0 ,"transferred a too short length: %d" , ret); goto error;@@ -105,21 +114,25 @@ static void test_sense(void)report_info ("transferred a shorter length: %d" , len); } -if (senseid.reserved !=0xff ) { -report (0 ,"transferred garbage: 0x%02x" , senseid.reserved); +if (senseid->reserved !=0xff ) { +report (0 ,"transferred garbage: 0x%02x" , senseid->reserved); goto error; }report_prefix_pop ();report_info ("reserved 0x%02x cu_type 0x%04x cu_model 0x%02x dev_type 0x%04x dev_model 0x%02x" , - senseid.reserved, senseid.cu_type, senseid.cu_model, - senseid.dev_type, senseid.dev_model); + senseid->reserved, senseid->cu_type, senseid->cu_model, + senseid->dev_type, senseid->dev_model); -report (senseid.cu_type == cu_type,"cu_type expected 0x%04x got 0x%04x" , - (uint16_t ) cu_type, senseid.cu_type); + report(senseid->cu_type == cu_type, "cu_type expected 0x%04x got 0x%04x",
s390x/css.c static void test_sense(void) · line 138
Quoted 10 lines
s390x/css.c +5
-0+ (uint16_t) cu_type, senseid->cu_type); error: +free_io_page (ccw); +error_ccw: +free_io_page (senseid); +error_senseid:unregister_io_int_func (css_irq_io); }
Thomas
Quoted 35 lines · Thomas Huth
Quoted 9 lines · Pierre Morel
We want the tests to automatically work with or without protected virtualisation.
To do this we need to share the I/O memory with the host.Let's replace all static allocations with dynamic allocations to clearly separate shared and private memory.
Signed-off-by Pierre Morel <[email protected]>---
[...]
Quoted 24 lines
s390x/css.c +4
-1@@ -17,13 +17,15 @@ #include <interrupt.h> #include <asm/arch_def.h> +#include <malloc_io.h> #include <css.h> +#include <asm/barrier.h> #define DEFAULT_CU_TYPE 0x3832 /* virtio-ccw */ static unsigned long cu_type = DEFAULT_CU_TYPE; static int test_device_sid; -static struct senseid senseid; +static struct senseid *senseid; static void test_enumerate(void) {@@ -57,6 +59,7 @@ static void test_enable(void)*/ static void test_sense(void) { + struct ccw1 *ccw; int ret; int len;
Quoted 8 lines
s390x/css.c static void test_sense(void) · line 84
Quoted 6 lines
s390x/css.c +1
-3@@ -80,9 +83,15 @@ static void test_sense(void) lowcore_ptr->io_int_param = 0; - memset(&senseid, 0, sizeof(senseid)); - ret = start_single_ccw(test_device_sid, CCW_CMD_SENSE_ID, - &senseid, sizeof(senseid), CCW_F_SLI); + senseid = alloc_io_page(sizeof(*senseid));Would it make sense to move the above
alloc_io_pageinto theccw_alloc()function, too?
If the goal is to have all allocations inside the ccw_alloc(),
I don't think so, we may have an already allocated buffer for which we want to pass the address without any allocation inside ccw_alloc() to reuse the same buffer.
Quoted 14 lines
s390x/css.c static void test_sense(void) · line 96
Quoted 12 lines
s390x/css.c +8
-0+ if (!senseid) + goto error_senseid; + + ccw = ccw_alloc(CCW_CMD_SENSE_ID, senseid, sizeof(*senseid),CCW_F_SLI ); + if (!ccw) + goto error_ccw; + + ret = start_ccw1_chain(test_device_sid, ccw); if (ret) goto error;I think you should add a "
report(0, ...)" orreport_abort()in front of all three gotos above - otherwise the problems might go unnoticed.
Yes, right, I will do this,
Thanks.
Pierre
Signature · 2 lines
Pierre Morel IBM Lab Boeblingen