From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F0972F3624 for ; Mon, 15 Sep 2025 11:38:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757936294; cv=none; b=WemFcywal91vPPuSOVhOYw8B+8y7f16opdM2T2NDm/VFK9Wvxk8Z/fvpqnoql7f8LtGOi/lfgHY0KpTvt/CckbYhxfHy3wVE/PYxZVgAeUyl2zljQkXHsuh11/kth0mcSln3uwBHu2Ss4+or6fsaNdfRTvOIjlRSxvWx+Efkwl0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757936294; c=relaxed/simple; bh=DtpYL1MzMO59HaNPliuxasN+81gY5KxCeSX8joTRWjg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Rs5SBoaPZrwPpfRIqQsLCYrL2ZljAAKSsMwIJmUCd7s9XC5RCl8cyUmQ9dU3K5pgK7NtpmkM5UdmryjrpLoQxfcOMBYyeVwfstqPY9+ex+yPuK1dkWCCEPoKLJbbyKc/e8ST/S2s9FpRsg150SwYj/20mOQ2T68gkYMogCTYjJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=gWvGh0Ld; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gWvGh0Ld" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1757936290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=39jZ4OPAPIvuhnUtLzb8a5ybFIk25brxp1aIYN08MjM=; b=gWvGh0LdegLVJjwkGCUedpReOketIXjDkcxh9qPFnzpreyG538rmfm7mcWtQzdDVIjGggD DGtkDb/42ZeWFRimQrfHMCd5WqaOG+wAfPonsKNRMcp3UOGv3BTc0UScO+M0lXB2bv1XJi +UagdKlekzjuFcVeOJsUgLO9nWKi9j4= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-83-XUuM5B9wP5yUv5eSeckniw-1; Mon, 15 Sep 2025 07:38:07 -0400 X-MC-Unique: XUuM5B9wP5yUv5eSeckniw-1 X-Mimecast-MFC-AGG-ID: XUuM5B9wP5yUv5eSeckniw_1757936286 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3eae0de749dso484976f8f.3 for ; Mon, 15 Sep 2025 04:38:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757936286; x=1758541086; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=39jZ4OPAPIvuhnUtLzb8a5ybFIk25brxp1aIYN08MjM=; b=KFnOrMd8Jr0OJyCyuNBcM8o8OykE53zqFCr7tVvh1LjNiUoE88++GLMrzVWEriiwXP ULEdpBJYYoVIKoG7P8X+hSNCSPkGwn6NQiUQSvE7QyrL4ThiR9OqTYxoP1qFjBE/dQMI HRP9RxhIxgxNtabvNCcW4aIQ/SsjUjmVIeuN6UY2uYZXDsc1Ng/Prrp95P8irh9kjOQi lBBL89BajZDPHBlp83qXH/VSbgP5PWWQOR2MbgWFKnM+9Ua9buTnVar99Jq+8aMTvtPB /31BhgYFPAXaVw7CiUZAuQJY2fCYWq37PJgvEBnb74XnFLg86fXOE4u4C4SSf7z543nc Tm1g== X-Forwarded-Encrypted: i=1; AJvYcCWNvOpwvwdqCuDZlafWUKlbavtHYGzLUTTeMsmi/fl0M8quWxAncsmmqh7wSlVDfFvvhSafgM8=@vger.kernel.org X-Gm-Message-State: AOJu0YyPgJS19cEIRHssFxgxNAmpCkGCA1j1vwIiyBpmB4kVeT3aqywh AWQUQVDFD4qvLHFqFA6tywbtcryKvaP7+I61FuYH3IaEPKPR2Uv66U8iJgzFF8vnPrbKMroS5ED HroxF4H3/Gt13a5hBHhA1c+fTlVIMDYyiuv1s3aeM8A+56kbU2H4djx6eQA== X-Gm-Gg: ASbGncsjxm3jLZgcEkO3Xzui/wsq/4k8xjN2sTkM6f8yxRT5gceuNIk2Nk31lnsK5PV iPjle37idm0xLhl3C8ZQdrBoSypYSGygTi0x4E5zP4R/mPJyciK4T3iLy4U1fL1gMN+AzZex2Jl mKYM5hNS4QmSthWAa+fiKlmmORWQvC2V4Ir7+i1iluu+uRmBF4kmzjp+aPdelSp8jfqUfvB39DQ Ds56gRZaSh9dU7CkxlMMe4cYG+N+cZrgxpVwCQKw1l1F/LskKJ7YjgD9yvZwJ0L3EC53h0Jf2eu hS5RFVTIZsH9Ta+93oXBy/ru8Er8wfKiUg== X-Received: by 2002:a05:6000:4011:b0:3ea:9042:e67e with SMTP id ffacd0b85a97d-3ea9042ed5emr2860202f8f.27.1757936286385; Mon, 15 Sep 2025 04:38:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvNoI1D/uJWt4h3s+V0LcUEucReRdXNza2d/QlgTnZdSjXQ7v/FZ9grJzMVk85TQEVfXoE4A== X-Received: by 2002:a05:6000:4011:b0:3ea:9042:e67e with SMTP id ffacd0b85a97d-3ea9042ed5emr2860172f8f.27.1757936285881; Mon, 15 Sep 2025 04:38:05 -0700 (PDT) Received: from redhat.com ([2a0d:6fc0:151b:1100:901d:65fe:87c2:7b22]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e8892afc04sm9667404f8f.13.2025.09.15.04.38.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Sep 2025 04:38:05 -0700 (PDT) Date: Mon, 15 Sep 2025 07:38:02 -0400 From: "Michael S. Tsirkin" To: Jason Wang Cc: eperezma@redhat.com, jonah.palmer@oracle.com, kuba@kernel.org, jon@nutanix.com, kvm@vger.kernel.org, virtualization@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH net V2 2/2] vhost-net: correctly flush batched packet before enabling notification Message-ID: <20250915073616-mutt-send-email-mst@kernel.org> References: <20250915024703.2206-1-jasowang@redhat.com> <20250915024703.2206-2-jasowang@redhat.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250915024703.2206-2-jasowang@redhat.com> On Mon, Sep 15, 2025 at 10:47:03AM +0800, Jason Wang wrote: > Commit 8c2e6b26ffe2 ("vhost/net: Defer TX queue re-enable until after > sendmsg") tries to defer the notification enabling by moving the logic > out of the loop after the vhost_tx_batch() when nothing new is > spotted. This will bring side effects as the new logic would be reused > for several other error conditions. > > One example is the IOTLB: when there's an IOTLB miss, get_tx_bufs() > might return -EAGAIN and exit the loop and see there's still available > buffers, so it will queue the tx work again until userspace feed the > IOTLB entry correctly. This will slowdown the tx processing and > trigger the TX watchdog in the guest as reported in > https://lkml.org/lkml/2025/9/10/1596. > > Fixing this via partially reverting 8c2e6b26ffe2 and sticking the > notification enabling logic inside the loop when nothing new is > spotted and flush the batched before. > > Reported-by: Jon Kohler > Cc: stable@vger.kernel.org > Fixes: 8c2e6b26ffe2 ("vhost/net: Defer TX queue re-enable until after sendmsg") > Signed-off-by: Jason Wang I still think it's better to structure this as 2 patches: 1. the revert to fix the deadlock 2. one line addition of vhost_tx_batch(net, nvq, sock, &msg); to get back the performance of 8c2e6b26ffe2 Not critical though > --- > Changes since V1: > - Tweak the commit log > - Typo fixes but you didn't fix them all :( See below > --- > drivers/vhost/net.c | 33 +++++++++++++-------------------- > 1 file changed, 13 insertions(+), 20 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index 16e39f3ab956..3611b7537932 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -765,11 +765,11 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) > int err; > int sent_pkts = 0; > bool sock_can_batch = (sock->sk->sk_sndbuf == INT_MAX); > - bool busyloop_intr; > bool in_order = vhost_has_feature(vq, VIRTIO_F_IN_ORDER); > > do { > - busyloop_intr = false; > + bool busyloop_intr = false; > + > if (nvq->done_idx == VHOST_NET_BATCH) > vhost_tx_batch(net, nvq, sock, &msg); > > @@ -780,10 +780,18 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) > break; > /* Nothing new? Wait for eventfd to tell us they refilled. */ > if (head == vq->num) { > - /* Kicks are disabled at this point, break loop and > - * process any remaining batched packets. Queue will > - * be re-enabled afterwards. > + /* Flush batched packets before enabling > + * virqtueue notification to reduce notifications > + * unnecssary virtqueue kicks. unnecessary > */ > + vhost_tx_batch(net, nvq, sock, &msg); > + if (unlikely(busyloop_intr)) { > + vhost_poll_queue(&vq->poll); > + } else if (unlikely(vhost_enable_notify(&net->dev, > + vq))) { > + vhost_disable_notify(&net->dev, vq); > + continue; > + } > break; > } > > @@ -839,22 +847,7 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) > ++nvq->done_idx; > } while (likely(!vhost_exceeds_weight(vq, ++sent_pkts, total_len))); > > - /* Kicks are still disabled, dispatch any remaining batched msgs. */ > vhost_tx_batch(net, nvq, sock, &msg); > - > - if (unlikely(busyloop_intr)) > - /* If interrupted while doing busy polling, requeue the > - * handler to be fair handle_rx as well as other tasks > - * waiting on cpu. > - */ > - vhost_poll_queue(&vq->poll); > - else > - /* All of our work has been completed; however, before > - * leaving the TX handler, do one last check for work, > - * and requeue handler if necessary. If there is no work, > - * queue will be reenabled. > - */ > - vhost_net_busy_poll_try_queue(net, vq); > } > > static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) > -- > 2.34.1