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 D2F35C3DA41 for ; Thu, 11 Jul 2024 13:04:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4BD906B008C; Thu, 11 Jul 2024 09:04:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 46D7D6B0092; Thu, 11 Jul 2024 09:04:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3356F6B0093; Thu, 11 Jul 2024 09:04:15 -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 12B426B008C for ; Thu, 11 Jul 2024 09:04:15 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 81F2C160548 for ; Thu, 11 Jul 2024 13:04:14 +0000 (UTC) X-FDA: 82327490028.01.FC118FB Received: from out-187.mta1.migadu.com (out-187.mta1.migadu.com [95.215.58.187]) by imf29.hostedemail.com (Postfix) with ESMTP id 0125D12002D for ; Thu, 11 Jul 2024 13:04:11 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=G3LHeXQ5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.187 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720703025; a=rsa-sha256; cv=none; b=ePmSnR9GN6dOEf8mEVx0tuuPklvK9AgadjUiwNQLp1RQB1zmDaATSZ9OGNrOdFbu1HqlXM rMwv+Yt4fv9ON169DXKFTxef7IQprG1qWQajEHDld52yurvUN+xQ+6c+scfjLgw2PQ8UEw y7EQKuwVYSyLG+D/NbY1WTDHQYp5idY= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=G3LHeXQ5; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf29.hostedemail.com: domain of yajun.deng@linux.dev designates 95.215.58.187 as permitted sender) smtp.mailfrom=yajun.deng@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720703025; 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:references:dkim-signature; bh=3MGObJu/3MJ/LX6Yb+8U9JI9LiQ7r/lgAYHryvrfHwM=; b=P8iRkb3BV+NvLz0nVfKugIPO4dl9Y3GYn/NLZxQjtQtZrccK5W+A0DFVIA+QtjzUURQVV9 fNnDvU7Gi8Ht1VVIdsNQRjLaRr2Nt7lcKfC2T6uKEfCxqliAVHJDcJ2N2Xku1C2On4j84U wfMTOJfR8qnbzH/YJH2BQz5SFwtySFM= X-Envelope-To: akpm@linux-foundation.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1720703049; 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; bh=3MGObJu/3MJ/LX6Yb+8U9JI9LiQ7r/lgAYHryvrfHwM=; b=G3LHeXQ5DuvAxMOvJatjKgUWr1oiY5szAUrS63hOj0QnROLQ4zmNh92aEbDDZuOQIJSM45 eu8xNSSs0cudNPOnMtMW5vy0ToGk7XE523IcdR6Dex2v2Xki52iVFnybitIvvN6CxILRr1 VtrXAnhmWwNBHq9mlzbpXAuNr5ip8yc= X-Envelope-To: willy@infradead.org X-Envelope-To: david@redhat.com X-Envelope-To: linux-mm@kvack.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: yajun.deng@linux.dev X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Yajun Deng To: akpm@linux-foundation.org, willy@infradead.org, david@redhat.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yajun Deng Subject: [PATCH] mm: unified folio_test_anon()/folio_anon_vma() and use them Date: Thu, 11 Jul 2024 21:03:51 +0800 Message-Id: <20240711130351.2830-1-yajun.deng@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 0125D12002D X-Stat-Signature: ce5666efozm7cbaus3kxodk5i3h1brsp X-Rspam-User: X-HE-Tag: 1720703051-960232 X-HE-Meta: U2FsdGVkX18eT0A3UfkAlCPHSfTgXjTy+rob+T/Ut1+sBt3GK0fv30sWufbORnPRbvOGsKxaIMB8BRa2WC1UIy3GWg5/PJubT5bYToW19r5cX9Rhc2EVd/x6ZWlRn21utJydToyvpI+3poMOdiDQJT/b07zzQi0lzmrRWHJmDPD5djLUy9iIrXSpsebe5LR8LrO6CZncyz3Pcrug5QfJv5bnxHGsliql3IS0fXkSQMjTgcXU1XUde+Bw72irnVUXReMy+fxlxnJaoL0nRpjxuW/ygqdU+mLph8TfFUwn/+MBhvi6qimODqdFyxzha6EXrO5/xNDmYPKoKOKr9CRqQOXX2L1KCaSfUxhRKdtIivy1tfzlDY58b2MxQBBJ69UNCOTmdoNFJxSH2hwm5Ee/JaxV6gHmpQQpAQsm3qayiQg8665qlag2/UwwmjIloLHVBI+0vPc4egHS2ZsUoJG+aPz13LsURmi7hrW20JtXiTz06wxbYibdhQDUB7T2/Yp+JoEbqSsTDeFIoMSYCE/A45CAFz2RjAWYB+xJsVgXNpIzX0LXB3jP8M7NR+z77hxWi41/C5J1lRjLIKfVIsmWATQ83jyRCzbZgkMBMViLHhujl2MtSgnYf4ACrXnFElhdlT2vTAbHOI8arci5RtaQMBqQgG/3qnhfkcoxB88X2yqSOqqthmmXr/B1rKdcSw0eBjqJ1PgY856IETKesJrOrjkJjp9UuYTKAoV5z4F0eZGeWD7DuH3JFxxC04/uTlabXuszpj3zJnwXwaZISCmjI5OEOtjl9GuMjt6z8XxdiyWXZAhAXyWl68bwPjE91YabsbGUVvgnp8ld8udfaKfVKSXd6MpeH0lEqRwexQ8doJFLMfOMcgri5ataNA29YhubOSA7uY3E+Ohcay8WLHsKwMpRutm48un7HDAxINK6+1ZHBBKaJPMEUl+uLwEoUNJMUeoxCPS4wYjDPz7EGQn tG6HqlxW OmkzHWwtUZXgM/X0G6rlPs6ZoWuCEdeZPq1t+fxw9hONZ1v4its7iSD2slDriAoQXFvGEB2SvHN0KIypcSwAvLuO7eE6C57gFe9H3GnLQGGB7kW4uCwumKFAKfgv4bQXZ56ipdpWdzUI9e6ydMhvhAHKhcH1kPxet+xiI 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: In folio_get_anon_vma() and folio_lock_anon_vma_read(), we get anon_vma from folio, but the code isn't clean enough. Instead, folio_test_anon() and folio_anon_vma() can do this. They have the same functionality, but their implementations are not identical. Unify folio_test_anon() and folio_anon_vma(), and use them. Signed-off-by: Yajun Deng --- include/linux/page-flags.h | 3 ++- mm/rmap.c | 20 +++++++++----------- mm/util.c | 6 +++--- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 5769fe6e4950..6e2197b22f5f 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -691,7 +691,8 @@ static __always_inline bool PageMappingFlags(const struct page *page) static __always_inline bool folio_test_anon(const struct folio *folio) { - return ((unsigned long)folio->mapping & PAGE_MAPPING_ANON) != 0; + return ((unsigned long)folio->mapping & PAGE_MAPPING_FLAGS) == + PAGE_MAPPING_ANON; } static __always_inline bool PageAnon(const struct page *page) diff --git a/mm/rmap.c b/mm/rmap.c index 86787df6e212..3f5d9879591c 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -499,16 +499,14 @@ void __init anon_vma_init(void) struct anon_vma *folio_get_anon_vma(struct folio *folio) { struct anon_vma *anon_vma = NULL; - unsigned long anon_mapping; rcu_read_lock(); - anon_mapping = (unsigned long)READ_ONCE(folio->mapping); - if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + anon_vma = folio_anon_vma(folio); + if (!anon_vma) goto out; if (!folio_mapped(folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON); if (!atomic_inc_not_zero(&anon_vma->refcount)) { anon_vma = NULL; goto out; @@ -550,12 +548,12 @@ struct anon_vma *folio_lock_anon_vma_read(struct folio *folio, retry: rcu_read_lock(); anon_mapping = (unsigned long)READ_ONCE(folio->mapping); - if ((anon_mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + anon_vma = folio_anon_vma(folio); + if (!anon_vma) goto out; if (!folio_mapped(folio)) goto out; - anon_vma = (struct anon_vma *) (anon_mapping - PAGE_MAPPING_ANON); root_anon_vma = READ_ONCE(anon_vma->root); if (down_read_trylock(&root_anon_vma->rwsem)) { /* @@ -774,16 +772,16 @@ static bool should_defer_flush(struct mm_struct *mm, enum ttu_flags flags) unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) { struct folio *folio = page_folio(page); + struct anon_vma *anon_vma; pgoff_t pgoff; - if (folio_test_anon(folio)) { - struct anon_vma *page__anon_vma = folio_anon_vma(folio); + anon_vma = folio_anon_vma(folio); + if (anon_vma) { /* * Note: swapoff's unuse_vma() is more efficient with this * check, and needs it to match anon_vma when KSM is active. */ - if (!vma->anon_vma || !page__anon_vma || - vma->anon_vma->root != page__anon_vma->root) + if (!vma->anon_vma || vma->anon_vma->root != anon_vma->root) return -EFAULT; } else if (!vma->vm_file) { return -EFAULT; @@ -791,7 +789,7 @@ unsigned long page_address_in_vma(struct page *page, struct vm_area_struct *vma) return -EFAULT; } - /* The !page__anon_vma above handles KSM folios */ + /* The !anon_vma above handles KSM folios */ pgoff = folio->index + folio_page_idx(folio, page); return vma_address(vma, pgoff, 1); } diff --git a/mm/util.c b/mm/util.c index bc488f0121a7..668dab9e27e6 100644 --- a/mm/util.c +++ b/mm/util.c @@ -782,11 +782,11 @@ EXPORT_SYMBOL(vcalloc_noprof); struct anon_vma *folio_anon_vma(struct folio *folio) { - unsigned long mapping = (unsigned long)folio->mapping; + unsigned long mapping = (unsigned long)READ_ONCE(folio->mapping); - if ((mapping & PAGE_MAPPING_FLAGS) != PAGE_MAPPING_ANON) + if (!folio_test_anon(folio)) return NULL; - return (void *)(mapping - PAGE_MAPPING_ANON); + return (struct anon_vma *)(mapping - PAGE_MAPPING_ANON); } /** -- 2.25.1