From patchwork Mon Aug 19 02:30:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Usama Arif X-Patchwork-Id: 13767736 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 979AFC52D7C for ; Mon, 19 Aug 2024 02:39:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1710E6B0093; Sun, 18 Aug 2024 22:39:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 121516B0095; Sun, 18 Aug 2024 22:39:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F03A86B0098; Sun, 18 Aug 2024 22:39:42 -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 D5F766B0093 for ; Sun, 18 Aug 2024 22:39:42 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7A667140F1A for ; Mon, 19 Aug 2024 02:39:42 +0000 (UTC) X-FDA: 82467439404.17.BEE0B37 Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by imf01.hostedemail.com (Postfix) with ESMTP id A44DB40003 for ; Mon, 19 Aug 2024 02:39:40 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="XH4xZx0/"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.167.181 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724035123; a=rsa-sha256; cv=none; b=KHEh5rB/kIj3JHKExuQQ3bSt3f8vjQOMiQZ7Q3TplGRxHcvWGqIumx0BFQXyBipggZtA7o 6c9hk2D6abVSDCcwOFEC/lVSEnzk5gDSs9v96DdZb4u/pqukZOLLLxcLpbSlwpYjg4IyL6 wuZ7sS4MbrnUzKtzg+ViffSR94Uumco= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="XH4xZx0/"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of usamaarif642@gmail.com designates 209.85.167.181 as permitted sender) smtp.mailfrom=usamaarif642@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724035123; 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=+Be5wg7AuGlyVLPd79rHyMZjywH2a3H2lUduVQVliSc=; b=PrQbIyYjSjyYOUKPc7JgBf96QwUpnhSpln2JNCdt4iMD1RHLNV0CRscvgHi5mEjsXEpVh6 uYtpk+3Cf0ra6Bt5u9p6xxB68GKBBb9fYdkjcJOWItCRp5b3WBgZaMqtCVNtct0pOg0ufj GLmbEZfxPU56kHVAoY/Fg5sR6Jj/gcg= Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3db14339fb0so2366948b6e.2 for ; Sun, 18 Aug 2024 19:39:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724035179; x=1724639979; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+Be5wg7AuGlyVLPd79rHyMZjywH2a3H2lUduVQVliSc=; b=XH4xZx0/KSgZfWEsmN8I852Fs1tqyyqUgvspyT43aWmFkl+cCyCVppfD0qbT5Ngp2y 3cVQIE3lzAn8Ht51bm4g3w9ty97hpVmQecnv/ltzyGvwtF7O9y0MTJQ8/ezWGccVhfJi FH4aVdTP8tc4SWn8pusf3BMAICgt+dF4Mtq0Gnth/4ApZDYl7EGOOA3tFTn+zPA+Exlf gCVQ8MsTFTRkxPYGqiS007vrzHhwl3c2HF0c1YXSfEN4rRgcwdnBy9H84y+Isf/EMura jiq7wbtaGqWCZkWicLWFnre7E+Bjfzt6f5uEcbAHrnOUQqD4ayJOAeC/4B260FAxIlO9 ya8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724035179; x=1724639979; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+Be5wg7AuGlyVLPd79rHyMZjywH2a3H2lUduVQVliSc=; b=WdKZvLoUOKioNcnInevcGQQQWUxwsNh1AH0nQyTKAWEDOJeIhb1qe7AmYSG1P4PKwS qGh0SbYvnLDdRIwgWAvlxF3p+NN9luGO5z72zsOdIq3BfEf0qrqCfGrtnxZmy6hS1HXB 2yX63N/J0ZIcl/CfTVwBWfEGjhGwr1JMyOhWMCHr3aC5o9xErh6B+LNcjXT9enGPNxn6 8c8Tv7DNS2L5Ssj1UHh4nSuOqTHNRCMNtRLTGZNkU0Ay8+o1pLmUtdOgIK/3+4otcT2K ++vjLYCCPGQLr3aF4x3dUgvzdhe0ZyzsFEVAzlqWWhS+oWkrZkx+ZAUDVpTsF+JmJDCa pKqA== X-Forwarded-Encrypted: i=1; AJvYcCURxoaiFcWOQx50IJ6ljlUr8TmwwdGqTbbaCM/75+eb8enwrw7ZFkO0CqC2yTdwkIDPKxo6Bk1JnNPH+7hDs+bGLPM= X-Gm-Message-State: AOJu0Yze8NA1BR5KvOW9QB9DPZ8s+oMLDDQ+y2oVyvM5GLNfquaO/v7D +vSpxuKc7CUM/HD1QSCIwJg+M1lKxBxLnZnU0fdIlu2eMs2/rQ0ky3lRma3s X-Google-Smtp-Source: AGHT+IFeP4hzF59Alq38selex7r4IkghqvqpA36paciq5N3TrCWUhapW14wSlaHsVPgGfZ79jyfiJw== X-Received: by 2002:a05:622a:4c8b:b0:451:d557:22ed with SMTP id d75a77b69052e-454b67b6fd7mr63370071cf.11.1724034712823; Sun, 18 Aug 2024 19:31:52 -0700 (PDT) Received: from localhost (fwdproxy-ash-000.fbsv.net. [2a03:2880:20ff::face:b00c]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45369ff5460sm36860341cf.35.2024.08.18.19.31.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Aug 2024 19:31:52 -0700 (PDT) From: Usama Arif To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: hannes@cmpxchg.org, riel@surriel.com, shakeel.butt@linux.dev, roman.gushchin@linux.dev, yuzhao@google.com, david@redhat.com, baohua@kernel.org, ryan.roberts@arm.com, rppt@kernel.org, willy@infradead.org, cerasuolodomenico@gmail.com, ryncsn@gmail.com, corbet@lwn.net, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, kernel-team@meta.com, Shuang Zhai , Usama Arif Subject: [PATCH v4 2/6] mm: remap unused subpages to shared zeropage when splitting isolated thp Date: Mon, 19 Aug 2024 03:30:55 +0100 Message-ID: <20240819023145.2415299-3-usamaarif642@gmail.com> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240819023145.2415299-1-usamaarif642@gmail.com> References: <20240819023145.2415299-1-usamaarif642@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: A44DB40003 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: oic7jk671da9oaggxzemqnsapu9kbef6 X-HE-Tag: 1724035180-552459 X-HE-Meta: U2FsdGVkX1/iXkCtK3HdFGFIG/pk3Fa/aJEhYS5AnDLJIzI5VWq/K3/q+ga7Yu5dM3tJeq0Oq0dwYj8cgMimrvWCTgjA7OlVBf8Mwtjl68waA+OucwVJpX8Cd1A61KgK0NmhYjdUuUHAXYxMoZsbFyHk1hUthdMcxFXfF1qQ/iEfY1kw/bsFz0IDpmWVk87o2pYg18bvAUmhgj3fIObfcIIQsJZd4wk7pZ3HR2bBtYmjeLuxC75eQAzp9kATEzaDuJhfZLk4ZgbeiQ4PLawpUVDD6f0LfRJuYGl3ia5zhBIKOSQWOHlzKXQUYJkx2eQKCZYSBJAeupJZX/NSHmlZphofdG137uzmiuEpOROeFP59G4nCiWuN20rdzxgL0cPGgkNp0uUBirNIL6ysal+Bku7w3rkuBHBHSqNmvpUwepBh5l4rPAteh8ebGqKw8sr6R+E2XCY5mDQv9oGPbj4nB8b9XzfhVFeXsC7CmJruDFXxYz6IH6CsvVYTY0f9JLwNtgQRUfUxnmEW6RSaxkRf2GcCV30Iwa9Y6k3PNn1zzrmAskL8PJ8qewM1LkBgbWD394sLqMPlxkIKm2PM9cEEKcMCZD3hV5PHQHK6qjCvH90/+ywZbx6EthmYqtgxS6pHlxF5nzCTqBxz7zqcWQ5CM8jKA+nFAtnbxKaReWbTo2Tj+pcwdhVviDGsMoISdurZUboqL/9dfPkC4L6mIfDBD1eqm8qKNA3MZ3RhXqga6YicYnwB0yzoUou3IsX8ecMIEohj8qDGRNq3rlANlPRo/Qi0zRtNR3iFQlkzQucb6rmProyssEIsyAVc/jHVEvXAQjXV3NQXwGH77l7Jes3kcMaGmSt0RsOkfB00W50mcMjQWOv+yxE0pwIKZPHvOPf54jD4jk+cP/z7K8OIJQcDSb8UGv+0gfyEl10JBrSf2CqmdsR5hfeqBStLzyQoxD+Yh6nTRcZUB6D2HoUu/eK m+zyaZzC OlwRAgN+jx6F5Xob0vHXVfTjVXBpamIUPq1OV6fdAej1NLxXZssqKq11aafJAdtuj3KBRXX+aCziQx5yTctGWoNwqD4FkB/5rylM5ips1IQPv52tCv1kHSx6p7TpOvL62/S4El6Le342iakpz7r77jTpcb0LtA25q7Qvcu6M+ArhrXXIJJsTnndke1rxWpEUf89BdtjSX5esvau3eC/ATbC7qU+F0RlcbCW9DiZ1vCsy80hso/EMDL1/jEZa59lOuZTOqCrxeokVHmRZSKM/GyKoD/p9zOgSEzl6dMP3P+3VfyN3yWUq0ZGun+GxM2hG60wJqYwdS528SW2G1Gbh0dz+9BrpTE2A1wMyRMDm6Rv+pbYs= 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: From: Yu Zhao Here being unused means containing only zeros and inaccessible to userspace. When splitting an isolated thp under reclaim or migration, the unused subpages can be mapped to the shared zeropage, hence saving memory. This is particularly helpful when the internal fragmentation of a thp is high, i.e. it has many untouched subpages. This is also a prerequisite for THP low utilization shrinker which will be introduced in later patches, where underutilized THPs are split, and the zero-filled pages are freed saving memory. Signed-off-by: Yu Zhao Tested-by: Shuang Zhai Signed-off-by: Usama Arif --- include/linux/rmap.h | 7 ++++- mm/huge_memory.c | 8 ++--- mm/migrate.c | 72 ++++++++++++++++++++++++++++++++++++++------ mm/migrate_device.c | 4 +-- 4 files changed, 75 insertions(+), 16 deletions(-) diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 0978c64f49d8..07854d1f9ad6 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -745,7 +745,12 @@ int folio_mkclean(struct folio *); int pfn_mkclean_range(unsigned long pfn, unsigned long nr_pages, pgoff_t pgoff, struct vm_area_struct *vma); -void remove_migration_ptes(struct folio *src, struct folio *dst, bool locked); +enum rmp_flags { + RMP_LOCKED = 1 << 0, + RMP_USE_SHARED_ZEROPAGE = 1 << 1, +}; + +void remove_migration_ptes(struct folio *src, struct folio *dst, int flags); /* * rmap_walk_control: To control rmap traversing for specific needs diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 147655821f09..2d77b5d2291e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2911,7 +2911,7 @@ bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, return false; } -static void remap_page(struct folio *folio, unsigned long nr) +static void remap_page(struct folio *folio, unsigned long nr, int flags) { int i = 0; @@ -2919,7 +2919,7 @@ static void remap_page(struct folio *folio, unsigned long nr) if (!folio_test_anon(folio)) return; for (;;) { - remove_migration_ptes(folio, folio, true); + remove_migration_ptes(folio, folio, RMP_LOCKED | flags); i += folio_nr_pages(folio); if (i >= nr) break; @@ -3129,7 +3129,7 @@ static void __split_huge_page(struct page *page, struct list_head *list, if (nr_dropped) shmem_uncharge(folio->mapping->host, nr_dropped); - remap_page(folio, nr); + remap_page(folio, nr, PageAnon(head) ? RMP_USE_SHARED_ZEROPAGE : 0); /* * set page to its compound_head when split to non order-0 pages, so @@ -3425,7 +3425,7 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, if (mapping) xas_unlock(&xas); local_irq_enable(); - remap_page(folio, folio_nr_pages(folio)); + remap_page(folio, folio_nr_pages(folio), 0); ret = -EAGAIN; } diff --git a/mm/migrate.c b/mm/migrate.c index 66a5f73ebfdf..2d2e65d69427 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -178,13 +178,57 @@ void putback_movable_pages(struct list_head *l) } } +static bool try_to_map_unused_to_zeropage(struct page_vma_mapped_walk *pvmw, + struct folio *folio, + unsigned long idx) +{ + struct page *page = folio_page(folio, idx); + bool contains_data; + pte_t newpte; + void *addr; + + VM_BUG_ON_PAGE(PageCompound(page), page); + VM_BUG_ON_PAGE(!PageAnon(page), page); + VM_BUG_ON_PAGE(!PageLocked(page), page); + VM_BUG_ON_PAGE(pte_present(*pvmw->pte), page); + + if (PageMlocked(page) || (pvmw->vma->vm_flags & VM_LOCKED) || + mm_forbids_zeropage(pvmw->vma->vm_mm)) + return false; + + /* + * The pmd entry mapping the old thp was flushed and the pte mapping + * this subpage has been non present. If the subpage is only zero-filled + * then map it to the shared zeropage. + */ + addr = kmap_local_page(page); + contains_data = memchr_inv(addr, 0, PAGE_SIZE); + kunmap_local(addr); + + if (contains_data) + return false; + + newpte = pte_mkspecial(pfn_pte(my_zero_pfn(pvmw->address), + pvmw->vma->vm_page_prot)); + set_pte_at(pvmw->vma->vm_mm, pvmw->address, pvmw->pte, newpte); + + dec_mm_counter(pvmw->vma->vm_mm, mm_counter(folio)); + return true; +} + +struct rmap_walk_arg { + struct folio *folio; + bool map_unused_to_zeropage; +}; + /* * Restore a potential migration pte to a working pte entry */ static bool remove_migration_pte(struct folio *folio, - struct vm_area_struct *vma, unsigned long addr, void *old) + struct vm_area_struct *vma, unsigned long addr, void *arg) { - DEFINE_FOLIO_VMA_WALK(pvmw, old, vma, addr, PVMW_SYNC | PVMW_MIGRATION); + struct rmap_walk_arg *rmap_walk_arg = arg; + DEFINE_FOLIO_VMA_WALK(pvmw, rmap_walk_arg->folio, vma, addr, PVMW_SYNC | PVMW_MIGRATION); while (page_vma_mapped_walk(&pvmw)) { rmap_t rmap_flags = RMAP_NONE; @@ -208,6 +252,9 @@ static bool remove_migration_pte(struct folio *folio, continue; } #endif + if (rmap_walk_arg->map_unused_to_zeropage && + try_to_map_unused_to_zeropage(&pvmw, folio, idx)) + continue; folio_get(folio); pte = mk_pte(new, READ_ONCE(vma->vm_page_prot)); @@ -286,14 +333,21 @@ static bool remove_migration_pte(struct folio *folio, * Get rid of all migration entries and replace them by * references to the indicated page. */ -void remove_migration_ptes(struct folio *src, struct folio *dst, bool locked) +void remove_migration_ptes(struct folio *src, struct folio *dst, int flags) { + struct rmap_walk_arg rmap_walk_arg = { + .folio = src, + .map_unused_to_zeropage = flags & RMP_USE_SHARED_ZEROPAGE, + }; + struct rmap_walk_control rwc = { .rmap_one = remove_migration_pte, - .arg = src, + .arg = &rmap_walk_arg, }; - if (locked) + VM_BUG_ON_FOLIO((flags & RMP_USE_SHARED_ZEROPAGE) && (src != dst), src); + + if (flags & RMP_LOCKED) rmap_walk_locked(dst, &rwc); else rmap_walk(dst, &rwc); @@ -903,7 +957,7 @@ static int writeout(struct address_space *mapping, struct folio *folio) * At this point we know that the migration attempt cannot * be successful. */ - remove_migration_ptes(folio, folio, false); + remove_migration_ptes(folio, folio, 0); rc = mapping->a_ops->writepage(&folio->page, &wbc); @@ -1067,7 +1121,7 @@ static void migrate_folio_undo_src(struct folio *src, struct list_head *ret) { if (page_was_mapped) - remove_migration_ptes(src, src, false); + remove_migration_ptes(src, src, 0); /* Drop an anon_vma reference if we took one */ if (anon_vma) put_anon_vma(anon_vma); @@ -1305,7 +1359,7 @@ static int migrate_folio_move(free_folio_t put_new_folio, unsigned long private, lru_add_drain(); if (old_page_state & PAGE_WAS_MAPPED) - remove_migration_ptes(src, dst, false); + remove_migration_ptes(src, dst, 0); out_unlock_both: folio_unlock(dst); @@ -1443,7 +1497,7 @@ static int unmap_and_move_huge_page(new_folio_t get_new_folio, if (page_was_mapped) remove_migration_ptes(src, - rc == MIGRATEPAGE_SUCCESS ? dst : src, false); + rc == MIGRATEPAGE_SUCCESS ? dst : src, 0); unlock_put_anon: folio_unlock(dst); diff --git a/mm/migrate_device.c b/mm/migrate_device.c index 6d66dc1c6ffa..8f875636b35b 100644 --- a/mm/migrate_device.c +++ b/mm/migrate_device.c @@ -424,7 +424,7 @@ static unsigned long migrate_device_unmap(unsigned long *src_pfns, continue; folio = page_folio(page); - remove_migration_ptes(folio, folio, false); + remove_migration_ptes(folio, folio, 0); src_pfns[i] = 0; folio_unlock(folio); @@ -837,7 +837,7 @@ void migrate_device_finalize(unsigned long *src_pfns, src = page_folio(page); dst = page_folio(newpage); - remove_migration_ptes(src, dst, false); + remove_migration_ptes(src, dst, 0); folio_unlock(src); if (is_zone_device_page(page))