The branch main has been updated by jhb:
URL:
https://cgit.FreeBSD.org/src/commit/?id=8ee127efb045caf5ad9522f3c63c7e18f9d7279f
commit 8ee127efb045caf5ad9522f3c63c7e18f9d7279f
Author: SHENGYI HONG <aokbl...@freebsd.org>
AuthorDate: 2025-02-23 17:12:57 +0000
Commit: John Baldwin <j...@freebsd.org>
CommitDate: 2025-03-05 01:18:52 +0000
vm_lowmem: Fix signature mismatches in vm_lowmem callbacks
This is required for kernel CFI.
Reviewed by: rrs, jhb, glebius
Differential Revision: https://reviews.freebsd.org/D49111
---
sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 +-
sys/dev/drm2/ttm/ttm_page_alloc.c | 2 +-
sys/kern/kern_exec.c | 2 +-
sys/netinet/ip_reass.c | 11 ++++++++---
sys/netinet/sctp_pcb.c | 2 +-
sys/netinet/tcp_subr.c | 2 +-
sys/netinet6/frag6.c | 2 +-
sys/netinet6/ip6_var.h | 2 +-
sys/ufs/ufs/ufs_dirhash.c | 4 ++--
9 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/sys/compat/linuxkpi/common/src/linux_shrinker.c
b/sys/compat/linuxkpi/common/src/linux_shrinker.c
index 18200fa0bc01..e06490b92ed1 100644
--- a/sys/compat/linuxkpi/common/src/linux_shrinker.c
+++ b/sys/compat/linuxkpi/common/src/linux_shrinker.c
@@ -120,7 +120,7 @@ shrinker_shrink(struct shrinker *s)
}
static void
-linuxkpi_vm_lowmem(void *arg __unused)
+linuxkpi_vm_lowmem(void *arg __unused, int flags __unused)
{
struct shrinker *s;
diff --git a/sys/dev/drm2/ttm/ttm_page_alloc.c
b/sys/dev/drm2/ttm/ttm_page_alloc.c
index 7518ecb4dfd1..724ba0bfb4d8 100644
--- a/sys/dev/drm2/ttm/ttm_page_alloc.c
+++ b/sys/dev/drm2/ttm/ttm_page_alloc.c
@@ -441,7 +441,7 @@ static int ttm_pool_get_num_unused_pages(void)
/**
* Callback for mm to request pool to reduce number of page held.
*/
-static int ttm_pool_mm_shrink(void *arg)
+static int ttm_pool_mm_shrink(void *arg, int flags __unused)
{
static unsigned int start_pool = 0;
unsigned i;
diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c
index 51bbdeaaa55e..f6d0201f9b37 100644
--- a/sys/kern/kern_exec.c
+++ b/sys/kern/kern_exec.c
@@ -1475,7 +1475,7 @@ exec_free_args_kva(void *cookie)
}
static void
-exec_args_kva_lowmem(void *arg __unused)
+exec_args_kva_lowmem(void *arg __unused, int flags __unused)
{
SLIST_HEAD(, exec_args_kva) head;
struct exec_args_kva *argkva;
diff --git a/sys/netinet/ip_reass.c b/sys/netinet/ip_reass.c
index a95780aa2f27..177069f5e010 100644
--- a/sys/netinet/ip_reass.c
+++ b/sys/netinet/ip_reass.c
@@ -670,6 +670,11 @@ ipreass_drain(void)
VNET_LIST_RUNLOCK();
}
+static void
+ipreass_drain_lowmem(void *arg __unused, int flags __unused)
+{
+ ipreass_drain();
+}
/*
* Initialize IP reassembly structures.
@@ -711,10 +716,10 @@ ipreass_init(void)
maxfrags = IP_MAXFRAGS;
EVENTHANDLER_REGISTER(nmbclusters_change, ipreass_zone_change,
NULL, EVENTHANDLER_PRI_ANY);
- EVENTHANDLER_REGISTER(vm_lowmem, ipreass_drain, NULL,
+ EVENTHANDLER_REGISTER(vm_lowmem, ipreass_drain_lowmem, NULL,
+ LOWMEM_PRI_DEFAULT);
+ EVENTHANDLER_REGISTER(mbuf_lowmem, ipreass_drain_lowmem, NULL,
LOWMEM_PRI_DEFAULT);
- EVENTHANDLER_REGISTER(mbuf_lowmem, ipreass_drain, NULL,
- LOWMEM_PRI_DEFAULT);
}
/*
diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 185530e3bc5e..55b452743f86 100644
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -6823,7 +6823,7 @@ sctp_drain_mbufs(struct sctp_tcb *stcb)
}
static void
-sctp_drain(void)
+sctp_drain(void *arg __unused, int flags __unused)
{
struct epoch_tracker et;
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 4baeb6f8f2d2..03efc759092d 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1384,7 +1384,7 @@ deregister_tcp_functions(struct tcp_function_block *blk,
bool quiesce,
}
static void
-tcp_drain(void)
+tcp_drain(void *ctx __unused, int flags __unused)
{
struct epoch_tracker et;
VNET_ITERATOR_DECL(vnet_iter);
diff --git a/sys/netinet6/frag6.c b/sys/netinet6/frag6.c
index e976298bf984..f6bb6e94ed08 100644
--- a/sys/netinet6/frag6.c
+++ b/sys/netinet6/frag6.c
@@ -1078,7 +1078,7 @@ frag6_drain_one(void)
}
void
-frag6_drain(void)
+frag6_drain(void *arg __unused, int flags __unused)
{
VNET_ITERATOR_DECL(vnet_iter);
diff --git a/sys/netinet6/ip6_var.h b/sys/netinet6/ip6_var.h
index 1aa170f6ed2b..12b00d4f9934 100644
--- a/sys/netinet6/ip6_var.h
+++ b/sys/netinet6/ip6_var.h
@@ -414,7 +414,7 @@ int route6_input(struct mbuf **, int *, int);
void frag6_init(void);
void frag6_destroy(void);
int frag6_input(struct mbuf **, int *, int);
-void frag6_drain(void);
+void frag6_drain(void *, int);
void rip6_init(void);
int rip6_ctloutput(struct socket *, struct sockopt *);
diff --git a/sys/ufs/ufs/ufs_dirhash.c b/sys/ufs/ufs/ufs_dirhash.c
index 92f067f5af8c..dd0405d3aeac 100644
--- a/sys/ufs/ufs/ufs_dirhash.c
+++ b/sys/ufs/ufs/ufs_dirhash.c
@@ -98,7 +98,7 @@ static int ufsdirhash_findslot(struct dirhash *dh, char
*name, int namelen,
doff_t offset);
static doff_t ufsdirhash_getprev(struct direct *dp, doff_t offset);
static int ufsdirhash_recycle(int wanted);
-static void ufsdirhash_lowmem(void);
+static void ufsdirhash_lowmem(void *, int);
static void ufsdirhash_free_locked(struct inode *ip);
static uma_zone_t ufsdirhash_zone;
@@ -1247,7 +1247,7 @@ ufsdirhash_recycle(int wanted)
* Callback that frees some dirhashes when the system is low on virtual memory.
*/
static void
-ufsdirhash_lowmem(void)
+ufsdirhash_lowmem(void *arg __unused, int flags __unused)
{
struct dirhash *dh, *dh_temp;
int memfreed, memwanted;
