From nobody Fri Jun 24 19:36:58 2022 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 4CB9A86445B; Fri, 24 Jun 2022 19:36:59 +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 4LV6nk5BxWz4XGp; Fri, 24 Jun 2022 19:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099418; 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=fROD6wpw882uhGjBxuy0XZLqNfYmbNuU8JSNjn+JIVY=; b=ldUv4vM5GPUgDyUvEYpcdgt+gCO4bjguyFp0Dt595/VHhvyYnwKS4H3TeKzweWBGQ7HD6u vTniHEYgrQl6k1yMcRKCzeaCR9izofFv1GuOsx6Zx8g66v99QZ+Mi6CWxiaRf7Wl75H4M1 CQvYz0QE6OZ0uOjuvthGvgjEk8+Xgq0aP1xJKoPCCarmc35IVDWTwcCHSWkTzhB9H6CMUt f5iwfgL+1UGFG5QxCgIa0pgszouglbjmlgJrBiVEzWJrb7UgZsKHV993gptqX2YTssp6jq cZu6Tx+qqlwWBxcqx5766y2xVSEHujspYafLNp4Lad142c+wx7GxrdoUyP7gtw== 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 6532C15D7A; Fri, 24 Jun 2022 19:36:58 +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 25OJawCx084237; Fri, 24 Jun 2022 19:36:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OJawEG084236; Fri, 24 Jun 2022 19:36:58 GMT (envelope-from git) Date: Fri, 24 Jun 2022 19:36:58 GMT Message-Id: <202206241936.25OJawEG084236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 209131e656bc - stable/13 - weed_inhib(): do not double-suspend already suspended thread if the loop reiterates 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 209131e656bc2b0f22f309a73b168ff5d7c52ec9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656099418; 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=fROD6wpw882uhGjBxuy0XZLqNfYmbNuU8JSNjn+JIVY=; b=Vbog/wcDE0qxQbWNBthusMdCvbtW71LDOdP8i4/IWsy7YxefAwhA8Q+qJIfMdl45JXd/nk skguG2A76ibt+cxasUrouubFdu8KWBRkep281tdbs6y0oArChtvuX7ZNSGBy6TkPLA+EjI tHdeAn/4FpRfzWhS4YI6+V+BvRUr5O7QAX8vvafM26CzF+qt6nLxXgd0gWJA4D4OFIi6TQ wREaQzGaye1X1r5/ewGZWpNP7zn8UT8sKcKbD/FiQcZokUn+f4Ud7kmndkvrfdOvQibIff 9F/ornknstsVU3YlhKAYXrgTo7RLQP77HIkDwht1PfQMNvljUWklScJBKQl+fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656099418; a=rsa-sha256; cv=none; b=fPd+M7HoMrXmTpLs4TCDHQmyuPQC460GPg1Gnlc7ifYOdLwAr/wsyCHrcjtnD8iIoZUHZy gv+LLpPn6PenzdeF1jYE+5lEJBrJhW6zSkGdwkizQ4I7uT8wkBrs7HRviIdDtsGYU8uRLC 2/9Smhn9P6vVBs+IV3/W7r2uNM7R9MOYAiHYhyB4NCFIl/d6I3nlPMOeSqa9xeMJ30q1Jo Bo1QehBOwN1L9CDx6S5NIL30SDJdrNDFPNVzWjw5mZlwZ5ZP5IEAbSSQdp9UUr3FFs4S6N KJj3j6nr3zmsrN6eUS61quJWu47G1DFiXlzNx0Iah/lsJcDPzWqbJYtuQygfEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=209131e656bc2b0f22f309a73b168ff5d7c52ec9 commit 209131e656bc2b0f22f309a73b168ff5d7c52ec9 Author: Konstantin Belousov AuthorDate: 2022-04-30 23:30:13 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-24 14:45:45 +0000 weed_inhib(): do not double-suspend already suspended thread if the loop reiterates (cherry picked from commit b9893b353312cc3c75a0ab2ff7ca69dc55864bea) --- sys/kern/kern_thread.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_thread.c b/sys/kern/kern_thread.c index 5e32a8be8f4e..10b3f1a27876 100644 --- a/sys/kern/kern_thread.c +++ b/sys/kern/kern_thread.c @@ -1144,7 +1144,8 @@ restart: } if (TD_CAN_ABORT(td2)) { if ((td2->td_flags & TDF_SBDRY) == 0) { - thread_suspend_one(td2); + if (!TD_IS_SUSPENDED(td2)) + thread_suspend_one(td2); td2->td_flags |= TDF_ALLPROCSUSP; } else { wakeup_swapper |= sleepq_abort(td2, ERESTART);