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 30103A0527 for ; Mon, 9 Nov 2020 19:44:37 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2A6C072E9; Mon, 9 Nov 2020 19:44:36 +0100 (CET) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by dpdk.org (Postfix) with ESMTP id AF84772E9 for ; Mon, 9 Nov 2020 19:44:35 +0100 (CET) Received: by mail-wr1-f44.google.com with SMTP id k2so6492597wrx.2 for ; Mon, 09 Nov 2020 10:44:35 -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=I5sfT0dUIGlNTUaQg0Kv656jit3P1D62+lwZ8rZW8G8=; b=bo91a8LdnKzub6hcWOFlPRmqABeBg73aru3kyle7M0Zm80zoX0JVrNtqFVz8Kh3cse w5we0l8gj+ujd7fGup6JWSW9TFru+QCgrAF7oNbrjovSfeehKRZYDiZeE562BvxrIaO/ mG3Ju5ILUu3Qqp1pncgwJD0fAE8viz6viESlYIJtTF9IhN3nx0hBwNeMhlXbBkt25Co2 Bz9JNG5hVgSrhwHSTp1pRgVtPJQfIMwkpAOmqtOQM8Cy5whYynRbrWJJNAF7ZYH2Vjh0 Xo1DPjqtFP/rdciW+wcwG7t6yUfvEaEU/8UlF72oPnShCEOsh1bFVsK+8EpjZG4GdV5/ vzXA== 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=I5sfT0dUIGlNTUaQg0Kv656jit3P1D62+lwZ8rZW8G8=; b=io69vG6gZakT4ROg66yJWpkMyK4CospJwThzjvE7lmETUeIUnIewg7nG/jGi+zmxcB QuzoyE2trgs2OXCj/Oa1QqZFoA50dX9fRfjGjqExbH0cxGUeQ1g7LOv8e4haZ+zNf5m8 FoPb959WdYtAl14w+s/98EFgoggDONR1Cb4HaNUztqsAkNydH0JArrXi7baULRDwzhps a9y6gNIlV9nUvUfRJiCjnVEvV0sSnpTaVLZkPSQoCAN/3LXRqixqIpQclvxsNLVlrvKy npoiAtSl9qjzIQmDZU0FCp/++UzjzZ7SLz+FWQwOyJ40SYJeWMJCqQs3ZsuvtVhSIT4A r/lQ== X-Gm-Message-State: AOAM530CwO14uJoW0x3kqffKqwahP0NAClvR9h9/fYcENnmfopQ9bOMJ VVkICqSBZYnEJ0oaL00Kj8m0yJygJkLJ35hP X-Google-Smtp-Source: ABdhPJx6epBNdqRMzaJcaBSN0L4c43ldqkTL+Pw+NBT6PuA6usX2/tiJtsslC8459EFePoX+Xr6cmg== X-Received: by 2002:a05:6000:143:: with SMTP id r3mr8453244wrx.212.1604947474434; Mon, 09 Nov 2020 10:44:34 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n14sm14494664wrt.8.2020.11.09.10.44.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:44:33 -0800 (PST) From: luca.boccassi@gmail.com To: Ajit Khaparde Cc: Lance Richardson , dpdk stable Date: Mon, 9 Nov 2020 18:40:47 +0000 Message-Id: <20201109184111.3463090-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix resetting mbuf data offset' 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 11/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/d9d122771dd5f78c3be9c955a0ff53332729bbe9 Thanks. Luca Boccassi --- >From d9d122771dd5f78c3be9c955a0ff53332729bbe9 Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Sun, 25 Oct 2020 20:56:14 -0700 Subject: [PATCH] net/bnxt: fix resetting mbuf data offset [ upstream commit 3cefa72935fde04824fdfbee9c435c08278ab3c2 ] Reset mbuf->data_off before handing the Rx packet to the application. We were not doing this in the TPA path. It can cause applications using this field for post processing to work incorrectly. Fixes: 0958d8b6435d ("net/bnxt: support LRO") Signed-off-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_rxr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index 32eaf75ed5..5afe5c4f36 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -145,6 +145,7 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq, tpa_info->mbuf = mbuf; tpa_info->len = rte_le_to_cpu_32(tpa_start->len); + mbuf->data_off = RTE_PKTMBUF_HEADROOM; mbuf->nb_segs = 1; mbuf->next = NULL; mbuf->pkt_len = rte_le_to_cpu_32(tpa_start->len); -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:13.443888361 +0000 +++ 0059-net-bnxt-fix-resetting-mbuf-data-offset.patch 2020-11-09 18:40:11.191312216 +0000 @@ -1 +1 @@ -From 3cefa72935fde04824fdfbee9c435c08278ab3c2 Mon Sep 17 00:00:00 2001 +From d9d122771dd5f78c3be9c955a0ff53332729bbe9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3cefa72935fde04824fdfbee9c435c08278ab3c2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 2645ed61f4..4d0ab604f3 100644 +index 32eaf75ed5..5afe5c4f36 100644 @@ -23 +24 @@ -@@ -150,6 +150,7 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq, +@@ -145,6 +145,7 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,