alex/bcachefs-tools
1
0
Fork 0
mirror of https://github.com/koverstreet/bcachefs-tools.git synced 2025-02-22 00:00:03 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bcachefs-tools: Use sysinfo(2) directly to implement si_meminfo()

Browse Source 
Use a single sysinfo(2) call to fill out struct sysinfo instead of
multiple libc sysconf(3) requests, which will only make sysinfo(2) calls
internally anyway. This also enables us to access other struct sysinfo
fields, not just the three filled-out previously.

As we provide our own definition of struct sysinfo in include/linux/mm.h
to match the kernel, which is not guaranteed to align with the definition
libc provides in <sys/sysinfo.h>, use syscall(SYS_sysinfo, ...) directly
instead of the libc wrapper.

Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Chris Webb 2023-12-09 12:49:12 +00:00 committed by Kent Overstreet
parent 2d5118e01f
commit ddc7161531
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/linux/mm.h
View File

@ -2,6 +2,7 @@
#ifndef _TOOLS_LINUX_MM_H
#define _TOOLS_LINUX_MM_H
#include <sys/syscall.h>
#include <linux/types.h>
struct sysinfo {
@ -20,6 +21,11 @@ struct sysinfo {
__u32 mem_unit; /* Memory unit size in bytes */
};
extern void si_meminfo(struct sysinfo * val);
static inline void si_meminfo(struct sysinfo *val)
{
BUG_ON(syscall(SYS_sysinfo, val));
}
#endif /* _TOOLS_LINUX_MM_H */

15
linux/shrinker.c
View File

@ -33,21 +33,6 @@ void unregister_shrinker(struct shrinker *shrinker)
mutex_unlock(&shrinker_lock);
}
struct meminfo {
u64 total;
u64 available;
};
void si_meminfo(struct sysinfo *val)
{
long page_size = sysconf(_SC_PAGESIZE);
memset(val, 0, sizeof(*val));
val->mem_unit = 1;
val->totalram = sysconf(_SC_PHYS_PAGES) * page_size;
val->freeram = sysconf(_SC_AVPHYS_PAGES) * page_size;
}
static void run_shrinkers_allocation_failed(gfp_t gfp_mask)
{
struct shrinker *shrinker;