From nobody Tue Oct 24 07:51:55 2023
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 4SF45R2l6wz4xh7Y;
Tue, 24 Oct 2023 07:51:55 +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 4SF45R29vVz3Vyl;
Tue, 24 Oct 2023 07:51:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1698133915;
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=DZ5xLrEB62Q+tEH50yziBpIwaC8MA7x0GqOpEvHcfXs=;
b=aUefa3fqD/gFDF5fyPS51lMZ/MRfxqc587st7YOdV8+fXsSjwDvmiPMnMPU1wwhYpQNRKc
GoYzgCyk9sSEvSrlD+BRwLm7kdc/jxHSQeeHXcFLN3s+3OfTYa1+7sbj3eIUoOd4SFB/Jl
u0R2Ichkp39XVSxxQFnOv+Ks1DqKsj3TEL/MV19kfVJLom0+rUs0TqCI474xR+bPa4fv3Z
cHjR81wqvAmeIjLyMAH2NrHXrHOjRlu9z2WEJnE6UP70HVPx8DXmZs/27cNu4NIElKPfpg
aGqzy9wIkNWOvHdNRCMssez3+p5R1WiOg8n3OmC9OvL0dfgT/HKzd7m7rvIvCQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698133915; a=rsa-sha256; cv=none;
b=NUQDPxaMvhj5j+GR5m2fBXTx8+Ngbu8/6QuWyBWFHXT1SwaAiFCqrCDJIoAA508lP1Nj2Z
Bze8cxrzfTn7j4jcvW85QmN8jtPbytzAM+D4thW6zBIY1ilLv+l6XjbEX+WtLpPR1oq8pc
KvnTIMUjINs2pFZxVUw1DHEmVEH3xYyiLpP+QPscBcHiGCo2ba09No6vrmCECO+KZnJh9v
oQjv5zqPNRQy1K5oByNbTPc5Bdq+AlpIwDk9au8atHYS11o13/0LznnVmTQM1EJY8Z/Yg+
IoEm/PDzs3UK7bDzDEA3+8j++6x2ob2y51My31vv1ESq3Rs5bwBS7lg65S5BJQ==
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=1698133915;
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=DZ5xLrEB62Q+tEH50yziBpIwaC8MA7x0GqOpEvHcfXs=;
b=CQwe7psYS0gHktvD5DgsF4G4rmMQwhU9soPOhbyS9oRzb8XvX3BVK489mZ+X6Kk1IJKxy9
ld5awGx/f3+/gRi3DZswRXY9MlZIjPsJP3JOJzMYq9P0R2GUAvaT1ioDQsHw3iDgCyA7Gt
IANyyoLG10nLMsmsstwiWVx26ddMqsbSHvy/hciAQLXPvukPAXb8J7+weAkffNkcFZThuF
ro1joqYZ7U1UOrF075g3+28xr6XLcxPVq6zqSgMJBcBY9joBnFZMOYJ7DofEP/CBJo4ZYz
V/y6iX85vSHV2FaOCKFzxKaKKdxwUJRIG2Jxx6ujQJjZ0TfU40OXsk0OfRlOow==
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 4SF45R0wT9zvg;
Tue, 24 Oct 2023 07:51:55 +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 39O7pt3X016319;
Tue, 24 Oct 2023 07:51:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O7pt5K016316;
Tue, 24 Oct 2023 07:51:55 GMT
(envelope-from git)
Date: Tue, 24 Oct 2023 07:51:55 GMT
Message-Id: <202310240751.39O7pt5K016316@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Wei Hu <whu@FreeBSD.org>
Subject: git: 7a19350993d9 - releng/14.0 - Hyper-V: vmbus: check
if signaling host is needed in vmbus_rxbr_read
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: whu
X-Git-Repository: src
X-Git-Refname: refs/heads/releng/14.0
X-Git-Reftype: branch
X-Git-Commit: 7a19350993d9d93fb378abb588e92df4c4086a63
Auto-Submitted: auto-generated
The branch releng/14.0 has been updated by whu:
URL: https://cgit.FreeBSD.org/src/commit/?id=7a19350993d9d93fb378abb588e92df4c4086a63
commit 7a19350993d9d93fb378abb588e92df4c4086a63
Author: Wei Hu <whu@FreeBSD.org>
AuthorDate: 2023-10-20 08:58:20 +0000
Commit: Wei Hu <whu@FreeBSD.org>
CommitDate: 2023-10-24 07:51:00 +0000
Hyper-V: vmbus: check if signaling host is needed in vmbus_rxbr_read
It is observed that netvsc's send rings could stall on the latest
Azure Boost platforms. This is due to vmbus_rxbr_read() routine
doesn't check if host is waiting for more room to put data, which
leads to host side sleeping forever on this vmbus channel. The
problem was only observed on the latest platform because the host
requests larger buffer ring room to be available, which causes
the issue to happen much more easily.
Fix this by adding check in the vmbus_rxbr_read call and signaling
the host in the callers if check returns positively.
Approved by: re (gjb)
Reported by: NetApp
Tested by: whu
Sponsored by: Microsoft
(cherry picked from commit 49fa9a64372b087cfd66459a20f4ffd25464b6a3)
(cherry picked from commit c81166b018acfbe521f52415ff37b8c2696d77c6)
---
sys/dev/hyperv/vmbus/vmbus_br.c | 9 ++++++++-
sys/dev/hyperv/vmbus/vmbus_brvar.h | 2 +-
sys/dev/hyperv/vmbus/vmbus_chan.c | 12 ++++++++++--
3 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/sys/dev/hyperv/vmbus/vmbus_br.c b/sys/dev/hyperv/vmbus/vmbus_br.c
index 27adf71fd6ea..f663bb7c2ba5 100644
--- a/sys/dev/hyperv/vmbus/vmbus_br.c
+++ b/sys/dev/hyperv/vmbus/vmbus_br.c
@@ -684,7 +684,8 @@ vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv,
* We assume (dlen + skip) == sizeof(channel packet).
*/
int
-vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip)
+vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip,
+ boolean_t *need_sig)
{
uint32_t rindex, br_dsize = rbr->rxbr_dsize;
@@ -717,5 +718,11 @@ vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen, uint32_t skip)
mtx_unlock_spin(&rbr->rxbr_lock);
+ if (need_sig) {
+ *need_sig =
+ vmbus_rxbr_need_signal(rbr,
+ dlen + skip + sizeof(uint64_t));
+ }
+
return (0);
}
diff --git a/sys/dev/hyperv/vmbus/vmbus_brvar.h b/sys/dev/hyperv/vmbus/vmbus_brvar.h
index 8593c1886b0f..a04169f3291c 100644
--- a/sys/dev/hyperv/vmbus/vmbus_brvar.h
+++ b/sys/dev/hyperv/vmbus/vmbus_brvar.h
@@ -129,7 +129,7 @@ void vmbus_rxbr_deinit(struct vmbus_rxbr *rbr);
void vmbus_rxbr_setup(struct vmbus_rxbr *rbr, void *buf, int blen);
int vmbus_rxbr_peek(struct vmbus_rxbr *rbr, void *data, int dlen);
int vmbus_rxbr_read(struct vmbus_rxbr *rbr, void *data, int dlen,
- uint32_t skip);
+ uint32_t skip, boolean_t *need_sig);
int vmbus_rxbr_idxadv(struct vmbus_rxbr *rbr, uint32_t idx_adv,
boolean_t *need_sig);
int vmbus_rxbr_idxadv_peek(struct vmbus_rxbr *rbr, void *data,
diff --git a/sys/dev/hyperv/vmbus/vmbus_chan.c b/sys/dev/hyperv/vmbus/vmbus_chan.c
index d5c4d357e9ec..ecb2e947c953 100644
--- a/sys/dev/hyperv/vmbus/vmbus_chan.c
+++ b/sys/dev/hyperv/vmbus/vmbus_chan.c
@@ -1205,6 +1205,7 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0,
{
struct vmbus_chanpkt_hdr pkt;
int error, dlen, hlen;
+ boolean_t sig_event;
error = vmbus_rxbr_peek(&chan->ch_rxbr, &pkt, sizeof(pkt));
if (error)
@@ -1235,9 +1236,12 @@ vmbus_chan_recv(struct vmbus_channel *chan, void *data, int *dlen0,
*dlen0 = dlen;
/* Skip packet header */
- error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen);
+ error = vmbus_rxbr_read(&chan->ch_rxbr, data, dlen, hlen, &sig_event);
KASSERT(!error, ("vmbus_rxbr_read failed"));
+ if (!error && sig_event)
+ vmbus_chan_signal_rx(chan);
+
return (0);
}
@@ -1246,6 +1250,7 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan,
struct vmbus_chanpkt_hdr *pkt, int *pktlen0)
{
int error, pktlen, pkt_hlen;
+ boolean_t sig_event;
pkt_hlen = sizeof(*pkt);
error = vmbus_rxbr_peek(&chan->ch_rxbr, pkt, pkt_hlen);
@@ -1277,9 +1282,12 @@ vmbus_chan_recv_pkt(struct vmbus_channel *chan,
* by the above vmbus_rxbr_peek().
*/
error = vmbus_rxbr_read(&chan->ch_rxbr, pkt + 1,
- pktlen - pkt_hlen, pkt_hlen);
+ pktlen - pkt_hlen, pkt_hlen, &sig_event);
KASSERT(!error, ("vmbus_rxbr_read failed"));
+ if (!error && sig_event)
+ vmbus_chan_signal_rx(chan);
+
return (0);
}