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 4AAB0A0093 for ; Fri, 22 May 2020 11:41:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 43D5A1D966; Fri, 22 May 2020 11:41:21 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 8C98B1D971 for ; Fri, 22 May 2020 11:41:19 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id h4so8049882wmb.4 for ; Fri, 22 May 2020 02:41:19 -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=sDly9pzOVK6v1Cr+e+PCxIVdWanP6V7V2JnMCk/MbG4=; b=joOja2Sw1+qR+K3YYmq7thh5tjue1RnkDRb92Y7NjSsulYUw34fSJUGHZfIVTIzbJa oJ1tPk0oxS3gQu5xJIvWQMyUUMmb/wPX4v6BuudzTVVFvj7T0Y5fP88JaUz3sZ+VJPFR DHpUKx0t+hzBPjaElW/vWi+dQ1gFqnap98BGdJeMzvDoLbDQj1nw4Ckoudd1APjIoVo0 uwIpwtTKcUQgjlLnT6cp1SanzvJTJ36ZL2hwR36BgjDRlimO+CKaTvckTSqC7T3DqlUy Fu52nCq9/8JJj3EzAjvvBJCrY6X8fxxgYpIuJ/8+Dhrh3EvKIAMg3hS95CJM1eOeCNM3 pMYw== 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=sDly9pzOVK6v1Cr+e+PCxIVdWanP6V7V2JnMCk/MbG4=; b=cjXuhYhfSBXPu+AMqvcPkp1+8rVdyKyQwE+jw4J5uBpHOF2oRtFd9cM2XfsWKpxrld AsVlckka3rKlQq+n9BKwmN1TLTK9MQg0DqYYlwLmMp+Eha2lXcB6HmDO6DBcF5/JG3Lg eMYDV0HG6gy3SWKx3jfB0aG5xfckfd8FoaI+c3gErqKxTwdd0gbwCHREPDqGEZfIgp37 O8aryLqjkGO3Eikpu4P1R9fHfNuNSfPJ2+GlwPNXWLB+7D0W1ni+K4hd+V9QhuJ7gza6 8qYsjql/e139FB2/Q1xWNEbNt7/kotY0G8Zd6wBK1dfkL8sStxw8/fa3oL9OWJv9ukAK WBWg== X-Gm-Message-State: AOAM533r7aliWMX51/6sEvYkg2mklrX0Gvn5WFxJDYbo0+pAcspK7Z6f aFbkAhHLNoAg/WTbQXTrS5E= X-Google-Smtp-Source: ABdhPJyxYcSF6cpQnBV2hQo92PpmuSwRubNhbUQ9bfcXqVqzaQE5pfgCjtnx7iz03HMyDljDDz1Miw== X-Received: by 2002:a1c:9cd5:: with SMTP id f204mr5556008wme.105.1590140479332; Fri, 22 May 2020 02:41:19 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i6sm10307426wmb.41.2020.05.22.02.41.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:18 -0700 (PDT) From: luca.boccassi@gmail.com To: Xiaoyun Wang Cc: dpdk stable Date: Fri, 22 May 2020 10:39:57 +0100 Message-Id: <20200522094022.1025696-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/hinic: fix Tx mbuf length while copying' has been queued to stable release 19.11.3 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.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 05/24/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. Thanks. Luca Boccassi --- >From 1e2a3beb12595d18270c2a01a54cf3a7c857e6d0 Mon Sep 17 00:00:00 2001 From: Xiaoyun Wang Date: Thu, 14 May 2020 17:29:17 +0800 Subject: [PATCH] net/hinic: fix Tx mbuf length while copying [ upstream commit ee750eaa1476d55b812673fcfbe6352f67b890b4 ] When copy a mbuf to a new dst_mbuf, the pkt_len member of dst_mbuf needs to be updated. Fixes: 076221c8fe1d ("net/hinic: add Rx/Tx") Signed-off-by: Xiaoyun Wang --- drivers/net/hinic/hinic_pmd_tx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c index a919417277..33d8ae2102 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c @@ -312,6 +312,8 @@ static inline struct rte_mbuf *hinic_copy_tx_mbuf(struct hinic_nic_dev *nic_dev, mbuf = mbuf->next; } + dst_mbuf->pkt_len = dst_mbuf->data_len; + return dst_mbuf; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.917042210 +0100 +++ 0018-net-hinic-fix-Tx-mbuf-length-while-copying.patch 2020-05-22 10:37:39.104412284 +0100 @@ -1,13 +1,14 @@ -From ee750eaa1476d55b812673fcfbe6352f67b890b4 Mon Sep 17 00:00:00 2001 +From 1e2a3beb12595d18270c2a01a54cf3a7c857e6d0 Mon Sep 17 00:00:00 2001 From: Xiaoyun Wang Date: Thu, 14 May 2020 17:29:17 +0800 Subject: [PATCH] net/hinic: fix Tx mbuf length while copying +[ upstream commit ee750eaa1476d55b812673fcfbe6352f67b890b4 ] + When copy a mbuf to a new dst_mbuf, the pkt_len member of dst_mbuf needs to be updated. Fixes: 076221c8fe1d ("net/hinic: add Rx/Tx") -Cc: stable@dpdk.org Signed-off-by: Xiaoyun Wang --- @@ -15,10 +16,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/hinic/hinic_pmd_tx.c b/drivers/net/hinic/hinic_pmd_tx.c -index 996e0b26ff..bd39f9364f 100644 +index a919417277..33d8ae2102 100644 --- a/drivers/net/hinic/hinic_pmd_tx.c +++ b/drivers/net/hinic/hinic_pmd_tx.c -@@ -313,6 +313,8 @@ static inline struct rte_mbuf *hinic_copy_tx_mbuf(struct hinic_nic_dev *nic_dev, +@@ -312,6 +312,8 @@ static inline struct rte_mbuf *hinic_copy_tx_mbuf(struct hinic_nic_dev *nic_dev, mbuf = mbuf->next; }