From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DE6D7A04B1 for ; Thu, 5 Nov 2020 13:42:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7FFE2BFF; Thu, 5 Nov 2020 13:42:24 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id C3AF5C7FA for ; Thu, 5 Nov 2020 13:42:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580140; 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=Dkx5CXJZBLwI1FVN7ig9lNlteffecRpuhFUFGuNxdqI=; b=BlM7ULY+4bKrm5+7v5qwbSpgpYS8ePVxyp3WjPXaymudUSo4ldHtSWma5F5Qy/DUDZ1UYO cXVx0cF0YaEkKguCquzAJjfDwkZpLFGtrB03Z0QMtVITWwsTbFd02AtDcld2+ecNtJzMzm CHrxopROgIv3v5iNgXwiHCkTmldY7AA= 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-162-wWY9LuMLObmeZGCDNWoZ9g-1; Thu, 05 Nov 2020 07:42:17 -0500 X-MC-Unique: wWY9LuMLObmeZGCDNWoZ9g-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D085F64081; Thu, 5 Nov 2020 12:42:16 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id CEC005C3E1; Thu, 5 Nov 2020 12:42:12 +0000 (UTC) From: Kevin Traynor To: Chas Williams <3chas3@gmail.com> Cc: Maxime Coquelin , dpdk stable Date: Thu, 5 Nov 2020 12:40:06 +0000 Message-Id: <20201105124015.306404-59-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'net/virtio: check raw checksum failure' has been queued to LTS release 18.11.11 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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, FYI, your patch has been queued to LTS release 18.11.11 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/10/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/2f9caa3cdcfc8d4e9465429e92befb6753ef2e1e Thanks. Kevin. --- >From 2f9caa3cdcfc8d4e9465429e92befb6753ef2e1e Mon Sep 17 00:00:00 2001 From: Chas Williams <3chas3@gmail.com> Date: Thu, 1 Oct 2020 06:22:45 -0400 Subject: [PATCH] net/virtio: check raw checksum failure [ upstream commit dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 ] rte_raw_cksum_mbuf can fail, so we should check to see if it has. If so, return with an error. Fixes: 96cb6711939e ("net/virtio: support Rx checksum offload") Signed-off-by: Chas Williams <3chas3@gmail.com> Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index 8ce5c33940..ccf03fc774 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -844,7 +844,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) uint16_t csum = 0, off; - rte_raw_cksum_mbuf(m, hdr->csum_start, + if (rte_raw_cksum_mbuf(m, hdr->csum_start, rte_pktmbuf_pkt_len(m) - hdr->csum_start, - &csum); + &csum) < 0) + return -EINVAL; if (likely(csum != 0xffff)) csum = ~csum; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.563353252 +0000 +++ 0059-net-virtio-check-raw-checksum-failure.patch 2020-11-05 12:38:54.258896034 +0000 @@ -1 +1 @@ -From dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 Mon Sep 17 00:00:00 2001 +From 2f9caa3cdcfc8d4e9465429e92befb6753ef2e1e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15,3 +16,2 @@ - drivers/net/virtio/virtio_rxtx.c | 5 +++-- - drivers/net/virtio/virtio_rxtx_packed_avx.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) + drivers/net/virtio/virtio_rxtx.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) @@ -20 +20 @@ -index 88c03bf40e..77934e8c58 100644 +index 8ce5c33940..ccf03fc774 100644 @@ -23 +23 @@ -@@ -911,7 +911,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) +@@ -844,7 +844,8 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) @@ -32,15 +31,0 @@ - if (likely(csum != 0xffff)) - csum = ~csum; -diff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.c b/drivers/net/virtio/virtio_rxtx_packed_avx.c -index ce035b5747..9bc62719ee 100644 ---- a/drivers/net/virtio/virtio_rxtx_packed_avx.c -+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.c -@@ -337,7 +337,8 @@ virtio_vec_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) - uint16_t csum = 0, off; - -- rte_raw_cksum_mbuf(m, hdr->csum_start, -+ if (rte_raw_cksum_mbuf(m, hdr->csum_start, - rte_pktmbuf_pkt_len(m) - hdr->csum_start, -- &csum); -+ &csum) < 0) -+ return -1;