From mboxrd@z Thu Jan 1 00:00:00 1970 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 7E2DEEE57DF for ; Mon, 11 Sep 2023 15:57:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D2D3E6B02BF; Mon, 11 Sep 2023 11:57:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CDCBC6B02C0; Mon, 11 Sep 2023 11:57:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA4676B02C1; Mon, 11 Sep 2023 11:57:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id A7EFA6B02BF for ; Mon, 11 Sep 2023 11:57:32 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7BDA54080F for ; Mon, 11 Sep 2023 15:57:32 +0000 (UTC) X-FDA: 81224771544.16.33BCE55 Received: from mail-qv1-f48.google.com (mail-qv1-f48.google.com [209.85.219.48]) by imf01.hostedemail.com (Postfix) with ESMTP id 38A7440005 for ; Mon, 11 Sep 2023 15:57:30 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=WSCo8iJz; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf01.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.48 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1694447850; 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:in-reply-to:references:references:dkim-signature; bh=1zJewVgK4Q88dH7D9uHefrBaaN5ObYhd5seyknIRoWE=; b=C4otaHmvozC49l4RqKZKz7JJjGAN2jA+xC2H+LhJEgljr1hSTSNYf920jt5O1yaF540Km0 bkjEJApPYngUpYxTZ4bbAk/GVuOCpK4G/DK9Ha0CxrZMlG8OOVNiB/zwvfFnFGJ8TPcGZ+ 3JNmkTXfzD6j2iiXuaQm8dweKweeT5o= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=WSCo8iJz; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf01.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.48 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1694447850; a=rsa-sha256; cv=none; b=TqV68QcZZVxxQfnmTV5W15b74Dt6nwNz96AQEXBS+rg+ci66h+zQ3T49YypTvotV6ZpSLj YI+WzAqxxnBIeRMSGZx5zULi5aXJl1u/U2vfQVJSwbZLudnszgtIB9OqSy6mXBv8Vj//Gc EIPb0mswKo/5mJnzFZJxIO4AccSh5K0= Received: by mail-qv1-f48.google.com with SMTP id 6a1803df08f44-64bd231c95cso27122506d6.1 for ; Mon, 11 Sep 2023 08:57:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1694447849; x=1695052649; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=1zJewVgK4Q88dH7D9uHefrBaaN5ObYhd5seyknIRoWE=; b=WSCo8iJzn+pxx5dgb+gvwzG6JbLw1BQ6q89PCgws29hUFGYrvecvFFBpKFFORkekl3 rLa8obZh6c0XKxm4zoID5AZYa6cbahzt9B5LZQiZ+I6paf3ucEDokPJB4vyw1SC3V9Rv mmk0Vx+CR1dtV2GeKT+IUp9a0WJA995LwhdkFnvZcm91Ns2rZMrslKlvbfxFc7EQR0PR 5CnJb85d/rv8k5K6/024s31VU15JFGaHYWowJRD628e7sWOsmYMtmTHHUiJd0HbGJq1F Ne2Cx6CiEFvf7h5h4iUB/EuA1yB1aXsd5DEO+ob7N+xisSacYy7YJ2SsuxD5m5cqhBEU J7sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694447849; x=1695052649; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=1zJewVgK4Q88dH7D9uHefrBaaN5ObYhd5seyknIRoWE=; b=C35kqFOAu7P3ym1MCWwXtkjVvGajuY0RtwjeqDS8TZ/GU1h5v8L/Z5FWSkXiu6qsZ9 1hFCzIMw5PaW3lOVgK8RHd0qxGVyWZ6QF106uOqzFAVJVWCUJYPCOHa1xuesruizO4hD MYExpgz40pSl7ytSMa3fWmQVbl74KVdmm7dJP3DHauza12YJ47wtWu/oDWLfprE/L93M KOCncZ8K2ujwjI3diosSdU1g1m4D0hodHZtC+2+XVk1ttfGGZJCPeMNttCTCI2hT0/kR 5mM/lEMMM+yx9Smgg0WYTk/69x/TAq/35E8c/InuBDIzVa5rN80odHVGolUhDTIWHXiW sG1Q== X-Gm-Message-State: AOJu0YzHiJsdDP2KPT6+gSJ+UOUnT5JrlgKATl5NmhJSGW3JTNJVmtEp AQ10Ls7bqF+y+b9LedwrBIqwrQ== X-Google-Smtp-Source: AGHT+IH4gDeOyRQdXdjMFhQ2fneyWyjSA4r8Q4JRSJab2ZEdDVWDWGL4Ljnm6GKqFufO97u1r8SMCg== X-Received: by 2002:a0c:f0d3:0:b0:655:e12d:d42d with SMTP id d19-20020a0cf0d3000000b00655e12dd42dmr5094050qvl.28.1694447849209; Mon, 11 Sep 2023 08:57:29 -0700 (PDT) Received: from localhost (2603-7000-0c01-2716-3012-16a2-6bc2-2937.res6.spectrum.com. [2603:7000:c01:2716:3012:16a2:6bc2:2937]) by smtp.gmail.com with ESMTPSA id u19-20020a0cdd13000000b006485e76574csm2999934qvk.78.2023.09.11.08.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Sep 2023 08:57:28 -0700 (PDT) Date: Mon, 11 Sep 2023 11:57:27 -0400 From: Johannes Weiner To: Mel Gorman Cc: Lecopzer Chen , akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, vbabka@suse.cz, nsaenzju@redhat.com, yj.chiang@mediatek.com, Mark-pk Tsai , Joe Liu Subject: Re: [PATCH] mm: page_alloc: fix cma pageblock was stolen in rmqueue fallback Message-ID: <20230911155727.GA102237@cmpxchg.org> References: <20230830111332.7599-1-lecopzer.chen@mediatek.com> <20230905090922.zy7srh33rg5c3zao@techsingularity.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230905090922.zy7srh33rg5c3zao@techsingularity.net> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 38A7440005 X-Stat-Signature: iphc39sioyfy5eweob7734cz4hazizea X-Rspam-User: X-HE-Tag: 1694447850-354624 X-HE-Meta: U2FsdGVkX1/aSI3YIcAQ7wL2wR/uQBT6sQaYD1kLQLf8SEMlCpaNlvk1mfXuBFQtG83X87J9DMPMwThSijDTdWRSXbTCVilckBDLSlSyBCgbGGBzwOhrOqJcSCv8hkODDbu7sEKvP/umrIIV9oR8jQYRIhjDPPkwZn4Xi/zyNl9oalzqIZiu4Tz5Z8lPwyLisGedVJ/yNyKa/z8hPdSL1zfNWrurdcfpoZffBmWzN58BXKWFY4id/x+i/+QrspY5Na6I/N9D4bvJOoudNzXcMw4IK8xKX1bfQo0bMTCI+wbgjPA45aN3v9vOd/qOkbFRfQ4DSdyIAfXNHWkA/V2Nch12wqZeesCrK/Hnhm12/IsT3xHLMjfJVToXHDtMBaci3MYv1aEROiP+dzecbniJbu0rjtZrmwjgjLIUdQWJfRHvM6mann608Bf+S0wwUto2wlDVxHWxz0814/Kwquhq4L+894HFutgfhQfpnRpNEcsq6MnhwcwcT8MmjYdaQ5C8orJ3xhMuVPYbSDXQSmcvI+xwv620c3aLQjMzE21ytsq1dNF7Sv8CvY6zZcb4eYSr1i1jbY/g8Ex3bf1RvtsDmgobPsGL6YosDaSXYXFzT4IcMfK9Goa2+xx9SwOh8wuYG71YTk6SwCJE0sl2wOM2e1aXQuQy6Olgp/Kn8bpWecx/ZpV7A4/y9UWjwBojGiw7XwetdVjpAhW+2fkG05N32dEeSNC+HkBhvDx64HAowtUXJr+fr0z3N4pT7+QAQyRLVkyz7flVeQpBWUELlBs104b4bZI8rfhwNq9Bn3UhPx/pLHrFcSgcOW7xgIMPFke0ih3zrYRzL2LMQWideNoFr6Vw3qdX15DF/vh7SsCejG1msD6TPXfdJOAd9chIF1FLeBMP5uWRzR9RHJ+XQzCymcST9A3LGROp0opubb3ZumcOglxiXt75Ae9x8FVrWnWYb7tvjSS2dCNovMmfpTE 9nYyy8FT nCdeO6DkanBYccrxfEXJLbZTrNjkxYwAxS+ds0MG1d/607NGoDHoHEZN/vg3qAVZeWRdYSmhZkbKbV2fhOQ8qJdxhIQ1Oiewq+wy41sjxExSImaqbBdc+Q+pV6GxkwpgVM185mU5YsaHdVTD2ymDgmS85eidpohWnEBp2aHoRIqfDFc9uwiBR4eVtY2MDC7ZABO1Yl8Pmqgxb0nGz/5zv8vbh+r40Xyf7nx2XyemQbIrCC0hzBsSa3cQ5SjLnPOmfn4GEkyEBabRiDe1HcvWJ4H8gUbxYHqqyNop8gRs27/viHoKCNlwbRzD56qdZph3eFy0dEKY5zmJGCp16J7Cv/vNS0A1VLloWAaWfPG+cJW7xhcSyl/wBfMkW9Ou+ik8pCES+x3HG/lawBPdvFLKYJeUa+Cmh+My7kL0T2q6qrY/oI4sGpL1FPBLWhsM8ve9w7oXQtsnfbvXdQQK3b2NZf2T2oBj6zUeZZqLeJxPJCIB96vrRbw2N2HSwgxKIUSozlk0pUTI0xORB8KJAZJMT1Pg8tAXqann7H+ZPjjdv3unE1+iM5dNkPBn3qRGeCRjHqc1MfhfnuLTOqYiMfHJHkfQBdly7VaPKtVQG8MR8nG9tJ8jFj2L1IhupMApOpmDc8cU4cg4gggS6pJiVQMIYnomgjeEsiS5w0GTO/0lyGVMsM8g= 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: On Tue, Sep 05, 2023 at 10:09:22AM +0100, Mel Gorman wrote: > mm: page_alloc: Free pages to correct buddy list after PCP lock contention > > Commit 4b23a68f9536 ("mm/page_alloc: protect PCP lists with a spinlock") > returns pages to the buddy list on PCP lock contention. However, for > migratetypes that are not MIGRATE_PCPTYPES, the migratetype may have > been clobbered already for pages that are not being isolated. In > practice, this means that CMA pages may be returned to the wrong > buddy list. While this might be harmless in some cases as it is > MIGRATE_MOVABLE, the pageblock could be reassigned in rmqueue_fallback > and prevent a future CMA allocation. Lookup the PCP migratetype > against unconditionally if the PCP lock is contended. > > [lecopzer.chen@mediatek.com: CMA-specific fix] > Fixes: 4b23a68f9536 ("mm/page_alloc: protect PCP lists with a spinlock") > Reported-by: Joe Liu > Signed-off-by: Mel Gorman > --- > mm/page_alloc.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 452459836b71..4053c377fee8 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -2428,7 +2428,13 @@ void free_unref_page(struct page *page, unsigned int order) > free_unref_page_commit(zone, pcp, page, migratetype, order); > pcp_spin_unlock(pcp); > } else { > - free_one_page(zone, page, pfn, order, migratetype, FPI_NONE); > + /* > + * The page migratetype may have been clobbered for types > + * (type >= MIGRATE_PCPTYPES && !is_migrate_isolate) so > + * must be rechecked. > + */ > + free_one_page(zone, page, pfn, order, > + get_pcppage_migratetype(page), FPI_NONE); > } > pcp_trylock_finish(UP_flags); > } > I had sent a (similar) fix for this here: https://lore.kernel.org/lkml/20230821183733.106619-4-hannes@cmpxchg.org/ The context wasn't CMA, but HIGHATOMIC pages going to the movable freelist. But the class of bug is the same: the migratetype tweaking really only applies to the pcplist, not the buddy slowpath; I added a local pcpmigratetype to make it more clear, and hopefully prevent bugs of this nature down the line. I'm just preparing v2 of the above series. Do you want me to break this change out and send it separately?