fix: keep virtual USB responsive under bulk OUT backpressure

This commit is contained in:
tongtong committed 2026-11-13 02:35:00 +08:00
1 parent a339465392
commit 5aa575f182
3 files changed
+37 -4

No files matched your search

+4
View File
@@ -78,3 +78,7 @@ dotnet run --project Ads.Desktop.Smoke -c Debug -- --live --screen --usb
Flutter 连接会等待租约状态为 true,禁用网络 adb connect,分配独立回环 USB/IP 端口并挂载;设备列表和投屏使用 ADS- 序列号。断开/退出停止本次 ads-usb,借助 --once 与 TCP EOF 移除本设备,不按可能复用的控制器端口 detach。
Windows 包在 drivers/ 下附带原版 USBip-0.9.8.1-x64.exe 及来源说明;ADS 主安装器只复制该文件,不自动安装驱动。
## 安装 APK 时的双向流控
USB/IP bulk OUT 写入由独立有界任务处理,不再阻塞控制请求和 bulk IN 完成;仅在远端实际接收写入后确认 OUT 完成。避免 APK 安装等双向高负载下主事件循环等待网络写入、无法处理返回数据而触发断线。`tests/usb_e2e.py` 包含远端停止读取且上行堆积 12 MiB 时的控制请求回归测试。更新 ads-usb 后需要重新连接虚拟 USB 才能使用新进程。
+13
View File
@@ -61,6 +61,19 @@ def main():
submit(s,11,1,3,1);assert reply(s,11,-32)==0
wait_until(lambda:received==[b'from-usb'],'bulk OUT delivery')
print('PASS: USB/IP list/import/exclusivity, descriptor stalls, fragmented ADB header/payload, ZLP, bulk OUT, URB unlink and invalid endpoint',flush=True)
# The backend deliberately stops reading after the first eight bytes.
# A blocked bulk OUT must not block unrelated control/IN completions.
payload=b'B'*(1024*1024)
for seq in range(100,112):submit(s,seq,0,2,len(payload),payload)
submit(s,1000,1,0,18,setup=bytes([128,6,0,1,0,0,18,0]))
for _ in range(13):
h=receive(s,48);command,seq=struct.unpack('!2I',h[:8]);assert command==3
if seq==1000:
assert struct.unpack('!I',h[24:28])[0]==18
receive(s,18);break
assert 100<=seq<112
else:raise AssertionError('control transfer starved behind bulk OUT')
print('PASS: blocked 12 MiB bulk OUT does not starve USB control requests',flush=True)
submit(s,12,1,1,1024*1024+1);assert s.recv(1)==b''
print('PASS: oversized URB rejected',flush=True)
finally:
+20 -4
View File
@@ -188,7 +188,8 @@ async fn imported(socket: TcpStream, target: SocketAddr, serial: &str) -> Result
let mut tasks = JoinSet::new();
tasks.spawn(read_requests(read, tx));
let (data_tx, mut data_rx) = mpsc::channel(16);
let mut backend: Option<OwnedWriteHalf> = None;
let mut backend: Option<mpsc::Sender<Request>> = None;
let (completed_tx, mut completed_rx) = mpsc::channel::<Request>(32);
let mut pending: VecDeque<Request> = VecDeque::new();
let mut bytes: VecDeque<Vec<u8>> = VecDeque::new();
let mut offset = 0;
@@ -223,18 +224,33 @@ async fn imported(socket: TcpStream, target: SocketAddr, serial: &str) -> Result
if size==0{reply(&mut write,&request,0,&[],0).await?;continue}
if backend.is_none(){
let socket=timeout(Duration::from_secs(10),TcpStream::connect(target)).await??;socket.set_nodelay(true)?;
let(read,write)=socket.into_split();backend=Some(write);
let(read,mut writer)=socket.into_split();
let(out_tx,mut out_rx)=mpsc::channel::<Request>(32);
backend=Some(out_tx);
let completed=completed_tx.clone();
// OUT may block on network backpressure. Keep IN completions and
// control/unlink requests serviced while the remote drains it.
tasks.spawn(async move {
while let Some(request)=out_rx.recv().await {
timeout(IO,writer.write_all(&request.data)).await.context("ADB bulk OUT timed out")??;
completed.send(request).await.context("USB completion queue closed")?;
}
Ok(())
});
tasks.spawn(read_adb(read,data_tx.clone()));
}
if direction==0{
timeout(IO,backend.as_mut().unwrap().write_all(&request.data)).await??;
reply(&mut write,&request,0,&[],request.data.len()).await?;
backend.as_ref().unwrap().try_send(request).context("USB bulk OUT queue full or closed")?;
}else{
if pending.len()>=64{bail!("too many pending bulk reads")}
pending.push_back(request);
}
}else{reply(&mut write,&request,-32,&[],0).await?;}
},
completed=completed_rx.recv()=>{
let request=completed.context("USB bulk OUT completion queue closed")?;
reply(&mut write,&request,0,&[],request.data.len()).await?;
},
data=data_rx.recv(),if bytes.len()<16=>{bytes.push_back(data.context("ADB disconnected")?);},
result=tasks.join_next()=>{return result.context("USB worker missing")?.context("USB worker failed")?;},
}