From nobody Tue Feb 27 10:38:30 2024 X-Original-To: dev-commits-src-branches@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 4TkYqV6lnGz5CvlS; Tue, 27 Feb 2024 10:38:30 +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 4TkYqV51Bfz4sjk; Tue, 27 Feb 2024 10:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030310; 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=Z/zzQYhPS/ws689boKvkG3ok+ei5GQyAX4dMgbEOu9M=; b=gyxZBIAAsD+6sVnVC3UvXsoskF+0FZ9fxxbkShlv2Q+fTDqcjr/fyZg7UVeyFS57z9e4rx UUHVEGpL5sTg2w4nHgEj5b2ruxRxgMJ27YXtlu+Qpg4kPWCA/eXqwzlvu7mQS/PqxI0QbU T4RWB40a+ztRSdI+HvESlUmRsPf1txHLavCo4epEc4a+C/iSKhh2z76Lu2ihkmmBH2rHr8 prvHPZmd/qTGvhSohJiUOEX7unzGO68wJABDBNoYBcruw4F2yQuGv1Btjiaw+vM47uNFHp MxMBBV4SXapbN7c5ZOn2XCRNvUmgmEmAyXAtzGza9VBQs6auBFd8up+q6TBKeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030310; a=rsa-sha256; cv=none; b=mgwNTDsQN5lPdHn3+zecXcySEBLzZhDyiLKJFItqX6n5wTJwjuqeSfOLLjx9KT0RyrHC3s j6jDaPREwhv/PwpLbYscwmFSdgtpRDioaxyFo6eCxxQbXULHGthqSbnWnuAosCAcIf8+lm VBgwo2vgQW/B58Vt+b57n0puh0xrF87TihipSzQsDazP426xL/dWvJpQDaN6eyInmhWuSH uhUzW0KaQiVPM+SfiO+LwqyFVRoZwVTv1TejsGO8W/8tjy+t4eb94AFCJXevZJMTk3voQ2 1hWMnx1Sl/p3WnEF0BfVPwm+qedALvGZ347UhsPT38pU9+sqkV99NYxRKAp0zQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030310; 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=Z/zzQYhPS/ws689boKvkG3ok+ei5GQyAX4dMgbEOu9M=; b=HfXVxugafKydDV7fE5KECCwCdC5At2nu1YqdOjo2VNz+sQBRw2yt3M3qVgV1B5Az0jqnxp /YZGAZEHiPJCz5A/ybrsWHi+hhrUfqdKedtePbLzf+KLiNk4i8m0yLnONHBpVa71PVx3eE 8qe37NkrOhSFn/pIEAFAopTUh9FofL1vUeVO1JK5BUoCc6HU8SWoujQ12nmpxvfUO/fCHH jo+Pf/17Eo4sJK64XqRTWtGaB23W+CnXTrIr0HQ85G10L/S3GIeCX6VX3fOxpuHJUf8381 A14bvscX5+jKfrv0/qUV2oQTr0ZUV+2avpuCs/ezLL7O7cq+xX3nls/Tzb5DEQ== 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 4TkYqV44WKz185L; Tue, 27 Feb 2024 10:38:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41RAcUf0063860; Tue, 27 Feb 2024 10:38:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAcUD1063857; Tue, 27 Feb 2024 10:38:30 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:38:30 GMT Message-Id: <202402271038.41RAcUD1063857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: d3de30d0186b - stable/14 - sched: sched_switch(): Factorize sleepqueue flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3de30d0186b7ac984a272b4d874613c5fb59580 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=d3de30d0186b7ac984a272b4d874613c5fb59580 commit d3de30d0186b7ac984a272b4d874613c5fb59580 Author: Olivier Certner AuthorDate: 2024-01-16 09:42:11 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:36:57 +0000 sched: sched_switch(): Factorize sleepqueue flags Avoid duplicating common flags for the preempted and non-preempted cases, making it clear that they are the same without resorting to formatting. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit 6a3c02bc52892eb09c3b766562b8ddb452c393a9) Approved by: emaste (mentor) --- sys/kern/sched_4bsd.c | 5 ++--- sys/kern/sched_ule.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index efcd9b7cb250..f0fffeb08e2d 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1041,9 +1041,8 @@ sched_switch(struct thread *td, int flags) } else { if (TD_IS_RUNNING(td)) { /* Put us back on the run queue. */ - sched_add(td, preempted ? - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING); + sched_add(td, SRQ_HOLDTD | SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0)); } } diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index 20515f4e430b..ee1e0ab0b955 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2227,9 +2227,8 @@ sched_switch(struct thread *td, int flags) TD_SET_CAN_RUN(td); } else if (TD_IS_RUNNING(td)) { MPASS(mtx == TDQ_LOCKPTR(tdq)); - srqflag = preempted ? - SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_OURSELF|SRQ_YIELDING; + srqflag = SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0); #ifdef SMP if (THREAD_CAN_MIGRATE(td) && (!THREAD_CAN_SCHED(td, ts->ts_cpu) || pickcpu))