From nobody Mon Jul 18 13:21:47 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 4LmjKm0F3Qz4T8Rf; Mon, 18 Jul 2022 13:21:48 +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 4LmjKl3YNsz3tBd; Mon, 18 Jul 2022 13:21:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658150507; 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=x3zkFXbiGYXM+xZrSuLcxxoZNMO+XuaBAPMCPVdLL7s=; b=tiTLhUuuouAo3uluukl5I1vqpofUxUxTeCjfBw6aTY7dresMi1bqttsXgmN+N4+anus3cR YHqM0lwO9aYm9NvNWAzHpSAisuNiQ5b9mFBDj1nwg9P3coL11eTIV3PcQc4fhcWb5+DHx2 TA20WInRH6LNkl7tQV6/AsQaw4sPiyQbKNpljCUplopJ69VLHulXpZYhGC8saXgAR95liR FXYEvKYUGZ05A+ySge+CB1u1ZokP9fFx14qyPUeTuKSXIxavZDSPlV9Zhh9+AB5mIY41at q1vvxMxiPhXKCltzjnfvEGwQ9GRDIEVLJmpb+qsNsD64LER+8SExKmaktNObrQ== 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 4LmjKl2ZLyzgkX; Mon, 18 Jul 2022 13:21:47 +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 26IDLlYi032105; Mon, 18 Jul 2022 13:21:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26IDLlJX032104; Mon, 18 Jul 2022 13:21:47 GMT (envelope-from git) Date: Mon, 18 Jul 2022 13:21:47 GMT Message-Id: <202207181321.26IDLlJX032104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d5e5bd96dc4e - stable/13 - eventtimer: Pass a pcpu state pointer to getnext(cpu)event() 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/stable/13 X-Git-Reftype: branch X-Git-Commit: d5e5bd96dc4ec94b0860bf5b2c8aa4567fc58aed Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658150507; 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=x3zkFXbiGYXM+xZrSuLcxxoZNMO+XuaBAPMCPVdLL7s=; b=n+0WdRhL2ZDB3yLzgT6bCbhC1tj2KdZhzZlMOoit34YW8P+EOlS58UNbhjWMW92l9kshbK Zw1GzjVzQjr7cwyi4Xqdstz8pq2V/9VbRj7VfC9Ca4dVdVEcQbGvIsHGzBrxKNkvcH7FTC p+d+cbUyPPNnwlTwCRtQyvq387zndNZqaY+Gy1Ud0qAhfgQi1hLo0CTSRDW5VzuJ14fYuN 2scfMna3jiD3XWjn281Bwr2W3fJAViU04oacSNSSc9briTHG2KBZxT+vv7881GmTFGn0Ot bcYFRNgo/IKIqExCiNc21npIEoJp+qaEnR5a70z2EJiwWB6BGnAJ8GnaLhaj4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658150507; a=rsa-sha256; cv=none; b=ZZUET169JCuPCn9eDGr06nS/h1YKOTXPL4lXGykr1zjoE7m/OwqIqvLic7RAyreGZpaid0 EU1CaX1UFAX0Dthb0TSyirN0qU9mzDoevjdH8xWsLOIUoiu7JKcyCds+PYNyB9xH1vnnh7 Pbi96FCcMggRRFSsh2+yENoxQX8xP6vgNHNKt8mQzc+EOwGyoZTt5yTLPEEnusanlzG81V JNbAyXH1yGZP2mrp/rR+53shgfirrAr5r2TAdOc8QwKpuixM1Vpe9ulVkCeU5Dp795Y5t9 EemALLasJ9+F3Jtjsmp5I15B38unOMiXNgjPBPs3NU4ThNmShnrQ8aeDOx1peg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d5e5bd96dc4ec94b0860bf5b2c8aa4567fc58aed commit d5e5bd96dc4ec94b0860bf5b2c8aa4567fc58aed Author: Mark Johnston AuthorDate: 2022-07-11 19:38:43 +0000 Commit: Mark Johnston CommitDate: 2022-07-18 13:08:24 +0000 eventtimer: Pass a pcpu state pointer to getnext(cpu)event() Callers have already loaded the pointer, so these functions don't need to fetch it again. No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit ebb3cb61958da8bcc3c28ec3b20dc3a6b8168952) --- sys/kern/kern_clocksource.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/sys/kern/kern_clocksource.c b/sys/kern/kern_clocksource.c index 48e06ee082fc..9d53d1242482 100644 --- a/sys/kern/kern_clocksource.c +++ b/sys/kern/kern_clocksource.c @@ -65,8 +65,9 @@ static int doconfigtimer(void); static void configtimer(int start); static int round_freq(struct eventtimer *et, int freq); -static sbintime_t getnextcpuevent(int idle); -static sbintime_t getnextevent(void); +struct pcpu_state; +static sbintime_t getnextcpuevent(struct pcpu_state *state, int idle); +static sbintime_t getnextevent(struct pcpu_state *state); static int handleevents(sbintime_t now, int fake); static struct mtx et_hw_mtx; @@ -213,7 +214,7 @@ handleevents(sbintime_t now, int fake) callout_process(now); } - t = getnextcpuevent(0); + t = getnextcpuevent(state, 0); ET_HW_LOCK(state); if (!busy) { state->idle = 0; @@ -229,13 +230,11 @@ handleevents(sbintime_t now, int fake) * Schedule binuptime of the next event on current CPU. */ static sbintime_t -getnextcpuevent(int idle) +getnextcpuevent(struct pcpu_state *state, int idle) { sbintime_t event; - struct pcpu_state *state; u_int hardfreq; - state = DPCPU_PTR(timerstate); /* Handle hardclock() events, skipping some if CPU is idle. */ event = state->nexthard; if (idle) { @@ -266,9 +265,8 @@ getnextcpuevent(int idle) * Schedule binuptime of the next event on all CPUs. */ static sbintime_t -getnextevent(void) +getnextevent(struct pcpu_state *state) { - struct pcpu_state *state; sbintime_t event; #ifdef SMP int cpu; @@ -278,7 +276,6 @@ getnextevent(void) c = -1; #endif - state = DPCPU_PTR(timerstate); event = state->nextevent; #ifdef SMP if ((timer->et_flags & ET_FLAGS_PERCPU) == 0) { @@ -385,10 +382,10 @@ loadtimer(sbintime_t now, int start) uint64_t tmp; int eq; - if (timer->et_flags & ET_FLAGS_PERCPU) { - state = DPCPU_PTR(timerstate); + state = DPCPU_PTR(timerstate); + if (timer->et_flags & ET_FLAGS_PERCPU) next = &state->nexttick; - } else + else next = &nexttick; if (periodic) { if (start) { @@ -407,7 +404,7 @@ loadtimer(sbintime_t now, int start) et_start(timer, new, timerperiod); } } else { - new = getnextevent(); + new = getnextevent(state); eq = (new == *next); CTR4(KTR_SPARE2, "load at %d: next %d.%08x eq %d", curcpu, (int)(new >> 32), (u_int)(new & 0xffffffff), eq); @@ -778,7 +775,7 @@ cpu_idleclock(void) now = sbinuptime(); CTR3(KTR_SPARE2, "idle at %d: now %d.%08x", curcpu, (int)(now >> 32), (u_int)(now & 0xffffffff)); - t = getnextcpuevent(1); + t = getnextcpuevent(state, 1); ET_HW_LOCK(state); state->idle = 1; state->nextevent = t;