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 BA0B6A054A for ; Tue, 25 Oct 2022 17:10:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B6E4842C51; Tue, 25 Oct 2022 17:10:07 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 80BA742C34 for ; Tue, 25 Oct 2022 17:10:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710606; 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=pLNro/zcxhpUR34KZnXg21Rh0dN2nECVxQ2S0E7bgVM=; b=FoEhWkQJ59cY8205+brJlfSnfy671VO1mzRTxgdmtiyQSWoa2eSOy3xCgE4bnMqhC0VzDT gaoG5ODf7B9KmCZZ3p1yTBLCeHXzxbhrEUd2195yOr/sU5tVf/ZnqsL4iatdKcQJhJTaIQ gM1wr1PVZkcKAv6Echo6hFbIqW9dYug= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-179-G63LXkmOMOK-8wldzYhEdQ-1; Tue, 25 Oct 2022 11:10:02 -0400 X-MC-Unique: G63LXkmOMOK-8wldzYhEdQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B4F2B101A52A; Tue, 25 Oct 2022 15:10:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id A1F0449BB60; Tue, 25 Oct 2022 15:10:00 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: David Marchand , Amit Prakash Shukla , dpdk stable Subject: patch 'vhost: fix build with GCC 12' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:24 +0100 Message-Id: <20221025150734.142189-89-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/54a98eecdb81d95d958998c3ecb85b20cde03837 Thanks. Kevin --- >From 54a98eecdb81d95d958998c3ecb85b20cde03837 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Wed, 5 Oct 2022 22:35:24 +0200 Subject: [PATCH] vhost: fix build with GCC 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 4226aa9caca9511bf95a093b6ad9c1f8727a4d43 ] This patch fixes a compilation issue met with GCC 12 on LoongArch64: In function ‘mbuf_to_desc’, inlined from ‘vhost_enqueue_async_packed’ inlined from ‘virtio_dev_rx_async_packed’ inlined from ‘virtio_dev_rx_async_submit_packed’ lib/vhost/virtio_net.c:1159:18: error: ‘buf_vec[0].buf_addr’ may be used uninitialized 1159 | buf_addr = buf_vec[vec_idx].buf_addr; | ~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~ lib/vhost/virtio_net.c: In function ‘virtio_dev_rx_async_submit_packed’: lib/vhost/virtio_net.c:1834:27: note: ‘buf_vec’ declared here 1834 | struct buf_vector buf_vec[BUF_VECTOR_MAX]; | ^~~~~~~ It happens because the compiler assumes that 'size' variable in vhost_enqueue_async_packed could wrap to 0 since 'size' is uint32_t and pkt->pkt_len too. In practice, it would never happen since 'pkt->pkt_len' is unlikely to be close to UINT32_MAX, but let's just change 'size' to uint64_t to make the compiler happy without having to add runtime checks. This patch also fixes similar patterns in three other places, including one that also produces similar build issue on ARM64 in vhost_enqueue_single_packed(). Fixes: 873e8dad6f49 ("vhost: support packed ring in async datapath") Signed-off-by: Maxime Coquelin Reviewed-by: David Marchand Tested-by: Amit Prakash Shukla --- lib/vhost/virtio_net.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c index bf4d75b4bd..64460e3e8c 100644 --- a/lib/vhost/virtio_net.c +++ b/lib/vhost/virtio_net.c @@ -600,5 +600,5 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq, static inline int reserve_avail_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq, - uint32_t size, struct buf_vector *buf_vec, + uint64_t size, struct buf_vector *buf_vec, uint16_t *num_buffers, uint16_t avail_head, uint16_t *nr_vec) @@ -1070,5 +1070,5 @@ vhost_enqueue_single_packed(struct virtio_net *dev, uint32_t len = 0; uint16_t desc_count; - uint32_t size = pkt->pkt_len + sizeof(struct virtio_net_hdr_mrg_rxbuf); + uint64_t size = pkt->pkt_len + sizeof(struct virtio_net_hdr_mrg_rxbuf); uint16_t num_buffers = 0; uint32_t buffer_len[vq->size]; @@ -1138,5 +1138,5 @@ virtio_dev_rx_split(struct virtio_net *dev, struct vhost_virtqueue *vq, for (pkt_idx = 0; pkt_idx < count; pkt_idx++) { - uint32_t pkt_len = pkts[pkt_idx]->pkt_len + dev->vhost_hlen; + uint64_t pkt_len = pkts[pkt_idx]->pkt_len + dev->vhost_hlen; uint16_t nr_vec = 0; @@ -1486,5 +1486,5 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev, for (pkt_idx = 0; pkt_idx < count; pkt_idx++) { - uint32_t pkt_len = pkts[pkt_idx]->pkt_len + dev->vhost_hlen; + uint64_t pkt_len = pkts[pkt_idx]->pkt_len + dev->vhost_hlen; uint16_t nr_vec = 0; @@ -1576,5 +1576,5 @@ vhost_enqueue_async_packed(struct virtio_net *dev, uint32_t len = 0; uint16_t desc_count = 0; - uint32_t size = pkt->pkt_len + sizeof(struct virtio_net_hdr_mrg_rxbuf); + uint64_t size = pkt->pkt_len + sizeof(struct virtio_net_hdr_mrg_rxbuf); uint32_t buffer_len[vq->size]; uint16_t buffer_buf_id[vq->size]; -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.554242334 +0100 +++ 0089-vhost-fix-build-with-GCC-12.patch 2022-10-25 14:18:58.531798521 +0100 @@ -1 +1 @@ -From 4226aa9caca9511bf95a093b6ad9c1f8727a4d43 Mon Sep 17 00:00:00 2001 +From 54a98eecdb81d95d958998c3ecb85b20cde03837 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 4226aa9caca9511bf95a093b6ad9c1f8727a4d43 ] + @@ -39 +40,0 @@ -Cc: stable@dpdk.org @@ -49 +50 @@ -index 8f4d0f0502..6b4a062df3 100644 +index bf4d75b4bd..64460e3e8c 100644 @@ -52 +53 @@ -@@ -788,5 +788,5 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -600,5 +600,5 @@ fill_vec_buf_split(struct virtio_net *dev, struct vhost_virtqueue *vq, @@ -59 +60 @@ -@@ -1278,5 +1278,5 @@ vhost_enqueue_single_packed(struct virtio_net *dev, +@@ -1070,5 +1070,5 @@ vhost_enqueue_single_packed(struct virtio_net *dev, @@ -66 +67 @@ -@@ -1346,5 +1346,5 @@ virtio_dev_rx_split(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -1138,5 +1138,5 @@ virtio_dev_rx_split(struct virtio_net *dev, struct vhost_virtqueue *vq, @@ -73 +74 @@ -@@ -1690,5 +1690,5 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev, struct vhost_virtqueue +@@ -1486,5 +1486,5 @@ virtio_dev_rx_async_submit_split(struct virtio_net *dev, @@ -80 +81 @@ -@@ -1781,5 +1781,5 @@ vhost_enqueue_async_packed(struct virtio_net *dev, +@@ -1576,5 +1576,5 @@ vhost_enqueue_async_packed(struct virtio_net *dev,