From nobody Fri Oct 14 22:48:19 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 4Mq1kq4tJ5z4fWpt; Fri, 14 Oct 2022 22:48:19 +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 4Mq1kq4Q6Zz3jWx; Fri, 14 Oct 2022 22:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665787699; 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=N6G4y0IbS4JFNP6828vjRQ37w+hnFvgLceGPUkKdPEg=; b=dk5459vD3NzqgORENUrfPmXmYULx01aPUUAn+HxXwuG802+Q6eoZLP0fzhyjW6H/X1ZpRu TswvlKUgPbCiHY/92RepKK5LQ+fbZ0DNkYjmjGWsl+vdRDNMmzpjhxM29pSuuQ2JU7zlQ1 u9t7Y9Fzrivug4mdyzWjUpxMs+90Am2t/mZvW9qCPhoCn9ZDW9bIfiTAxPZKs15VefoYfP 6+s5ArsZAc+7wAgwRyRqs5uYxBpKgTYZZiQFncXKcah8YdbqVnaNUDPfdcLEvCYGp9weoQ ypojAJmZjhC+rRS7wsGd4JeGlVN6Z9tTTc5SameZCKb5N2206B0nUfxvrwExnQ== 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 4Mq1kq3MmFzwCq; Fri, 14 Oct 2022 22:48:19 +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 29EMmJhZ039061; Fri, 14 Oct 2022 22:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EMmJ4V039060; Fri, 14 Oct 2022 22:48:19 GMT (envelope-from git) Date: Fri, 14 Oct 2022 22:48:19 GMT Message-Id: <202210142248.29EMmJ4V039060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 82512c17ea39 - main - clnt_vc.c: Replace msleep() with pause() to avoid assert panic 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: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82512c17ea39fcc272483024cb55d567dfd55366 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665787699; 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=N6G4y0IbS4JFNP6828vjRQ37w+hnFvgLceGPUkKdPEg=; b=BG5QCM3OCq/fwl3Mc6oIwQflIcHi5JSS2wy+yTtOvBOoaHfwdo4xxD3uB8gDrqx0uWUGf8 uJHmkV61iiZbU+/DKeUFF6V/Ckg93HL4IY8rcJ6wxYXxa9yKEWE1xWkqj7UpCnqOoemUHR hUG2owbcM4wWxJI+t0iKRqlBADJPC30VHZH87aId8HPKDPTpZQYs/Agnq8FFEaargOIvUl hxCvKGBUBumCksyAN3IZIKEBe3KJg8DuM9ALluXHNj5CIEVCFQhMv3+yDLaq4hmaW3Ds71 GiUw+E9zL8wU29BEz9KIkMdmMEdaZb2c/VJrpH3XIHMMXc10Hz3+HkfwEd4XEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665787699; a=rsa-sha256; cv=none; b=QjqEXJ5z63YVBuKf54ozva+wbvTCq9wYswUYdDIOabH0e7RpPmPzIIQOWXU+JbP+ZGh+aY u69PpNU66LNVfCeofMmgqxoIarFJQaAEJIi9RsHu1lsZ7stIgp2KxsOq8GfQfmUqxXG+fI BVpqOAZVdxZT1DqcXIjR9FesdUPh+gtrlI4PMwfC63N0tc71wd+nVtfAB5wH5eIJgpG1Z8 S+KExOOpNUewq4JIqupEoKWrInsRTwxFf0csdINnMrtYlKOXp6xWanjaYqhAkJbx+IEfum D83ydsYUm1sQXll3PgbGrElF/mGctLmsntreiC3/+cI48LKBGtUZcca+3x30Cg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=82512c17ea39fcc272483024cb55d567dfd55366 commit 82512c17ea39fcc272483024cb55d567dfd55366 Author: Rick Macklem AuthorDate: 2022-10-14 22:46:55 +0000 Commit: Rick Macklem CommitDate: 2022-10-14 22:46:55 +0000 clnt_vc.c: Replace msleep() with pause() to avoid assert panic An msleep() in clnt_vc.c used a global "fake_wchan" wchan argument along with the mutex in a CLIENT structure. As such, it was possible to use different mutexes for the same wchan and cause a panic assert. Since this is in a rarely executed code path, the assert panic was only recently observed. Since "fake_wchan" never gets a wakeup, this msleep() can be replaced with a pause() to avoid the panic assert, which is what this patch does. Reviewed by: kib, markj MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D36977 --- sys/rpc/clnt_vc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/rpc/clnt_vc.c b/sys/rpc/clnt_vc.c index 0c415d048141..38aead381619 100644 --- a/sys/rpc/clnt_vc.c +++ b/sys/rpc/clnt_vc.c @@ -116,8 +116,6 @@ static const struct clnt_ops clnt_vc_ops = { static void clnt_vc_upcallsdone(struct ct_data *); -static int fake_wchan; - /* * Create a client handle for a connection. * Default options are set, which the user can change using clnt_control()'s. @@ -453,7 +451,9 @@ call_again: mtx_lock(&ct->ct_lock); TAILQ_REMOVE(&ct->ct_pending, cr, cr_link); /* Sleep for 1 clock tick before trying the sosend() again. */ - msleep(&fake_wchan, &ct->ct_lock, 0, "rpclpsnd", 1); + mtx_unlock(&ct->ct_lock); + pause("rpclpsnd", 1); + mtx_lock(&ct->ct_lock); goto call_again; }