From nobody Tue Feb 27 10:42:21 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 4TkYvx3hs8z5CvyL; Tue, 27 Feb 2024 10:42:21 +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 4TkYvx3Cxxz4vCl; Tue, 27 Feb 2024 10:42:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709030541; 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=qIviaB4KatVXXglFZzM5Qjx1TYCY18P412iOzfYBkYQ=; b=Hmz+eeh7R/ObiDDAj14vPqKUW03FWKzBnvpK/oCAV5JFFP/Tf/X8ea/zhaqL9m9imVj17x 0F4Ui/kx1EZ3DyjdI4ePwg222MzLmTq3PR6OhbGSUEASx8w+quBUAiyLWJ/dkFmXc/UqCn e8T0lZv4Cf9s+EXpJKo8m96H0eQia3rqce46lrFQqxD9UX7zhPd5lqB4Pamh9RKg4bKs0W U8z2HhX/P/0cCm22fFVc3z+Mn6KJUzNNnMleFoUcvhN0wCvuNR+7RpIL0HabvA+w8MwbiL G7yaU3YzjI24b8w3Loe92UqU2BPETxUfdjpQnY0/k963R2EHAN248fbB5BxeYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709030541; a=rsa-sha256; cv=none; b=KCNQuzt2ZKdWU3z70ux1hC0zpZKXjupQPAqdVHYugrphD2JzZkho92mXttj2PBUJ8Ox1gz itHClJl5ljOzUjD6bZILOhwQrXrB2VGQ+7PjTFuXOyaFnWcLd7imHLj1k42+kUTAca0QB4 VhfGLJKhMpbRSIx+FcPhHfMdjzuVtxCuTXcCs4EBOd9nOeRHTL0wVwGRssCENGMKggxSQW /3PMZhytrqc282rYuyvLfEtWJP9Tr1BSkE9wIPAmpj9zEWkNeEl4J+VjUb9+QRn5Qpzen3 CLjakOJRRl/Idm1VG4y2ZuPoJN0LgV2InpXPL7VHOjZogJrKJvuYta6IQOPL4Q== 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=1709030541; 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=qIviaB4KatVXXglFZzM5Qjx1TYCY18P412iOzfYBkYQ=; b=u3HmXkjxZY3FRQ/AVXqnbo9UASsv/gLf/MRlXh7LcMjJrp3NMFp1vvLx9FtOJSfVs+Sbh5 11rduNXnk9xsY16RWwGmYfJRYxilaWb0NhFUGI3tH/p/skU4ac7jshw5QH3lZnmMTXN8di 5KgXsbAPFnR7Sr+PPakrmXCtVkNWs4QoQXm8y6X1Ub/zFa4smCwI6CNa2kiqjpYDxv71Ro TmfhAFu/LuDyqyIMlC8mWMYY9SbDZODEYak3YJFU13Ek5fTLD43+mzcMKVxy+RLeek/gy/ CRQZIZkpw/xf619HjfXuJIE+vRptvgHlnTJRvUYSeG/n1j+7XGB1M+RP3mjojw== 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 4TkYvx2Gnyz18BQ; Tue, 27 Feb 2024 10:42:21 +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 41RAgLog079605; Tue, 27 Feb 2024 10:42:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41RAgLoR079602; Tue, 27 Feb 2024 10:42:21 GMT (envelope-from git) Date: Tue, 27 Feb 2024 10:42:21 GMT Message-Id: <202402271042.41RAgLoR079602@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: 79a1410c0dcb - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 79a1410c0dcbdd5245b2b0af17897932d146daa9 Auto-Submitted: auto-generated The branch stable/13 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=79a1410c0dcbdd5245b2b0af17897932d146daa9 commit 79a1410c0dcbdd5245b2b0af17897932d146daa9 Author: Olivier Certner AuthorDate: 2024-01-16 09:42:11 +0000 Commit: Olivier Certner CommitDate: 2024-02-27 10:41:36 +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 621ec77523bf..700f0dca93aa 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1016,9 +1016,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 e87294d670c0..9220b4700af7 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2215,9 +2215,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))