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 57C9AC25B0C for ; Tue, 9 Aug 2022 17:19:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B46768E000E; Tue, 9 Aug 2022 13:19:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F1E098E0008; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92C3B8E0007; Tue, 9 Aug 2022 13:19:03 -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 0CCA28E0007 for ; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id D9E7F140B72 for ; Tue, 9 Aug 2022 17:19:02 +0000 (UTC) X-FDA: 79780714524.05.5227396 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 45AD4A0058 for ; Tue, 9 Aug 2022 17:19:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=S18NECuMOm64JJMXrNYm/m2CGg68YKL85JSuNns8jrM=; b=oHwxzKvs9U7lwwT5OaAxhmwzKM Qb5duVYUyA4hGg7RhMEUJeSQEca7UmT66WzM4BdFybhEUpYq9WN+Nzldqpt6mXjtvTg6WnWy15d/H C04ywEGMfKGaU0/qyfoP11ruxhH6m86lZ3FExZUhsRHNY2X3dcSG9mWTTJ7NkytqPw1IQsRfCi6iz qWTEzx+98VZsouWjV3/X0YXPDzjZ0FxC1ps5qqGUwFt5tk6J0rSKT/3sdaxEdTapiq/fY1T50SUj8 Ai9HL9qFxDKeARJvgVOyzKVoAf5UjqM0FXXBnRsFBBQsnTsg5nV82zSSid+Pu6CLxnTZKQQDN1svG /eJzTrCA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLSsd-00FdFF-F3; Tue, 09 Aug 2022 17:18:59 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 08/16] mm/page_alloc: Move set_page_refcounted() to callers of __alloc_pages_may_oom() Date: Tue, 9 Aug 2022 18:18:46 +0100 Message-Id: <20220809171854.3725722-9-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220809171854.3725722-1-willy@infradead.org> References: <20220809171854.3725722-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660065542; a=rsa-sha256; cv=none; b=kmW7EJj5T+NIQgnJT81v5KyLyYijYAKLmrvHUkrygAvpK0ZVfu4wtD6Q4FZ4OiAcyQYuRY 4dfhoSV24aZrS50vS9toftVJFvga8GKzo8L/Trlch0j3m7aeh1pwty9Fmpj59oLpsJM9V0 tyU/KJMXFS/aH6mnQPrEOVwK2STaPhk= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oHwxzKvs; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660065542; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=S18NECuMOm64JJMXrNYm/m2CGg68YKL85JSuNns8jrM=; b=M7tni34Yjn7FjeuU3xGuHI7Ee657wHtfsK+N7SpEhLnztZS0h54wCxEpDRPpy6GBYB5sKN 4U1MnC1HvlG2U8iIqmt+v2qAI2QL1YHupLEDE0g/KQmHbOrNK9LPDBaEHcPdFTE5E3eUfo 9n32gDtQqQwfj5AcWDIyK7SSKvfXq7s= X-Stat-Signature: 5qh97eq153m8xszdrsid8ycyzyzeh7zz X-Rspamd-Queue-Id: 45AD4A0058 Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=oHwxzKvs; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1660065542-554827 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: In preparation for allocating frozen pages, stop initialising the page refcount in __alloc_pages_may_oom(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/page_alloc.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 0287b3be92e5..8222cc6ce7dd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4411,10 +4411,8 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, page = get_page_from_freelist((gfp_mask | __GFP_HARDWALL) & ~__GFP_DIRECT_RECLAIM, order, ALLOC_WMARK_HIGH|ALLOC_CPUSET, ac); - if (page) { - set_page_refcounted(page); + if (page) goto out; - } /* Coredumps can quickly deplete all memory reserves */ if (current->flags & PF_DUMPCORE) @@ -4459,8 +4457,6 @@ __alloc_pages_may_oom(gfp_t gfp_mask, unsigned int order, if (gfp_mask & __GFP_NOFAIL) page = __alloc_pages_cpuset_fallback(gfp_mask, order, ALLOC_NO_WATERMARKS, ac); - if (page) - set_page_refcounted(page); } out: mutex_unlock(&oom_lock); @@ -5202,8 +5198,10 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, /* Reclaim has failed us, start killing things */ page = __alloc_pages_may_oom(gfp_mask, order, ac, &did_some_progress); - if (page) + if (page) { + set_page_refcounted(page); goto got_pg; + } /* Avoid allocations with no watermarks from looping endlessly */ if (tsk_is_oom_victim(current) && -- 2.35.1