From patchwork Wed Aug 30 11:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lecopzer Chen X-Patchwork-Id: 13370184 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53B61C6FA8F for ; Wed, 30 Aug 2023 11:14:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DED76280050; Wed, 30 Aug 2023 07:14:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9D6E28004F; Wed, 30 Aug 2023 07:14:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C64B2280050; Wed, 30 Aug 2023 07:14:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id B6A6128004F for ; Wed, 30 Aug 2023 07:14:10 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 85042160404 for ; Wed, 30 Aug 2023 11:14:10 +0000 (UTC) X-FDA: 81180511860.21.B97F117 Received: from mailgw01.mediatek.com (mailgw01.mediatek.com [216.200.240.184]) by imf28.hostedemail.com (Postfix) with ESMTP id AEBCAC000D for ; Wed, 30 Aug 2023 11:14:07 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b=OOoZY4DA; spf=pass (imf28.hostedemail.com: domain of lecopzer.chen@mediatek.com designates 216.200.240.184 as permitted sender) smtp.mailfrom=lecopzer.chen@mediatek.com; dmarc=pass (policy=quarantine) header.from=mediatek.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1693394048; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=Z/l9vVKd4IJQQlkUTiNKpXnzdHF7Q11R3pXMQApTJ1Q=; b=OTWS/nqdiD/Mjm8CISqrDTMAZRUOp+jtYn1lhPnIfVqzFEcFsgvE0OK9G4rKHoA+JGmwo7 UpKEpbrfC/0kzjZN81oCXUTdiG6heyjkLWArDL9CJ2FVwTgE7SwEq/LP3TdZTHLTHFHDxY tN2hC400Fg+T7Cd5jwW3GgklGQzSm9c= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1693394048; a=rsa-sha256; cv=none; b=ZjwhHNb3ieuvB8WA/iBwUfdtyp1zw37JO6aRQOVViY3IuRTpSntQ33QMU9YrO2vB6mFbA4 Oni83Gje6udVdHbQBEebarf9vJRs8JAbDieqHkt6/HVdsmsJg+r2n62doBg6haIRYMqeKY kmWUwgSmFP0m0qF0lKhQakXm9m0deJo= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=mediatek.com header.s=dk header.b=OOoZY4DA; spf=pass (imf28.hostedemail.com: domain of lecopzer.chen@mediatek.com designates 216.200.240.184 as permitted sender) smtp.mailfrom=lecopzer.chen@mediatek.com; dmarc=pass (policy=quarantine) header.from=mediatek.com X-UUID: 543e336e472611ee912e1518a6540028-20230830 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:Message-ID:Date:Subject:CC:To:From; bh=Z/l9vVKd4IJQQlkUTiNKpXnzdHF7Q11R3pXMQApTJ1Q=; b=OOoZY4DAyUchQHlZQE65hqNoRbHkbQSNIwX5lhL19UmxbC3lAL0xGAIym1QIQUsKFgyNK4xzZ4QDvRj/yAF7tQEd1Yy/Xi9YycWZot+ZuZwekSBuZ/Je2muhOLyTgtbS83MH9lFUOItCr9G275eh7CtkKqRqk+SnYwx1dzvGzzI=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.31,REQID:a7cab4ed-7a4e-42ec-bb86-ac0d7e1fd12e,IP:0,U RL:0,TC:0,Content:22,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:22 X-CID-META: VersionHash:0ad78a4,CLOUDID:cb8772c2-1e57-4345-9d31-31ad9818b39f,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:4,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO, DKR:0,DKP:0,BRR:0,BRE:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR X-UUID: 543e336e472611ee912e1518a6540028-20230830 Received: from mtkmbs13n2.mediatek.inc [(172.21.101.108)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 1593303641; Wed, 30 Aug 2023 04:14:04 -0700 Received: from mtkmbs11n1.mediatek.inc (172.21.101.185) by MTKMBS14N1.mediatek.inc (172.21.101.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.26; Wed, 30 Aug 2023 19:14:02 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs11n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.1118.26 via Frontend Transport; Wed, 30 Aug 2023 19:14:02 +0800 From: Lecopzer Chen To: , CC: , , , , , Lecopzer Chen , Mark-pk Tsai , Joe Liu Subject: [PATCH] mm: page_alloc: fix cma pageblock was stolen in rmqueue fallback Date: Wed, 30 Aug 2023 19:13:33 +0800 Message-ID: <20230830111332.7599-1-lecopzer.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 MIME-Version: 1.0 X-MTK: N X-Rspamd-Queue-Id: AEBCAC000D X-Rspam-User: X-Stat-Signature: nnad5qez8c1cj6h9atu8n7i9qrgkzg7h X-Rspamd-Server: rspam03 X-HE-Tag: 1693394047-793774 X-HE-Meta: U2FsdGVkX19JiVr4crzg9AfgMJkj4e3BkI98DX7hCUjegFzRUlMu1EIwjzu2P33m/wyie+VR4Wt6zmUHAgBsubfrbqnSYL65smtovirZbYx7kWOEEwg8Yn5TmP0vpfwCG7PoFVAHU4uyXikTKIXFrHXuW6gqgWfTceWg9ZjXqInP3iF7qEbjBeQeKJ8xoNFnmOpj/IdhUPW1YD3RICzIuLZO+czy+SdByqiflcjc0rVGoDbhcj5LLX2R8ZJTp5YONCnUOE/iEza7wDkHUaewVwspHd9dCQ258JZb9RL/DUCtPtRt20oGvrWA8a04tDjtRcmF/NyRB4xtuJt+NR7WpTZusz/1QUUnLvpmUM1xvoKMgYGbglEL0lO8iZjyZsED8wRA/lgYbVF5vQ9Qv2Vs9oNxBDvuv2xtQUJG3DO8jy3ucysUFYfo+W987EGEQQ6A9o6rx6YLauRUMFNd0nXh3bfJrepzefqmfT/UGBe5+A1E9lISsWJkSPnvF5q2WPEQ49yBfZ7Y3312IVujyhJoKmptpbvM04JqWtFwRNE2I/xNSb7rjORN7gQaWLzI/DXa67EMoKA0AVZ6pbPlgRJ42ghP/wagzsKH6W63ezfhRI+k7dtmJFVegLxoCQYFYi8kr1iTFGnQ2oY2Ff4nw4A+WDgq4Dkd3QPtKtsJcrDvevYShk4wPogNgHrGHnxsRzzCE4puirBnr5hQBgKoDvNzSrGl5ZZt2oGYLw1Ufr28YvDe7S+vzOA+fzK4dGvZJUP6eqMkkPFSiAjgikCsW7MRrhilQjeIgw2QV8uWyEI5NT6buu/izf4/cCpDZPj943V73inwJLaDTAi/UQpdMk1DQfd+DS3JS3UyfHNIaDf96HUfUOtkV4uhF8AibdWArsTZNdA93WStSpZxaWAKAPOVPrCh6wE9juIiZmRHaMO/Vbx7559WpYdPc9/0X3WBt+HxDe3ZNtd9bTGoVfDeZaY fJFh7dDr lUF1Cv3sc6WqJ2Qi465B7QSymE7TJNykhHyyH7JT/Tjc0zFIMwUq4R6vOKtkfYVVMLTHcXvpG9WfdputeKvrzK3T9/nSA/GI8tI/wJXj6ezgX9pMqO7krYkcd+AzuEHMBuy6paJC+KK1Mi7UQhq2nBff842eVPVfau4G6enC4pPY0zOYZ68OQoq7q9qzuRz5+m0FMsBLIwMC+gvrODWw+e9m8V58Yr3maMYK0eNg+h/RHx/ldtlXocMYlqtx7Yo9fcjkQ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: commit 4b23a68f9536 ("mm/page_alloc: protect PCP lists with a spinlock") fallback freeing page to free_one_page() if pcp trylock failed. This make MIGRATE_CMA be able to fallback and be stolen whole pageblock by MIGRATE_UNMOVABLE in the page allocation. PCP free is fine because free_pcppages_bulk() will always get migratetype again before freeing the page, thus this only happen when someone tried to put CMA page in to other MIGRATE_TYPE's freelist. Fixes: 4b23a68f9536 ("mm/page_alloc: protect PCP lists with a spinlock") Reported-by: Joe Liu Signed-off-by: Lecopzer Chen Cc: Mark-pk Tsai Cc: Joe Liu Reported-by: Joe Liu Signed-off-by: Mel Gorman Acked-by: Vlastimil Babka Reported-by: Joe Liu Signed-off-by: Johannes Weiner Reviewed-by: Vlastimil Babka --- mm/page_alloc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 452459836b71..0ea88c031838 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2428,6 +2428,14 @@ void free_unref_page(struct page *page, unsigned int order) free_unref_page_commit(zone, pcp, page, migratetype, order); pcp_spin_unlock(pcp); } else { +#ifdef CONFIG_CMA + /* + * CMA must be back to its freelist. Otherwise CMA pageblock may + * be stolen by fallback flow while getting free page. + */ + if (get_pcppage_migratetype(page) == MIGRATE_CMA) + migratetype = MIGRATE_CMA; +#endif free_one_page(zone, page, pfn, order, migratetype, FPI_NONE); } pcp_trylock_finish(UP_flags);