git: b8f7267d499c - main - uma: allow uma_zfree_pcu(..., NULL)
Kristof Provost
kp at FreeBSD.org
Fri Mar 12 12:15:33 UTC 2021
The branch main has been updated by kp:
URL: https://cgit.FreeBSD.org/src/commit/?id=b8f7267d499c8ef8e70b021879d3e9e087ecc32d
commit b8f7267d499c8ef8e70b021879d3e9e087ecc32d
Author: Kristof Provost <kp at FreeBSD.org>
AuthorDate: 2021-03-10 14:11:59 +0000
Commit: Kristof Provost <kp at FreeBSD.org>
CommitDate: 2021-03-12 11:12:35 +0000
uma: allow uma_zfree_pcu(..., NULL)
We already allow free(NULL) and uma_zfree(..., NULL). Make
uma_zfree_pcpu(..., NULL) work as well.
This also means that counter_u64_free(NULL) will work.
These make cleanup code simpler.
MFC after: 1 week
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D29189
---
sys/vm/uma_core.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index 8cbd1216678a..b1762500c147 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -3171,6 +3171,11 @@ uma_zfree_pcpu_arg(uma_zone_t zone, void *pcpu_item, void *udata)
#ifdef SMP
MPASS(zone->uz_flags & UMA_ZONE_PCPU);
#endif
+
+ /* uma_zfree_pcu_*(..., NULL) does nothing, to match free(9). */
+ if (pcpu_item == NULL)
+ return;
+
item = zpcpu_offset_to_base(pcpu_item);
uma_zfree_arg(zone, item, udata);
}
More information about the dev-commits-src-all
mailing list