From patchwork Wed Feb 19 02:17:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 13981431 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 16A25C021AA for ; Wed, 19 Feb 2025 02:18:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D9A302801CE; Tue, 18 Feb 2025 21:18:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CD13F2801CA; Tue, 18 Feb 2025 21:18:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B74892801CE; Tue, 18 Feb 2025 21:18:29 -0500 (EST) 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 8E67F2801CA for ; Tue, 18 Feb 2025 21:18:29 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 4DE08B0CD0 for ; Wed, 19 Feb 2025 02:18:29 +0000 (UTC) X-FDA: 83135085138.06.2B305BF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 9BE161C0007 for ; Wed, 19 Feb 2025 02:18:27 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XBI6QU0E; spf=pass (imf20.hostedemail.com: domain of luizcap@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739931507; 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=sO1RKRz7AmW+mPQ8kuacqDxnDkJ26PvSRyCVK8dkxcg=; b=ISzWU2NQw1iJjOsf+yeR79Kj+FlhzvlranNHmCgyOa6ud08Y6dL0fET0pM3vf1VRpZ0db1 V+RsQzoDkir79OHnXNMtg7S4TYaP+nluOoJSO41CK/kuw0dXTdsQdBf4cxvrQzxlxIDhSc e8MMaW7WPxg1TRdFRf99OW4Evmd/+Ck= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=XBI6QU0E; spf=pass (imf20.hostedemail.com: domain of luizcap@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739931507; a=rsa-sha256; cv=none; b=FCSrP/1QOwjTS57mQZi/CIJWINfJheyBYfbaSZchHbINuPGMIZt37mfn229+R74GfmUfVu aaPZX/XUdyvyegXzSKbMcusx7HzA/FAIK6cZWDh67c+mgkPDhSjRrMQuXxMHSzvKDRpMt6 98iWbu38Q/XLuS91ibrUPiCGG3/A/gg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1739931507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sO1RKRz7AmW+mPQ8kuacqDxnDkJ26PvSRyCVK8dkxcg=; b=XBI6QU0ENEuCwnc8j7ekfiLcmZTKpyIAcB47uNrYMWhxmXDFKXzE5+a3yZZovN6Xw/kLJY 6A8IFRqdYCjkBZqTJOe+UE0MTXgrheKec2GXiVW+aeldr8PEvE2veEMJUioziuSNowkKMi Y9dkDAmOVSpapFKu7Vp1oJmDQavyEiM= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-214-kACK9iz7N-iKjG_UQRlKJQ-1; Tue, 18 Feb 2025 21:18:21 -0500 X-MC-Unique: kACK9iz7N-iKjG_UQRlKJQ-1 X-Mimecast-MFC-AGG-ID: kACK9iz7N-iKjG_UQRlKJQ_1739931500 Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F35CB196E078; Wed, 19 Feb 2025 02:18:19 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.65.50]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id ECCAB1955F0F; Wed, 19 Feb 2025 02:18:17 +0000 (UTC) From: Luiz Capitulino To: linux-kernel@vger.kernel.org, linux-mm@kvack.org, david@redhat.com, yuzhao@google.com, pasha.tatashin@soleen.com Cc: akpm@linux-foundation.org, hannes@cmpxchg.org, muchun.song@linux.dev, luizcap@redhat.com Subject: [PATCH 3/4] mm: page_owner: use new iteration API Date: Tue, 18 Feb 2025 21:17:49 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 9BE161C0007 X-Stat-Signature: ssqrfkamtstrhos3pmgbhboj4zor891f X-HE-Tag: 1739931507-26422 X-HE-Meta: U2FsdGVkX1+cDdd2Cv9VacaopXdsqpOLzMD5qyB3HxCUAx46KZl7dgwub6GdsM3uAc2SGD8U5n0XEchyQQ7hK0DM7oJBBptldkpRZNr+gwk+vqYv9GmnBMvdyZULyWdmO9hAC9HGHs8Xz61xZ38CalhYSA4/QKYAB1Q/t4mQq9BtNkJQod4BMp8rKZmBlt6mtyMcgdDgky2UO/CCe0UKOMivpPE7qFtI6bDtVRpmHZhlWHffykeR7xd0zsmFDmGAmdYn5X4HJ6IfR3ro4GBUXwzYnplN1fSFCc7GgUGNxdjc5CJiP/54A2AIGlK8P7lbp+iVxfgwukp9BlMeVAPAE22YznditybIfjwXA/QfhNJZYiLllVhoiYRz7Isutd/p+OkFIm1OIKeon9i9s56dyTiIM97VCYmndKXAYau48S5UJiWRjMxtNHGf331cYHgUVXDtIXvxisuszLkguWDg+uiaiDgNeLP1A/yvaJeFRfyx17A0v/e2z8dEgN8PiZ1YsxflpxTJTVDOL1v24mo6jTsve1NMW2lqpgmTZPRiEKimiptvVepWrwQiUrUtBVUmuoocFLu7sjPIK4XnNceiBfNWo99EjUKd1Q7qxpeuyZZMwXE0ygKl4Q3dzNTUMbT1ujiTOiZDuOmZiyR8RJLR+sMhpdxHcfwKcTy5Qs02ykGJ3+7X/Wmw4Bc+e53kIuTzp1v0tM7b7YZ8WGp/MEMjiAimtTG+2X++iqlITrBM6OY0q3ihMnd9BWPWXyD54tpDMDT97opyoRp81zxqiiZolc1fwchJQd5PxSvhc+81c6lE6pgiUK9MZqEdYdjH8ApCwqOK3kmOtAhtW504wXD9jbWw2wFsS5gTiihvjguii7cF9oCaGfp9n4QkCY85v3xIPJwSnYMu4Okl9Y3gK/17oMud1QUOszBJMSfk5KTsE829IrAhMCJH4QSf4spMPCq815iDCKLoO6kq+jrTOLe 5wiceaNf wDPk5lEtijLDBNCLfcHN9196S/v91rZ62LRCi1z7+OhO9g2VkIqw2oya4CBsrCpDuU5+MVoE3ggHx96J4XEjvZNsKbU61pe23JnZvN9vHJY82yrm9himXiOL/hEWvT2NPyzzlWWuan9Jc2jY1rnxII8eAs5XltfZpZ75qolEaHmC0lyWWTdAXXaEuhwhUXhANOZJj4Oq/g29u5XyxiwJiQc/p+l0nbzagkuZQA+h9prYmUEbZ6vHgb1ZcTM/7eeiyTqt+88APcRcDqA80zQ1ZBSDE9gozteX+kt2pe3AWvRL67ZsXaEG+aJes20znSBkLvFK+IYNnEemcXqHOWqyT+fX0j8SI4cV00HV46e7DXnjKyMA9KoFKMjIIhQ== 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: The page_ext_next() function assumes that page extension objects for a page order allocation always reside in the same memory section, which may not be true and could lead to crashes. Use the new page_ext iteration API instead. Fixes: cf54f310d0d3 ("mm/hugetlb: use __GFP_COMP for gigantic folios") Signed-off-by: Luiz Capitulino --- mm/page_owner.c | 61 +++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 32 deletions(-) diff --git a/mm/page_owner.c b/mm/page_owner.c index 2d6360eaccbb6..9afc62a882813 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -229,17 +229,19 @@ static void dec_stack_record_count(depot_stack_handle_t handle, handle); } -static inline void __update_page_owner_handle(struct page_ext *page_ext, +static inline void __update_page_owner_handle(struct page *page, depot_stack_handle_t handle, unsigned short order, gfp_t gfp_mask, short last_migrate_reason, u64 ts_nsec, pid_t pid, pid_t tgid, char *comm) { - int i; + struct page_ext_iter iter; + struct page_ext *page_ext; struct page_owner *page_owner; - for (i = 0; i < (1 << order); i++) { + rcu_read_lock(); + for_each_page_ext_order(page, order, page_ext, iter) { page_owner = get_page_owner(page_ext); page_owner->handle = handle; page_owner->order = order; @@ -252,20 +254,22 @@ static inline void __update_page_owner_handle(struct page_ext *page_ext, sizeof(page_owner->comm)); __set_bit(PAGE_EXT_OWNER, &page_ext->flags); __set_bit(PAGE_EXT_OWNER_ALLOCATED, &page_ext->flags); - page_ext = page_ext_next(page_ext); } + rcu_read_unlock(); } -static inline void __update_page_owner_free_handle(struct page_ext *page_ext, +static inline void __update_page_owner_free_handle(struct page *page, depot_stack_handle_t handle, unsigned short order, pid_t pid, pid_t tgid, u64 free_ts_nsec) { - int i; + struct page_ext_iter iter; + struct page_ext *page_ext; struct page_owner *page_owner; - for (i = 0; i < (1 << order); i++) { + rcu_read_lock(); + for_each_page_ext_order(page, order, page_ext, iter) { page_owner = get_page_owner(page_ext); /* Only __reset_page_owner() wants to clear the bit */ if (handle) { @@ -275,8 +279,8 @@ static inline void __update_page_owner_free_handle(struct page_ext *page_ext, page_owner->free_ts_nsec = free_ts_nsec; page_owner->free_pid = current->pid; page_owner->free_tgid = current->tgid; - page_ext = page_ext_next(page_ext); } + rcu_read_unlock(); } void __reset_page_owner(struct page *page, unsigned short order) @@ -293,11 +297,11 @@ void __reset_page_owner(struct page *page, unsigned short order) page_owner = get_page_owner(page_ext); alloc_handle = page_owner->handle; + page_ext_put(page_ext); handle = save_stack(GFP_NOWAIT | __GFP_NOWARN); - __update_page_owner_free_handle(page_ext, handle, order, current->pid, + __update_page_owner_free_handle(page, handle, order, current->pid, current->tgid, free_ts_nsec); - page_ext_put(page_ext); if (alloc_handle != early_handle) /* @@ -313,19 +317,13 @@ void __reset_page_owner(struct page *page, unsigned short order) noinline void __set_page_owner(struct page *page, unsigned short order, gfp_t gfp_mask) { - struct page_ext *page_ext; u64 ts_nsec = local_clock(); depot_stack_handle_t handle; handle = save_stack(gfp_mask); - - page_ext = page_ext_get(page); - if (unlikely(!page_ext)) - return; - __update_page_owner_handle(page_ext, handle, order, gfp_mask, -1, + __update_page_owner_handle(page, handle, order, gfp_mask, -1, ts_nsec, current->pid, current->tgid, current->comm); - page_ext_put(page_ext); inc_stack_record_count(handle, gfp_mask, 1 << order); } @@ -344,26 +342,24 @@ void __set_page_owner_migrate_reason(struct page *page, int reason) void __split_page_owner(struct page *page, int old_order, int new_order) { - int i; - struct page_ext *page_ext = page_ext_get(page); + struct page_ext_iter iter; + struct page_ext *page_ext; struct page_owner *page_owner; - if (unlikely(!page_ext)) - return; - - for (i = 0; i < (1 << old_order); i++) { + rcu_read_lock(); + for_each_page_ext_order(page, old_order, page_ext, iter) { page_owner = get_page_owner(page_ext); page_owner->order = new_order; - page_ext = page_ext_next(page_ext); } - page_ext_put(page_ext); + rcu_read_unlock(); } void __folio_copy_owner(struct folio *newfolio, struct folio *old) { - int i; struct page_ext *old_ext; struct page_ext *new_ext; + struct page_ext *page_ext; + struct page_ext_iter iter; struct page_owner *old_page_owner; struct page_owner *new_page_owner; depot_stack_handle_t migrate_handle; @@ -381,7 +377,7 @@ void __folio_copy_owner(struct folio *newfolio, struct folio *old) old_page_owner = get_page_owner(old_ext); new_page_owner = get_page_owner(new_ext); migrate_handle = new_page_owner->handle; - __update_page_owner_handle(new_ext, old_page_owner->handle, + __update_page_owner_handle(&newfolio->page, old_page_owner->handle, old_page_owner->order, old_page_owner->gfp_mask, old_page_owner->last_migrate_reason, old_page_owner->ts_nsec, old_page_owner->pid, @@ -391,7 +387,7 @@ void __folio_copy_owner(struct folio *newfolio, struct folio *old) * will be freed after migration. Keep them until then as they may be * useful. */ - __update_page_owner_free_handle(new_ext, 0, old_page_owner->order, + __update_page_owner_free_handle(&newfolio->page, 0, old_page_owner->order, old_page_owner->free_pid, old_page_owner->free_tgid, old_page_owner->free_ts_nsec); @@ -400,11 +396,12 @@ void __folio_copy_owner(struct folio *newfolio, struct folio *old) * for the new one and the old folio otherwise there will be an imbalance * when subtracting those pages from the stack. */ - for (i = 0; i < (1 << new_page_owner->order); i++) { + rcu_read_lock(); + for_each_page_ext_order(&old->page, new_page_owner->order, page_ext, iter) { + old_page_owner = get_page_owner(page_ext); old_page_owner->handle = migrate_handle; - old_ext = page_ext_next(old_ext); - old_page_owner = get_page_owner(old_ext); } + rcu_read_unlock(); page_ext_put(new_ext); page_ext_put(old_ext); @@ -813,7 +810,7 @@ static void init_pages_in_zone(pg_data_t *pgdat, struct zone *zone) goto ext_put_continue; /* Found early allocated page */ - __update_page_owner_handle(page_ext, early_handle, 0, 0, + __update_page_owner_handle(page, early_handle, 0, 0, -1, local_clock(), current->pid, current->tgid, current->comm); count++;