Attachment 208118 Details for Bug 241048 – proposed patch for stable/12

[patch] proposed patch for stable/12

reclaim_stable_12.diff (text/plain), 1.41 KB, created by Mark Johnston on 2019-10-05 15:00:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Johnston

Created: 2019-10-05 15:00:11 UTC

Size: 1.41 KB

patch

obsolete

>Index: sys/vm/uma_core.c
>===================================================================
>--- sys/vm/uma_core.c	(revision 353108)
>+++ sys/vm/uma_core.c	(working copy)
>@@ -521,6 +521,8 @@ zone_foreach_keg(uma_zone_t zone, void (*kegfn)(um
> {
> 	uma_klink_t klink;
> 
>+	if ((zone->uz_flags & UMA_ZFLAG_CACHE) != 0)
>+		return;
> 	LIST_FOREACH(klink, &zone->uz_kegs, kl_link)
> 		kegfn(klink->kl_keg);
> }
>@@ -1978,6 +1980,8 @@ zone_foreach(void (*zfunc)(uma_zone_t))
> 		LIST_FOREACH(zone, &keg->uk_zones, uz_link)
> 			zfunc(zone);
> 	}
>+	LIST_FOREACH(zone, &uma_cachezones, uz_link)
>+		zfunc(zone);
> 	rw_runlock(&uma_rwlock);
> }
> 
>@@ -2282,7 +2286,7 @@ uma_zcache_create(char *name, int size, uma_ctor c
> 	args.release = zrelease;
> 	args.arg = arg;
> 	args.align = 0;
>-	args.flags = flags;
>+	args.flags = flags | UMA_ZFLAG_CACHE;
> 
> 	return (zone_alloc_item(zones, &args, UMA_ANYDOMAIN, M_WAITOK));
> }
>Index: sys/vm/uma_int.h
>===================================================================
>--- sys/vm/uma_int.h	(revision 353108)
>+++ sys/vm/uma_int.h	(working copy)
>@@ -374,6 +374,7 @@ struct uma_zone {
> /*
>  * These flags must not overlap with the UMA_ZONE flags specified in uma.h.
>  */
>+#define	UMA_ZFLAG_CACHE		0x02000000	/* uma_zcache_create()d it */
> #define	UMA_ZFLAG_MULTI		0x04000000	/* Multiple kegs in the zone. */
> #define	UMA_ZFLAG_DRAINING	0x08000000	/* Running zone_drain. */
> #define	UMA_ZFLAG_BUCKET	0x10000000	/* Bucket zone. */

Actions: View | Diff

Attachments on bug 241048: 208104 | 208105 | 208118 | 208237 | 208276 | 208284