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 D343DA0C45 for ; Mon, 13 Sep 2021 17:35:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5830410E5; Mon, 13 Sep 2021 17:35:25 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id 7CEE74014F for ; Mon, 13 Sep 2021 17:35:23 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631547322; 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=f10PPVLEVGTA/XBmDh3fnv3gMur2fmdpzxDZjlQMy7g=; b=PS7U4/la0IyBcEHT4+jrtSYVF2sDVMsjoeFkzWzcZHZ17MJAvEcfxeW7ekoTu3hnKGMQ4a GQxe+eb0YPh9pi+imFzmDV2MdcSq+WiiCNNrEJMyNJJSZaixmVcsbCxTwuI5R3naOTtm9E GXF/5zpB8v48nor3sXZKo+n7pj9S7KI= 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-227-exy4gAAiP1yr-5amdNPung-1; Mon, 13 Sep 2021 11:35:19 -0400 X-MC-Unique: exy4gAAiP1yr-5amdNPung-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1F27A40DD; Mon, 13 Sep 2021 15:34:59 +0000 (UTC) Received: from [10.39.208.12] (unknown [10.39.208.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8735077F35; Mon, 13 Sep 2021 15:34:58 +0000 (UTC) To: zhihongx.peng@intel.com, chenbo.xia@intel.com Cc: dev@dpdk.org, ivan.ilchenko@oktetlabs.ru, stable@dpdk.org References: <20210804083128.64981-1-zhihongx.peng@intel.com> From: Maxime Coquelin Message-ID: Date: Mon, 13 Sep 2021 17:34:56 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210804083128.64981-1-zhihongx.peng@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [DPDK] net/virtio: fix check scatter on all Rx queues 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" Hi Zhihong, On 8/4/21 10:31 AM, zhihongx.peng@intel.com wrote: > From: Zhihong Peng > > This patch fixes the wrong way to obtain virtqueue. > The end of virtqueue cannot be judged based on whether > the array is NULL. My understanding is that it is causing issue because it is confusing the control queue with a Rx queue? I so, please be more specific on the issue it is fixing in the commit message. > Fixes: 4e8169eb0d2d (net/virtio: fix Rx scatter offload) > Cc: stable@dpdk.org > > Signed-off-by: Zhihong Peng > --- > drivers/net/virtio/virtio_ethdev.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c > index e58085a2c9..f2d19dc9d6 100644 > --- a/drivers/net/virtio/virtio_ethdev.c > +++ b/drivers/net/virtio/virtio_ethdev.c > @@ -873,8 +873,8 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev, > if (hw->vqs == NULL) > return true; > > - for (qidx = 0; (vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]) != NULL; > - qidx++) { > + for (qidx = 0; qidx < hw->max_queue_pairs; qidx++) { > + vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]; I agree with the change, but I would add a check to ensure vq is not NULL to be safe wrt to NULL pointer dereferencing. > rxvq = &vq->rxq; > if (rxvq->mpool == NULL) > continue; > Thanks, Maxime