Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2197528iof; Tue, 7 Jun 2022 22:56:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzN+UFyXRFkTvwC05gT/7/r44zExwyxtPmcjQ+n0WUV4yU0nQ4zNmwYlSAOVl9zTqQV5oz X-Received: by 2002:a17:902:7083:b0:167:6549:48e9 with SMTP id z3-20020a170902708300b00167654948e9mr19668910plk.118.1654667804902; Tue, 07 Jun 2022 22:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654667804; cv=none; d=google.com; s=arc-20160816; b=cGTOXa+gFaa/B3eLJJ28yasQEQ+aKvKAIsd66zUGMyVOljNFJX/L8Faa8ksIiHldUE M2QI6wCzgEIuc1baVKlArNHjzIT+VhU8MqTL5djaGsVX81J0G29b7CY7rWDrVIbg9/cd trP4Qpsgpgjys3V7oENuuioojid7t8Yna/i8fjm9lVXq3f94UuvyO7u6LWYx1boitvR9 xtJFRVxb83Iu32UdV1WiDOfjRq25Ab8K1TYKO16/uFcFNR/RhWfQdNYnV5GxWabHrukR odQWvrJdoPk/PpusZkoWn43RjRpH2eTjLWv4uTlDffAV+7fir/F3zywiRKgUKJYlLBNi XRcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=X9ouOXOFWQB9a9+6DJsTai1j0oGDjjNV0rRKtL0PjPc=; b=XmuVdo919DnNbxeIWfZPOhVAUC/wOzzlj0hgf0aMTWANLHDY1F4/uqmdOzb77n9cfV WwFOhs0svuQFJcrbmI7UjsYlfutZeMeXxEqz4ENCEq5/cL6HVcin9cw+cnb8/ri/Dj8x 8j78TM6amCtlqCw5rL+cE5tVrizjFi75Gal4vODkeLExvVFNGopt7+4QxQTwNbkZSfyn fpdRAaHGMn2xma/AgzIGYsM5lo8KxM4tVpUuMp7YISCjYbjFjDeXap8rV2S5ENNy78TU xmq1RE+HEtPoLi/ccj/PiSoon+iJ05Aw2ji9ahChoygwW9gVzAxSlKi+r/O17F3a6E4E jjDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1StKF03I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id f8-20020a636a08000000b003fcb1baee3bsi1281202pgc.269.2022.06.07.22.56.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 22:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1StKF03I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6A20532E770; Tue, 7 Jun 2022 22:22:44 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1444157AbiFHBBb (ORCPT + 99 others); Tue, 7 Jun 2022 21:01:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1381542AbiFGW3W (ORCPT ); Tue, 7 Jun 2022 18:29:22 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F3B319C3B9; Tue, 7 Jun 2022 12:23:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 9D4CFB823D8; Tue, 7 Jun 2022 19:23:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A098C385A2; Tue, 7 Jun 2022 19:23:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629819; bh=X1C2/LqC7ZSYlbBJm017pUCtoKMKyPs5LQhEGfYzQ90=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1StKF03ITsEPhAUkdnzCeXUY8+FmUzQdILxpr6vO0UEcoDA1IB8W4dsMet4aUZATh /YsEKGScoPv1u4t9NksSgpaB7q4WeHCs+LOFTy7mNIizSHPVpBwGqbMFRdYz49KOot rs7G/27xkCURWpn1Kuwvkc1OX4TOqw67akpKn3gM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dong Aisheng , Minchan Kim , David Hildenbrand , Marek Szyprowski , Lecopzer Chen , Vlastimil Babka , Andrew Morton Subject: [PATCH 5.18 828/879] Revert "mm/cma.c: remove redundant cma_mutex lock" Date: Tue, 7 Jun 2022 19:05:46 +0200 Message-Id: <20220607165026.888307472@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dong Aisheng commit 60a60e32cf91169840abcb4a80f0b0df31708ba7 upstream. This reverts commit a4efc174b382fcdb which introduced a regression issue that when there're multiple processes allocating dma memory in parallel by calling dma_alloc_coherent(), it may fail sometimes as follows: Error log: cma: cma_alloc: linux,cma: alloc failed, req-size: 148 pages, ret: -16 cma: number of available pages: 3@125+20@172+12@236+4@380+32@736+17@2287+23@2473+20@36076+99@40477+108@40852+44@41108+20@41196+108@41364+108@41620+ 108@42900+108@43156+483@44061+1763@45341+1440@47712+20@49324+20@49388+5076@49452+2304@55040+35@58141+20@58220+20@58284+ 7188@58348+84@66220+7276@66452+227@74525+6371@75549=> 33161 free of 81920 total pages When issue happened, we saw there were still 33161 pages (129M) free CMA memory and a lot available free slots for 148 pages in CMA bitmap that we want to allocate. When dumping memory info, we found that there was also ~342M normal memory, but only 1352K CMA memory left in buddy system while a lot of pageblocks were isolated. Memory info log: Normal free:351096kB min:30000kB low:37500kB high:45000kB reserved_highatomic:0KB active_anon:98060kB inactive_anon:98948kB active_file:60864kB inactive_file:31776kB unevictable:0kB writepending:0kB present:1048576kB managed:1018328kB mlocked:0kB bounce:0kB free_pcp:220kB local_pcp:192kB free_cma:1352kB lowmem_reserve[]: 0 0 0 Normal: 78*4kB (UECI) 1772*8kB (UMECI) 1335*16kB (UMECI) 360*32kB (UMECI) 65*64kB (UMCI) 36*128kB (UMECI) 16*256kB (UMCI) 6*512kB (EI) 8*1024kB (UEI) 4*2048kB (MI) 8*4096kB (EI) 8*8192kB (UI) 3*16384kB (EI) 8*32768kB (M) = 489288kB The root cause of this issue is that since commit a4efc174b382 ("mm/cma.c: remove redundant cma_mutex lock"), CMA supports concurrent memory allocation. It's possible that the memory range process A trying to alloc has already been isolated by the allocation of process B during memory migration. The problem here is that the memory range isolated during one allocation by start_isolate_page_range() could be much bigger than the real size we want to alloc due to the range is aligned to MAX_ORDER_NR_PAGES. Taking an ARMv7 platform with 1G memory as an example, when MAX_ORDER_NR_PAGES is big (e.g. 32M with max_order 14) and CMA memory is relatively small (e.g. 128M), there're only 4 MAX_ORDER slot, then it's very easy that all CMA memory may have already been isolated by other processes when one trying to allocate memory using dma_alloc_coherent(). Since current CMA code will only scan one time of whole available CMA memory, then dma_alloc_coherent() may easy fail due to contention with other processes. This patch simply falls back to the original method that using cma_mutex to make alloc_contig_range() run sequentially to avoid the issue. Link: https://lkml.kernel.org/r/20220509094551.3596244-1-aisheng.dong@nxp.com Link: https://lore.kernel.org/all/20220315144521.3810298-2-aisheng.dong@nxp.com/ Fixes: a4efc174b382 ("mm/cma.c: remove redundant cma_mutex lock") Signed-off-by: Dong Aisheng Acked-by: Minchan Kim Acked-by: David Hildenbrand Cc: Marek Szyprowski Cc: Lecopzer Chen Cc: Vlastimil Babka Cc: [5.11+] Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/cma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/mm/cma.c +++ b/mm/cma.c @@ -37,6 +37,7 @@ struct cma cma_areas[MAX_CMA_AREAS]; unsigned cma_area_count; +static DEFINE_MUTEX(cma_mutex); phys_addr_t cma_get_base(const struct cma *cma) { @@ -468,9 +469,10 @@ struct page *cma_alloc(struct cma *cma, spin_unlock_irq(&cma->lock); pfn = cma->base_pfn + (bitmap_no << cma->order_per_bit); + mutex_lock(&cma_mutex); ret = alloc_contig_range(pfn, pfn + count, MIGRATE_CMA, GFP_KERNEL | (no_warn ? __GFP_NOWARN : 0)); - + mutex_unlock(&cma_mutex); if (ret == 0) { page = pfn_to_page(pfn); break;