From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9BBBFA0C4B for ; Thu, 21 Oct 2021 14:35:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13E014122D; Thu, 21 Oct 2021 14:35:51 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 77C2E41229 for ; Thu, 21 Oct 2021 14:35:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634819749; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HytlKXYeqc66f37m9Z0Bplu7HxNuZX0mV329r4XGY4I=; b=UA1MtvtRnromF6kr8CHVvsXU2A1a8KB00kwvlDS1G5OlNsgDJ4SVJpyb7JRl2N6YvDG7wt mDCnL/cLkh4XB2q6FuKvekpY9Q8+6KYbk50qcNIHKomkkPgdDvgW1jB5E0S8fFSYGzncVw M+28/+f0njytInAuI3fzZk1b0p9AtAw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-tUbf0iTLMvG-omAPgEuKdg-1; Thu, 21 Oct 2021 08:35:44 -0400 X-MC-Unique: tUbf0iTLMvG-omAPgEuKdg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A84A8100CCC1; Thu, 21 Oct 2021 12:35:43 +0000 (UTC) Received: from [10.39.208.27] (unknown [10.39.208.27]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 51A495B826; Thu, 21 Oct 2021 12:35:40 +0000 (UTC) Message-ID: Date: Thu, 21 Oct 2021 14:35:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 To: xuan.ding@intel.com, dev@dpdk.org, chenbo.xia@intel.com Cc: stable@dpdk.org, Yong Liu , Miao Li References: <20211021142540.43753-1-xuan.ding@intel.com> From: Maxime Coquelin In-Reply-To: <20211021142540.43753-1-xuan.ding@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] [PATCH] net/virtio: fix incorrect avail desc id X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 10/21/21 16:25, xuan.ding@intel.com wrote: > From: Xuan Ding > > Vhost will update desc’s Buffer ID advance to next used descriptor when > VIRTIO_F_IN_ORDER feature negotiated. When virtio reuses the descriptor, > the Buffer ID should be restored even VIRTQ_DESC_F_INDIRECT > feature negotiated. > > Fixes: b473061b0e1d ("net/virtio: fix indirect descriptors in packed datapaths") > Cc: stable@dpdk.org > > Signed-off-by: Xuan Ding > Signed-off-by: Yong Liu > Signed-off-by: Miao Li > --- > drivers/net/virtio/virtqueue.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h > index d0c48ca415..5259a6f814 100644 > --- a/drivers/net/virtio/virtqueue.h > +++ b/drivers/net/virtio/virtqueue.h > @@ -709,6 +709,9 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie, > RTE_PTR_DIFF(&txr[idx].tx_packed_indir, txr); > start_dp[idx].len = (seg_num + 1) * > sizeof(struct vring_packed_desc); > + /* Packed descriptor id needs to be restored when inorder. */ > + if (in_order) > + start_dp[idx].id = idx; > /* reset flags for indirect desc */ > head_flags = VRING_DESC_F_INDIRECT; > head_flags |= vq->vq_packed.cached_flags; > Applied to dpdk-next-virtio/main. Thanks, Maxime