From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD9DBC10F1B for ; Mon, 19 Dec 2022 07:40:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231573AbiLSHkm (ORCPT ); Mon, 19 Dec 2022 02:40:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiLSHkj (ORCPT ); Mon, 19 Dec 2022 02:40:39 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1933C4F for ; Sun, 18 Dec 2022 23:39:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1671435593; 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=w11vatQNVAnUlnMv1dmIAsVTD8BgrqYdlE5ppWAhfcU=; b=QkH3RAeEHOefS3aX62LvTskihBDnOvtaFHGOzWxOQE+Hb7RhCWo8maUkSecVaL/9d8+ck3 zkSqbZjpwpmvQAVc9rMdcwg2K09EtgEewsa5ElR3VuDg0Wi+cLqHYWe32kF27w8LS8NOph hlHbY3nCrElmQEJx750AiYIWKXMKUn0= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-70-Bc3ZZmJjPRG2gf62IXoDhQ-1; Mon, 19 Dec 2022 02:39:52 -0500 X-MC-Unique: Bc3ZZmJjPRG2gf62IXoDhQ-1 Received: by mail-qk1-f200.google.com with SMTP id az39-20020a05620a172700b006ff85c3b19eso6774201qkb.18 for ; Sun, 18 Dec 2022 23:39:52 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=w11vatQNVAnUlnMv1dmIAsVTD8BgrqYdlE5ppWAhfcU=; b=Zf2Q9hVjEi0JXy8qa+TQEFVfrEXlpDqjc7iA5fgdtxw/WdZDA3aABK9u6MgCz58TzF b1RW/WhVEEDjOk8FkGXumEnBmdmIbuEJZU/bAodGEVJjXYUE+f/iDQQfa233BbVSuLhb ovpoAFs6P1YFQLEo2qakSk+WHzVh+C2FLaeN2qQjx3WqmaV+DJJmsI4iIW43u2LnEmKZ vIypDhDTVLGo1VXrjGlXBjdWSJZEU9AOQoprXOMfFFbMaUg0f7I6PFnOcqVmMR8ogZ96 B9HTgjnUitkpyZrEVaH7HWRttH29uMGCGUVLv8q5PHyxD7nV1mDz1qPIY7miXM8Precy SnsA== X-Gm-Message-State: ANoB5pnqaRHP53srTtnS2LzDn48CUuiTHVlkYKfjHVSON8pYBPnNEKWU 5lcSZYHCfieoxAOH5uJWGNXHzLtBniyYsryKZkUs/Q23aMgUzFetfRwNoRo62MqME94qhmQJnfv TaozBFkGTqwwwCk4EZvQXyvI0 X-Received: by 2002:ac8:5544:0:b0:3a8:b88:c1 with SMTP id o4-20020ac85544000000b003a80b8800c1mr51790080qtr.66.1671435591905; Sun, 18 Dec 2022 23:39:51 -0800 (PST) X-Google-Smtp-Source: AA0mqf7+jlbEi9Hng1kQBhZFIW+Ck6EaPnOm37evbb26ZWZOc9ge1j5bCv1B5OdL+PMwpgyh21WQcw== X-Received: by 2002:ac8:5544:0:b0:3a8:b88:c1 with SMTP id o4-20020ac85544000000b003a80b8800c1mr51790067qtr.66.1671435591645; Sun, 18 Dec 2022 23:39:51 -0800 (PST) Received: from redhat.com ([45.144.113.29]) by smtp.gmail.com with ESMTPSA id cj23-20020a05622a259700b003a7f597dc60sm5645751qtb.72.2022.12.18.23.39.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Dec 2022 23:39:51 -0800 (PST) Date: Mon, 19 Dec 2022 02:39:46 -0500 From: "Michael S. Tsirkin" To: Jason Wang Cc: Andrey Smetanin , kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, yc-core@yandex-team.ru Subject: Re: [PATCH] vhost_net: revert upend_idx only on retriable error Message-ID: <20221219023900-mutt-send-email-mst@kernel.org> References: <20221123102207.451527-1-asmetanin@yandex-team.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Dec 01, 2022 at 05:01:58PM +0800, Jason Wang wrote: > On Wed, Nov 23, 2022 at 6:24 PM Andrey Smetanin > wrote: > > > > Fix possible virtqueue used buffers leak and corresponding stuck > > in case of temporary -EIO from sendmsg() which is produced by > > tun driver while backend device is not up. > > > > In case of no-retriable error and zcopy do not revert upend_idx > > to pass packet data (that is update used_idx in corresponding > > vhost_zerocopy_signal_used()) as if packet data has been > > transferred successfully. > > Should we mark head.len as VHOST_DMA_DONE_LEN in this case? > > Thanks Any response here? > > > > Signed-off-by: Andrey Smetanin > > --- > > drivers/vhost/net.c | 9 ++++++--- > > 1 file changed, 6 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > > index 20265393aee7..93e9166039b9 100644 > > --- a/drivers/vhost/net.c > > +++ b/drivers/vhost/net.c > > @@ -934,13 +934,16 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) > > > > err = sock->ops->sendmsg(sock, &msg, len); > > if (unlikely(err < 0)) { > > + bool retry = err == -EAGAIN || err == -ENOMEM || err == -ENOBUFS; > > + > > if (zcopy_used) { > > if (vq->heads[ubuf->desc].len == VHOST_DMA_IN_PROGRESS) > > vhost_net_ubuf_put(ubufs); > > - nvq->upend_idx = ((unsigned)nvq->upend_idx - 1) > > - % UIO_MAXIOV; > > + if (retry) > > + nvq->upend_idx = ((unsigned)nvq->upend_idx - 1) > > + % UIO_MAXIOV; > > } > > - if (err == -EAGAIN || err == -ENOMEM || err == -ENOBUFS) { > > + if (retry) { > > vhost_discard_vq_desc(vq, 1); > > vhost_net_enable_vq(net, vq); > > break; > > -- > > 2.25.1 > >