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 50FF1A0C47 for ; Mon, 26 Jul 2021 15:55:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AF5040F35; Mon, 26 Jul 2021 15:55:56 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 7DFEA40DDA for ; Mon, 26 Jul 2021 15:55:54 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id q3so11275636wrx.0 for ; Mon, 26 Jul 2021 06:55:54 -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=koHmLQBpnSqS99O8JOsts8PAOwBSRdl2fiWtThr/2JA=; b=laSyxXjF9oB6swhBI5GY/4Fr3vbvUOl9RJt88TExvikLDlDlGzu//H5pzuQQphaHw5 tGHBRHKPgunCocHDfzH89H/muKhjhUcIMkXYsyTwADkkieJUGpG1zA0bfPhsmm48Pc/g CzQd/vRXDYtPbMDzO0zphxG6L3AXozXTuCwD8N8nemSi+tcZvAxNR1RYSpLxTE9Tb8NK +6fYYKrjPh6iXmLngINUvqM62+gBIe1Rj0Ep7RXYj/lDyvSV2M8vZIHbw0apPQW/OaRI dGuFzp+ZVGvWr5OjvbKsZRQGo8jhwGjCByn+j0yjO32P7ogrr1ijdLZxbpBADzMa3yzS 21gQ== 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=koHmLQBpnSqS99O8JOsts8PAOwBSRdl2fiWtThr/2JA=; b=gb6BJ+LbIudBoLvPVJxzsFC40zmJdiWpbBRLjn4QS0Lln6LF6A2RsDRAlDq5GF/LQg q29caSCqyj+1Km8vin9Ar4NbweUMK1i3+4aRkIzQxMu+js8xlX7pB/QtgUxW1zemhcRL SeCyHqahZp75O6DXvkZMgFTMrYX0sTN1uBQiLCNSV2ADTjExG7NwZcAGKpJr4fzI8hVZ ayx81FoCOS9/HlHbdeVfeSWYDQko/WQCtnd3Emy55gd61ImA4d0JyGO4WAV1UzkqydMl IbXV71lt+4ikskYb/+TC4gswnQxXKMebDJ83DILrdO1AGzpjpxYB+U5f2pEWndq5qYhH vUKw== X-Gm-Message-State: AOAM532yAhPB8AukZHQoBjID3syWRQ+XvbiadjXP7iRByRDYzprs3e4I A3QIS2w2J4qGXsUtp8ZUAVw= X-Google-Smtp-Source: ABdhPJw7N9uRJzvYT/IauIAHMpjlg4sIgX7EHNcgU0HWFgs54s2R4ieANqr734TtTJ9Jn2zy/kZm6Q== X-Received: by 2002:a5d:4c88:: with SMTP id z8mr19352238wrs.187.1627307754262; Mon, 26 Jul 2021 06:55:54 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id l22sm13299341wmp.41.2021.07.26.06.55.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:55:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Nipun Gupta Cc: dpdk stable Date: Mon, 26 Jul 2021 14:53:13 +0100 Message-Id: <20210726135322.149850-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/dpaa: fix headroom in VSP case' has been queued to stable release 20.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/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/4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d Thanks. Luca Boccassi --- >From 4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d Mon Sep 17 00:00:00 2001 From: Nipun Gupta Date: Mon, 19 Jul 2021 19:29:12 +0530 Subject: [PATCH] net/dpaa: fix headroom in VSP case [ upstream commit 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 ] This patch fixes providing the correct headroom size when VSP is enabled. Fixes: e4abd4ff183c ("net/dpaa: support virtual storage profile") Signed-off-by: Nipun Gupta --- drivers/net/dpaa/dpaa_flow.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c index a0087df670..c5b5ec8695 100644 --- a/drivers/net/dpaa/dpaa_flow.c +++ b/drivers/net/dpaa/dpaa_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2017-2019 NXP + * Copyright 2017-2019,2021 NXP */ /* System headers */ @@ -999,6 +999,9 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, buf_prefix_cont.pass_time_stamp = true; buf_prefix_cont.pass_hash_result = false; buf_prefix_cont.pass_all_other_pcdinfo = false; + buf_prefix_cont.manip_ext_space = + RTE_PKTMBUF_HEADROOM - DPAA_MBUF_HW_ANNOTATION; + ret = fm_vsp_config_buffer_prefix_content(dpaa_intf->vsp_handle[vsp_id], &buf_prefix_cont); if (ret != E_OK) { -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:18.769305985 +0100 +++ 0050-net-dpaa-fix-headroom-in-VSP-case.patch 2021-07-26 13:53:15.949294725 +0100 @@ -1 +1 @@ -From 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 Mon Sep 17 00:00:00 2001 +From 4b44020ca7ad0bc5874f4a4f97bcaaa50662a47d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8d2bf7c1d5b93becd8b4649e0c628eec94be1799 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org