From nobody Fri Sep 16 17:29:59 2022 X-Original-To: dev-commits-src-main@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 4MTh0S17dCz4cdd3; Fri, 16 Sep 2022 17:30:00 +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 4MTh0R70FLz3wZ3; Fri, 16 Sep 2022 17:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663349400; 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=ZP7yzgDnv6APUgG+mR031DsXj4N1eWlVz7RsGB5efQ8=; b=yMH4Sc2kV9jBaKylZIHcWm0C2kjw4yrb8GsD+gIQzS9M+LZXMva/LvSjpoCil/4kAiiTcR RDyV6LSzcfGDDwawTZ6DcpSOcIjAVHewZjT/fddbqAaAPNBegMDYQeUpxJJJoO/IRGcBcY 0jXCbPgjNp9zkw+ExPInyhwmHqPYJUK7+10DLw6gdSU58p/4sGQCz07BFHZCvmzr8oIzWK ygt6yFCH7GNgxosD+TIC7gL0D9DieXZFLrdmoE9dGknIZeH/PZ3zE6NYkMANAE3gNb1xXl 2jda+eQur54Gqq5n9w/VHAmqAvucutvehBoJKslVVnmeMM2oYXQ/mV2COFxIFA== 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 4MTh0R60gkzR6q; Fri, 16 Sep 2022 17:29:59 +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 28GHTxTi000967; Fri, 16 Sep 2022 17:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GHTxAo000966; Fri, 16 Sep 2022 17:29:59 GMT (envelope-from git) Date: Fri, 16 Sep 2022 17:29:59 GMT Message-Id: <202209161729.28GHTxAo000966@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 50176b0296f0 - main - locks: whack a failed experiment in form of restrict_starvation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50176b0296f0f143f1ac655c8e50ab340f36536a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663349400; 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=ZP7yzgDnv6APUgG+mR031DsXj4N1eWlVz7RsGB5efQ8=; b=qc0676xZL6V2FfNlgkopMFpKjgSV7lO8MVGLvQp8SBbQv5QvwLdm4Q4sQ7KlnQkIRkIkcG r33ATnON8raJVm6hJSs10GP+PTFHvo6z25htS7xXbHDhuUbLgjPs9rT+FSbotht5+jOTdk b/BYL/VGHS7AbmyghvKWO4P7aydQ896mNdX/1sGYSFvMPzBSmTq2+4Diicnl8RS+uvOCR8 59k6XspVoCQBB6jr9iQzyUJQgKwIQCyBMRMPWxEQ/y7wLA21oWOixxjE/zMgY4i8obA2Gu /7PQkH1jOii2TQ4xNzGuSl4J0Ts/tIGouaTYQhgzOR1SviRMB3Nx/jxfKaJEzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663349400; a=rsa-sha256; cv=none; b=MEVluNbwN5yRjJ79YLlGIX1/mRmZ/IMXYR7CLN0KKHLfwX0JfbMfPUzbqdqa3tXIDJYZOm HoF16huwR0Sil6l8WUswRuD1xd2T2KdOlTLrJsNM/eVeLhAZNpxRQHXeYquxCk2peW0jj8 OkdwyJhuH4eGkEmeHOayckIOeFuNHomjsa5YTpqOI7USKXV/VPRClYsDPuzO3YdENi1+ec NNVw2jZTEuTb6cb2Uv+8bMLw/extyqHqWYn9WSL9jxjBBOfxAp1Hz6OXqJ2/LKMv926VrW pybd+WguuK6iqG+daz9zMV0I9rpIB+uH3cUN3terL9cEfAvDdK/BUmzUT92Udw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=50176b0296f0f143f1ac655c8e50ab340f36536a commit 50176b0296f0f143f1ac655c8e50ab340f36536a Author: Mateusz Guzik AuthorDate: 2022-09-16 17:28:35 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-16 17:29:37 +0000 locks: whack a failed experiment in form of restrict_starvation This was never enabled and only pollutes the code. The issue will be addressed later in a different manner. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/kern/subr_lock.c | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/sys/kern/subr_lock.c b/sys/kern/subr_lock.c index 9bea021baac4..1061ed5f5d03 100644 --- a/sys/kern/subr_lock.c +++ b/sys/kern/subr_lock.c @@ -64,9 +64,6 @@ __FBSDID("$FreeBSD$"); */ //#define LOCK_PROFILING_DEBUG_SPIN -SDT_PROVIDER_DEFINE(lock); -SDT_PROBE_DEFINE1(lock, , , starvation, "u_int"); - CTASSERT(LOCK_CLASS_MAX == 15); struct lock_class *lock_classes[LOCK_CLASS_MAX + 1] = { @@ -120,14 +117,6 @@ static SYSCTL_NODE(_debug_lock, OID_AUTO, delay, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "lock delay"); -static u_int __read_mostly starvation_limit = 131072; -SYSCTL_INT(_debug_lock_delay, OID_AUTO, starvation_limit, CTLFLAG_RW, - &starvation_limit, 0, ""); - -static u_int __read_mostly restrict_starvation = 0; -SYSCTL_INT(_debug_lock_delay, OID_AUTO, restrict_starvation, CTLFLAG_RW, - &restrict_starvation, 0, ""); - void lock_delay(struct lock_delay_arg *la) { @@ -141,12 +130,6 @@ lock_delay(struct lock_delay_arg *la) la->delay <<= 1; if (__predict_false(la->delay > lc->max)) la->delay = lc->max; - - if (__predict_false(la->spin_cnt > starvation_limit)) { - SDT_PROBE1(lock, , , starvation, la->delay); - if (restrict_starvation) - la->delay = lc->base; - } } static u_int