From patchwork Thu Mar 21 16:36:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13599177 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 40922C54E58 for ; Thu, 21 Mar 2024 16:38:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EEAC46B00B1; Thu, 21 Mar 2024 12:37:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E989B6B00B2; Thu, 21 Mar 2024 12:37:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC38A6B00B3; Thu, 21 Mar 2024 12:37:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id AA33F6B00B1 for ; Thu, 21 Mar 2024 12:37:56 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7EE2B14048C for ; Thu, 21 Mar 2024 16:37:56 +0000 (UTC) X-FDA: 81921602952.22.93EF7E4 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf15.hostedemail.com (Postfix) with ESMTP id 75784A0034 for ; Thu, 21 Mar 2024 16:37:54 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wTEecQ2c; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3YWL8ZQYKCE48A7u3rw44w1u.s421y3AD-220Bqs0.47w@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YWL8ZQYKCE48A7u3rw44w1u.s421y3AD-220Bqs0.47w@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1711039074; 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=/zyX0GCVbwAVqAn+thP4TQZbJ1DZ8xPrkSKdxK+srAs=; b=l/zCb4yVpttw8hqL62QxWhfDiN4/bmPmSQr5IDzXSjU/3DOOeO2U0KIIsdOiK2y41dHHKe F2FW6lmaVNwsAUVidtAbdh9wP8HGsABvjvheuyPXMJuvBlsy5r1hmPj/4uKwWGURqodfgT TQF9JHen0q5KOhPji0aVOPMCmsFFS50= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=wTEecQ2c; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf15.hostedemail.com: domain of 3YWL8ZQYKCE48A7u3rw44w1u.s421y3AD-220Bqs0.47w@flex--surenb.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3YWL8ZQYKCE48A7u3rw44w1u.s421y3AD-220Bqs0.47w@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1711039074; a=rsa-sha256; cv=none; b=qkEsbKCCrhW++ZPwB3FgtoICzPs6v4e+s3kMk+iyWvceap+PgOFHc2aKTgBEx4ej8MIKEF /XuDi/46ZC9Y0aWhV5L2en23T4mcPFdGrwwdHBUMIa50KVq+TVbJC/dRtETCBzsV7kMQJd IFqpryNIsGpwKPmJDcmTmrra+8jZMbk= Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dcc15b03287so1685963276.3 for ; Thu, 21 Mar 2024 09:37:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711039073; x=1711643873; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=/zyX0GCVbwAVqAn+thP4TQZbJ1DZ8xPrkSKdxK+srAs=; b=wTEecQ2cDrHQxDnAb+Tf7sKFoqd9o90gnp7F6AYfrfXFAD+vJat3N0KOR02/V3fpIg xeS+2wL5b+0aotpmK4QmHwJSsmYAoA1MMaD8DxAW5eAOwtrX/ppBzkLFnThEP0TJCaWF g60lV+zfdidOd8iayxqOGNaxrijW3vHIYCrO7Wl/FP6w4Z0x5C+dKnHKwHG69mCIZu3i /KhH17a3uSjTxHLjo1rNI/tMO8qDHBob6f5ozkqpfys0H5yZU4cqVjTM4+Kbu+fIUhFF 1dlKLHqNCGNkBuu/ZZSMMAas1ORxxaS8AkdsTHDKRYELcN1H117q8dxTO9ZsjqyIVHZw Wx2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039073; x=1711643873; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/zyX0GCVbwAVqAn+thP4TQZbJ1DZ8xPrkSKdxK+srAs=; b=AdEan5N1r/yZ3D6yBcoycIabRhQ8p9j4fHiC7vPZCoT3qHWEywV97RtrCnjM2877gT 3KIl08lqDx3RSjYFYwg7+OvrGZBAsq4m+iz5fGzPkD3TtIbhCYUrItND3hsDtUEf5/AT nnLQnR4DhduOtJasM5GQFAgtIhznVz8y8MTJOl92j/Izx6OE48Stg7w1BqAW33v83t7j tR6jV0MDScnrhr8zPXL5BYRVrCE02FMC3cIL3mhlawcJ8kZj8fRbZEKNBhCuBCeYeTev hxkSXEyXnGcW76GZTe4m6FXd8hLIoGqR4mPPXDWb4tK9dgnVKrj89HMqlbsf2QgiYlBy a4Ag== X-Forwarded-Encrypted: i=1; AJvYcCUCgZ7BOfKTZuSvKLDR7NPgyOPEtgF5t6aqKO7i2qf8nLewjOV1TGH1i6UNZAbWY8b962G73IT2G9xQR4sdFeMaXuE= X-Gm-Message-State: AOJu0Yzs8ICxyzdigJ5T7IF/tzRtH9I+kUTcsEpaX93VGMkciBl8/vyc 2ETuEbButjcIf9qdnYyIUHQZjbnaGLAMZk1od0qspbhw2LUFqgFVsZMTdFpoaU+Ty8lBAE3ivrz dhQ== X-Google-Smtp-Source: AGHT+IGl7/sqfjKOff0ZjNp0/9geWcByH3EbVIixPqUdOWI6lFEA8KUqGJXoRB+ynXILrSpbs71KJ/Vx4lo= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:a489:6433:be5d:e639]) (user=surenb job=sendgmr) by 2002:a05:6902:218c:b0:dcc:4785:b51e with SMTP id dl12-20020a056902218c00b00dcc4785b51emr980431ybb.12.1711039073381; Thu, 21 Mar 2024 09:37:53 -0700 (PDT) Date: Thu, 21 Mar 2024 09:36:42 -0700 In-Reply-To: <20240321163705.3067592-1-surenb@google.com> Mime-Version: 1.0 References: <20240321163705.3067592-1-surenb@google.com> X-Mailer: git-send-email 2.44.0.291.gc1ea87d7ee-goog Message-ID: <20240321163705.3067592-21-surenb@google.com> Subject: [PATCH v6 20/37] mm: fix non-compound multi-order memory accounting in __free_pages From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, roman.gushchin@linux.dev, mgorman@suse.de, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, penguin-kernel@i-love.sakura.ne.jp, corbet@lwn.net, void@manifault.com, peterz@infradead.org, juri.lelli@redhat.com, catalin.marinas@arm.com, will@kernel.org, arnd@arndb.de, tglx@linutronix.de, mingo@redhat.com, dave.hansen@linux.intel.com, x86@kernel.org, peterx@redhat.com, david@redhat.com, axboe@kernel.dk, mcgrof@kernel.org, masahiroy@kernel.org, nathan@kernel.org, dennis@kernel.org, jhubbard@nvidia.com, tj@kernel.org, muchun.song@linux.dev, rppt@kernel.org, paulmck@kernel.org, pasha.tatashin@soleen.com, yosryahmed@google.com, yuzhao@google.com, dhowells@redhat.com, hughd@google.com, andreyknvl@gmail.com, keescook@chromium.org, ndesaulniers@google.com, vvvvvv@google.com, gregkh@linuxfoundation.org, ebiggers@google.com, ytcoode@gmail.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, rostedt@goodmis.org, bsegall@google.com, bristot@redhat.com, vschneid@redhat.com, cl@linux.com, penberg@kernel.org, iamjoonsoo.kim@lge.com, 42.hyeyoo@gmail.com, glider@google.com, elver@google.com, dvyukov@google.com, songmuchun@bytedance.com, jbaron@akamai.com, aliceryhl@google.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, surenb@google.com, kernel-team@android.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, linux-arch@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-modules@vger.kernel.org, kasan-dev@googlegroups.com, cgroups@vger.kernel.org X-Rspamd-Queue-Id: 75784A0034 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 79yo6c3xsetqdgxy6erd7aeky1u3esg7 X-HE-Tag: 1711039074-364218 X-HE-Meta: U2FsdGVkX19xSHKrwuxbZ8L6rz4UXLebdqwtj5kTeiUSuACJe38TKQ0TPLCPom37DZNXw/bFKePurMYgTvAlrdeg9NteSmgi7n6Drilb344F7Mw0SYebfSbZSzlo6rN2k85SLysDijUS9X/YRtKAheMZLBUyPy8wTiAK6/LtVqIjMtWD7SImzVjCdj4mJ9AUA0cNChroTFlhmZktEzX6IT7+d0WHOUNWOda9g2Q/aPJLpiiq4EPAxsDhVCneZNz+LKKy+2Cyn1kTNSxqivzz80uE2wBIbkrBI0SNs3yZE04jEEDvL4ZH3dLXuXAmi5RV9MffQqlrZQvD7eFpW3rrP3rXG5W1bT/NlXWjXpRnYomQdvVCTZ8dGHyeiqOXC/TuqJQq7VIJPmH+zAoSgnCzj1aBXIWqnvpaN8jBsMsfKvgwTlj9WAA1yUMRSrLpsPekZwFcxabIbFfM0/uJcOhZJmK/ifED6fKqPzqLkwWIxWXmyWZLftrXHYilf8maBvSmb3NmxsjYVyGyNfhy81SMUW9+SZxtfF3Km0/UBmJdS/tYUUqNrb2A7PdMcGzO1dQLO9uXUB1A4lDMe34XjYBxVS3BXqgOhE6ycr1nS5Vr6z7zDKppfhK2syuAc3U4USU/Sudh3JGhMlaUUDDGfoYwRWzOPJhxGpyOzr/FpGQ2KlB8fXclKmBkYJhzSt3oF6uLrIY7fG59Wg6Nf5J/elpZDeiCuQQrcroyRBIglea05gZtV9M5QYRtoupLEX02IMDPImb+Vsc83OQICaV5x+JFk4GRMSCBTGgQDmOxTTEXMHlubyKM3jjbpNOCma0N07tvpXfBBOdetAlmrroZARf46d9F5tnRA1rQpIaHcwAfyErXZo747c2f7tyZl+j9KtC9W74LJnU/SAm0sQlrbPBr8xIHlnQ2RAgD0JCIZCYdYC5Or5CtP+Zd0/PxGDOjfnmjV7r8wuD2XmXdA730uHU j9LVhcSH R+yR7Dqhhqy/ya8mvXDRyFHWwT0F1IONqVPItZrbp8CzwXganoYyEQj/MhjmzgMoB35GRSdfFCzkeUwCI/HLPRo2ig/Gey1X9lIQSYlDXVYrEHKfgdcYaHpVHqPFJsW5i60vmar+MPAezVi5cixN8C4FaIpK9m3DLmoyDlozF5qSOd1gph8IjUd3vBKJNg3AOpQaCSkb2zvFFS6V7CN4vtEm1BoSuIDbNHLCzqKQLudTz0b7GJX+tWYOv94yB+7JZC2u+YQt3N3W+EAj5XmxO/B/iouTuLcJ0Osw5UO2dpTDN1U7nQCZ9+fbXJqfeFKMT6oYz6fyXTCSsUHh7/p9i0hWflljm1PVc1C8xQKS3VqaQAQiZil6E/SJpQ5xFRwVkOTHigzMVRJ8IU+y6A+LNfvQwLcYUyn+2bWjLko1/0vmvLWJ3mwXD7mmCTA23zPfveZ4riqiGOZ7TbuisKRW4YcsBOLE4WRo4gW+MgxxQlm4gnPZnAAuh8DkO/KpX09+hL0WDBnMYOpcYeVw2fP3bXQTw7+aZluqsTQ+BqwM5M7biDzdHTQZWThnBGAmhfOX2CZ9hwCe/iRL2QHHNCcdAObIX1fxGYQHDH//CQyARcVpuv0UkPCBcr12yXIzutoyO9GR7j3KEUWSE+civk427GpN0rOsv49s/FkQ/lS1xEH9LjF8iub/xD+0miLKDGuM9DmdNIPmjrwOJKks/trWuwI7NqQ== 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: List-Subscribe: List-Unsubscribe: When a non-compound multi-order page is freed, it is possible that a speculative reference keeps the page pinned. In this case we free all pages except for the first page, which will be freed later by the last put_page(). However the page passed to put_page() is indistinguishable from an order-0 page, so it cannot do the accounting, just as it cannot free the subsequent pages. Do the accounting here, where we free the pages. Reported-by: Vlastimil Babka Signed-off-by: Suren Baghdasaryan --- include/linux/pgalloc_tag.h | 24 ++++++++++++++++++++++++ mm/page_alloc.c | 5 ++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/include/linux/pgalloc_tag.h b/include/linux/pgalloc_tag.h index 093edf98c3d7..50d212330bbb 100644 --- a/include/linux/pgalloc_tag.h +++ b/include/linux/pgalloc_tag.h @@ -96,12 +96,36 @@ static inline void pgalloc_tag_split(struct page *page, unsigned int nr) page_ext_put(page_ext); } +static inline struct alloc_tag *pgalloc_tag_get(struct page *page) +{ + struct alloc_tag *tag = NULL; + + if (mem_alloc_profiling_enabled()) { + union codetag_ref *ref = get_page_tag_ref(page); + + alloc_tag_sub_check(ref); + if (ref && ref->ct) + tag = ct_to_alloc_tag(ref->ct); + put_page_tag_ref(ref); + } + + return tag; +} + +static inline void pgalloc_tag_sub_pages(struct alloc_tag *tag, unsigned int nr) +{ + if (mem_alloc_profiling_enabled() && tag) + this_cpu_sub(tag->counters->bytes, PAGE_SIZE * nr); +} + #else /* CONFIG_MEM_ALLOC_PROFILING */ static inline void pgalloc_tag_add(struct page *page, struct task_struct *task, unsigned int nr) {} static inline void pgalloc_tag_sub(struct page *page, unsigned int nr) {} static inline void pgalloc_tag_split(struct page *page, unsigned int nr) {} +static inline struct alloc_tag *pgalloc_tag_get(struct page *page) { return NULL; } +static inline void pgalloc_tag_sub_pages(struct alloc_tag *tag, unsigned int nr) {} #endif /* CONFIG_MEM_ALLOC_PROFILING */ diff --git a/mm/page_alloc.c b/mm/page_alloc.c index fd1cc5b80a56..00e0ae4cbf2d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -4700,12 +4700,15 @@ void __free_pages(struct page *page, unsigned int order) { /* get PageHead before we drop reference */ int head = PageHead(page); + struct alloc_tag *tag = pgalloc_tag_get(page); if (put_page_testzero(page)) free_the_page(page, order); - else if (!head) + else if (!head) { + pgalloc_tag_sub_pages(tag, (1 << order) - 1); while (order-- > 0) free_the_page(page + (1 << order), order); + } } EXPORT_SYMBOL(__free_pages);