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 E9D05C25B0C for ; Tue, 9 Aug 2022 17:19:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 081418E0011; Tue, 9 Aug 2022 13:19:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3660D8E000A; Tue, 9 Aug 2022 13:19:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B25F48E0003; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 26F4A8E000E for ; Tue, 9 Aug 2022 13:19:03 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 08860A1160 for ; Tue, 9 Aug 2022 17:19:03 +0000 (UTC) X-FDA: 79780714566.16.D1526B7 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf13.hostedemail.com (Postfix) with ESMTP id 55DE920058 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=BeUyc6bwqnOjb9uThg3VdGtutHuJFXaTYrK5XFsvcpU=; b=e4cqFsUqV36gFDMjCEnUq0vP/m B0jIsioVU0vcKb034LlrSh7tGHm+2yyJ78QkySOy2CnpEr27q2c/Bl6J83xJu3SoZFV7auLTHJx7Z l0oVWLu3sQTwZvXpqvLcO0x/s0GqO5s4XMlFW0Us0/GELgJmaklDuRixZ6XJ06FJU+6v8GzjiFHrO HJsY+M8khbxyKy3WC+77O8V8hHI5vbDPbrxliRAZ5yRSVDOPVIH2tSpvHn4JWSOB0WOyjaoItBVZa rCwZLbcE5eDvw7RfaCOimRhjacesU6ATUTX4vEjwpLFWFssgnTTuFvPoYQ1plzHxFp93MrOFjFOAa cLuXiydQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oLSsd-00FdFb-Up; Tue, 09 Aug 2022 17:19:00 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH v2 12/16] mm/page_alloc: Move set_page_refcounted() to end of __alloc_pages() Date: Tue, 9 Aug 2022 18:18:50 +0100 Message-Id: <20220809171854.3725722-13-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=d+4ptsFKqabt5Z57qE3WMU+lDcuSE/Tn0rCBcsKrjTMLyeZez3MOEI1+PdmrEGKMHFJqDo KB1M1zuAPwoZH04TrZWuevZsdA/q1xvwuNcWLvm6r9kJPGQHfpZvwTayLLlVsXiJUbEM3i Jczqqyh+SkUcX0Oi8j7EMc+UFgd5aPE= 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=BeUyc6bwqnOjb9uThg3VdGtutHuJFXaTYrK5XFsvcpU=; b=344Bv+8USJ2Ih7oKDQ6TRqBXXFNjj/yaDCEc2YCPP2r3HfzurikU1t3fQRTREDwNlj00Vc OPUCmOjPPMO9vThrcMj/wpbDiGShBQ0+x3YldWWcG9fbFVKRO1hsdSZcRazoOxGcegJ++5 yFzMh9cNk0FrIvf1Q+viyQd2KqUMy4A= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e4cqFsUq; spf=none (imf13.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-Stat-Signature: ufzrtytm6tbkrk8zdjqrwz6gbnb4r64q X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 55DE920058 Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e4cqFsUq; spf=none (imf13.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-HE-Tag: 1660065542-584186 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: Remove some code duplication by calling set_page_refcounted() at the end of __alloc_pages() instead of after each call that can allocate a page. That means that we free a frozen page if we've exceeded the allowed memcg memory. 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 26f8ed480ebb..f1b7fc657c74 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5513,10 +5513,8 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, /* First allocation attempt */ page = get_page_from_freelist(alloc_gfp, order, alloc_flags, &ac); - if (likely(page)) { - set_page_refcounted(page); + if (likely(page)) goto out; - } alloc_gfp = gfp; ac.spread_dirty_pages = false; @@ -5528,15 +5526,15 @@ struct page *__alloc_pages(gfp_t gfp, unsigned int order, int preferred_nid, ac.nodemask = nodemask; page = __alloc_pages_slowpath(alloc_gfp, order, &ac); - if (page) - set_page_refcounted(page); out: if (memcg_kmem_enabled() && (gfp & __GFP_ACCOUNT) && page && unlikely(__memcg_kmem_charge_page(page, gfp, order) != 0)) { - __free_pages(page, order); + free_frozen_pages(page, order); page = NULL; } + if (page) + set_page_refcounted(page); trace_mm_page_alloc(page, order, alloc_gfp, ac.migratetype); -- 2.35.1