From nobody Mon Jul 11 19:59:04 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 6B00312AE9F2; Mon, 11 Jul 2022 19:59:05 +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 4LhZTP0zvCz3hBM; Mon, 11 Jul 2022 19:59:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657569545; 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=HPSmx3hmW1Ot+xiNhg9s7UIcXwI32I8KjMTR9aR5l2M=; b=o6aHcAA2d3pDy9EUCyh+BTWFhEFs0khRHd3hTsgVwCMIbCYtnWR3suv0Dwg/IHPQypP7iu 8FQ/uzUj2OsFydCfxc0RX5Si2eeQdRKEG+12Cjg0VRPpMdDnmWBSrs8BFEFNN6XmR/G9xL qCJlNvHQrxwiaj2JYd1omjIG/v/WTs9JD+uPIzbT/vKDzHUBD05DWC7zf31/vtQdpCvCAs tCuic61DxPBBdcpuOBJNafHF1f6IxzDq0425IVhIGGMUktQeVx3YSBd+tLF5vOUhvjSQng t2w6UoOahaIv/ZfpRVDmpahQSzITY6RMsP7IDAAcohcLly6oUO9VWWTHY3FXZw== 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 4LhZTP05JvzGV7; Mon, 11 Jul 2022 19:59:05 +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 26BJx42j003311; Mon, 11 Jul 2022 19:59:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26BJx4X8003310; Mon, 11 Jul 2022 19:59:04 GMT (envelope-from git) Date: Mon, 11 Jul 2022 19:59:04 GMT Message-Id: <202207111959.26BJx4X8003310@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: 93cd28ea82bb - main - uma: Use a taskqueue to execute uma_timeout() 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: 93cd28ea82bb7b5e9489c8febfe1ae7ed2c044fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657569545; 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=HPSmx3hmW1Ot+xiNhg9s7UIcXwI32I8KjMTR9aR5l2M=; b=UM6s+hGOb0+vHMTcd1OguXZnUIoLI58gG4ntlrn3Qc2ht9rdGlSSDXcrWmY+obe4XoWEAM WH+YUbrlkIWHZvbCK7zzq++cc8wKZSS8uyYeXKgNT32z4OmoNdJ9yP8sB82X+9AHsDW2Ih YlX1iQ5uPerd9syo7OycP3cmfGezoBmn+FcW50o6HeLwKNRCa4CfOtcHEl6kEqAwJ4Objc Gy7Mt0m/3fJTjHc7CE6Q0rzc4g0trSZYudfV2oD67JOHXVwehgz3CW9We7qX/Yabl1vzN+ IfiFVwZsasB+hGJpkrFJPVT9h8ZGuxxPhMp2m8ybTb0VMdRV8jaq+oywuAcMGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657569545; a=rsa-sha256; cv=none; b=dgSHO2pXnNXAYbeiUxW69adMHrfhhyi//UM6nRiaUVI++Q2aD7AiU9vuOq8EHV8tTY2hgr hUF+d/BRkKRxfmHdE+7SDI2jrnKNsTi1j4g1c/mN7ucKFixB4Er7zjZIXIR/RqWjOTt2HK n1w0wDtwDs85HuRIecRh/S1jeZzkRMP1dkKFwY88Scm7q4Fg/1ULKh/NpjhIc2NbQTr8qi yIk3+5kGuG6saR3aBgef4AmXNwnCdbJoezQnUGolWX5Ur1pjYXhOL7bZdufUqUQy1EclhD m/jNeg8dfKF50D80oztudMenaRz+oy1yHz/8mEb8UKuzaMwxQopLt+GHl6VVlQ== 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=93cd28ea82bb7b5e9489c8febfe1ae7ed2c044fb commit 93cd28ea82bb7b5e9489c8febfe1ae7ed2c044fb Author: Mark Johnston AuthorDate: 2022-07-11 19:45:36 +0000 Commit: Mark Johnston CommitDate: 2022-07-11 19:58:43 +0000 uma: Use a taskqueue to execute uma_timeout() uma_timeout() has several responsibilities; it visits every UMA zone and as of recently will drain underutilized caches, so is rather expensive (>1ms in some cases). Currently it is executed by softclock threads and so will preempt most other CPU activity. None of this work requires a high scheduling priority, though, so defer it to a taskqueue so as to avoid stalling higher-priority work. Reviewed by: rlibby, alc, mav, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35738 --- sys/vm/uma_core.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c index 8502719cac72..d2ccf10b0134 100644 --- a/sys/vm/uma_core.c +++ b/sys/vm/uma_core.c @@ -207,7 +207,7 @@ static enum { * This is the handle used to schedule events that need to happen * outside of the allocation fast path. */ -static struct callout uma_callout; +static struct timeout_task uma_timeout_task; #define UMA_TIMEOUT 20 /* Seconds for callout interval. */ /* @@ -311,7 +311,7 @@ static void zone_timeout(uma_zone_t zone, void *); static int hash_alloc(struct uma_hash *, u_int); static int hash_expand(struct uma_hash *, struct uma_hash *); static void hash_free(struct uma_hash *hash); -static void uma_timeout(void *); +static void uma_timeout(void *, int); static void uma_shutdown(void); static void *zone_alloc_item(uma_zone_t, void *, int, int); static void zone_free_item(uma_zone_t, void *, void *, enum zfreeskip); @@ -1107,13 +1107,14 @@ zone_maxaction(uma_zone_t zone) * Nothing */ static void -uma_timeout(void *unused) +uma_timeout(void *unused __unused, int pending __unused) { bucket_enable(); zone_foreach(zone_timeout, NULL); /* Reschedule this event */ - callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL); + taskqueue_enqueue_timeout(taskqueue_thread, &uma_timeout_task, + UMA_TIMEOUT * hz); } /* @@ -3208,8 +3209,6 @@ uma_startup3(void *arg __unused) uma_skip_cnt = counter_u64_alloc(M_WAITOK); #endif zone_foreach_unlocked(zone_alloc_sysctl, NULL); - callout_init(&uma_callout, 1); - callout_reset(&uma_callout, UMA_TIMEOUT * hz, uma_timeout, NULL); booted = BOOT_RUNNING; EVENTHANDLER_REGISTER(shutdown_post_sync, uma_shutdown, NULL, @@ -3217,6 +3216,16 @@ uma_startup3(void *arg __unused) } SYSINIT(uma_startup3, SI_SUB_VM_CONF, SI_ORDER_SECOND, uma_startup3, NULL); +static void +uma_startup4(void *arg __unused) +{ + TIMEOUT_TASK_INIT(taskqueue_thread, &uma_timeout_task, 0, uma_timeout, + NULL); + taskqueue_enqueue_timeout(taskqueue_thread, &uma_timeout_task, + UMA_TIMEOUT * hz); +} +SYSINIT(uma_startup4, SI_SUB_TASKQ, SI_ORDER_ANY, uma_startup4, NULL); + static void uma_shutdown(void) {