Remove the need to alloc memory in uv.c
cover Remove the need to alloc memory in uv.c
The pkey handler is calling the uv in some circumstances where no memory allocation is acceptable. As of now only the uv_get_secret_metadata() function allocates memory. As this is exactly one page, lets introduce a pre-allocated work page and protect the concurrent use with a mutex to remove dynamic memory allocation and free. This page may be also used with future extension to the uv code.
Harald Freudenberger (1):
s390/uv: Prealloc and use one work page
arch/s390/kernel/uv.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/1 s390/uv: Prealloc and use one work page
The pkey handler is calling the uv in some circumstances where no memory allocation is acceptable. As of now only the uv_get_secret_metadata() function allocates memory. As this is exactly one page, lets introduce a pre-allocated work page and protect the concurrent use with a mutex to remove dynamic memory allocation and free. This page may be also used with future extension to the uv code.
--- arch/s390/kernel/uv.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
arch/s390/kernel/uv.c +18 -4
@@ -37,6 +37,13 @@ EXPORT_SYMBOL(uv_info);int __bootdata_preserved (prot_virt_host );EXPORT_SYMBOL (prot_virt_host); +/* +* Need one work page for ephemeral use by uv_get_secret_metadata() +* The concurrent use of this page is protected by a mutex. +*/ +static u8 *work_page; +static DEFINE_MUTEX (work_page_lock); +static int __init uv_init (phys_addr_t stor_base,unsigned long stor_len) {struct uv_cb_init uvcb = {
@@ -61,6 +68,12 @@ void __init setup_uv(void)if (!is_prot_virt_host ())return ; + work_page = (u8 *)__get_free_page (GFP_KERNEL ); +if (!work_page) { +pr_warn ("Failed to alloc a working memory page\n" ); +return ; + } + uv_stor_base =memblock_alloc_try_nid ( uv_info.uv_base_stor_len,SZ_1M ,SZ_2G ,MEMBLOCK_ALLOC_ACCESSIBLE ,NUMA_NO_NODE );
@@ -80,6 +93,7 @@ void __init setup_uv(void)return ; fail:pr_info ("Disabling support for protected virtualization" ); +free_page ((unsigned long )work_page); prot_virt_host =0 ; }
@@ -730,11 +744,11 @@ int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN],struct uv_secret_list *buf;int rc; - buf =kzalloc (sizeof (*buf),GFP_KERNEL ); -if (!buf) -return -ENOMEM ; +mutex_lock (&work_page_lock); + buf = (struct uv_secret_list *)work_page; rc =find_secret (secret_id, buf, secret); -kfree (buf); +mutex_unlock (&work_page_lock); +return rc; }EXPORT_SYMBOL_GPL (uv_get_secret_metadata);
Signature · 1 line
2.43.0
Heiko Carstens
maintainerRe: [PATCH v1 1/1] s390/uv: Prealloc and use one work page
Quoted 8 lines · Harald Freudenberger
The pkey handler is calling the uv in some circumstances where no memory allocation is acceptable. As of now only the
uv_get_secret_metadata()function allocates memory. As this is exactly one page, lets introduce a pre-allocated work page and protect the concurrent use with a mutex to remove dynamic memory allocation and free. This page may be also used with future extension to the uv code.
Quoted 4 lines
Signed-off-by Harald Freudenberger <[email protected]>--- arch/s390/kernel/uv.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
[adding maintainers, according to get_maintainer.pl]
Quoted 4 lines
static int
__inituv_init(phys_addr_t stor_base, unsigned long stor_len){arch/s390/kernel/uv.c +0
-0struct uv_cb_init uvcb = {
arch/s390/kernel/uv.c void __init setup_uv(void) · line 77
Quoted 10 lines
arch/s390/kernel/uv.c +6
-0@@ -61,6 +68,12 @@ void __init setup_uv(void)if (!is_prot_virt_host ())return ; + work_page = (u8 *)__get_free_page (GFP_KERNEL ); +if (!work_page) { +pr_warn ("Failed to alloc a working memory page\n" ); +return ; + } + uv_stor_base = memblock_alloc_try_nid(
Did you test this? I think this cannot work. When setup_uv() is called the buddy allocator is not yet initialized.
Please use memblock_alloc_or_panic() instead.
arch/s390/kernel/uv.c int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN], · line 750
Quoted 8 lines
arch/s390/kernel/uv.c +3
-4- buf =kzalloc (sizeof (*buf),GFP_KERNEL ); -if (!buf) -return -ENOMEM ; +mutex_lock (&work_page_lock); + buf = (struct uv_secret_list *)work_page; rc =find_secret (secret_id, buf, secret); -kfree (buf); +mutex_unlock (&work_page_lock);
The commit message does not explain why memory allocation is not acceptable. Usually this translates to non-sleepable context. If that is the case, then using a mutex would be wrong. This needs to be clarified.
arch/s390/kernel/uv.c int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN], · line 752
Quoted 2 lines
arch/s390/kernel/uv.c +1
-0+return rc;
Unrelated whitespace change.
It is up to the kvm folks to decide if the whole approach is ok.
Re: [PATCH v1 1/1] s390/uv: Prealloc and use one work page
Quoted 25 lines · Heiko Carstens
Quoted 8 lines · Harald Freudenberger
The pkey handler is calling the uv in some circumstances where no memory allocation is acceptable. As of now only the
uv_get_secret_metadata()function allocates memory. As this is exactly one page, lets introduce a pre-allocated work page and protect the concurrent use with a mutex to remove dynamic memory allocation and free. This page may be also used with future extension to the uv code.Quoted 4 lines
Signed-off-by Harald Freudenberger <[email protected]>--- arch/s390/kernel/uv.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)[adding maintainers, according to get_maintainer.pl]
Quoted 8 lines
static int
__inituv_init(phys_addr_tstor_base, unsigned longstor_len)
{arch/s390/kernel/uv.c +0
-0struct uv_cb_init uvcb = {@@ -61,6 +68,12 @@ void __init setup_uv(void)if (!is_prot_virt_host ())return ;
Quoted 12 lines
arch/s390/kernel/uv.c void __init setup_uv(void) · line 77
Quoted 7 lines
arch/s390/kernel/uv.c +6
-0+ work_page = (u8 *)__get_free_page (GFP_KERNEL ); +if (!work_page) { +pr_warn ("Failed to alloc a working memory page\n" ); +return ; + } + uv_stor_base = memblock_alloc_try_nid(Did you test this? I think this cannot work. When
setup_uv()is called the buddy allocator is not yet initialized.
Please usememblock_alloc_or_panic()instead.
I only compiled this and I wanted to test this today in my SEL environment. The patch is a suggestion and should trigger maybe some feedback.
Quoted 20 lines
arch/s390/kernel/uv.c int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN], · line 750
Quoted 8 lines
arch/s390/kernel/uv.c +3
-4- buf =kzalloc (sizeof (*buf),GFP_KERNEL ); -if (!buf) -return -ENOMEM ; +mutex_lock (&work_page_lock); + buf = (struct uv_secret_list *)work_page; rc =find_secret (secret_id, buf, secret); -kfree (buf); +mutex_unlock (&work_page_lock);The commit message does not explain why memory allocation is not acceptable. Usually this translates to non-sleepable context. If that is the case, then using a mutex would be wrong. This needs to be clarified.
arch/s390/kernel/uv.c int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN], · line 752
Quoted 2 lines
arch/s390/kernel/uv.c +1
-0+return rc;Unrelated whitespace change.
It is up to the kvm folks to decide if the whole approach is ok.
Heiko Carstens
maintainerRe: [PATCH v1 1/1] s390/uv: Prealloc and use one work page
Quoted 13 lines · Harald Freudenberger
Quoted 12 lines
arch/s390/kernel/uv.c void __init setup_uv(void) · line 77
Quoted 7 lines
arch/s390/kernel/uv.c +6
-0+ work_page = (u8 *)__get_free_page (GFP_KERNEL ); +if (!work_page) { +pr_warn ("Failed to alloc a working memory page\n" ); +return ; + } + uv_stor_base = memblock_alloc_try_nid(Did you test this? I think this cannot work. When
setup_uv()is called the buddy allocator is not yet initialized.
Please usememblock_alloc_or_panic()instead.
Quoted 3 lines
I only compiled this and I wanted to test this today in my SEL environment. The patch is a suggestion and should trigger maybe some feedback.
Well, you got some feedback :)
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
arch/s390/kernel/uv.c +2
-3- buf =kzalloc (sizeof (*buf),GFP_KERNEL ); -if (!buf) -return -ENOMEM ; +mutex_lock (&work_page_lock); + buf = (struct uv_secret_list *)work_page;
Quoted 8 lines
Quoted 8 lines
arch/s390/kernel/uv.c int uv_get_secret_metadata(const u8 secret_id[UV_SECRET_ID_LEN], · line 750
Quoted 3 lines
arch/s390/kernel/uv.c +1
-1rc =find_secret (secret_id, buf, secret); -kfree (buf); +mutex_unlock (&work_page_lock);The commit message does not explain why memory allocation is not acceptable. Usually this translates to non-sleepable context. If that is the case, then using a mutex would be wrong. This needs to be clarified.
But I'm really wondering about this part. Please clarify.