[1/2] Memory Allocation: Fixes ms_idx jump (lookahead) during find_next_n() in fb_array library
Message ID | 1673615325-20624-2-git-send-email-vipinp@vmware.com (mailing list archive) |
---|---|
State | Changes Requested, archived |
Delegated to: | Thomas Monjalon |
Headers |
Return-Path: <dev-bounces@dpdk.org> X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 976B0423E6; Sun, 15 Jan 2023 21:11:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A1AE40A8B; Sun, 15 Jan 2023 21:11:41 +0100 (CET) Received: from MW2PR02CU001-vft-obe.outbound.protection.outlook.com (mail-westus2azon11012005.outbound.protection.outlook.com [52.101.48.5]) by mails.dpdk.org (Postfix) with ESMTP id 821CD40E03; Fri, 13 Jan 2023 14:09:53 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fnLEZm/NQb3inDD7CVWEG7fCqYv4gvZJfeEG35+jEjDv3rMoFBXGYYOdU07+9k4H60aBnF7FN5v4qRPztC6NqhwmYGw8B9aeaO+MCX2Egdfn3KBYst51RekdPdFJQnbK6yPdPG92hxVQg8+SoQchv33n+KUhMSBpKM7wexCiLAZuoGpVuGTNfQyMsmr2eWP1WSeAS2AwVEnK8ejU8hga3xFk7WraKJPnsbJt1f/O7rlDcinedl6c6OTY8XLU7rySHotks43oHZOzqwCpsH+1ZEH55iu3yw5kDVcnYKMLSh7MgrYs0hj6AOr99axC5Wz9xauAqN1F1sP7z96zBr032Q== 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=467qiaozynZn3xHWVwdJQXav6CwqxVIiC3s/a6e81Kg=; b=EcKsvz+oz2w9l7oR6GWDXViSJDv/FZE5Zq7qmherOVV1DwKR+2pEUfp0drUBDelqVpn4m+U4CX4GsQ0AnlqYuR0zLrr+IV73R97DOffyEDYvwI3U7Bj57rnDhOvk9vNyAS+Yrz5/sNq74NN2AoY8ewbN/3Elp8gGJ242ZTWKw4Pq3uGJ8pHqzYaxao1TZwJpHUJj2T1S9uupR2LyUaAUijbkofHBn4EoKnM68gSo3+CDELuQg9VsZQGDMAGpV/kjhGH/G5FA9DaoGsHi90GeGcAFyJJYgy+Od2LvASaoicTkiji6C9zuI/GIyKAeiI82U43/tzOcKz6LjJsUYBI6Fw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=vmware.com; dmarc=pass action=none header.from=vmware.com; dkim=pass header.d=vmware.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vmware.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=467qiaozynZn3xHWVwdJQXav6CwqxVIiC3s/a6e81Kg=; b=RshsAioo5ganFMCN5wMEaRT/0DHu+dnGpDDQj3TXE+U/BgW0qfRooAB06hw90Y6uyYp6NjHqRfnHU/mxNTLDtPwHERVaQ55fyPW1YedN1vhFs7LRRgktEvmll4ONqW8d+8tb5qGjg7cH3bScsjOTUEqLAAX/Czg8dFr3OpFwJ/8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=vmware.com; Received: from DM6PR05MB5577.namprd05.prod.outlook.com (2603:10b6:5:c::16) by BYAPR05MB5990.namprd05.prod.outlook.com (2603:10b6:a03:a8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5986.19; Fri, 13 Jan 2023 13:09:48 +0000 Received: from DM6PR05MB5577.namprd05.prod.outlook.com ([fe80::4cbc:cca6:3a16:5023]) by DM6PR05MB5577.namprd05.prod.outlook.com ([fe80::4cbc:cca6:3a16:5023%4]) with mapi id 15.20.5986.018; Fri, 13 Jan 2023 13:09:47 +0000 From: Vipin P R <vipinp@vmware.com> To: anatoly.burakov@intel.com Cc: dev@dpdk.org, Vipin P R <vipinp@vmware.com>, stable@dpdk.org Subject: [PATCH 1/2] Memory Allocation: Fixes ms_idx jump (lookahead) during find_next_n() in fb_array library Date: Fri, 13 Jan 2023 13:08:44 +0000 Message-Id: <1673615325-20624-2-git-send-email-vipinp@vmware.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1673615325-20624-1-git-send-email-vipinp@vmware.com> References: <1673615325-20624-1-git-send-email-vipinp@vmware.com> Content-Type: text/plain X-ClientProxiedBy: SJ0PR13CA0170.namprd13.prod.outlook.com (2603:10b6:a03:2c7::25) To DM6PR05MB5577.namprd05.prod.outlook.com (2603:10b6:5:c::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR05MB5577:EE_|BYAPR05MB5990:EE_ X-MS-Office365-Filtering-Correlation-Id: 8d3676b1-aded-499c-4003-08daf567723c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I9tdIFQLigJPIJ8Uj7GfKy9+9jPgPMeujbt6liEGm4DQ+5C/RLk9OT5pVvmyLXylKhwy9X+5zCrGSqSOmFxbwkgdnXYeGS11W7xFaZkmGmGFhMc4SzG0uCFrR76qOqW0H+SxrV83ZrN9l2UuEkW2GIY3+Ur8SHL3+bIeWUF8Cl+D0fYTJSsBrw2GnHUX9t1AlUoHuCEFaUiHB+Pr3gPgUN/tH2m2EdpLDG3VMjm3nOIxAbLxEtp555k3sM20BSHpBVIalaWdFZ0Wg0TbaYkc1MphMAjK+K0oIhtqluDLS6wu0AzRAoNDpZ6KHjUQ//nibk8xj84tz0Aq+ziM324rlyQbDHPsz/HibOPSPyKnM9+yb4G7pWVPrXe/LqaTt2T2ffJWI5Nmbuas6fFEZsOilkR3KSOpi8WRmzsYb8F6PA31CtJEuaoHdvfNIbYTd49h5CQ50wdffIWAs1XSU+nP8aSc2UA/DRqtY4Wapjl/jH4cOUHGHB39T1IN0FBI9SXv4La7DIPfQ75zH/m4xrDCS46vARB4dNtc1IHpLAufGqaeDsXEJBRLHzdauoMrWcVBW1BOHhcFq3KaBmNawr+iSfnqYx2hK2wtCaenhBuX6l4jOsb4j1rnazAstUQTEOi4BtNhJWJ8evQvNUcv7MEOL3fuVlpKdiv79hK2+HKTu0VN6yeXUYUnIkKevEp3ioQSHtD2fNeP1FD3G/lYHoD3ejRxu+LbXimAt8l8ifK0a9zSnf8J5CeTThGP+agiU7SA X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR05MB5577.namprd05.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(4636009)(346002)(366004)(136003)(39860400002)(376002)(396003)(451199015)(4326008)(41300700001)(6916009)(8936002)(5660300002)(2906002)(8676002)(66556008)(66946007)(66476007)(478600001)(6486002)(52116002)(26005)(186003)(6666004)(6506007)(6512007)(2616005)(83380400001)(38100700002)(38350700002)(36756003)(86362001)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sTcjatr8ugyZCD7R78SvlQWjzlel2OJqZ3HLlc/HTCWHfITh0403agJCiM/teCyR+eNY845oe3nridxEQxkpVcQKtqvtOeBPK0pTNCE1BvK4kdpyMy4KiGhrtxHqhjOi4me1lurjY2LJy6VKk09/V8jCJUegECZY0BiDHgAvnqLSuittfjrkskx0DoMTcLypByXMm178aXqj8+jWKVtXUTDjw60gDJWvfMs1Ld5JkPPHa6FyWy6wgT04tgK50wUoIF4UnWS8RQ4UEl/Uyb9VZMUx9pEcwDcPqyZ8+kZmc85Sq7NBlWCtQjc7jVp7fa4rueuvsOW+1NoKGFn8vDe927KnISMCgAA9wSNyXW7kpHRPqcW3HwAYXW0Zf++CXSDfgCRae1SptYRa8thZLjpk/S6dyFK/zneyvmnThvOa9bSX+6pMlrYKzwPeA56MHUfMJMtwKkK7T/HgPlOX8gHZxVK9VDHSySUOThfzbw3q48xziaxAMwFEaqB95WGRE0MlijhpX9GybTOqTAZfM3oIgdC2G8w4DiTmFAPAQHK9U2PoBDEcTyQ7nKhhIC541R5W7OhoO0gG8qHzadSNzhayiwKSkofboXNLdm+8uFyoleMi5WaR6qW/7ppMkpeTNbItXh/S6W2H4E+zqED3ttSSSGotqDYr+KGEo2njYeXcjKw3y36qDql5qrXdTyAbk4UO44qt9pwr80amW9wh9+nNeYi9Oqi5RqOOXwzlR2EV4WClrqN1ZxfndmVHzWr1GgcjnO5Qld8t3qH1leCrlW0waAUgys0NtQ1XcrYY6urX3honEG5+5rK72F/ydButog5/AUdnDVFq/M+yC6Dm9fQp/oWq9NICdknOUacQa9I+6IDM1t5h5yiwlb47m3FLlgBr75QjWv3kGnGJNH7FOP3LfaZZjn3R+xbUBoFgoRw0KxBIprp6vhohARBfgrvLAyCITQVYqMd6Xrgvs4HvvTdc12BVXvnd9U56eEFgh8juvRZtfjY9WvyvtBhe3K0MvEPVFV2QI7OtHEEqULjl1mjO4ZWuq0/d7IzVtr4cg072XL4u+/sXfOsn+7gv/CN4Sr90YZr9IEaCPnWmwEzbNX96rdIsOuDpS8Gwf2YmnzFUvATztLN9hp75cgKQuKUXJq+pr2N/LTH1AqD/E1FJ0s2pEHqrLGYHT1eg8m5iyJpDlTkagIV24QXnqnLa4aqvZhajsgLNz3Qq4L/xL1E0nuKNBRVSXp5jYChYGrLB+IdPfSoBcFJhGpz31VetFUTvO26GlXpHCaIO6lT4RrvRnXnicsg9CAl/JMxA5k/m3USwrvcpU4P84/3J4OuoJJ5t2hoNXc7K+q/5f9Y84U3Kfn0yFeli/hxjw+Uh/po2KozFcYS6qPFke5pGImcEmVDZbbXlDEJ/qCI12psS4fpmkRB1+nWD7zFFMjttHL6RdlgH/UnyZRYLKLLwZTUW6wlkY32LvX3VJdrdjLDISlo3Z4cocsxJ864Vu8BQ075uk4O3XKy4hJtIYrLwpMRsPjtWPaad1aF7K+uTKfV7+f7ZkyIpARtEHHThzneA23cFsMGXYyM45DxNtT59gJO4x6qQaOAp X-OriginatorOrg: vmware.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8d3676b1-aded-499c-4003-08daf567723c X-MS-Exchange-CrossTenant-AuthSource: DM6PR05MB5577.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2023 13:09:47.4740 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: pStJU3uC30FNRjUBPgCX7nIyJlHbzuY6/PF4nNOAq9ae1zSlDQrxMiLUZ51ax/Hnz2fm8bP/udfz1v0hvKvoLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR05MB5990 X-Mailman-Approved-At: Sun, 15 Jan 2023 21:11:39 +0100 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions <dev.dpdk.org> List-Unsubscribe: <https://mails.dpdk.org/options/dev>, <mailto:dev-request@dpdk.org?subject=unsubscribe> List-Archive: <http://mails.dpdk.org/archives/dev/> List-Post: <mailto:dev@dpdk.org> List-Help: <mailto:dev-request@dpdk.org?subject=help> List-Subscribe: <https://mails.dpdk.org/listinfo/dev>, <mailto:dev-request@dpdk.org?subject=subscribe> Errors-To: dev-bounces@dpdk.org |
Series |
*** Memory Allocation: Fixes ms_idx jump in fb_array library ***
|
|
Checks
Context | Check | Description |
---|---|---|
ci/checkpatch | warning | coding style issues |
Commit Message
Vipin P R
Jan. 13, 2023, 1:08 p.m. UTC
In the legacy mem mode, when the fb_array is being populated, if there are holes in between, the ms_idx could go backward and there will be an overlap of the region starting from the ms_idx returned later. i.e. it's being mapped to two different physical regions in PA space to a contiguous region in VA space. this would result in the allocator assuming that the memory is contiguous even though there is a hole in between. In legacy mem, allocator assumes that PA contiguous are VA contiguous as well. Cc: stable@dpdk.org Signed-off-by: Vipin P R <vipinp@vmware.com> Acked-by: Kumara Parameshwaran <kparameshwar@vmware.com> --- .mailmap | 1 + lib/eal/common/eal_common_fbarray.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
Comments
Hi Vipin, Fix looks good, took a while to understand what's going on, but it's a great find! Reviewed-by: Anatoly Burakov <anatoly.burakov@intel.com> Couple of comments below: On 1/13/2023 1:08 PM, Vipin P R wrote: > In the legacy mem mode, when the fb_array is being populated, if there are holes in between, the ms_idx could go backward and there will be an overlap of the region starting from the ms_idx returned later. i.e. it's being mapped to two different physical regions in PA space to a contiguous region in VA space. this would result in the allocator assuming that the memory is contiguous even though there is a hole in between. In legacy mem, allocator assumes that PA contiguous are VA contiguous as well. Technically, while this bug is indeed triggered in legacy mode, it does not in any way depend on it, so I would suggest avoid mentioning it explicitly. Suggested commit message rewording: fbarray: fix incorrect lookahead behavior Currently, whenever last bit of current index mask is set (meaning, there is potentially a run starting at the end of the mask), lookahead loop is entered. In that loop, if the first bit of lookahead index is not set, the lookahead is stopped, and the current lookahead mask index is assigned to current index mask. However, because at that point we are inside a for-loop that increments current index mask after each iteration, this results in additional mask index increment. Fix it to leave current index mask at `lookahead - 1`. Fixes: c44d09811b40 ("eal: add shared indexed file-backed array") Cc: anatoly.burakov@intel.com > > Cc: stable@dpdk.org > > Signed-off-by: Vipin P R <vipinp@vmware.com> > Acked-by: Kumara Parameshwaran <kparameshwar@vmware.com> > --- > .mailmap | 1 + > lib/eal/common/eal_common_fbarray.c | 2 +- > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/.mailmap b/.mailmap > index 75884b6..3707bf5 100644 > --- a/.mailmap > +++ b/.mailmap > @@ -1391,6 +1391,7 @@ Vincent Guo <guopengfei160@163.com> > Vincent Jardin <vincent.jardin@6wind.com> > Vincent Li <vincent.mc.li@gmail.com> > Vincent S. Cojot <vcojot@redhat.com> > +Vipin P R <vipinp@vmware.com> <vipinpadmamramesh@gmail.com> > Vipin Varghese <vipin.varghese@amd.com> <vipin.varghese@intel.com> > Vipul Ashri <vipul.ashri@oracle.com> > Vishal Kulkarni <vishal@chelsio.com> > diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c > index f11f879..551bd87 100644 > --- a/lib/eal/common/eal_common_fbarray.c > +++ b/lib/eal/common/eal_common_fbarray.c > @@ -236,7 +236,7 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, > * as well, so skip that on next iteration. > */ > ignore_msk = ~((1ULL << need) - 1); > - msk_idx = lookahead_idx; > + msk_idx = lookahead_idx - 1; > break; > } >
diff --git a/.mailmap b/.mailmap index 75884b6..3707bf5 100644 --- a/.mailmap +++ b/.mailmap @@ -1391,6 +1391,7 @@ Vincent Guo <guopengfei160@163.com> Vincent Jardin <vincent.jardin@6wind.com> Vincent Li <vincent.mc.li@gmail.com> Vincent S. Cojot <vcojot@redhat.com> +Vipin P R <vipinp@vmware.com> <vipinpadmamramesh@gmail.com> Vipin Varghese <vipin.varghese@amd.com> <vipin.varghese@intel.com> Vipul Ashri <vipul.ashri@oracle.com> Vishal Kulkarni <vishal@chelsio.com> diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index f11f879..551bd87 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -236,7 +236,7 @@ find_next_n(const struct rte_fbarray *arr, unsigned int start, unsigned int n, * as well, so skip that on next iteration. */ ignore_msk = ~((1ULL << need) - 1); - msk_idx = lookahead_idx; + msk_idx = lookahead_idx - 1; break; }