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 2C927A04DD for ; Wed, 28 Oct 2020 11:53:29 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2654149E0; Wed, 28 Oct 2020 11:53:28 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 4796549E0 for ; Wed, 28 Oct 2020 11:53:27 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id w23so4099508wmi.4 for ; Wed, 28 Oct 2020 03:53:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wkrPrXkRsImAUdkla+Y+iUn/shs92eIC1vLF5e9i/98=; b=mUNekoJgzMEZfsFPvDelwcww1SXTVwohIEiJRHsWlHAAho5LQy06cREjCREYNGgMKj pHucQDaGuGdQvkm2e4vs5tAvhcmDw5Wojk8M0SlQ1zKiSDh/n4Hl5NOfZ4Z2IxKjLBdl pLoJLF0HmefOeTzs6oqA+PEDIWNEY40pzwkQTr5fKTx/Tzt8vjEitCocy73ibgNEjs+D UUdjOwkMBrgK11oz04akmH+j32yugrw3McqcJM8/cPDlqZBwGGo8V5m3UQhqYcLGFMIg tIWfebeQXGDHDVSZbEU8FpSVJ3RZwXaGA6OBEh0PRDPg0KI4eUBWuVPfimOSOkCM7JF0 cy3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wkrPrXkRsImAUdkla+Y+iUn/shs92eIC1vLF5e9i/98=; b=ZSFFt4dnaLQC+gDb9pUMAoWeTY+IK/caAuqPhvICzxLDZpzG43lC0XldmDremfbtc6 6LuZu+g0ythK7Yda8/fq29w1o+DJBvEYNiSfFn40MrTfuyg2lJKgmwHrtTOBNbZXLFV/ wChp7c6uC/72vcFyw9f+TG2k/464dgi4+eD7Jw0mLeZuZ/Pb7M6RoUnr5VqpfvVCPZa5 oLWZhQm++Tt+13Ej+REaTU/VITPu4/7zwEbEy+MpjeuzY8KiNo3z3JRkCTEsezvcc5IS 42IRTz6ZO4SWne66a9HJ8vyP4of6Twru/atqoM0ULN3YvILzbeW6vGBQp6GyuSq0G/qh uAdA== X-Gm-Message-State: AOAM530zLKYIOQp7AXRYZk7d89HTYP8CS/lyVesSBQc8mK7ytzIHdptS Hk037WbJSeulPNFcHWVnXVk= X-Google-Smtp-Source: ABdhPJyOzwk1PE81KSyCi2g9K6TC/WIgOUX3kSnkmnebKohlMin3JPSKehcApDt7cYj+9DoAgpZFaQ== X-Received: by 2002:a05:600c:2302:: with SMTP id 2mr7362264wmo.111.1603882406031; Wed, 28 Oct 2020 03:53:26 -0700 (PDT) Received: from localhost ([2a01:4b00:f419:6f00:7a8e:ed70:5c52:ea3]) by smtp.gmail.com with ESMTPSA id u9sm6661929wrp.65.2020.10.28.03.53.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:53:25 -0700 (PDT) From: luca.boccassi@gmail.com To: Chas Williams <3chas3@gmail.com> Cc: Maxime Coquelin , dpdk stable Date: Wed, 28 Oct 2020 10:44:55 +0000 Message-Id: <20201028104606.3504127-136-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: check raw checksum failure' has been queued to stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 35ce81d79f5c941fe93658a46e3019558b9f8ce1 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 060410577a..5211736d29 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -1184,9 +1184,10 @@ 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; off = hdr->csum_offset + hdr->csum_start; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.962601219 +0000 +++ 0136-net-virtio-check-raw-checksum-failure.patch 2020-10-28 10:35:11.708833026 +0000 @@ -1,26 +1,26 @@ -From dd6d6704f5b83e42af6ef3674a54ce7fb80d0254 Mon Sep 17 00:00:00 2001 +From 35ce81d79f5c941fe93658a46e3019558b9f8ce1 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") -Cc: stable@dpdk.org Signed-off-by: Chas Williams <3chas3@gmail.com> Reviewed-by: Maxime Coquelin --- - 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(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c -index 88c03bf40e..77934e8c58 100644 +index 060410577a..5211736d29 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c -@@ -910,9 +910,10 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) +@@ -1184,9 +1184,10 @@ virtio_rx_offload(struct rte_mbuf *m, struct virtio_net_hdr *hdr) */ uint16_t csum = 0, off; @@ -33,23 +33,6 @@ if (likely(csum != 0xffff)) csum = ~csum; off = hdr->csum_offset + hdr->csum_start; -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 -@@ -336,9 +336,10 @@ 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; - if (likely(csum != 0xffff)) - csum = ~csum; - off = hdr->csum_offset + hdr->csum_start; -- 2.20.1