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 B7D67C67861 for ; Tue, 9 Apr 2024 07:34:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 127986B0088; Tue, 9 Apr 2024 03:34:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D6BF6B0089; Tue, 9 Apr 2024 03:34:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E92E86B008A; Tue, 9 Apr 2024 03:34:37 -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 CA4E46B0088 for ; Tue, 9 Apr 2024 03:34:37 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 31E751602CA for ; Tue, 9 Apr 2024 07:34:37 +0000 (UTC) X-FDA: 81989180994.09.5B30B51 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 0264E140007 for ; Tue, 9 Apr 2024 07:34:34 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="CHtivn7/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712648075; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0q+HU0I8zQxKjM+cGvM+C7R5KeCL9UkLViFVS4kRTPc=; b=If1kUotyrnvsUASo97Si2Eea6G+p3CxyAfp6iPwURhm9aEtH/+/ue/YIMNG9pXZg29QB0l wtWnSh1iUgEgNq3mPgHnB0p4vvPuVxNjdwAMNw4AudE5WqUXuEcKoVQcMJH99bt7eMpSZX BLyrE4BS/azY2ZQlqEzJLZkIHtBc2/U= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="CHtivn7/"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712648075; a=rsa-sha256; cv=none; b=VSvHR6yEViR7zD5us0h4k7hTZrhmxNJpwhhCNYLCK3mD7f65S7pWxQstsERqkr3YAf8AZ8 uu8GvvQQZjKn/SQrZFXxU/YRyExuy4lWxUTv2sZbOEtfgohBhTxTktvqE1GSdYpPYEM9lC e8qIZ1c4T5Sh/o80U5XsHTPy8H0AajA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712648074; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=0q+HU0I8zQxKjM+cGvM+C7R5KeCL9UkLViFVS4kRTPc=; b=CHtivn7/cva81l60ax0RVFWf664KcuaRAa/jQMG4dh84MxitYUc/5lQ8/wEmy8o3IYeKZq A0cHGyz3sS4DPcm90N8lSUcjRfyTMi+QpQC2uEJdJ8ipZlGrNdTvMDpZIhSDmfbQiLsqBu fNf4ENYeVS2WdD2e+e9s69zMYMup7Vk= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-449-JCM2yJMKOE6hMbZSZ8mdJQ-1; Tue, 09 Apr 2024 03:34:33 -0400 X-MC-Unique: JCM2yJMKOE6hMbZSZ8mdJQ-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2d87dad1640so20307711fa.3 for ; Tue, 09 Apr 2024 00:34:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712648071; x=1713252871; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=0q+HU0I8zQxKjM+cGvM+C7R5KeCL9UkLViFVS4kRTPc=; b=W/BWHE9UieGriClcCYTCMye4SxXHWxLXaZcz/lfOMIN8lV02n5/n48oF4LaXV+ryrU A1I+FiHXCFNDHgsVnm+wjadkaP545kl2Ggq5dG0QA4e+M/z60vX8MdDxGFx0ryKm41i1 I/2EHd2mT7qWUzqq7b7pUjStSToNmEbnsAM4X5uy0x6C8bcf79DZV6jvByHT9LKFX+I3 jLM5CrdHVp8aIq4me0VpO9njso3R+X3qhfGIDrqMLdAu5DfxVlge41c9RM/xjXE+RhEH oyD6bIzhkJjNOThuCI9OoIR4wGjwDwRY5dRN30cpcLpQ7Pp9KK4uaLxBBLYyk+bddweL 3oCA== X-Gm-Message-State: AOJu0YxOitAGfL4Byn6UKKnpsdSgCXAMRUfmmWSA5ckCHhWLY+4qoXVW LDJhCrlK9NSafvkUEuKPpf0PQfTF9fuoociWl7cQMrI8mCSN48pecDdnDl9uJJKM+/P8qnggzZk 8c/rQPHZejtvHZXGQeb9jahgcCvYDaxMVQZDuxVHtH8GH9hEW X-Received: by 2002:a2e:b8c3:0:b0:2d8:a862:2411 with SMTP id s3-20020a2eb8c3000000b002d8a8622411mr506053ljp.46.1712648071348; Tue, 09 Apr 2024 00:34:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEajpP01sxdAETuPDMX+9d7r5iEj2AuC6aEnf6ol8D2HOBKiEMou7iKPEKtYnlTe5fHGED9w== X-Received: by 2002:a2e:b8c3:0:b0:2d8:a862:2411 with SMTP id s3-20020a2eb8c3000000b002d8a8622411mr506028ljp.46.1712648070736; Tue, 09 Apr 2024 00:34:30 -0700 (PDT) Received: from ?IPV6:2003:cb:c70a:be00:a285:bc76:307d:4eaa? (p200300cbc70abe00a285bc76307d4eaa.dip0.t-ipconnect.de. [2003:cb:c70a:be00:a285:bc76:307d:4eaa]) by smtp.gmail.com with ESMTPSA id f8-20020a05600c4e8800b00415dfa709dasm16241871wmq.15.2024.04.09.00.34.29 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 09 Apr 2024 00:34:30 -0700 (PDT) Message-ID: <52173d5b-672d-4ef6-ad06-ec350c44d739@redhat.com> Date: Tue, 9 Apr 2024 09:34:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v7 2/7] mm: swap: free_swap_and_cache_nr() as batched free_swap_and_cache() To: Ryan Roberts , Andrew Morton , Matthew Wilcox , Huang Ying , Gao Xiang , Yu Zhao , Yang Shi , Michal Hocko , Kefeng Wang , Barry Song <21cnbao@gmail.com>, Chris Li , Lance Yang Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org References: <20240408183946.2991168-1-ryan.roberts@arm.com> <20240408183946.2991168-3-ryan.roberts@arm.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240408183946.2991168-3-ryan.roberts@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 0264E140007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: jdq4xcztcoujuhds91a4ugrc9fuj4kd7 X-HE-Tag: 1712648074-120277 X-HE-Meta: U2FsdGVkX1+lwjqtodsq2tBJ2n29a/jwgl3nhc1D3puvxA3Jo1UNvikaJ8qVNZ4Ip2SJJlrvxSnMTa8Tk/gDnpJJJ5DDMEDE0rr0/sF8rvnPaIdwRREeEm6URqPz9FFLRnf4QG4G3AdUjeDQM0Oo3JSe4f8acXDhE2PlR77ywW8BzGFZKgam1wwlN6M8+o5G78GsSuTJ98fT4y66UyceT9PZDNlEV5A2iVl04EGylriTKV7KrGjU81I/tek8SXew2rN4u2J/oaUwk4lUbK9hjeLT/6UxLryzeYdSxZN5oSKB9Vn1erbFE91xQOb2ylPSn7uF6YfO7CtMV3lUA6bBY9WoY+SfnR1bzJ0/1lmxvgNsqi3UT2MXc7uTJEpxOoem9DmCZImWJR6+2xxUuMksB2IOQdl9LKml35dMqFa6Gj7CA1LfWQAveKsZWZ98/5SJHjUvraW1lNpV52KxjUQ/YwqjDhkkjAVopH4f5h8ez2EkMXVOA+tz/QhSItoVV271euOiRsjg04tb6KRp9Ow1t8qRW4hYoezttoLVb2XKV1Twfh/mh3tml2+sr9jMmonb/DCK5Js5rKZN4xXNmMs3GH/wt9K7GZxw3jvUcKkrjAzbNvg39M/QOOJoyYIy/dDmX+v9TI2gN0qKXIAzQpoSYmDwoB2vHLt6MIteT02aoWv9eX9TfHQiGEq91xz16xrVUkRx9dh2djvkIB9dlgbvBLvy2fBygP2rS3L1iJU6vru2L/9/j7K8cAnKtEIeMMNusO2rFjUr2bpoTxUO/XunUkUre2Iiruv4CFOo+uOa942Dki5mMnw4+8yrw6lwZnqLFdAzmTApemZnl9piajGXTRU3uhEOcAPTeuUB/0axKyPs/x6iZiKtwWKBB24E7f1pxYP9Umk/y+ohMnO8BuBs1jzWLAjixBWytpO++fhPAZXAaK3W9rBK8qJM5fjV1qMwOwLBo1+jHSW69B8hKTK SNeyaFje omiythCLZIJHDY6GgXu5M7s60ieMuDarbK7nxQxtP80Q1debDWoKcCODfUnwm6Y7N9FLJBmIAouQN1mrm73tgZbtE3DbHrlWDi/VngpDNp4A5QUrGqQrldqfOlF1CRISJsmWTxW4fVtLbEK64amN9yMBRZeZtq3zjaevjLA54Lm1W3bme6gPJ7220qtf3NozmcJ8rVVHAjLntiRJvu6GqcCgFEg== 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: On 08.04.24 20:39, Ryan Roberts wrote: > Now that we no longer have a convenient flag in the cluster to determine > if a folio is large, free_swap_and_cache() will take a reference and > lock a large folio much more often, which could lead to contention and > (e.g.) failure to split large folios, etc. > > Let's solve that problem by batch freeing swap and cache with a new > function, free_swap_and_cache_nr(), to free a contiguous range of swap > entries together. This allows us to first drop a reference to each swap > slot before we try to release the cache folio. This means we only try to > release the folio once, only taking the reference and lock once - much > better than the previous 512 times for the 2M THP case. > > Contiguous swap entries are gathered in zap_pte_range() and > madvise_free_pte_range() in a similar way to how present ptes are > already gathered in zap_pte_range(). > > While we are at it, let's simplify by converting the return type of both > functions to void. The return value was used only by zap_pte_range() to > print a bad pte, and was ignored by everyone else, so the extra > reporting wasn't exactly guaranteed. We will still get the warning with > most of the information from get_swap_device(). With the batch version, > we wouldn't know which pte was bad anyway so could print the wrong one. > > Signed-off-by: Ryan Roberts > --- > include/linux/pgtable.h | 29 ++++++++++++ > include/linux/swap.h | 12 +++-- > mm/internal.h | 63 ++++++++++++++++++++++++++ > mm/madvise.c | 12 +++-- > mm/memory.c | 13 +++--- > mm/swapfile.c | 97 +++++++++++++++++++++++++++++++++-------- > 6 files changed, 195 insertions(+), 31 deletions(-) > > diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h > index a3fc8150b047..75096025fe52 100644 > --- a/include/linux/pgtable.h > +++ b/include/linux/pgtable.h > @@ -708,6 +708,35 @@ static inline void pte_clear_not_present_full(struct mm_struct *mm, > } > #endif > > +#ifndef clear_not_present_full_ptes > +/** > + * clear_not_present_full_ptes - Clear multiple not present PTEs which are > + * consecutive in the pgtable. > + * @mm: Address space the ptes represent. > + * @addr: Address of the first pte. > + * @ptep: Page table pointer for the first entry. > + * @nr: Number of entries to clear. > + * @full: Whether we are clearing a full mm. > + * > + * May be overridden by the architecture; otherwise, implemented as a simple > + * loop over pte_clear_not_present_full(). > + * > + * Context: The caller holds the page table lock. The PTEs are all not present. > + * The PTEs are all in the same PMD. > + */ > +static inline void clear_not_present_full_ptes(struct mm_struct *mm, > + unsigned long addr, pte_t *ptep, unsigned int nr, int full) > +{ > + for (;;) { > + pte_clear_not_present_full(mm, addr, ptep, full); > + if (--nr == 0) > + break; > + ptep++; > + addr += PAGE_SIZE; > + } > +} > +#endif > + > #ifndef __HAVE_ARCH_PTEP_CLEAR_FLUSH > extern pte_t ptep_clear_flush(struct vm_area_struct *vma, > unsigned long address, > diff --git a/include/linux/swap.h b/include/linux/swap.h > index f6f78198f000..5737236dc3ce 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -471,7 +471,7 @@ extern int swap_duplicate(swp_entry_t); > extern int swapcache_prepare(swp_entry_t); > extern void swap_free(swp_entry_t); > extern void swapcache_free_entries(swp_entry_t *entries, int n); > -extern int free_swap_and_cache(swp_entry_t); > +extern void free_swap_and_cache_nr(swp_entry_t entry, int nr); > int swap_type_of(dev_t device, sector_t offset); > int find_first_swap(dev_t *device); > extern unsigned int count_swap_pages(int, int); > @@ -520,8 +520,9 @@ static inline void put_swap_device(struct swap_info_struct *si) > #define free_pages_and_swap_cache(pages, nr) \ > release_pages((pages), (nr)); > > -/* used to sanity check ptes in zap_pte_range when CONFIG_SWAP=0 */ > -#define free_swap_and_cache(e) is_pfn_swap_entry(e) > +static inline void free_swap_and_cache_nr(swp_entry_t entry, int nr) > +{ > +} > > static inline void free_swap_cache(struct folio *folio) > { > @@ -589,6 +590,11 @@ static inline int add_swap_extent(struct swap_info_struct *sis, > } > #endif /* CONFIG_SWAP */ > > +static inline void free_swap_and_cache(swp_entry_t entry) > +{ > + free_swap_and_cache_nr(entry, 1); > +} > + > #ifdef CONFIG_MEMCG > static inline int mem_cgroup_swappiness(struct mem_cgroup *memcg) > { > diff --git a/mm/internal.h b/mm/internal.h > index 3bdc8693b54f..de68705624b0 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -11,6 +11,8 @@ > #include > #include > #include > +#include > +#include > #include > > struct folio_batch; > @@ -189,6 +191,67 @@ static inline int folio_pte_batch(struct folio *folio, unsigned long addr, > > return min(ptep - start_ptep, max_nr); > } > + > +/** > + * pte_next_swp_offset - Increment the swap entry offset field of a swap pte. > + * @pte: The initial pte state; is_swap_pte(pte) must be true. Likely we also want non_swap_entry() to be false. > + * > + * Increments the swap offset, while maintaining all other fields, including > + * swap type, and any swp pte bits. The resulting pte is returned. > + */ > +static inline pte_t pte_next_swp_offset(pte_t pte) > +{ > + swp_entry_t entry = pte_to_swp_entry(pte); > + pte_t new = __swp_entry_to_pte(__swp_entry(swp_type(entry), > + swp_offset(entry) + 1)); > + > + if (pte_swp_soft_dirty(pte)) > + new = pte_swp_mksoft_dirty(new); > + if (pte_swp_exclusive(pte)) > + new = pte_swp_mkexclusive(new); > + if (pte_swp_uffd_wp(pte)) > + new = pte_swp_mkuffd_wp(new); > + > + return new; > +} Acked-by: David Hildenbrand -- Cheers, David / dhildenb