From nobody Tue Feb 15 14:25:53 2022 X-Original-To: dev-commits-src-all@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 5ECA919C26A3; Tue, 15 Feb 2022 14:25:53 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jyk0K27PZz3Hv1; Tue, 15 Feb 2022 14:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644935153; 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=D45Jg9nIYfY2xJ6pthuVKPjI72KfuOui0G5Tfehs6yI=; b=CG7MZUU+VEescnb01JkByOAKp9u6IlubFoPc4fyUs8xcxRwShAS9+TLkjKxfvK4t1W4UeY 1TBGyOIJ6nQiooDYyS0RgNPN48kSB3BUAuqsJ7KMPiwqgfbnl/0+FLerWHsQlO8Rt8ih+Z ms3IJN7HYWMR9BmPjhAH7cTKBPHJNwj6JGu9vVq8k6gHAhZoKatUcmDI27779chEbC2UIm 3+02KhsMiEH0BfXuO7Jf2iU6IV7ni5H1O+n7PbF6kuDEfZqSUd2EbxGJTCJlA0Rcf2SNXg 8HQnlcvTFVK2+0G0gcPbiR+D8nOs/GrB5eh2EwCMLwv31Wf2kCTqB4dxUs4bzQ== 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 2898C23FA1; Tue, 15 Feb 2022 14:25:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21FEPrYG037015; Tue, 15 Feb 2022 14:25:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21FEPr5d037014; Tue, 15 Feb 2022 14:25:53 GMT (envelope-from git) Date: Tue, 15 Feb 2022 14:25:53 GMT Message-Id: <202202151425.21FEPr5d037014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 389a3fa693ef - main - uma: Add UMA_ZONE_UNMANAGED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 389a3fa693ef61c35e15b36f042fb24197b7afb1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644935153; 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=D45Jg9nIYfY2xJ6pthuVKPjI72KfuOui0G5Tfehs6yI=; b=qu343lCrb+Hoqz13k06xKzQTZKxaUnEDe6XfRjYMrt3rP/23ERwU2FdCzYhSJ7erBibHiY 8hIlsepfOanTUFv2XAXaoURFkipYCvssQSMV/FCdyRAMXbpW2B0cnvgnGuQQ4udmkG2zzG gE2gPxV7ZSLGkk7b8zNfhwScKp64kYUTH45D7erBiRQtwaUwq8BlyoOhmDjpUwA2PCDiBa F+9jEaMLXYNxA/vVOjnQxOsaAZcX2HEwb3b3O3reJCAdqRmZPWaS+kWAGcvmdrpYHjUZu0 JEwq7vr8D5y27gAq+u6a3fF6bOQ2wLVAgX+r3Yf5kUD7eOAUdziwWynUI3P82w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644935153; a=rsa-sha256; cv=none; b=aRMIIJvntoRCC0Q6cqMPCbxUD6ujDAN241XJnU6NrVdpyaPhgY7vzieDu8CVrZTz4wVPtQ dQBWdo4quqtEkdH1bEl6+LbKl/LvrN0Z4Jy0Sp6q3nyTdWSy9pCmSi4jrxGYP5MbP1I3vj 3GOBDCnS4gHb7dxfv4+tRFqdmj89C7qUajEELBrBv5Qndy7XZISu15mw0XJv38Lf1Mdfn4 IBVFlj0GIaifwdAApcPASz70uUf/RtTgw/bj8yaUSX6l3UTswUgUEBYo2wCYT15uJ5VsK4 cIeKM1hwmZrZj2/YpHq2oKNewJ7HDE4V/fmwbwp3E6jTfxhdCX78Ul8/kl8W8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=389a3fa693ef61c35e15b36f042fb24197b7afb1 commit 389a3fa693ef61c35e15b36f042fb24197b7afb1 Author: Mark Johnston AuthorDate: 2022-02-15 13:57:22 +0000 Commit: Mark Johnston CommitDate: 2022-02-15 14:25:34 +0000 uma: Add UMA_ZONE_UNMANAGED Allow a zone to opt out of cache size management. In particular, uma_reclaim() and uma_reclaim_domain() will not reclaim any memory from the zone, nor will uma_timeout() purge cached items if the zone is idle. This effectively means that the zone consumer has control over when items are reclaimed from the cache. In particular, uma_zone_reclaim() will still reclaim cached items from an unmanaged zone. Reviewed by: hselasky, kib MFC after: 3 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34142 --- share/man/man9/zone.9 | 8 +++++- sys/vm/uma.h | 4 +++ sys/vm/uma_core.c | 73 ++++++++++++++++++++++++--------------------------- 3 files changed, 46 insertions(+), 39 deletions(-) diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index cae76dbc6ff7..e26b29976807 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 14, 2021 +.Dd February 15, 2022 .Dt UMA 9 .Os .Sh NAME @@ -324,6 +324,12 @@ The zone is for the VM subsystem. Items in this zone must be contiguous in physical address space. Items will follow normal alignment constraints and may span page boundaries between pages with contiguous physical addresses. +.It Dv UMA_ZONE_UNMANAGED +By default, UMA zone caches are shrunk to help resolve free page shortages. +Cached items that have not been used for a long period may also be freed from +zone. +When this flag is set, the system will not reclaim memory from the zone's +caches. .El .Pp Zones can be destroyed using diff --git a/sys/vm/uma.h b/sys/vm/uma.h index 743e02cdddf9..bcf6a038dc55 100644 --- a/sys/vm/uma.h +++ b/sys/vm/uma.h @@ -233,6 +233,10 @@ uma_zone_t uma_zcache_create(const char *name, int size, uma_ctor ctor, * These flags share space with UMA_ZFLAGs in uma_int.h. Be careful not to * overlap when adding new features. */ +#define UMA_ZONE_UNMANAGED 0x0001 /* + * Don't regulate the cache size, even + * under memory pressure. + */ #define UMA_ZONE_ZINIT 0x0002 /* Initialize with zeros */ #define UMA_ZONE_CONTIG 0x0004 /* * Physical memory underlying an object diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index f6f7b083133a..341b12209f9d 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -1223,10 +1223,12 @@ zone_timeout(uma_zone_t zone, void *unused) trim: /* Trim caches not used for a long time. */ - for (int i = 0; i < vm_ndomains; i++) { - if (bucket_cache_reclaim_domain(zone, false, false, i) && - (zone->uz_flags & UMA_ZFLAG_CACHE) == 0) - keg_drain(zone->uz_keg, i); + if ((zone->uz_flags & UMA_ZONE_UNMANAGED) == 0) { + for (int i = 0; i < vm_ndomains; i++) { + if (bucket_cache_reclaim_domain(zone, false, false, i) && + (zone->uz_flags & UMA_ZFLAG_CACHE) == 0) + keg_drain(zone->uz_keg, i); + } } } @@ -1735,24 +1737,6 @@ zone_reclaim(uma_zone_t zone, int domain, int waitok, bool drain) ZONE_UNLOCK(zone); } -static void -zone_drain(uma_zone_t zone, void *arg) -{ - int domain; - - domain = (int)(uintptr_t)arg; - zone_reclaim(zone, domain, M_NOWAIT, true); -} - -static void -zone_trim(uma_zone_t zone, void *arg) -{ - int domain; - - domain = (int)(uintptr_t)arg; - zone_reclaim(zone, domain, M_NOWAIT, false); -} - /* * Allocate a new slab for a keg and inserts it into the partial slab list. * The keg should be unlocked on entry. If the allocation succeeds it will @@ -3548,7 +3532,8 @@ uma_zalloc_debug(uma_zone_t zone, void **itemp, void *udata, int flags) zone->uz_ctor(item, zone->uz_size, udata, flags) != 0) { counter_u64_add(zone->uz_fails, 1); - zone->uz_fini(item, zone->uz_size); + if (zone->uz_fini != NULL) + zone->uz_fini(item, zone->uz_size); *itemp = NULL; return (error); } @@ -5202,6 +5187,21 @@ uma_zone_memory(uma_zone_t zone) return (sz * PAGE_SIZE); } +struct uma_reclaim_args { + int domain; + int req; +}; + +static void +uma_reclaim_domain_cb(uma_zone_t zone, void *arg) +{ + struct uma_reclaim_args *args; + + args = arg; + if ((zone->uz_flags & UMA_ZONE_UNMANAGED) == 0) + uma_zone_reclaim_domain(zone, args->req, args->domain); +} + /* See uma.h */ void uma_reclaim(int req) @@ -5212,23 +5212,23 @@ uma_reclaim(int req) void uma_reclaim_domain(int req, int domain) { - void *arg; + struct uma_reclaim_args args; bucket_enable(); - arg = (void *)(uintptr_t)domain; + args.domain = domain; + args.req = req; + sx_slock(&uma_reclaim_lock); switch (req) { case UMA_RECLAIM_TRIM: - zone_foreach(zone_trim, arg); - break; case UMA_RECLAIM_DRAIN: - zone_foreach(zone_drain, arg); + zone_foreach(uma_reclaim_domain_cb, &args); break; case UMA_RECLAIM_DRAIN_CPU: - zone_foreach(zone_drain, arg); + zone_foreach(uma_reclaim_domain_cb, &args); pcpu_cache_drain_safe(NULL); - zone_foreach(zone_drain, arg); + zone_foreach(uma_reclaim_domain_cb, &args); break; default: panic("unhandled reclamation request %d", req); @@ -5239,8 +5239,8 @@ uma_reclaim_domain(int req, int domain) * we visit again so that we can free pages that are empty once other * zones are drained. We have to do the same for buckets. */ - zone_drain(slabzones[0], arg); - zone_drain(slabzones[1], arg); + uma_zone_reclaim_domain(slabzones[0], UMA_RECLAIM_DRAIN, domain); + uma_zone_reclaim_domain(slabzones[1], UMA_RECLAIM_DRAIN, domain); bucket_zone_drain(domain); sx_sunlock(&uma_reclaim_lock); } @@ -5283,19 +5283,16 @@ uma_zone_reclaim(uma_zone_t zone, int req) void uma_zone_reclaim_domain(uma_zone_t zone, int req, int domain) { - void *arg; - - arg = (void *)(uintptr_t)domain; switch (req) { case UMA_RECLAIM_TRIM: - zone_trim(zone, arg); + zone_reclaim(zone, domain, M_NOWAIT, false); break; case UMA_RECLAIM_DRAIN: - zone_drain(zone, arg); + zone_reclaim(zone, domain, M_NOWAIT, true); break; case UMA_RECLAIM_DRAIN_CPU: pcpu_cache_drain_safe(zone); - zone_drain(zone, arg); + zone_reclaim(zone, domain, M_NOWAIT, true); break; default: panic("unhandled reclamation request %d", req);