From nobody Wed Aug 13 12:02:03 2025 X-Original-To: dev-commits-src-all@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 4c26Rv5wm4z64kH0; Wed, 13 Aug 2025 12:02:03 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c26Rv4MtMz3H0Y; Wed, 13 Aug 2025 12:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755086523; 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=cLDlanbW/rJJBabeOwEGwQj+lxzU3+7GDgHT+7hLPsw=; b=aHqIMLq2aaP3kvtn4I+N0tvaq0W/A523Rn348RSjoGwZt+/3p376Pg96ATneWjHRROW98Q XND+0r/6GsJNugGSH2lKtl5dWWk1ZcLdn8lPZQN4T3nssFf2ZJvCzwaIYtldSMoNaG97bX V6Z9/enFwu8goypZ2K9wooHGIm4fG41gFtutM8XT4Ft05Nj/bhazPGPFF7gBfqpfS4L4Yq mi3e9yNSNSxtueCfgjxyEYW9bFQwIilXR1xo3Mjr9i7azetvDDxsCERpy5tRQbP5RNVRxd doz8KUSEpSE+cUj7TDGSIeIOBQD/nu9FGv65JmAFieR6NGMnT4AQFd+GIh0g7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755086523; 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=cLDlanbW/rJJBabeOwEGwQj+lxzU3+7GDgHT+7hLPsw=; b=E3ivzjGKkZjBNh92fEIjY+jyjld4G1uFf9pY/awBmp4sqze5TU263USTBfjM+NjftcJnDG 7q08C6y6fLecP1hjlUKTBHHtwL99lNfVUW7OoTMrgBiz2+3CbcLSZGTQBnM6H/qBGjmr3T 1QUrT6s435PZQpP7v1bctjQ/15gyd9AC4lFhcrp/c7hVO5PhEP6ip3FYd6zMVYPT5HXOim 1WjzKk37jDa/ZpXmd5AOk63R/dOO0a/OKXKlc5G3NE5MjViwMVLGpMRnZw7X4/LixtcueK 1MqakMoKtf4SdKw4n5fs1KCCYyyzm20/hsudy7mfGKn5ETc97GM2saNFXMYCOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755086523; a=rsa-sha256; cv=none; b=UZVFGaqBGdT4O44BKTaa6Tk8VCjjG7tbrpecunsPX7+GLvuUU4uRfUgnrPVaps3nfA57jm 2FHLXcKpIQIywoWLVwr161xvylFvJpoeJznlgQyKGYm2KFA1wh7Z5IA4Y/1AoummWcZ7Md VLIqngGqp3m73yINcO61mEmB1pQYFzV83e5eSPYiz6P4jF9Cz4GD3o/6hnltXy8i+b3nzu gM7c4JGvdxjuTVUf9IgQ/J8hWVXh0AzVyNxIDNJy4aQ6e5A5D6v0qi/FoS7bK+J4m0st4Y LlEupDJawNU2emT1mQj/PAbIH+wGPOpvxYK0GtaAU64qQRPrBqJN7px/Y6kgRw== 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 4c26Rv3vLQz1Lyn; Wed, 13 Aug 2025 12:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57DC23aT010472; Wed, 13 Aug 2025 12:02:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DC23hw010469; Wed, 13 Aug 2025 12:02:03 GMT (envelope-from git) Date: Wed, 13 Aug 2025 12:02:03 GMT Message-Id: <202508131202.57DC23hw010469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 52da74743361 - stable/14 - virtio_p9fs: Simplify vt9p_req_wait() a bit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 52da74743361aee74de93052346bf1c951def73e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=52da74743361aee74de93052346bf1c951def73e commit 52da74743361aee74de93052346bf1c951def73e Author: Mark Johnston AuthorDate: 2024-10-25 17:52:52 +0000 Commit: Mark Johnston CommitDate: 2025-08-13 11:56:21 +0000 virtio_p9fs: Simplify vt9p_req_wait() a bit Remove an always-false check for whether the request has already completed before sleeping. Even if the request is complete, the response tag is updated while holding the channel lock, which is also held here. No functional change intended. Sponsored by: Klara, Inc. (cherry picked from commit 28c9b13b236d25512cfe4e1902411ff421a14b64) --- sys/dev/virtio/p9fs/virtio_p9fs.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/virtio/p9fs/virtio_p9fs.c b/sys/dev/virtio/p9fs/virtio_p9fs.c index 24d4542e4e48..1d9b847717b7 100644 --- a/sys/dev/virtio/p9fs/virtio_p9fs.c +++ b/sys/dev/virtio/p9fs/virtio_p9fs.c @@ -110,20 +110,20 @@ SYSCTL_UINT(_vfs_9p, OID_AUTO, ackmaxidle, CTLFLAG_RW, &vt9p_ackmaxidle, 0, static int vt9p_req_wait(struct vt9p_softc *chan, struct p9_req_t *req) { - if (req->tc->tag != req->rc->tag) { - if (msleep(req, VT9P_MTX(chan), 0, "chan lock", - vt9p_ackmaxidle * hz)) { - /* - * Waited for 120s. No response from host. - * Can't wait for ever.. - */ - P9_DEBUG(ERROR, "Timeout after waiting %u seconds" - "for an ack from host\n", vt9p_ackmaxidle); - return (EIO); - } - KASSERT(req->tc->tag == req->rc->tag, - ("Spurious event on p9 req")); + KASSERT(req->tc->tag != req->rc->tag, + ("%s: request %p already completed", __func__, req)); + + if (msleep(req, VT9P_MTX(chan), 0, "chan lock", vt9p_ackmaxidle * hz)) { + /* + * Waited for 120s. No response from host. + * Can't wait for ever.. + */ + P9_DEBUG(ERROR, "Timeout after waiting %u seconds" + "for an ack from host\n", vt9p_ackmaxidle); + return (EIO); } + KASSERT(req->tc->tag == req->rc->tag, + ("%s spurious event on request %p", __func__, req)); return (0); }