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 9CF87A0524 for ; Fri, 5 Feb 2021 12:33:21 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F68440682; Fri, 5 Feb 2021 12:33:21 +0100 (CET) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mails.dpdk.org (Postfix) with ESMTP id 46130188A07 for ; Fri, 5 Feb 2021 12:33:20 +0100 (CET) Received: by mail-wr1-f43.google.com with SMTP id u14so7338581wri.3 for ; Fri, 05 Feb 2021 03:33:20 -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=+/MdLYhgJHdieC3MPPxfN9i6FPqJvruThrWGVQJ1eXQ=; b=UPF448XI2NE3h5MFN67pyMgeeLYT7puET9M2kzL4LDPcRdb1CcVJAJn7A75pRBCPLL 1AJ7Uw8mTfliv89468E+eKbwglm0gKfirSO1svN5uTYdNJOnKh6gdzPokpS5lhRj92NX 9il6TrHhDkG3URSZYSkY68LsNDlPvEcsK4qOuDblrX695Y2Dn4Ze5Rd5MyGhXMyBopdn RMFRPIfWSN59xQU8IH6r44V+zGdEo4mvR6d2Nz1LKIJX6iicUM1UubYlMbKIx1zJGDhQ JF20e4ctd7fHgkIkJP2EW+uv4bbLoFCITudIUfRpFNG5oKa/2ueQzXYVqLBdOuoHzdm7 xx4Q== 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=+/MdLYhgJHdieC3MPPxfN9i6FPqJvruThrWGVQJ1eXQ=; b=cc36+znnO894ZAUdVPVAAoCrzFTlC3HfkBtPJYsDG1ZJ+Dsad2LlXsOn2P9jroN77q ky25/22GzftgmsO4E95aBXBKLlAuNqgoR32X5Gxran8dbWazw1+UiA0m4jEgKO8lQx5y i3eTDao/VHSwiOEigVRJ7dD9OEHRQCp/Y73Xb4w/JYRVtioLenTfLo+KIPFxY9frH78A UgMoa6GLOGJ+8ZtT/r3DK1lIj4vnn/y5DBLwIqRrCx5P68i8NB+gOGZXqvA5c+00lQuM yfJja70nVZhNGQuh6J2NCy5c8+0fnFkj+dud2wpywFpSyCLlMMBQAyh6cxXrQzOI8Apw 52/A== X-Gm-Message-State: AOAM531NsAOWIOFWtRctETKG4psi+CCOIXU8BoVcFlvydZaBGyOKMXAK 95piuz8MJI+GPkJSguM2Bkbl2nh0DI9+MRw2 X-Google-Smtp-Source: ABdhPJwkkIcuLB1rb1fper/dtIvIkMvL6KGqixywEDUSD6GewP60XH0BK0Pjg2rnOfLijt7xWUcxxg== X-Received: by 2002:adf:e68e:: with SMTP id r14mr4715915wrm.242.1612524800041; Fri, 05 Feb 2021 03:33:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j14sm13702878wrd.36.2021.02.05.03.33.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:19 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:21 +0000 Message-Id: <20210205111920.1272063-155-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/qede: fix jumbo frame flag condition for MTU set' 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/e51e0295b6ed6357d541238b4d55f64dfd6eac66 Thanks. Luca Boccassi --- >From e51e0295b6ed6357d541238b4d55f64dfd6eac66 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:19 +0000 Subject: [PATCH] net/qede: fix jumbo frame flag condition for MTU set [ upstream commit f9a69f8b5e94cae87d96ca5c160261687e0b9ec2 ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but the Ether overhead is larger than 18 when it supports dual VLAN tags. That will cause the jumbo flag rx offload is wrong when MTU size is 'RTE_ETHER_MTU'. This fix will change the boundary condition with 'RTE_ETHER_MTU' and overhead, that perhaps impacts the cases of the jumbo frame related. Fixes: 200645ac7909 ("net/qede: set MTU") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/qede/qede_ethdev.c | 2 +- drivers/net/qede/qede_rxtx.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index 3bec62d828..ab5f5b1065 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -2369,7 +2369,7 @@ static int qede_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) fp->rxq->rx_buf_size = rc; } } - if (max_rx_pkt_len > RTE_ETHER_MAX_LEN) + if (frame_size > QEDE_ETH_MAX_LEN) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else dev->data->dev_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; diff --git a/drivers/net/qede/qede_rxtx.h b/drivers/net/qede/qede_rxtx.h index d7ff870b20..fcb564a1bb 100644 --- a/drivers/net/qede/qede_rxtx.h +++ b/drivers/net/qede/qede_rxtx.h @@ -71,6 +71,7 @@ + (QEDE_LLC_SNAP_HDR_LEN) + 2) #define QEDE_MAX_ETHER_HDR_LEN (RTE_ETHER_HDR_LEN + QEDE_ETH_OVERHEAD) +#define QEDE_ETH_MAX_LEN (RTE_ETHER_MTU + QEDE_MAX_ETHER_HDR_LEN) #define QEDE_RSS_OFFLOAD_ALL (ETH_RSS_IPV4 |\ ETH_RSS_NONFRAG_IPV4_TCP |\ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.250254819 +0000 +++ 0155-net-qede-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.090696519 +0000 @@ -1 +1 @@ -From f9a69f8b5e94cae87d96ca5c160261687e0b9ec2 Mon Sep 17 00:00:00 2001 +From e51e0295b6ed6357d541238b4d55f64dfd6eac66 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f9a69f8b5e94cae87d96ca5c160261687e0b9ec2 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org