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 9E581454E9 for ; Tue, 25 Jun 2024 02:01:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97DC7410F2; Tue, 25 Jun 2024 02:01:03 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 2C4FD40EDD for ; Tue, 25 Jun 2024 02:01:02 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-4217d451f69so42240305e9.0 for ; Mon, 24 Jun 2024 17:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719273662; x=1719878462; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fkqG8r2j2F0oDIDSH9eb2SnXp26YBQZ3D7qHPJ77/i8=; b=N99vnIssvmhKrgmYwnuH+Z3vH5Z6f+FCltJ0lYi4NEL9OHo7h3No4sweR3xMLAwWdV 98zSTQMOieiDFHMeQMUGbugLOkXz4ddhhIX7JiMwxX7I9JseLo0DFQkqv630pa4I9/e5 eUJnZPMPQbSEaT3IAayp7VvqGz43a2AxK9RV7EiNv80bYbkEUXrxIRY6GIPbwfktnl6r N2fX8+cEMluzCBFb62eoeN0oY6hTx0B+in8oT1gRHrsJ83DRbCDrMPOrDogl3BwoOt5e l8B4sJ+XefUrjfo+OEuONy11Nj/51CUAOlUkIeX645cwwfqxqMkhCXtZZkr9mcGGL66I IDrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719273662; x=1719878462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fkqG8r2j2F0oDIDSH9eb2SnXp26YBQZ3D7qHPJ77/i8=; b=RA4r/kyrl37mrv+eos6QrwDb9pEMIIC9udxCqSJPBdcTGfEYsUJtyOUs8/1s61jc3I z0JPXQEGa0dyb5kjc+2ObXl422WHzkUdtV+cFcFt3gfVLHpeaqgszU6K8bJkSH6ca+nh Xrnu3m1DvxcWl/X8zrbap01hYdkC20k4kuHlc52Qc/GMuEUhi6z2F5T+YLSv33oAovmN B99Ek2jxelyGH1/cAIUwUMTz3i0kod8KeBsmJEd83H87vhFZZ5EbsZj2bxabKnDtP9qI 227Op5SgwBh2UmP+ar0ZldWsSr3/Wr9O93Vxwnb9rrXYJjJEvh1rTYnqNGdYXtWzTUav RZCA== X-Forwarded-Encrypted: i=1; AJvYcCU53zbBn1c+qWr9meUZ916/sE2b87xVtx56+RSklJmM1jwnMLLfSNQFkp/eTBoKykFR5+0U3db276RnlRJ+FJw= X-Gm-Message-State: AOJu0YxRbPYRiiDglBAfmayphEUd6qgSJ7dQGeTHjDI3iYSjGaTmPhtj QXBuX0+WyvQQ5mKGfkTuFF9l8Hi3zRC1UitDqh7uKNaLcq4cCX99 X-Google-Smtp-Source: AGHT+IEb+Vy6i2ObD7Vg20DotWypbPJpyt4R2Yr2DZxiF9PuO6XhxxfuiNnRLUtQDg60dU1DDb9knw== X-Received: by 2002:adf:fcc8:0:b0:362:4d2a:7bea with SMTP id ffacd0b85a97d-366e9652cc8mr3769929f8f.62.1719273661658; Mon, 24 Jun 2024 17:01:01 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-366388c425fsm11318438f8f.38.2024.06.24.17.01.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 17:01:01 -0700 (PDT) From: luca.boccassi@gmail.com To: David Marchand Cc: Bruce Richardson , =?UTF-8?q?Morten=20Br=C3=B8rup?= , Ali Alnubani , dpdk stable Subject: patch 'net/ice: fix check for outer UDP checksum offload' has been queued to stable release 22.11.6 Date: Tue, 25 Jun 2024 00:58:21 +0100 Message-Id: <20240624235907.885628-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240624235907.885628-1-luca.boccassi@gmail.com> References: <20240624235907.885628-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 22.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 06/27/24. 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/e48c8875998c04dbc83065bbed8139b74a26a16c Thanks. Luca Boccassi --- >From e48c8875998c04dbc83065bbed8139b74a26a16c Mon Sep 17 00:00:00 2001 From: David Marchand Date: Thu, 18 Apr 2024 10:20:15 +0200 Subject: [PATCH] net/ice: fix check for outer UDP checksum offload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] ICE_TX_CTX_EIPT_NONE == 0. There is a good chance that !(anything & 0) is true :-). While removing this noop check is doable, let's check that the descriptor does contain a outer ip type. Fixes: 2ed011776334 ("net/ice: fix outer UDP Tx checksum offload") Signed-off-by: David Marchand Reviewed-by: Bruce Richardson Acked-by: Morten Brørup Tested-by: Ali Alnubani --- drivers/net/ice/ice_rxtx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c index 9a653cbc4a..f73065b81c 100644 --- a/drivers/net/ice/ice_rxtx.c +++ b/drivers/net/ice/ice_rxtx.c @@ -2733,9 +2733,9 @@ ice_parse_tunneling_params(uint64_t ol_flags, * Calculate the tunneling UDP checksum. * Shall be set only if L4TUNT = 01b and EIPT is not zero */ - if (!(*cd_tunneling & ICE_TX_CTX_EIPT_NONE) && - (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING) && - (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) + if ((*cd_tunneling & ICE_TXD_CTX_QW0_EIPT_M) && + (*cd_tunneling & ICE_TXD_CTX_UDP_TUNNELING) && + (ol_flags & RTE_MBUF_F_TX_OUTER_UDP_CKSUM)) *cd_tunneling |= ICE_TXD_CTX_QW0_L4T_CS_M; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-06-25 00:22:15.698246281 +0100 +++ 0035-net-ice-fix-check-for-outer-UDP-checksum-offload.patch 2024-06-25 00:22:13.129184507 +0100 @@ -1 +1 @@ -From f4eb07f031c4a6a0055f3b2773e031cd8000206e Mon Sep 17 00:00:00 2001 +From e48c8875998c04dbc83065bbed8139b74a26a16c Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f4eb07f031c4a6a0055f3b2773e031cd8000206e ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 95a2db3432..10babab231 100644 +index 9a653cbc4a..f73065b81c 100644 @@ -30 +31 @@ -@@ -2751,9 +2751,9 @@ ice_parse_tunneling_params(uint64_t ol_flags, +@@ -2733,9 +2733,9 @@ ice_parse_tunneling_params(uint64_t ol_flags,