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 63F95C4345F for ; Thu, 18 Apr 2024 10:58:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E16506B0096; Thu, 18 Apr 2024 06:58:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC7976B0098; Thu, 18 Apr 2024 06:58:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C402E6B0099; Thu, 18 Apr 2024 06:58:35 -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 A560F6B0096 for ; Thu, 18 Apr 2024 06:58:35 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 677B7A1318 for ; Thu, 18 Apr 2024 10:58:35 +0000 (UTC) X-FDA: 82022354190.23.62A06B2 Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by imf09.hostedemail.com (Postfix) with ESMTP id 938F6140015 for ; Thu, 18 Apr 2024 10:58:33 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DC8bXvnN; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713437913; 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=fCDKyy/HK4fLjIHRec29GbYvLewmbRt2hV7S2QYdA34=; b=HQ6iqXj82qiG8O+9LCEy3eLzwRLKwjNm9Nl1p/mVPdnzZgiucUuDWsWrJsUdq/0jfr2WeN AGahlMy2tX3G21fJYmFOIxDWTBjZF2T3cznhjsMqYfVXFOZJPYoFjUuzMPuJr5fmQcUrA+ 8WKKjgm2X7wNtnnb/VnI/GvugjTOtTI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713437913; a=rsa-sha256; cv=none; b=gFJGN8D6g69Z2k5bOxbzYiIVLbGDUmYNmHeo27NThsMBGzJMeBlm09sPjH4OX6bCX8k9VJ DUEi+uEqiqAEbAbQr48aFaiXIZmOip97nEWE31Ol2YM0xklGBFhwDgJA8zqyZEWbhGSErI FH6TcITO4F2eghF4sfp0Y43Am+PKi+Q= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=DC8bXvnN; spf=pass (imf09.hostedemail.com: domain of ioworker0@gmail.com designates 209.85.167.176 as permitted sender) smtp.mailfrom=ioworker0@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-oi1-f176.google.com with SMTP id 5614622812f47-3c709e5e4f9so504198b6e.3 for ; Thu, 18 Apr 2024 03:58:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713437912; x=1714042712; 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=fCDKyy/HK4fLjIHRec29GbYvLewmbRt2hV7S2QYdA34=; b=DC8bXvnNMRKBSMlXeummNCCgC9K/Cbd8WgwYfLm18xkXhMLCtp0Mp/xQdYCEXBDuRm 7TKYdbjsdrD310VqKEUQEvYI8+AhXY27WvirF+oU9zTXVUlz+jWLvkC2zWf7lSk82Ch2 D25paheXFsReCMxTh0srfskMzkvrsoSFqxt4RDxyh5RRdnvuKGlQEPhq86pXkJws/X2M iDYt/vUqED2Ii8ujsgwByacvIgws8D8ChzfiiG9djZ6K2MgcF8Ar4EyXkwfEZno9zjBL dzG32rHbdWXKp1qSMJJQkBkUVTgFzjjlOFel20cbDNKbIDqNMFa9sS1qd42Sjiy2BXO1 i23w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713437912; x=1714042712; 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=fCDKyy/HK4fLjIHRec29GbYvLewmbRt2hV7S2QYdA34=; b=d1qLLGD8Asut2dUaVT1UWrAYVojbMZ1GPHu6bNSrHmt16jzXsQCDFKlCf+pTx/3l/v EeQ8NwkI50Rs2E9PH5rC6k+KN8HYlwE/BKIvxxu92Y6fpJ0M+oUSGqRVfL/B8MXchziV T28VPJ+sxfoFUKGj0EkHES04AlTBLqTqvYcDf8khyAlaW6Aisx6PaV0ZMbRs5Ko3BsRJ M2JcJ6FE5wtdg12jXHRRBYTqrOtUX0L5slHFarXJk/fxYavu075lBPD2jo7MwyvJ2ZnH MoU5R+vwBPoaFxCq1MLGd7API3n0wPllxLCEubGDMgTcTbVtlNq7Cq5sjnRUGx5aZzuU b1IQ== X-Forwarded-Encrypted: i=1; AJvYcCUaCNq1nI+Y2CY0KbwrpSJBbFrqr41L10wnpTjSah6Ky0jegwjEpUnfFiaAylENScefOcCd4ZFOCRH23ug7Z3wOAI8= X-Gm-Message-State: AOJu0YyjN6Lsl2LnSJJRhLF3KwPyfywW+206sR8oHrYvNh8vfOqVKCYl wjxbKia8u/R2uJnIX0liy8Wdxs2kqEypOmNQNOijpGPAUibz9t09 X-Google-Smtp-Source: AGHT+IFiJWFYcIrSf2RPRltS/8C34Y5gwlKmlTV5x2wUCcZ1LqdcLz5TQFv4JEnEdVetJ6UiO6Fzxg== X-Received: by 2002:a05:6808:8f3:b0:3c7:3b1d:bb59 with SMTP id d19-20020a05680808f300b003c73b1dbb59mr1553476oic.2.1713437911086; Thu, 18 Apr 2024 03:58:31 -0700 (PDT) Received: from LancedeMBP.lan ([112.10.225.217]) by smtp.gmail.com with ESMTPSA id gd26-20020a056a00831a00b006ea923678a6sm1200487pfb.137.2024.04.18.03.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Apr 2024 03:58:30 -0700 (PDT) From: Lance Yang To: akpm@linux-foundation.org Cc: ryan.roberts@arm.com, david@redhat.com, 21cnbao@gmail.com, mhocko@suse.com, fengwei.yin@intel.com, zokeefe@google.com, shy828301@gmail.com, xiehuan09@gmail.com, wangkefeng.wang@huawei.com, songmuchun@bytedance.com, peterx@redhat.com, minchan@kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Lance Yang Subject: [PATCH v9 3/4] mm/memory: add any_dirty optional pointer to folio_pte_batch() Date: Thu, 18 Apr 2024 18:57:49 +0800 Message-Id: <20240418105750.98866-4-ioworker0@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20240418105750.98866-1-ioworker0@gmail.com> References: <20240418105750.98866-1-ioworker0@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: du8ubufesgedbnmzh8ge5xo7mtzbe1br X-Rspamd-Queue-Id: 938F6140015 X-Rspamd-Server: rspam06 X-Rspam-User: X-HE-Tag: 1713437913-278683 X-HE-Meta: U2FsdGVkX19TJlyI9ytQ5tIppR+xgqPadkwAUaAzrm3MMiwSXaalxfTLc4GRZse8yIYu6EMR35BqnKOqcjKlmMRTVjIOaI5OL01rE2Asv47g05DJhfWfg1z+L9YA3UE0ddDEeBn7d8dz8KzaM5xcZCP5uqool35L8Zr+ctRTzM0jab33Y934nHlixdgXRUIK+3eMBv5TMNWIQ15jcFgUywOjlnzBxyCDlZhkI55Eo0C1u3dSnBg8NlDrauQH0iEbcJ5dDvLJC1W7J0xKJAlPE2Bn8ZrB2O4itVd6THy9xxy9/ba2J0tCDxhkSGmmKmjDUH34e8H1Dd3uqq+CxcXD+1Jxfak/33HPzJP8ZQ6wTzCyjR6U+XVHSXKInie7dmeK/hN6xLirejstdXz1PW6uie61k5dPDu+y0YBc7OOaSrZn+5j6n8o0l9LV+IFCKb5nAc5C6zMc0PwDajkdoiwE6Ab1kEZxvoBo73c8N3LPtqu3PVWdzAqvbVlTSSbL6GpnpD6jImNzi5xl7eK8eNydeISjwHa6quaBxx4/sLBm3f3qU08K/m3PpmK0cSe7UMVz+48Xj/WxuHQa56sv2y9HF1wfxQR5dQqmluD/Bti+UVO23D61N6YOW0dX4uPWog+hI2URnFXLOwPGNQ1udQU8av9tPFC43gLPQPajkZlsnAz7mdIpn+KGzqkHvODEU2TxRqp/qJYIkeGv95tcGxjme8hx9Vd4YL+iyC/AzuSzXKrloTtPMD2oHOhJlUtSiXWCy/4IF+aEFGFjIftNFKAN7Wl5nu16twHEcW7AFWgrPRI5BAIfXrWfIT2TMfW1AcawS0Mktf+nBa753vcaucEqq4KmMrpEyaaMDfsebc6+crWTHLRIjcuqPUMTNIoGdaH9g8IS8FPlR0Slc9ulQ84NRclsHwbUDhPWI7vs4rmV40b2g/XVrG+q8kkS8HaKfcpGGi3meKGQjd701lZzpUO uhgIN9LK oFPOQoGokcOdguPMk7PPgvi8+z1U2qRPy2Pf6V7See3hCO7tA+qb9lRBjz/zj7rMwS4OlvZXkBpF2Ufo8U5W2txd0ffebwHFOWjjOtLaOxUeCO6yE4YdP2JOscPaILd8YcxHxqmYWN7RlXGg9TLyG8n1SxJKd1uKDye9PMfclU/Iv4Gq8tvd3bOZnkH4o4M8SO73p6QTg8ZbIbpIjR1gxfKIMs7P1fkspU/+IW2MGyuck4ilPQgxo27EsNF6TvHhx6HR5POUCb7czhLEFt6jWn9cTibxSxZ9BejspgF4Wbd9PfnfNa59hSxj3S7lbz506iTgAvLLc9qee1nnOHyFw1avJCb7vdIgZrg5qoZJUhp+JVQ+kSlLAPztok/8DOgFHTVAUTscyKR3mONrhZvUHSl2MlfNw3FEpxDlT1SAfh1DQzA/Y4fEZ7qLa1JmjhYmzCDnT6QREHP0S25VT9j3A2QuTsMvMBnhpVuWMdig0XwYk/R/JSwBibu9SfcRB59EEMLLs8ugnWThdCuw= 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: This commit adds the any_dirty pointer as an optional parameter to folio_pte_batch() function. By using both the any_young and any_dirty pointers, madvise_free can make smarter decisions about whether to clear the PTEs when marking large folios as lazyfree. Suggested-by: David Hildenbrand Signed-off-by: Lance Yang --- mm/internal.h | 12 ++++++++++-- mm/madvise.c | 19 ++++++++++++++----- mm/memory.c | 4 ++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index c6483f73ec13..daa59cef85d7 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -134,6 +134,8 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) * first one is writable. * @any_young: Optional pointer to indicate whether any entry except the * first one is young. + * @any_dirty: Optional pointer to indicate whether any entry except the + * first one is dirty. * * Detect a PTE batch: consecutive (present) PTEs that map consecutive * pages of the same large folio. @@ -149,18 +151,20 @@ static inline pte_t __pte_batch_clear_ignored(pte_t pte, fpb_t flags) */ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, pte_t *start_ptep, pte_t pte, int max_nr, fpb_t flags, - bool *any_writable, bool *any_young) + bool *any_writable, bool *any_young, bool *any_dirty) { unsigned long folio_end_pfn = folio_pfn(folio) + folio_nr_pages(folio); const pte_t *end_ptep = start_ptep + max_nr; pte_t expected_pte, *ptep; - bool writable, young; + bool writable, young, dirty; int nr; if (any_writable) *any_writable = false; if (any_young) *any_young = false; + if (any_dirty) + *any_dirty = false; VM_WARN_ON_FOLIO(!pte_present(pte), folio); VM_WARN_ON_FOLIO(!folio_test_large(folio) || max_nr < 1, folio); @@ -176,6 +180,8 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, writable = !!pte_write(pte); if (any_young) young = !!pte_young(pte); + if (any_dirty) + dirty = !!pte_dirty(pte); pte = __pte_batch_clear_ignored(pte, flags); if (!pte_same(pte, expected_pte)) @@ -193,6 +199,8 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, *any_writable |= writable; if (any_young) *any_young |= young; + if (any_dirty) + *any_dirty |= dirty; nr = pte_batch_hint(ptep, pte); expected_pte = pte_advance_pfn(expected_pte, nr); diff --git a/mm/madvise.c b/mm/madvise.c index f5e3699e7b54..4597a3568e7e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -321,6 +321,18 @@ static inline bool can_do_file_pageout(struct vm_area_struct *vma) file_permission(vma->vm_file, MAY_WRITE) == 0; } +static inline int madvise_folio_pte_batch(unsigned long addr, unsigned long end, + struct folio *folio, pte_t *ptep, + pte_t pte, bool *any_young, + bool *any_dirty) +{ + const fpb_t fpb_flags = FPB_IGNORE_DIRTY | FPB_IGNORE_SOFT_DIRTY; + int max_nr = (end - addr) / PAGE_SIZE; + + return folio_pte_batch(folio, addr, ptep, pte, max_nr, fpb_flags, NULL, + any_young, any_dirty); +} + static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, struct mm_walk *walk) @@ -456,13 +468,10 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, * next pte in the range. */ if (folio_test_large(folio)) { - const fpb_t fpb_flags = FPB_IGNORE_DIRTY | - FPB_IGNORE_SOFT_DIRTY; - int max_nr = (end - addr) / PAGE_SIZE; bool any_young; - nr = folio_pte_batch(folio, addr, pte, ptent, max_nr, - fpb_flags, NULL, &any_young); + nr = madvise_folio_pte_batch(addr, end, folio, pte, + ptent, &any_young, NULL); if (any_young) ptent = pte_mkyoung(ptent); diff --git a/mm/memory.c b/mm/memory.c index 33d87b64d15d..9e07d1b9020c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -989,7 +989,7 @@ copy_present_ptes(struct vm_area_struct *dst_vma, struct vm_area_struct *src_vma flags |= FPB_IGNORE_SOFT_DIRTY; nr = folio_pte_batch(folio, addr, src_pte, pte, max_nr, flags, - &any_writable, NULL); + &any_writable, NULL, NULL); folio_ref_add(folio, nr); if (folio_test_anon(folio)) { if (unlikely(folio_try_dup_anon_rmap_ptes(folio, page, @@ -1558,7 +1558,7 @@ static inline int zap_present_ptes(struct mmu_gather *tlb, */ if (unlikely(folio_test_large(folio) && max_nr != 1)) { nr = folio_pte_batch(folio, addr, pte, ptent, max_nr, fpb_flags, - NULL, NULL); + NULL, NULL, NULL); zap_present_folio_ptes(tlb, vma, folio, page, pte, ptent, nr, addr, details, rss, force_flush, -- 2.33.1