From nobody Wed Mar 05 01:19:29 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z6vpn6yGKz5p6cY; Wed, 05 Mar 2025 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6vpn6DSqz3YF2; Wed, 05 Mar 2025 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741137569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOUi7WR4PdRKnRkU95qn2SMG3sOncIEw6fWGMUNx48U=; b=M0+Cxvr19vugCVNnyti4Y7eU5hs6rJvwdBZTXKslMkO3EcvuYQvJ9c7nNauhtKTcuUcsIW HV7dciHmNKMBFSpm0YLoNJ0Oxb6IQux17uRoh4zR15ET5EB7A6aizlih62Yzfe1/stoWSp BIU2htpPWLshvizZoOY7qN/98Hq6t8ddFO4iQIZ/xFnHLUUN8aoMYx9uVwePSbVLgf/+Xx MLbe8B9bWtdQ5drxq3QIchSdolP4BDNpqvD1/+K+4oyRO3SjdgT1+Nn4K9OdmahSBujPl5 gH/2h+dqyAvdlJvpQWBDTOp8Joypv/hS2HaGMoHKS0R/YCyZQrxPiGXj639/AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741137569; a=rsa-sha256; cv=none; b=Oy7Ja3UQhDp38MQCEpULC1/5MH9uXM/LfBU+/ie49ZNxlVLQOCUFjOU3+D8w8zHfvVmBCU yS67qa61SSlcBHG50d04mKrxMGPc8KFS55RcoxXEzJ4b0gO0bC04cW1QWFvxT/zbdtxYe1 7IZoBUPlh+OlU+MFclzaBtYiLYqGB8kFzpFu6g53uEGe3kV1K8vNCjNbZODtK3n07Y4UiO l3+Mm2Ye22+UWiKWV/jJuDLgtiIGRA+gImyXJ1q/m413uRHtUVBqiFcFP9OPcRFR6hBO+7 7a/whyE9tfUnlfd7qzipqlkne8j91LnqP92aZw5wwJNzprixevC+75FHQI1nsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741137569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JOUi7WR4PdRKnRkU95qn2SMG3sOncIEw6fWGMUNx48U=; b=Oq/ALR1nSLBhqLM9CGSVI4jMfbDSGVTp+ANZGhYuZjFi68pLsovGouvvhRtAiM4p0SHHDI i38iqKiVBIFpLDxn3sAnFabOcrf2eRunhjHD34A+dD5wz1kPVE7T3ZMnEfWq2gH9+kzKYr TFQAVROjzrZLbWMLR7ZJLXGL+ifRhpcWcQEyfoDtpNT331Ijc2k1wjhNTVVM6kkk6E4caj 2QjSIvMDl+uB7XcTxkjlhGQ/8O3JSbXNzm4X+dJU6s2uIjf769SNuB+XVcLTiqDEz5Lsk9 wjvesN3wXMdIjzUkG8NPCo0gCJu24vSIzoInRFi9i1/9mflMVDQtZTcciiZSRg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z6vpn5S04zjtS; Wed, 05 Mar 2025 01:19:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5251JTJn016471; Wed, 5 Mar 2025 01:19:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5251JT3k016468; Wed, 5 Mar 2025 01:19:29 GMT (envelope-from git) Date: Wed, 5 Mar 2025 01:19:29 GMT Message-Id: <202503050119.5251JT3k016468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 8ee127efb045 - main - vm_lowmem: Fix signature mismatches in vm_lowmem callbacks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8ee127efb045caf5ad9522f3c63c7e18f9d7279f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8ee127efb045caf5ad9522f3c63c7e18f9d7279f commit 8ee127efb045caf5ad9522f3c63c7e18f9d7279f Author: SHENGYI HONG AuthorDate: 2025-02-23 17:12:57 +0000 Commit: John Baldwin 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;