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 81D11457A1 for ; Mon, 12 Aug 2024 14:55:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7CDAF4066D; Mon, 12 Aug 2024 14:55:34 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2075.outbound.protection.outlook.com [40.107.236.75]) by mails.dpdk.org (Postfix) with ESMTP id 07D734029C for ; Mon, 12 Aug 2024 14:55:33 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C01QiEcuX86Q22A5UMunJtl75EkwiEHE9Fu/ZPLUVtklofogvrTuOCDD+haCIzVetw8E1BvhSTJTlyGZn3GBT3yfIG4xA3pIQ6344D80COkkHKdYNZSt/8magShU29WetWryQEhxapvr/5GgyvITV0iP9mQMg4TlnPel+wAmehbfp6aa+DAwClhLl4q4s4ZhWML3TyJuooQ3wTL7Au5he1kRoOfZjmTVTvtjj+/MUf4yb/yk+QX2rFmxwU9vDnNv3F39ncvdyx3m7fsreZ+J/kHeRCI4yRMWiJnCwCERwZzCcivi+Mx87tHSR0xEA7+/j+AM/rkGp+D5UutfWvQF7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=fWCYpwGxd+N9GIOJzi5kIcJAzJGKzmJlb1AbHhDSPpI=; b=s9tMYu+rsZBu7lRgBdBwwYp8kWyBD5uvahbn2BBQZ09vTp/sEmmbwFzVndeVvICp+N9P7YWJuTWvwFCLSs/CSdbcVt1BGe9XsNt54T+aIcRu51lnua3i6B047RrW+DocfpPPq0T4jQ/NDkbw+z6UDD1gRztn9MOvWiT5JT3pX8NZ+y34nkQXUlPDIB6qqJ/Zpwf8aQFnPeKnYsY9Vd6ePpK1K+Vs0H0qcdCSbazGH308isOqhxW4ez43FC/l8PM/QzJ21u1bi5ZRaI3mgceLPSVEyDt19HtLBLK+Oew4L7ZO8nHmyeE/tqeMoH3SDCZ/gz+hdMVSe6dLfuTJif1/0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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 (0) 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=fWCYpwGxd+N9GIOJzi5kIcJAzJGKzmJlb1AbHhDSPpI=; b=Z1dnT7fwPo96Ee7fMKBzuLi//O2Qhv/xNmTK0STHaYe8MOMLX1TRQgdnr/Za7qdVvQHAPzt+Qd1xfo3Ak6FYrafDR4mWQzULEe8ib1kzp3n11+OLlloaD9s1qyi9Oc9fR+zojA4AjloUgsrmWoSTfKN+UpMy+PbiG4weYh4oELG5fYZVgvo2Vp8A/dVqwm5PnmgURnTU3Vzytl/MDlIP72c1lrbLn+HlCuxkj8GQSX91XFDx+sqWdg4hNb0Z/ZCe1ncHRCJSM2nR8YkC7ttBbAXLF42lkkKCZ/D+1zZpefOtUpD4D1h/GmownrWXasNU7W7Sgbpu2KW60WcTbY/5+A== Received: from SA1P222CA0044.NAMP222.PROD.OUTLOOK.COM (2603:10b6:806:2d0::9) by DM6PR12MB4057.namprd12.prod.outlook.com (2603:10b6:5:213::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.20; Mon, 12 Aug 2024 12:55:29 +0000 Received: from SA2PEPF00003F64.namprd04.prod.outlook.com (2603:10b6:806:2d0:cafe::b9) by SA1P222CA0044.outlook.office365.com (2603:10b6:806:2d0::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:55:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SA2PEPF00003F64.mail.protection.outlook.com (10.167.248.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:55:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug 2024 05:55:20 -0700 Received: from nvidia.com (10.126.231.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.1544.4; Mon, 12 Aug 2024 05:55:18 -0700 From: Xueming Li To: Anatoly Burakov CC: , dpdk stable Subject: patch 'fbarray: fix finding for unaligned length' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:48:46 +0800 Message-ID: <20240812125035.389667-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SA2PEPF00003F64:EE_|DM6PR12MB4057:EE_ X-MS-Office365-Filtering-Correlation-Id: 82295e8b-6fae-49b9-95d2-08dcbace0b74 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rcObgOAomoU778gd+Uo6/iVtu6c4C4U310v8/qkzluxJRaP/zzVB5f9n+/Ju?= =?us-ascii?Q?j3ToqONbk/t8v1ahVqcaz/QeNRw1LeRybtSrgYU7Pc5HsQ1XpZUKZvkaI9BO?= =?us-ascii?Q?PtHc8TPquHq7VAmCBBlziNFKvaf3is1y3o24U+5p8FP+qXhIeoCi+k6Ca7nF?= =?us-ascii?Q?zQ1MgWc2CTyGTH9RnS3Kt4aZhxrHND5okc9DhNgoJzzi3opfHq1cY+F+YkxK?= =?us-ascii?Q?BcyTvE+U6UmobwCeOU16M8HwYqH85yrokhxAFQcu6Q5uzRZIR1C4gRSLKd+h?= =?us-ascii?Q?oIq7R+y+dqwfZJDp1fxI00h12rApnSorMmeRJnlnFaGrSyUzWjjCmyL9YNkV?= =?us-ascii?Q?owCTd1n2ZtPtAX4zNH9du0bAtUQwKyE2SKJUDUxHpRzhGM81IJEyKNzQ8nBI?= =?us-ascii?Q?pNM1+kNuaklIVlyABC9rJk2QSjACEN04bAEiUVGqWzfkrNi349JeDeCYFHMZ?= =?us-ascii?Q?a6n/GmG2g0gmS22qsdy8QULqBH+mFFppVx3vZs/DAynCzyhJYUH2CCOEolQj?= =?us-ascii?Q?0IWcYzFTeKrP+hb0F2RAvjKkDut16OdqGLyD2SGztJ0qQkWw3O8v4d42m5rk?= =?us-ascii?Q?QjD8zfM0Abmg4/vkr+bhFKjTUc1bf+QkOL+9AcoA+IihoLvp3x17lGKre/B9?= =?us-ascii?Q?zGfsyTAE5A/0uxM2GZvGxP93M3pDCqw4WJF1i01UK8EzCYxZ76vw72nVIztk?= =?us-ascii?Q?f63EH8KRH8gz4y+R4I97IFrGfd5cVhgOx4HH97RIHNneMBUuk0/6zziPJqbS?= =?us-ascii?Q?eoR/GvLlsT9G84RK1JoIpnJ9GioVB6+nOXMiiFLVEIeyYSzPk0EbnD6q2nYc?= =?us-ascii?Q?qjpUVBN+xji9GF6ns1yj3a/buCZLFnw5wFF4IHM1p6ekQGLRQjmYH8eT9Rhr?= =?us-ascii?Q?q/YxHLd8KX/EaLEW5iKqNJ0/ejOqiNUR5U8m8WheEWgnXINHNJYW8vPsLoi+?= =?us-ascii?Q?OV+wsWvR1Due/cOMdQZ48LOP7MVahhfzBwTbZvN8ScXxAR3ZrBxPNcIQ4wz1?= =?us-ascii?Q?CbRj2PC2U7yPCfN6rz9ETUHQ60afvGeqQqsyXHvjQSIUHk5y60mwEpmZTr3j?= =?us-ascii?Q?JDetDrVkSD5Dt6uysF2tcEDeUxnonuKmh3hCM22y3iUlttJg2hMj9hhfsYJV?= =?us-ascii?Q?P1ThIXwDqrxBxQX1qeZ9jxIfa1xFiALzluNBi6dgkBRo9KMpkQofMhkaZ+Ku?= =?us-ascii?Q?Rp2wgnyXQS8em1uqZMg+IBktJkJ/MHZ5hNxrZOXNlSUY8EmntFQamWkA/Dij?= =?us-ascii?Q?ayNqicnbACZtfTdm5io+IG0p0OLMk0oDSdWxCebTJW3dQj+flwVzWiUbldRE?= =?us-ascii?Q?haDfitNjCRLAs8no++Fr1GcYAcnCquJCJvm+0vwdqpV+M8ew79hykY1aGOTT?= =?us-ascii?Q?Hzm3vD2GDpcnzuVtngqWnpWxqAssDohVbEF1NAny79XaJ13fOsUOyH7bpwYF?= =?us-ascii?Q?oVK7S877pDMBPEqMe6R0MK3wT2e5xXUU?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(376014)(82310400026)(1800799024); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:55:29.6737 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82295e8b-6fae-49b9-95d2-08dcbace0b74 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SA2PEPF00003F64.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4057 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 23.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=a4e8a4f48899e1e120bcc4f1e5256889935e8cfe Thanks. Xueming Li --- >From a4e8a4f48899e1e120bcc4f1e5256889935e8cfe Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Wed, 10 Jul 2024 12:49:26 +0100 Subject: [PATCH] fbarray: fix finding for unaligned length Cc: Xueming Li [ upstream commit a744665d2149ba8707621c1214c798f807ec398e ] When array length is not aligned on a power of 2, we need to mask out the unaligned bits from the mask whenever we reach the last mask. However, when both ignore mask (e.g. due to starting at unaligned bit) and last index ignore mask are specified, we combine them with an OR, which is incorrect. Fix it to combine them with AND instead, and add a unit test covering this case. The reverse function does not suffer from this issue because it does not have to deal with array end, and array beginning is always aligned. Fixes: c44d09811b40 ("eal: add shared indexed file-backed array") Signed-off-by: Anatoly Burakov --- app/test/test_fbarray.c | 123 +++++++++++++++++++++------- lib/eal/common/eal_common_fbarray.c | 2 +- 2 files changed, 94 insertions(+), 31 deletions(-) diff --git a/app/test/test_fbarray.c b/app/test/test_fbarray.c index 13c6691e50..09f6907fb1 100644 --- a/app/test/test_fbarray.c +++ b/app/test/test_fbarray.c @@ -21,23 +21,41 @@ struct fbarray_testsuite_params { }; static struct fbarray_testsuite_params param; +static struct fbarray_testsuite_params unaligned; #define FBARRAY_TEST_ARR_NAME "fbarray_autotest" #define FBARRAY_TEST_LEN 256 +#define FBARRAY_UNALIGNED_TEST_ARR_NAME "fbarray_unaligned_autotest" +#define FBARRAY_UNALIGNED_TEST_LEN 60 #define FBARRAY_TEST_ELT_SZ (sizeof(int)) static int autotest_setup(void) { - return rte_fbarray_init(¶m.arr, FBARRAY_TEST_ARR_NAME, + int ret; + + ret = rte_fbarray_init(¶m.arr, FBARRAY_TEST_ARR_NAME, FBARRAY_TEST_LEN, FBARRAY_TEST_ELT_SZ); + if (ret) { + printf("Failed to initialize test array\n"); + return -1; + } + ret = rte_fbarray_init(&unaligned.arr, FBARRAY_UNALIGNED_TEST_ARR_NAME, + FBARRAY_UNALIGNED_TEST_LEN, FBARRAY_TEST_ELT_SZ); + if (ret) { + printf("Failed to initialize unaligned test array\n"); + rte_fbarray_destroy(¶m.arr); + return -1; + } + return 0; } static void autotest_teardown(void) { rte_fbarray_destroy(¶m.arr); + rte_fbarray_destroy(&unaligned.arr); } -static int init_array(void) +static int init_aligned(void) { int i; for (i = param.start; i <= param.end; i++) { @@ -47,11 +65,35 @@ static int init_array(void) return 0; } -static void reset_array(void) +static int init_unaligned(void) +{ + int i; + for (i = unaligned.start; i <= unaligned.end; i++) { + if (rte_fbarray_set_used(&unaligned.arr, i)) + return -1; + } + return 0; +} + +static void reset_aligned(void) { int i; for (i = 0; i < FBARRAY_TEST_LEN; i++) rte_fbarray_set_free(¶m.arr, i); + /* reset param as well */ + param.start = -1; + param.end = -1; +} + +static void reset_unaligned(void) +{ + int i; + for (i = 0; i < FBARRAY_UNALIGNED_TEST_LEN; i++) + rte_fbarray_set_free(&unaligned.arr, i); + /* reset param as well */ + unaligned.start = -1; + unaligned.end = -1; + } static int first_msk_test_setup(void) @@ -59,7 +101,7 @@ static int first_msk_test_setup(void) /* put all within first mask */ param.start = 3; param.end = 10; - return init_array(); + return init_aligned(); } static int cross_msk_test_setup(void) @@ -67,7 +109,7 @@ static int cross_msk_test_setup(void) /* put all within second and third mask */ param.start = 70; param.end = 160; - return init_array(); + return init_aligned(); } static int multi_msk_test_setup(void) @@ -75,7 +117,7 @@ static int multi_msk_test_setup(void) /* put all within first and last mask */ param.start = 3; param.end = FBARRAY_TEST_LEN - 20; - return init_array(); + return init_aligned(); } static int last_msk_test_setup(void) @@ -83,7 +125,7 @@ static int last_msk_test_setup(void) /* put all within last mask */ param.start = FBARRAY_TEST_LEN - 20; param.end = FBARRAY_TEST_LEN - 1; - return init_array(); + return init_aligned(); } static int full_msk_test_setup(void) @@ -91,16 +133,7 @@ static int full_msk_test_setup(void) /* fill entire mask */ param.start = 0; param.end = FBARRAY_TEST_LEN - 1; - return init_array(); -} - -static int empty_msk_test_setup(void) -{ - /* do not fill anything in */ - reset_array(); - param.start = -1; - param.end = -1; - return 0; + return init_aligned(); } static int lookahead_test_setup(void) @@ -108,7 +141,7 @@ static int lookahead_test_setup(void) /* set index 64 as used */ param.start = 64; param.end = 64; - return init_array(); + return init_aligned(); } static int lookbehind_test_setup(void) @@ -116,7 +149,15 @@ static int lookbehind_test_setup(void) /* set index 63 as used */ param.start = 63; param.end = 63; - return init_array(); + return init_aligned(); +} + +static int unaligned_test_setup(void) +{ + unaligned.start = 0; + /* leave one free bit at the end */ + unaligned.end = FBARRAY_UNALIGNED_TEST_LEN - 2; + return init_unaligned(); } static int test_invalid(void) @@ -470,7 +511,7 @@ static int test_basic(void) if (check_free()) return TEST_FAILED; - reset_array(); + reset_aligned(); return TEST_SUCCESS; } @@ -713,6 +754,26 @@ static int test_find(void) return TEST_SUCCESS; } +static int test_find_unaligned(void) +{ + TEST_ASSERT_EQUAL((int)unaligned.arr.count, unaligned.end - unaligned.start + 1, + "Wrong element count\n"); + /* ensure space is free before start */ + if (ensure_correct(&unaligned.arr, 0, unaligned.start - 1, false)) + return TEST_FAILED; + /* ensure space is occupied where it's supposed to be */ + if (ensure_correct(&unaligned.arr, unaligned.start, unaligned.end, true)) + return TEST_FAILED; + /* ensure space after end is free as well */ + if (ensure_correct(&unaligned.arr, unaligned.end + 1, FBARRAY_UNALIGNED_TEST_LEN - 1, + false)) + return TEST_FAILED; + /* test if find_biggest API's work correctly */ + if (test_biggest(&unaligned.arr, unaligned.start, unaligned.end)) + return TEST_FAILED; + return TEST_SUCCESS; +} + static int test_empty(void) { TEST_ASSERT_EQUAL((int)param.arr.count, 0, "Wrong element count\n"); @@ -814,17 +875,19 @@ static struct unit_test_suite fbarray_test_suite = { .unit_test_cases = { TEST_CASE(test_invalid), TEST_CASE(test_basic), - TEST_CASE_ST(first_msk_test_setup, reset_array, test_find), - TEST_CASE_ST(cross_msk_test_setup, reset_array, test_find), - TEST_CASE_ST(multi_msk_test_setup, reset_array, test_find), - TEST_CASE_ST(last_msk_test_setup, reset_array, test_find), - TEST_CASE_ST(full_msk_test_setup, reset_array, test_find), - TEST_CASE_ST(empty_msk_test_setup, reset_array, test_empty), - TEST_CASE_ST(lookahead_test_setup, reset_array, test_lookahead), - TEST_CASE_ST(lookbehind_test_setup, reset_array, test_lookbehind), + TEST_CASE_ST(first_msk_test_setup, reset_aligned, test_find), + TEST_CASE_ST(cross_msk_test_setup, reset_aligned, test_find), + TEST_CASE_ST(multi_msk_test_setup, reset_aligned, test_find), + TEST_CASE_ST(last_msk_test_setup, reset_aligned, test_find), + TEST_CASE_ST(full_msk_test_setup, reset_aligned, test_find), + /* empty test does not need setup */ + TEST_CASE_ST(NULL, reset_aligned, test_empty), + TEST_CASE_ST(lookahead_test_setup, reset_aligned, test_lookahead), + TEST_CASE_ST(lookbehind_test_setup, reset_aligned, test_lookbehind), /* setup for these tests is more complex so do it in test func */ - TEST_CASE_ST(NULL, reset_array, test_lookahead_mask), - TEST_CASE_ST(NULL, reset_array, test_lookbehind_mask), + TEST_CASE_ST(NULL, reset_aligned, test_lookahead_mask), + TEST_CASE_ST(NULL, reset_aligned, test_lookbehind_mask), + TEST_CASE_ST(unaligned_test_setup, reset_unaligned, test_find_unaligned), TEST_CASES_END() } }; diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index fb8d32ce31..253110360e 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -173,7 +173,7 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, /* combine current ignore mask with last index ignore mask */ if (msk_idx == last) - ignore_msk |= last_msk; + ignore_msk &= last_msk; /* if we have an ignore mask, ignore once */ if (ignore_msk) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:04.166057468 +0800 +++ 0049-fbarray-fix-finding-for-unaligned-length.patch 2024-08-12 20:44:02.045069285 +0800 @@ -1 +1 @@ -From a744665d2149ba8707621c1214c798f807ec398e Mon Sep 17 00:00:00 2001 +From a4e8a4f48899e1e120bcc4f1e5256889935e8cfe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a744665d2149ba8707621c1214c798f807ec398e ] @@ -19 +21,0 @@ -Cc: stable@dpdk.org @@ -259 +261 @@ -index 63d8b731f5..22b43073c6 100644 +index fb8d32ce31..253110360e 100644