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 02C6BC3DA64 for ; Tue, 6 Aug 2024 12:56:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 76AFC6B008C; Tue, 6 Aug 2024 08:56:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 71B286B0092; Tue, 6 Aug 2024 08:56:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 594326B0093; Tue, 6 Aug 2024 08:56:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 3BD096B008C for ; Tue, 6 Aug 2024 08:56:45 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DA0A21C2BFB for ; Tue, 6 Aug 2024 12:56:44 +0000 (UTC) X-FDA: 82421819928.27.42AD11F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 89CFE40026 for ; Tue, 6 Aug 2024 12:56:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dXlzhkKm; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1722948951; a=rsa-sha256; cv=none; b=pYOHYXWHqU7/XQF0ycpWp2cOFFCp6mGPOO9rvXJ9+GbA9jzoaV45aY7HcVL5zhH8qzCaTD /IVjBLJBB5wrnQCUVX/AD47qf27La/VRIw9NDO2ii/yCYDf6160furmgCEh5haQu4+eMZE tnq7xEgRX3jppIVQM3oOnHFsh10dhak= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=dXlzhkKm; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of david@redhat.com designates 170.10.133.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=1722948951; 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=BbVHeghCxcbavlpwPUmyKdqFJPLDIUOPTBi2eefPzmU=; b=iiTAOmBxhZP14l8FI/kTF6XqWWSlUhGM+VhlaSySC30O51rI4gL7dRKoOlULutNYc6bXUz ijKeUd3aMWvUFrdE9TaEsGleJTHX8TP1vce2vTkP883zHTL7rmZRrKr4sk1pf4+wPW448O RhMrCQfORZWeyE8ESuBW67+PTm164RE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722949001; 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=BbVHeghCxcbavlpwPUmyKdqFJPLDIUOPTBi2eefPzmU=; b=dXlzhkKmjAEn3TCTmYHWPnYc2pqljveYLWLTlrdpyyYW1lRz+BjJvHlGrlMw2tb35kPrdp yZOEdwGmN9VPJ8KE5zFonx4/rxIhKiB/gRlvoeuhlK0SnLjGcaoyU/sTlfx93aCzdE7XpF vxIasItEcAQPOaXhFdVeP/LDRhmyvQc= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-614-EJ6bRtNYMiGaKCtgLeQLRg-1; Tue, 06 Aug 2024 08:56:40 -0400 X-MC-Unique: EJ6bRtNYMiGaKCtgLeQLRg-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4280cf2be19so5191005e9.3 for ; Tue, 06 Aug 2024 05:56:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722948999; x=1723553799; 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=BbVHeghCxcbavlpwPUmyKdqFJPLDIUOPTBi2eefPzmU=; b=pRRyABeDJ0lMyOdw+yfM6XNDLn5bcwN0FUAryIz/NBMsRQiKus+BONWBzkU2OSyPGT /pFOfG8yod0CxHzKDrrZ6giloK5n0oBzlC6HU8PnBdswvo/bOmU3zeOe8hXk8GLGAXqU CdgzMlIzjTxHjTP/RHtdKNggHezKbdESvtomWAY2Eui8h4sS8DGOHd9SODFWwEOs06Gf pM3tvJ2KxN0OQgdVwblsCubPiw4gSUvtiH13XAC0w5ZfAD/pCSkHaXzYAWlPKmvuypux 79ER1KSpxvlQGdZyTA5gktP8CKR3CigOYCHEZtkKYOtsLmrPVyECtpWPaYTLYfT4rsOI yEhA== X-Forwarded-Encrypted: i=1; AJvYcCWnDshElQ0Waj5GMnISfCv8eGmv2JNmGZUI9co0kcoQO7pLkF9LV+zrLQyZx4jRfCdw+INCbVE4w8rDdvUymw3omqA= X-Gm-Message-State: AOJu0YzF6iLcqv2BHytTuNBrJ/SJMdK+AHBW33F0YZDnF2f0A0Wbd1NH lI8+CboE8iIh06DU/8507jzzmt5q6E1dp9UNK/oS2CVxZ6UEU4BfSSpzmszEEOFH3JE1UlGrAPQ FZQ1rCKkfUOAllat/rzLo+CuIBLdCzCKM5UOe6Y0pPW/thKlLBdFJQ8G2 X-Received: by 2002:a05:600c:1910:b0:426:6f31:5f5c with SMTP id 5b1f17b1804b1-428e6b05c80mr103269885e9.17.1722948999334; Tue, 06 Aug 2024 05:56:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IErghGnHAa8cyLzdPF1c+VPdsO4XjVa9+4FF2AWApKYF1zVoIVlBBFR4oazz8FbaqEwLOwzmw== X-Received: by 2002:a05:600c:1910:b0:426:6f31:5f5c with SMTP id 5b1f17b1804b1-428e6b05c80mr103269615e9.17.1722948998828; Tue, 06 Aug 2024 05:56:38 -0700 (PDT) Received: from ?IPV6:2003:cb:c73f:8500:f83c:3602:5300:88af? (p200300cbc73f8500f83c3602530088af.dip0.t-ipconnect.de. [2003:cb:c73f:8500:f83c:3602:5300:88af]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-428e6e9d887sm180338905e9.43.2024.08.06.05.56.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Aug 2024 05:56:38 -0700 (PDT) Message-ID: <1e6bcaf2-7c48-4be0-b101-ec2ddc4098ce@redhat.com> Date: Tue, 6 Aug 2024 14:56:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: attempt to batch free swap entries for zap_pte_range() To: Barry Song <21cnbao@gmail.com>, akpm@linux-foundation.org, linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org, Barry Song , Kairui Song , Chris Li , "Huang, Ying" , Hugh Dickins , Kalesh Singh , Ryan Roberts References: <20240806012409.61962-1-21cnbao@gmail.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240806012409.61962-1-21cnbao@gmail.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-Server: rspam12 X-Rspamd-Queue-Id: 89CFE40026 X-Stat-Signature: 9xsuf7qttrgwrw9onkhnhs4dmn8czucq X-Rspam-User: X-HE-Tag: 1722949002-596202 X-HE-Meta: U2FsdGVkX1/c075HHIu+L/la7vWTV1PHuN4C0rzfav3vySCzZOFRp1ycLwO+XglqaM9cOoSE0jeBqIB8mYqC5UV6NFDBAuusq8WfjUScY7y85+lrmx6gvV59QcMJMXv0hKKvWyPqlr6XWvG2nODQXjeTVz0rn9VWbtejK6j/1YKg+uP9dvJHaIHYfbHUtdreyT+aGbQZgKh7z9/MKu7suV6kN7XZ1+KUrCZwJgwtI6CdxNV3SqNxZvi9tCHazbt+9eyjQqM1KCCPfoOTpefB1/AafPUFlH6dBngljBHSc225RLO/aHwq1PtzpAaqEAnpg38kvFdmmXadMyjjklheToiaIako4ftuJBf7q6qqU/zOYwa1+0YVxzyDApc57X+StPFWhWoxzKPzAQRngb0MyDclXeKgxXIL8srLPT4r8ZxlVbUSYsYRMg37D0q7qE2s+VXxk12Ve/Pmd+Y52bI1N4X3cHKXjPIdBl/NTOOCULVosQw+uqXFfQmy6e4AXif5QpdB66ZDy8FDvTwhYrCDB7N/UwIIZ49XgTum4ppAtp3I/Jk036OlLT9l041PrOrtsozxCoKgHnv9UofLXRDKKivuMPNZ1olUN2puxn/ecye2DIlCdmJfbnhOTFxz/FHZSiDNQALzDsi7FhGCfwFip/1FyYRsYfX+FzLfFqaC1mTUmJaIVdUedS/OoGAH2pFPspwi4eA4jFUUynuL2zK+PnKRn6WLEEQcoOBWmgIuiNyafhd0SI4lREopOYYLgwld+t5I28rLoDf+gUp6s/elk68b3dripPwkzjcrDHNwysL09jaFMaKWnEGK5BIU6MljuMMt5ucKO5jvP9pbGA9BADgaqk+1NmpCcRxLAL4Og2dvdv+s0ms1bxZkNxZ1LJHMdqMwd86Td+1tSxntYPiYTdOeaGTSBHYIMFi/pI46zjA19aXilKmscywlqfJOZkiSD/dY1buXFT7gmOGeOs2 tQhpeIz8 7FcruHxTirG+lW6WUBIQtDGi86fcuMclVytXUshad/c66NrDJIusVqsaRL44beM+ka5Fb4L41BsRZVapAb7asWx2xvbqzDYHc4q1qBTOGA4o2d1Krq2aggafgwlh1QRCo2mJ/fNc1Oy/pzdG+6KZgQSKTbC04iNckErKR9k1FcNos1+HgMnnmnM3M7DowM0S4jpAOSXc/zC1+okYajg5MACGxxmulHFl+XzmQ1o7T88YNQkgUXZC8Sam3jt6KEtLv1BP12BptNK+HzXXBKWhwP+wwpgRXWvV/EoppPRDbSHvgxlg/pzy4VnX0dD4USqkCfGdjAYpFh88Bd6ZnytJGliO7Ei2YcRkgxEUvfT0jTBLQXCeDkQosABA3lILHEzPUWV7dQOHfdGa+WCcoosweH+hw+N4jIII4vkJ0dK9fp3z626akocGXyOKmehpCkfTaf7avsLLTZgV+piX+tsVj4dLolDNgVbYBA/VQHjf5+tpck3B1e5GhhaIz5srMwZ7fvXmvQ9Uz6IQkSJu4cBu8peKJQF2yu14rOqANEKv39MxABSbRI4zOj/IJT0LG+wRCDE1GT+MYQL4X2/V8+LnZ3f0SbB8gONir6mUN4M+GZiyUqxtP8pJz7zeqCkWQpOavhdgzZt0anprrIq20vneK8FOHdMZEpVzb5qElfNPyDkW9UHkhKMbXjPjXwuXGuTAJ72uSJQW0+d/mhQphskj0i0kSoFE9dKHLRfuuDJmsPOIkCN9/U6A6i9SHUByrGTlVyMJ2sM9fuhJRoIQZYbSiDDaTcg== 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 06.08.24 03:24, Barry Song wrote: > From: Barry Song > > Zhiguo reported that swap release could be a serious bottleneck > during process exits[1]. With mTHP, we have the opportunity to > batch free swaps. > Thanks to the work of Chris and Kairui[2], I was able to achieve > this optimization with minimal code changes by building on their > efforts. > If swap_count is 1, which is likely true as most anon memory are > private, we can free all contiguous swap slots all together. > > Ran the below test program for measuring the bandwidth of munmap > using zRAM and 64KiB mTHP: > > #include > #include > #include > > unsigned long long tv_to_ms(struct timeval tv) > { > return tv.tv_sec * 1000 + tv.tv_usec / 1000; > } > > main() > { > struct timeval tv_b, tv_e; > int i; > #define SIZE 1024*1024*1024 > void *p = mmap(NULL, SIZE, PROT_READ | PROT_WRITE, > MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); > if (!p) { > perror("fail to get memory"); > exit(-1); > } > > madvise(p, SIZE, MADV_HUGEPAGE); > memset(p, 0x11, SIZE); /* write to get mem */ > > madvise(p, SIZE, MADV_PAGEOUT); > > gettimeofday(&tv_b, NULL); > munmap(p, SIZE); > gettimeofday(&tv_e, NULL); > > printf("munmap in bandwidth: %ld bytes/ms\n", > SIZE/(tv_to_ms(tv_e) - tv_to_ms(tv_b))); > } > > The result is as below (munmap bandwidth): > mm-unstable mm-unstable-with-patch > round1 21053761 63161283 > round2 21053761 63161283 > round3 21053761 63161283 > round4 20648881 67108864 > round5 20648881 67108864 > > munmap bandwidth becomes 3X faster. > > [1] https://lore.kernel.org/linux-mm/20240731133318.527-1-justinjiang@vivo.com/ > [2] https://lore.kernel.org/linux-mm/20240730-swap-allocator-v5-0-cb9c148b9297@kernel.org/ > > Cc: Kairui Song > Cc: Chris Li > Cc: "Huang, Ying" > Cc: Hugh Dickins > Cc: Kalesh Singh > Cc: Ryan Roberts > Cc: David Hildenbrand > Signed-off-by: Barry Song > --- > mm/swapfile.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 61 insertions(+) > > diff --git a/mm/swapfile.c b/mm/swapfile.c > index ea023fc25d08..ed872a186e81 100644 > --- a/mm/swapfile.c > +++ b/mm/swapfile.c > @@ -156,6 +156,25 @@ static bool swap_is_has_cache(struct swap_info_struct *si, > return true; > } > > +static bool swap_is_last_map(struct swap_info_struct *si, > + unsigned long offset, int nr_pages, > + bool *has_cache) > +{ > + unsigned char *map = si->swap_map + offset; > + unsigned char *map_end = map + nr_pages; > + bool cached = false; > + > + do { > + if ((*map & ~SWAP_HAS_CACHE) != 1) > + return false; > + if (*map & SWAP_HAS_CACHE) > + cached = true; > + } while (++map < map_end); > + > + *has_cache = cached; > + return true; > +} > + > /* > * returns number of pages in the folio that backs the swap entry. If positive, > * the folio was reclaimed. If negative, the folio was not reclaimed. If 0, no > @@ -1469,6 +1488,39 @@ static unsigned char __swap_entry_free(struct swap_info_struct *p, > return usage; > } > > +static bool try_batch_swap_entries_free(struct swap_info_struct *p, Why call it "p" here and not "si" like in the other code you are touching? > + swp_entry_t entry, int nr, bool *any_only_cache) > +{ > + unsigned long offset = swp_offset(entry); > + struct swap_cluster_info *ci; > + bool has_cache = false; > + bool can_batch; > + int i; > + > + /* cross into another cluster */ > + if (nr > SWAPFILE_CLUSTER - offset % SWAPFILE_CLUSTER) > + return false; > + ci = lock_cluster_or_swap_info(p, offset); > + can_batch = swap_is_last_map(p, offset, nr, &has_cache); > + if (can_batch) { > + for (i = 0; i < nr; i++) > + WRITE_ONCE(p->swap_map[offset + i], SWAP_HAS_CACHE); > + } > + unlock_cluster_or_swap_info(p, ci); > + > + /* all swap_maps have count==1 and have no swapcache */ > + if (!can_batch) > + goto out; > + if (!has_cache) { > + spin_lock(&p->lock); > + swap_entry_range_free(p, entry, nr); > + spin_unlock(&p->lock); > + } > + *any_only_cache = has_cache; > +out: > + return can_batch; > +} > + > /* > * Drop the last HAS_CACHE flag of swap entries, caller have to > * ensure all entries belong to the same cgroup. > @@ -1797,6 +1849,7 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) > bool any_only_cache = false; > unsigned long offset; > unsigned char count; > + bool batched; > > if (non_swap_entry(entry)) > return; > @@ -1808,6 +1861,13 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) > if (WARN_ON(end_offset > si->max)) > goto out; > > + if (nr > 1 && swap_count(data_race(si->swap_map[start_offset]) == 1)) { > + batched = try_batch_swap_entries_free(si, entry, nr, > + &any_only_cache); > + if (batched) > + goto reclaim; > + } > + I'm wondering if we could find a way to clean this up to achieve here: if (WARN_ON(end_offset > si->max)) goto out; /* * First free all entries in the range.$ */ any_only_cache = __free_swap_entries(si, entry, nr); /* * Short-circuit the below loop if none of the entries had their * reference drop to zero. */ if (!any_only_cache) goto out; Whereby move the fallback loop in that new function static bool __free_swap_entries(struct swap_info_struct *si, swp_entry_t entry, int nr) { const unsigned long start_offset = swp_offset(entry); const unsigned long end_offset = start_offset + nr; bool any_only_cache = false; if (nr > 1 && swap_count(data_race(si->swap_map[start_offset]) == 1)) { [... what try_batch_swap_entries_free() would do ...] } fallback: for (offset = start_offset; offset < end_offset; offset++) { if (data_race(si->swap_map[offset])) { [... what the fallback code would do ...] } return any_only_cache; } > /* > * First free all entries in the range. > */ > @@ -1821,6 +1881,7 @@ void free_swap_and_cache_nr(swp_entry_t entry, int nr) > } > } > > +reclaim: > /* > * Short-circuit the below loop if none of the entries had their > * reference drop to zero. -- Cheers, David / dhildenb