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 EFD2DA0543 for ; Tue, 21 Jun 2022 10:10:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 129EB427E9; Tue, 21 Jun 2022 10:10:26 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2084.outbound.protection.outlook.com [40.107.244.84]) by mails.dpdk.org (Postfix) with ESMTP id E94E942B71 for ; Tue, 21 Jun 2022 10:10:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g6o7xotIjL/0YeXkowVFOevb1XfD7pkpt02NUDjZg1BylQgR9YpIeo+mgLObf9gk9BPNTWzKUuxohf7deayqLsNF+JnczjJoSf0W3kg2bF41r+f7WTRyyEpfv1dgMxyim1eMvFdkmTpv+YU4u9XctfbR9sR2pMctxpisrtyF44pVucJTd+0zVwPPdo1KRmY15Fl7Ce2VxHs7scbm1ibK0ByHFSvYRjEcCjzKDs7dfC5sSYyt6xFlUKD6j0vZtzl9DXwGP1UD7bW+bWSW3ovDC627VlploJC7i5UsIITA4jxXgE/bbcbB56CCgnaRafNOGckmLPHSW00pvrOlgsexAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=qZkx90znuiBcA+DhUjJmzN/KiUtnTYTdHLMMEEfKPhg=; b=Wo71p9DHX4+yhdKyf7ixFA+oF+CWu4D4vzRNgRE0aEX2iDiC/gYXOu0PaMSmM0XicYoLPKlCxmQFf3zOsPH2ysesdRxcKOH4H7nyUd8+/iDArfbUlAmJBAUq2QvLslR4I3gAIOavZXpUzZISoB1HRuw47FRtedHqmH6lsh7SGWEADMUOPc87/9K60XETkV5uN0HeQrqlHals56Pi/scD9MbHaEM7kJy4A9kZRvX0UxlOUGuaseWkhJ8LfCsDsJ2J8zLEG6uZ/R17YIFwyOQ7J62346F+kZovskhB7LxZ7BipfmQncmr+hrTXITm2QG/4KXrzhDChKQOv5MATjZM1Jg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qZkx90znuiBcA+DhUjJmzN/KiUtnTYTdHLMMEEfKPhg=; b=jODhvldQakGWRdRkgxDsvJgiPUkCo25Cme2Ii8bD1yCCUPm952zhnv/kdhuB1BWvCCmmbL+3IAugU2hUewG9CJe87ReNSZse+vmQ3HG77dgs/xZ36DnASNQL0IZjQY1J9rOj+6FmoAA0HIVu5eCQnAyiqAF7TzMno2SLSoaIPmeRhI9UIvniLWsGfXZ86srNoemKD5qVq54OS6VyK0I2DCVYcoHdb3qj1yQI1Eaq4dQhDPY+iaUPcyodZFyXisphADmjrBsAKOzBWdq7iiLyNZZFa0romrKX31I5ZsRSl5KJlvx2/K5C8Ym4Dlea8VmK4Lxa7kRwquF4l9AqKgNxfQ== Received: from BN9PR03CA0511.namprd03.prod.outlook.com (2603:10b6:408:131::6) by DM4PR12MB5889.namprd12.prod.outlook.com (2603:10b6:8:65::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:10:22 +0000 Received: from BN8NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:408:131:cafe::58) by BN9PR03CA0511.outlook.office365.com (2603:10b6:408:131::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.18 via Frontend Transport; Tue, 21 Jun 2022 08:10:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT040.mail.protection.outlook.com (10.13.177.166) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:10:21 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:10:21 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:10:18 -0700 From: Xueming Li To: Joyce Kong CC: Ferruh Yigit , Ruifeng Wang , dpdk stable Subject: patch 'net/memif: fix overwriting of head segment' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:28 +0300 Message-ID: <20220621080301.2315720-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bfe613b6-7713-4590-37c7-08da535d7ceb X-MS-TrafficTypeDiagnostic: DM4PR12MB5889:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pyfvujishXQctP9D83qsR/2TYESkNAxznq154KddVGG6bLf1d0VHroESUEefFV0OF+MQc04XM9hVUqs42sAqifISrVNIKGlXnMMQrRwqFuJm/8EQYjbDOWQWoFiGphxt10t6A/Gkfg3auMXa2ZonbiFdzHzoEh92BckQRIy76cYEHvFUMMo4QTS29gVbgJQFt+niw7zBIF6/XRGeCHDxAB8EqGjHnuZ+6Pj/I3ejZkqQllc7tqpPqlaGJVEO9dmGLCadDz2y+O6nyKAIqHsOkqe+2i5Xf2wmpFMqjLMSrBSuvmTijn1OlLEd6lh/IjSd1yg4hTNe9qdDXwNI5F5WoOaJZmjIjXaWAtccKeRu+aO1AFfBZY7FkWcYVjmCMTIA6Nf8MBnbkryAyR1LOSWbfSJ27QeL1TKKnvQsV1bp6+gtyPcyk7OaCkF5IzgrI0xtjpdturcyZG9gk/pBypaflia6gXnFl4CqVl3FdP42Spn1zdNLW1Fm6hWGIFugbyQCxhjg7KXl8vat08jTkKSUxnSG/CK6XA4tlWuktFXT4LzM+t0BA2wR4Demz0GgtfvYo+WA9M8qY14wyYeOoxdvxMVOMawFAuA/PhNpP9bW1hMc94Na3Lg+G1JVC8cYg0lptzghlT2WwK+clDn3oIskhQoPg+prre85Bp8LNrc4U5eY9j63Vhw3A+4nVz4oCcWt5m8q7tU59/02HgsaC9DkaiCcFRLuU0Uyh0S1lubVet8EiVtZ609Gm1yRqRcGL6GgT5uo9ZUwpQ9mitF6KclNMhqogeDK+yk5B85BMb5q8s4+XaLfip6ErzujALi3sidsgaaKeQY7m50e0PbcsKAs9k07qHUWbZcOcfdN+MC8wJ4= X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(376002)(346002)(136003)(396003)(36840700001)(40470700004)(46966006)(26005)(70586007)(53546011)(47076005)(8676002)(7696005)(2906002)(70206006)(5660300002)(6666004)(82310400005)(36860700001)(426003)(55016003)(4326008)(82740400003)(966005)(6286002)(6916009)(41300700001)(316002)(40480700001)(86362001)(478600001)(8936002)(40460700003)(336012)(1076003)(186003)(83380400001)(36756003)(81166007)(54906003)(356005)(16526019)(2616005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:10:21.7481 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bfe613b6-7713-4590-37c7-08da535d7ceb X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5889 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 20.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/23/22. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/89f54969e74601b49c90389df682b329c5a3776b Thanks. Xueming Li --- >From 89f54969e74601b49c90389df682b329c5a3776b Mon Sep 17 00:00:00 2001 From: Joyce Kong Date: Wed, 25 May 2022 05:56:35 +0000 Subject: [PATCH] net/memif: fix overwriting of head segment Cc: Xueming Li [ upstream commit 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c ] The 'dst_off' was reset in multi segment case. This caused memif buffer segment to write to beginning of mbuf, overwriting previous data. Fix it with this patch. Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") Reported-by: Ferruh Yigit Signed-off-by: Joyce Kong Reviewed-by: Ruifeng Wang --- drivers/net/memif/rte_eth_memif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 3dc357aef3..642c44d4ac 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -349,13 +349,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) goto no_free_bufs; mbuf = mbuf_head; mbuf->port = mq->in_port; + dst_off = 0; next_slot: s0 = cur_slot & mask; d0 = &ring->desc[s0]; src_len = d0->length; - dst_off = 0; src_off = 0; do { -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:52.968686050 +0800 +++ 0082-net-memif-fix-overwriting-of-head-segment.patch 2022-06-21 15:37:49.167785046 +0800 @@ -1 +1 @@ -From 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c Mon Sep 17 00:00:00 2001 +From 89f54969e74601b49c90389df682b329c5a3776b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 10c4c4d4eac1b7def2d2e8a63f9d302cf42a606c ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 587ad45576..dd951b8296 100644 +index 3dc357aef3..642c44d4ac 100644 @@ -25 +27 @@ -@@ -348,13 +348,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) +@@ -349,13 +349,13 @@ eth_memif_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)