| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <f79969d52ad112210259f39c606e158b2206792a.1602093760.git.yuleixzhang@tencent.com>
Date: Thu, 8 Oct 2020 15:54:20 +0800
From: yulei.kernel@...il.com
To: akpm@...ux-foundation.org, naoya.horiguchi@....com,
viro@...iv.linux.org.uk, pbonzini@...hat.com
Cc: linux-fsdevel@...r.kernel.org, kvm@...r.kernel.org,
linux-kernel@...r.kernel.org, xiaoguangrong.eric@...il.com,
kernellwp@...il.com, lihaiwei.kernel@...il.com,
Yulei Zhang <yuleixzhang@...cent.com>,
Chen Zhuo <sagazchen@...cent.com>
Subject: [PATCH 30/35] dmem: introduce dmem_bitmap_alloc() and dmem_bitmap_free()
From: Yulei Zhang <yuleixzhang@...cent.com>
If dmem contained in dmem region is too large and dmemfs is mounted as
4K pagesize, size of bitmap in this dmem region maybe exceed maximal
available memory of kzalloc(). It would cause kzalloc() fail.
So introduce dmem_bitmap_alloc() and use vzalloc() if bitmap is larger than
PAGE_SIZE as vzalloc() will get sparse page.
Signed-off-by: Chen Zhuo <sagazchen@...cent.com>
Signed-off-by: Yulei Zhang <yuleixzhang@...cent.com>
---
fs/inode.c | 6 ++++
include/linux/fs.h | 1 +
mm/dmem.c | 69 +++++++++++++++++++++++++++++-----------------
3 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/fs/inode.c b/fs/inode.c
index 72c4c347afb7..6f8c60ac9302 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -208,6 +208,12 @@ int inode_init_always(struct super_block *sb, struct inode *inode)
}
EXPORT_SYMBOL(inode_init_always);
+struct inode *alloc_inode_nonrcu(void)
+{
+ return kmem_cache_alloc(inode_cachep, GFP_KERNEL);
+}
+EXPORT_SYMBOL(alloc_inode_nonrcu);
+
void free_inode_nonrcu(struct inode *inode)
{
kmem_cache_free(inode_cachep, inode);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7519ae003a08..872552dc5a61 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2984,6 +2984,7 @@ extern void clear_inode(struct inode *);
extern void __destroy_inode(struct inode *);
extern struct inode *new_inode_pseudo(struct super_block *sb);
extern struct inode *new_inode(struct super_block *sb);
+extern struct inode *alloc_inode_nonrcu(void);
extern void free_inode_nonrcu(struct inode *inode);
extern int should_remove_suid(struct dentry *);
extern int file_remove_privs(struct file *);
diff --git a/mm/dmem.c b/mm/dmem.c
index eb6df7059cf0..50cdff98675b 100644
--- a/mm/dmem.c
+++ b/mm/dmem.c
@@ -17,6 +17,7 @@
#include <linux/dmem.h>
#include <linux/debugfs.h>
#include <linux/notifier.h>
+#include <linux/vmalloc.h>
#define CREATE_TRACE_POINTS
#include <trace/events/dmem.h>
@@ -362,9 +363,38 @@ static int __init dmem_node_init(struct dmem_node *dnode)
return 0;
}
+static unsigned long *dmem_bitmap_alloc(unsigned long pages,
+ unsigned long *static_bitmap)
+{
+ unsigned long *bitmap, size;
+
+ size = BITS_TO_LONGS(pages) * sizeof(long);
+ if (size <= sizeof(*static_bitmap))
+ bitmap = static_bitmap;
+ else if (size <= PAGE_SIZE)
+ bitmap = kzalloc(size, GFP_KERNEL);
+ else
+ bitmap = vzalloc(size);
+
+ return bitmap;
+}
+
+static void dmem_bitmap_free(unsigned long pages,
+ unsigned long *bitmap,
+ unsigned long *static_bitmap)
+{
+ unsigned long size;
+
+ size = BITS_TO_LONGS(pages) * sizeof(long);
+ if (size > PAGE_SIZE)
+ vfree(bitmap);
+ else if (bitmap != static_bitmap)
+ kfree(bitmap);
+}
+
static void __init dmem_region_uinit(struct dmem_region *dregion)
{
- unsigned long nr_pages, size, *bitmap = dregion->error_bitmap;
+ unsigned long nr_pages, *bitmap = dregion->error_bitmap;
if (!bitmap)
return;
@@ -374,9 +404,7 @@ static void __init dmem_region_uinit(struct dmem_region *dregion)
WARN_ON(!nr_pages);
- size = BITS_TO_LONGS(nr_pages) * sizeof(long);
- if (size > sizeof(dregion->static_bitmap))
- kfree(bitmap);
+ dmem_bitmap_free(nr_pages, bitmap, &dregion->static_error_bitmap);
dregion->error_bitmap = NULL;
}
@@ -405,19 +433,15 @@ static void __init dmem_uinit(void)
static int __init dmem_region_init(struct dmem_region *dregion)
{
- unsigned long *bitmap, size, nr_pages;
+ unsigned long *bitmap, nr_pages;
nr_pages = __phys_to_pfn(dregion->reserved_end_addr)
- __phys_to_pfn(dregion->reserved_start_addr);
- size = BITS_TO_LONGS(nr_pages) * sizeof(long);
- if (size <= sizeof(dregion->static_error_bitmap)) {
- bitmap = &dregion->static_error_bitmap;
- } else {
- bitmap = kzalloc(size, GFP_KERNEL);
- if (!bitmap)
- return -ENOMEM;
- }
+ bitmap = dmem_bitmap_alloc(nr_pages, &dregion->static_error_bitmap);
+ if (!bitmap)
+ return -ENOMEM;
+
dregion->error_bitmap = bitmap;
return 0;
}
@@ -472,7 +496,7 @@ late_initcall(dmem_late_init);
static int dmem_alloc_region_init(struct dmem_region *dregion,
unsigned long *dpages)
{
- unsigned long start, end, *bitmap, size;
+ unsigned long start, end, *bitmap;
start = DMEM_PAGE_UP(dregion->reserved_start_addr);
end = DMEM_PAGE_DOWN(dregion->reserved_end_addr);
@@ -481,14 +505,9 @@ static int dmem_alloc_region_init(struct dmem_region *dregion,
if (!*dpages)
return 0;
- size = BITS_TO_LONGS(*dpages) * sizeof(long);
- if (size <= sizeof(dregion->static_bitmap))
- bitmap = &dregion->static_bitmap;
- else {
- bitmap = kzalloc(size, GFP_KERNEL);
- if (!bitmap)
- return -ENOMEM;
- }
+ bitmap = dmem_bitmap_alloc(*dpages, &dregion->static_bitmap);
+ if (!bitmap)
+ return -ENOMEM;
dregion->bitmap = bitmap;
dregion->next_free_pos = 0;
@@ -582,7 +601,7 @@ static void dmem_uinit_check_alloc_bitmap(struct dmem_region *dregion)
static void dmem_alloc_region_uinit(struct dmem_region *dregion)
{
- unsigned long dpages, size, *bitmap = dregion->bitmap;
+ unsigned long dpages, *bitmap = dregion->bitmap;
if (!bitmap)
return;
@@ -592,9 +611,7 @@ static void dmem_alloc_region_uinit(struct dmem_region *dregion)
dmem_uinit_check_alloc_bitmap(dregion);
- size = BITS_TO_LONGS(dpages) * sizeof(long);
- if (size > sizeof(dregion->static_bitmap))
- kfree(bitmap);
+ dmem_bitmap_free(dpages, bitmap, &dregion->static_bitmap);
dregion->bitmap = NULL;
}
--
2.28.0
Powered by blists - more mailing lists