From patchwork Wed Oct 23 17:07:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13847639 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 DADE2CFA454 for ; Wed, 23 Oct 2024 17:08:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C90446B00A1; Wed, 23 Oct 2024 13:08:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C18B36B00A4; Wed, 23 Oct 2024 13:08:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A6EEC6B00A6; Wed, 23 Oct 2024 13:08:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 830F96B00A1 for ; Wed, 23 Oct 2024 13:08:15 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 963581A0BC3 for ; Wed, 23 Oct 2024 17:07:43 +0000 (UTC) X-FDA: 82705499310.03.26EC302 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf13.hostedemail.com (Postfix) with ESMTP id 6031F20024 for ; Wed, 23 Oct 2024 17:07:55 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=swBVk8SK; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3ey0ZZwYKCHoqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3ey0ZZwYKCHoqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729703241; a=rsa-sha256; cv=none; b=t7tGUEOOFa1SJWuEaX6COxZ2pU9Q+RHHIckBQuqvDl28HjjmaK0Tw5p/QLV67AvgysV/tf Zk7bPmZGetU4VBOm5HDST/3UlZ53wCNzN1fo8yq26qCxvpvGT004bRjU3f6gb/0YJxrmRC bkW72hmjQlcpRyFRxVfbj0budIKo63U= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=swBVk8SK; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf13.hostedemail.com: domain of 3ey0ZZwYKCHoqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=3ey0ZZwYKCHoqspclZemmejc.amkjglsv-kkitYai.mpe@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729703241; 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=8wnMIe1iCPC4H6xxK8PR5xB7BjuNdLAE9wA+yh8Gbwc=; b=8BS8XP99Awvhs7nQPX+DMBY6eG7naQRuNcAwC50hU7iKIPPAt1fs41oqZ8MtEr55ibXSXw qNfa4l0Jn8CS94RnlgtJEqRHkZ9FM3DdXiWcJDmVLtxKTbFA69yb8g4eoDJAC+8mIghoZs t8zCxqlpTP/0haNGFX7naFA0iRSdEIY= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e297a366304so21237276.2 for ; Wed, 23 Oct 2024 10:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1729703292; x=1730308092; 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=8wnMIe1iCPC4H6xxK8PR5xB7BjuNdLAE9wA+yh8Gbwc=; b=swBVk8SK5NZp+bQpQMWbW0HCR5sSCWS8N0gF5cVtMc1vvGA/+5R3DM9DSHq+3c2j0v Nqss0biYWa48hkUk5d1CqhM78CqgdDdllTtde0WFpykwPxIwEVojSnURrwexo4viohmX 7hij1KLqer2SEbNcSYOQlcUMAjUPcM1WtpCf/jqGihTlJgK5r9mdmCfTBJJpHAYkOo49 zG5hhw8kATY4OdPwNEi8gk20vmQqhSx8cXV09+o4BeYD/AJsVIZzo6r9yrVUxfoKGm2L jnOAiWpA7yGt34Rg1R4ujjcjoECfWSxdryat6yyrraK5X6iOirLfYXD+GE3v0102iCyB pHNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729703292; x=1730308092; 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=8wnMIe1iCPC4H6xxK8PR5xB7BjuNdLAE9wA+yh8Gbwc=; b=GnV+KI70LM84NUrRrwMgaVHOweBiO6ZONwV7i4vtd+IDW7yDfFD60B7AGa6nmp2B3T ZjaPDjZGLFM4sQUTH827pn3DZ+/o195saRLmtXIvUAQUKd0ysrrqtH+9h1yK/3nydQpw yvtjw6l7vVDcqJDDTFSmz6DgYIVKdF5ryyfPjUKA/eTH2zAlqX7mLmB9LzMTWJ20Fobu tq8HSAW/TntpSTi8Gepvf9sa3iDYW3cfRS9W6ub2YyZbyNFRgpkccFbq/ocIevfosnuh GWwzifkb9JtL8hAeLegf5j4vNbUNmK9b9/imaDD/8hgFX18tp0UfAwX/MK/6yjYEXfZT cggw== X-Forwarded-Encrypted: i=1; AJvYcCW+eDyc2TVnEG50PluGdGuAdOs+eiC7JGgOFnRYi2Ed6q0gQydne+RXoWxDSnV3rC3no3THI87vyA==@kvack.org X-Gm-Message-State: AOJu0YwrRW9c8ki3xTBKfYvv7b91w7tTSB/DBGs1Yvelm9RPesIvL1mI 7N+dvkJ6jiM6fqVQ2L/72q2HtGxRd1TH+fag6F0LZCuyZuO66u1XXv6/6GD19WU+Cg6jkHSiBao AkQ== X-Google-Smtp-Source: AGHT+IHWTSefrY2mOEgvtjZrHcKSjJbm4CbIxnZltjP19nac0+xcMzP1s41Uk58cU65/uvtLl+YlVZeSEX4= X-Received: from surenb-desktop.mtv.corp.google.com ([2a00:79e0:2e3f:8:a087:59b9:198a:c44c]) (user=surenb job=sendgmr) by 2002:a5b:70b:0:b0:e28:e4a7:3206 with SMTP id 3f1490d57ef6-e2e3a6d62a7mr4485276.8.1729703291999; Wed, 23 Oct 2024 10:08:11 -0700 (PDT) Date: Wed, 23 Oct 2024 10:07:58 -0700 In-Reply-To: <20241023170759.999909-1-surenb@google.com> Mime-Version: 1.0 References: <20241023170759.999909-1-surenb@google.com> X-Mailer: git-send-email 2.47.0.105.g07ac214952-goog Message-ID: <20241023170759.999909-6-surenb@google.com> Subject: [PATCH v4 5/6] alloc_tag: introduce pgtag_ref_handle to abstract page tag references From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: kent.overstreet@linux.dev, corbet@lwn.net, arnd@arndb.de, mcgrof@kernel.org, rppt@kernel.org, paulmck@kernel.org, thuth@redhat.com, tglx@linutronix.de, bp@alien8.de, xiongwei.song@windriver.com, ardb@kernel.org, david@redhat.com, vbabka@suse.cz, mhocko@suse.com, hannes@cmpxchg.org, roman.gushchin@linux.dev, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, pasha.tatashin@soleen.com, souravpanda@google.com, keescook@chromium.org, dennis@kernel.org, jhubbard@nvidia.com, urezki@gmail.com, hch@infradead.org, petr.pavlu@suse.com, samitolvanen@google.com, da.gomez@samsung.com, yuzhao@google.com, vvvvvv@google.com, rostedt@goodmis.org, iamjoonsoo.kim@lge.com, rientjes@google.com, minchan@google.com, kaleshsingh@google.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, maple-tree@lists.infradead.org, linux-modules@vger.kernel.org, kernel-team@android.com, surenb@google.com X-Rspam-User: X-Rspamd-Queue-Id: 6031F20024 X-Rspamd-Server: rspam01 X-Stat-Signature: wbbesoed8hapcdbagzchew7uizuhgioh X-HE-Tag: 1729703275-4511 X-HE-Meta: U2FsdGVkX19DMNQEvB9XHulPmhhnnyqRZ+lSyXB6IxUjZDEisXW8Sqv9TloMUDHJsQevYqwpxcQi2lxDXabDvX0QmYdjJn1ofinOSz6aJRYPMgCfeiLE5pBVIpuCbUSMe/qDhOG50hwFrBV4LTl/qj3EqK3HS9fmxOpfqif851x8eG6yYrxyphopdHDDGnAdGUJ6NJsCX+UY0QwFUVjtaEjXnZzHaw3ZL7QTyM/6OCik5EjXKwQY8xgMCYMGoPznngNotfeCic8Cr+g69iAA3ye7K5Wy3YCFNIJcmMlqSMOZikAynlB87laN1KiGI7brUMoqpO70DUKpzz1QqKMb4tl0se4NrKU2kbgGtc7wLmw/FRfZCOlAyscP7ILu0yPK3J6SPWwTJq9hFiy47OXY00rb1QndV57VdMbZ6wLSuYRmfiPAZ1jGiPn9aUHnLne7JAAjuPOJFb5jPVNfLo6wZ3Qf5NPiaDHHG157aKeEahzSQdIlZGqeN2eceIc6rejn8LuVLFrx4hFgcRJgPzm+f+MT9EjU9Fef/pCtp1fFo+pNX6EbPYdsp/ZjIGBu0EKQxu15V/wnik6ovRalbK0OuHGiP55ht2px4rySTPqTfHpLymMfpzz9KZkQaiSctI03QldCedQcubfllD8z+z8bfGSvIZIqcX/N/CLHfdf/4+IjmEjeGE+XD+0H++upgrasVMPWUd8+zhL0laeBmqKBO1s1FSMizf3QiKqC4tmibYtlXI/K/YcCSQlOubq6nuNBe2y7djxNMjJNzC5YRROgyUR143b7d3kvwzDLaEeS1f8pfd7WTcuFcwIvj3x4oZET+Rs4bgAHOjpzIdyzcFKzltmw2r0Sm4F8cdlBGdWRE7ICbI3iby4iDcgAz0U4yX/3VTgIAGn6doJvDJ+U5+7n0Zp5xDMhfS4eAEdtMUfjppWxPWDAw8DgppNsURvGZW5cLQ7T1f8gW3pYppYNwk3 80tJvrem SldgPhLp7QkxCwQzrL942GAMq+p36/e7dlTq4Z9E9yR9HJTokNRhyKgF8GZy+YySTOasMwYV30yHVlyMQw4upWw11uC4fQUx9pZoepIDoYTBvagBqYTtqTgxWl0/j/GjvssR2TOTQ7FRhZ6MPBH9SjeGgx3/FViT7VteIImdg4QDOIck23zL4VpV0tncOA393n2PwBOVU6Inpqw4UkXKeRQvvLtIp3D+Mq7ot1DGJzeyFdtTe7TaqUem+CC+U7nUC6QLTVQq2GR+5RFM1yOZrII/0VxPnfk1FJ2uVc3moPGPVcT5rUYoz2v3yyGs24A/G2a4Whmfx5FW2KpoGjvQkozVVw6s5Z913enyAGTtuaXxBaJ5GCL918Rpg+36Aj27APoLjTLbiJHEx7R6iM3Nom6ZsNqhuznFjSIDokMJPXVcdg2ycH2kHynoG04OkwAhAo0cLArDie8Bpc1xZ35nAoiVR4iaY+vn7p2Sdac4d4JYQ/ccd3x1NSYbNBFR7IA6BpUshFhRy/m8t/GUMOmZO1Whry9dZ2YEyHwHvzHbDJrRkl+KOqtnBVOr56cFAfM3kWA+h4YXiHAZEQXTwATGFnb0XNA== 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: To simplify later changes to page tag references, introduce new pgtag_ref_handle type. This allows easy replacement of page_ext as a storage of page allocation tags. Signed-off-by: Suren Baghdasaryan Reviewed-by: Pasha Tatashin --- include/linux/mm.h | 25 +++++----- include/linux/pgalloc_tag.h | 92 ++++++++++++++++++++++--------------- 2 files changed, 67 insertions(+), 50 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 5cd22303fbc0..8efb4a6a1a70 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -4180,37 +4180,38 @@ static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new return; for (i = nr_pages; i < (1 << old_order); i += nr_pages) { - union codetag_ref *ref = get_page_tag_ref(folio_page(folio, i)); + union pgtag_ref_handle handle; + union codetag_ref ref; - if (ref) { + if (get_page_tag_ref(folio_page(folio, i), &ref, &handle)) { /* Set new reference to point to the original tag */ - alloc_tag_ref_set(ref, tag); - put_page_tag_ref(ref); + alloc_tag_ref_set(&ref, tag); + update_page_tag_ref(handle, &ref); + put_page_tag_ref(handle); } } } static inline void pgalloc_tag_copy(struct folio *new, struct folio *old) { + union pgtag_ref_handle handle; + union codetag_ref ref; struct alloc_tag *tag; - union codetag_ref *ref; tag = pgalloc_tag_get(&old->page); if (!tag) return; - ref = get_page_tag_ref(&new->page); - if (!ref) + if (!get_page_tag_ref(&new->page, &ref, &handle)) return; /* Clear the old ref to the original allocation tag. */ clear_page_tag_ref(&old->page); /* Decrement the counters of the tag on get_new_folio. */ - alloc_tag_sub(ref, folio_nr_pages(new)); - - __alloc_tag_ref_set(ref, tag); - - put_page_tag_ref(ref); + alloc_tag_sub(&ref, folio_nr_pages(new)); + __alloc_tag_ref_set(&ref, tag); + update_page_tag_ref(handle, &ref); + put_page_tag_ref(handle); } #else /* !CONFIG_MEM_ALLOC_PROFILING */ static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new_order) diff --git a/include/linux/pgalloc_tag.h b/include/linux/pgalloc_tag.h index 59a3deb792a8..b13cd3313a88 100644 --- a/include/linux/pgalloc_tag.h +++ b/include/linux/pgalloc_tag.h @@ -11,46 +11,59 @@ #include +union pgtag_ref_handle { + union codetag_ref *ref; /* reference in page extension */ +}; + extern struct page_ext_operations page_alloc_tagging_ops; -static inline union codetag_ref *codetag_ref_from_page_ext(struct page_ext *page_ext) +/* Should be called only if mem_alloc_profiling_enabled() */ +static inline bool get_page_tag_ref(struct page *page, union codetag_ref *ref, + union pgtag_ref_handle *handle) { - return (union codetag_ref *)page_ext_data(page_ext, &page_alloc_tagging_ops); -} + struct page_ext *page_ext; + union codetag_ref *tmp; -static inline struct page_ext *page_ext_from_codetag_ref(union codetag_ref *ref) -{ - return (void *)ref - page_alloc_tagging_ops.offset; + if (!page) + return false; + + page_ext = page_ext_get(page); + if (!page_ext) + return false; + + tmp = (union codetag_ref *)page_ext_data(page_ext, &page_alloc_tagging_ops); + ref->ct = tmp->ct; + handle->ref = tmp; + return true; } -/* Should be called only if mem_alloc_profiling_enabled() */ -static inline union codetag_ref *get_page_tag_ref(struct page *page) +static inline void put_page_tag_ref(union pgtag_ref_handle handle) { - if (page) { - struct page_ext *page_ext = page_ext_get(page); + if (WARN_ON(!handle.ref)) + return; - if (page_ext) - return codetag_ref_from_page_ext(page_ext); - } - return NULL; + page_ext_put((void *)handle.ref - page_alloc_tagging_ops.offset); } -static inline void put_page_tag_ref(union codetag_ref *ref) +static inline void update_page_tag_ref(union pgtag_ref_handle handle, + union codetag_ref *ref) { - if (WARN_ON(!ref)) + if (WARN_ON(!handle.ref || !ref)) return; - page_ext_put(page_ext_from_codetag_ref(ref)); + handle.ref->ct = ref->ct; } static inline void clear_page_tag_ref(struct page *page) { if (mem_alloc_profiling_enabled()) { - union codetag_ref *ref = get_page_tag_ref(page); + union pgtag_ref_handle handle; + union codetag_ref ref; - if (ref) { - set_codetag_empty(ref); - put_page_tag_ref(ref); + if (get_page_tag_ref(page, &ref, &handle)) { + set_codetag_empty(&ref); + update_page_tag_ref(handle, &ref); + put_page_tag_ref(handle); } } } @@ -59,11 +72,13 @@ static inline void pgalloc_tag_add(struct page *page, struct task_struct *task, unsigned int nr) { if (mem_alloc_profiling_enabled()) { - union codetag_ref *ref = get_page_tag_ref(page); + union pgtag_ref_handle handle; + union codetag_ref ref; - if (ref) { - alloc_tag_add(ref, task->alloc_tag, PAGE_SIZE * nr); - put_page_tag_ref(ref); + if (get_page_tag_ref(page, &ref, &handle)) { + alloc_tag_add(&ref, task->alloc_tag, PAGE_SIZE * nr); + update_page_tag_ref(handle, &ref); + put_page_tag_ref(handle); } } } @@ -71,11 +86,13 @@ static inline void pgalloc_tag_add(struct page *page, struct task_struct *task, static inline void pgalloc_tag_sub(struct page *page, unsigned int nr) { if (mem_alloc_profiling_enabled()) { - union codetag_ref *ref = get_page_tag_ref(page); + union pgtag_ref_handle handle; + union codetag_ref ref; - if (ref) { - alloc_tag_sub(ref, PAGE_SIZE * nr); - put_page_tag_ref(ref); + if (get_page_tag_ref(page, &ref, &handle)) { + alloc_tag_sub(&ref, PAGE_SIZE * nr); + update_page_tag_ref(handle, &ref); + put_page_tag_ref(handle); } } } @@ -85,13 +102,14 @@ 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) { - if (ref->ct) - tag = ct_to_alloc_tag(ref->ct); - put_page_tag_ref(ref); + union pgtag_ref_handle handle; + union codetag_ref ref; + + if (get_page_tag_ref(page, &ref, &handle)) { + alloc_tag_sub_check(&ref); + if (ref.ct) + tag = ct_to_alloc_tag(ref.ct); + put_page_tag_ref(handle); } } @@ -106,8 +124,6 @@ static inline void pgalloc_tag_sub_pages(struct alloc_tag *tag, unsigned int nr) #else /* CONFIG_MEM_ALLOC_PROFILING */ -static inline union codetag_ref *get_page_tag_ref(struct page *page) { return NULL; } -static inline void put_page_tag_ref(union codetag_ref *ref) {} static inline void clear_page_tag_ref(struct page *page) {} static inline void pgalloc_tag_add(struct page *page, struct task_struct *task, unsigned int nr) {}