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 665DDA0524 for ; Fri, 5 Feb 2021 12:38:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6114D4067B; Fri, 5 Feb 2021 12:38:44 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id DD8354067B for ; Fri, 5 Feb 2021 12:38:42 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id g10so7361965wrx.1 for ; Fri, 05 Feb 2021 03:38:42 -0800 (PST) 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=vhnaXdZ7JH4wE94CpHca6pwZvY+tMeb78laFpGQxkak=; b=TILRQb0PAIFL4Cbu8ljZAwWtTuajKxOM/zNOtAUD8uaZtjLjphXCrvPeyT9CFS39Ta 9DEwUZ6J4Mk0Nzdq04wRK+RajPUTjoc4zIGb7OyetN8b2jkdiygOb9ubd+P/CfGEhsp8 l+FAnnFp1AdK2Q+aUbKFhcdYBLW2/hvNAfAJAH8SNWGOzfACn5S5pgAMXzt6RpUCSseq 3xiyuZnuI4LiQZLXJHlVBL4fEBP4JKvbVzh1ehpb6u1kBtfm8Lcqsotfr4pFYXhQiDfC gsmjJAv/txhU7mHi49lOpLauzGhNarIhMlXW3dURTvsjmJ9hJTFk9hblUeGcIiowp8OO XF0g== 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=vhnaXdZ7JH4wE94CpHca6pwZvY+tMeb78laFpGQxkak=; b=WPQhd32w2+/RsYTlQfUxtbDSzqj9Wl+KMIPrbAy9/xxqHzJOv+57fNq9FgU3b6mUOT 7GQUzludS7MRF4zVQ5tXbFvp+SiJrIwqLbOqS4zh2aWHtspovI0Y20I9OQj5uOH6ebMX np7zONbI2p7Wz71QM2MDJK1pby0VQyV0sLvcNDaf4CgN9b7NxCcWbubup+cAcK+2U9GO YnB+zcOh4GuDUKVEzXbZsixiG8EuQeWm7WC4frDiYBw/zapH/rldhECBrXWYfsMDB5W+ LlEIZW4UJgkGAwl0FtNBwJlWp3GfDgpNHmTzQXZiiuhRJo+eXXw9Jxwi+WFjS6uBrQf5 o1Eg== X-Gm-Message-State: AOAM530UTTU2PUcZbxc6r0lJXCOmU0O6Y24Je3KDMQu4s6M/tSwdx60t +cePqDdNo22VhUnj1Ms3ghp/ywpQQ8/LAsHc X-Google-Smtp-Source: ABdhPJyn43QHr6YI3EiVr4hwiUGiIN4qFZ4ZZRG5X3yhnwf7MRtqKKqk0vk4GSLZaM0CJLl8+zT9kA== X-Received: by 2002:adf:e411:: with SMTP id g17mr4662641wrm.296.1612525122716; Fri, 05 Feb 2021 03:38:42 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m16sm7811228wmq.36.2021.02.05.03.38.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:42 -0800 (PST) From: luca.boccassi@gmail.com To: Andrew Boyer Cc: dpdk stable Date: Fri, 5 Feb 2021 11:18:57 +0000 Message-Id: <20210205111920.1272063-251-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/ionic: allow separate L3 and L4 checksum offload' has been queued to stable release 20.11.1 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, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/66ac5aec1f976dc5041b50b0b7a06cbd024ec5a9 Thanks. Luca Boccassi --- >From 66ac5aec1f976dc5041b50b0b7a06cbd024ec5a9 Mon Sep 17 00:00:00 2001 From: Andrew Boyer Date: Mon, 18 Jan 2021 12:35:05 -0800 Subject: [PATCH] net/ionic: allow separate L3 and L4 checksum offload [ upstream commit f603eebc43840fc70a3abdbb5089c2564ce61ec8 ] DTS, at least, expects to be able to specify L4 checksum offload without L3 csum offload. Split up the flag checks. Fixes: a27d901331da ("net/ionic: add Rx and Tx handling") Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_rxtx.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 26893795a1..0b7c273939 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -448,17 +448,21 @@ ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm, uint8_t flags = 0; if ((ol_flags & PKT_TX_IP_CKSUM) && - (offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)) { + (offloads & DEV_TX_OFFLOAD_IPV4_CKSUM)) { opcode = IONIC_TXQ_DESC_OPCODE_CSUM_HW; flags |= IONIC_TXQ_DESC_FLAG_CSUM_L3; - if (((ol_flags & PKT_TX_TCP_CKSUM) && - (offloads & DEV_TX_OFFLOAD_TCP_CKSUM)) || - ((ol_flags & PKT_TX_UDP_CKSUM) && - (offloads & DEV_TX_OFFLOAD_UDP_CKSUM))) - flags |= IONIC_TXQ_DESC_FLAG_CSUM_L4; - } else { + } + + if (((ol_flags & PKT_TX_TCP_CKSUM) && + (offloads & DEV_TX_OFFLOAD_TCP_CKSUM)) || + ((ol_flags & PKT_TX_UDP_CKSUM) && + (offloads & DEV_TX_OFFLOAD_UDP_CKSUM))) { + opcode = IONIC_TXQ_DESC_OPCODE_CSUM_HW; + flags |= IONIC_TXQ_DESC_FLAG_CSUM_L4; + } + + if (opcode == IONIC_TXQ_DESC_OPCODE_CSUM_NONE) stats->no_csum++; - } has_vlan = (ol_flags & PKT_TX_VLAN_PKT); encap = ((ol_flags & PKT_TX_OUTER_IP_CKSUM) || -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.236312157 +0000 +++ 0251-net-ionic-allow-separate-L3-and-L4-checksum-offload.patch 2021-02-05 11:18:29.266699870 +0000 @@ -1 +1 @@ -From f603eebc43840fc70a3abdbb5089c2564ce61ec8 Mon Sep 17 00:00:00 2001 +From 66ac5aec1f976dc5041b50b0b7a06cbd024ec5a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f603eebc43840fc70a3abdbb5089c2564ce61ec8 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 61ad396469..73e728436b 100644 +index 26893795a1..0b7c273939 100644 @@ -21 +22 @@ -@@ -460,17 +460,21 @@ ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm, +@@ -448,17 +448,21 @@ ionic_tx(struct ionic_queue *q, struct rte_mbuf *txm,