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 AC998E77184 for ; Thu, 19 Dec 2024 13:47:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E8E6E6B0082; Thu, 19 Dec 2024 08:47:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E652B6B0083; Thu, 19 Dec 2024 08:47:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CDEB16B0085; Thu, 19 Dec 2024 08:47:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id AFE486B0082 for ; Thu, 19 Dec 2024 08:47:14 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D61EDA169D for ; Thu, 19 Dec 2024 13:47:13 +0000 (UTC) X-FDA: 82911834180.26.9A589E1 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf28.hostedemail.com (Postfix) with ESMTP id B3C9AC0009 for ; Thu, 19 Dec 2024 13:46:34 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PqAHlRJO; spf=pass (imf28.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734616000; a=rsa-sha256; cv=none; b=ajrdBV1V64Ph4nyoGtJbj1FtLfhIHpZj3aM8EUXNoDLMgQBfJLyVWJ7nQS2pqfA4FU1gjM tn6OSa57Q0JRaRzuzKOhezFNwjyZkMFd/gF1uJRrIVsxHRJtEli8jq7ekPDwmBF3FJBYfc j8orgxq8Xx3RMx5ndCv5qFGGkChgFGc= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=PqAHlRJO; spf=pass (imf28.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734616000; 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=tAy3E0d3vqb6yzl4turJ5CZsZIeaB8ajvmYgZE3Ve7Q=; b=gCzJHHiVNNdNtJrOnqg/EZMK4HtWBe1jXkZekB6uKOh4V5dH6Bi/HTaRqtS5InnzJm5k4e EJHsLKkxamYdArpfCTeX2d0j3N7weiOcVUnVT5qyCy53AV1sQkZRvkJ8fbbSHqjJEuGILc BjxEseSdMQrrtCV2YsVahSi10goaCWg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734616030; 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=tAy3E0d3vqb6yzl4turJ5CZsZIeaB8ajvmYgZE3Ve7Q=; b=PqAHlRJO446u0Ytg/AB3U0b9Iq3wT5oSCE5eRHShpsOqnOgCJPOU3dJXe72ry0rcTyosOi LZyq/By422Dq+1gUo78Xa5gohdBjBuxHIhO2OPeA85Y94mb0QpA5aLWrkziPLeIELZIErt 55vtLITe6PwDGD9lA+9jCheIidUqFf8= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-31-7W4j6AnJMKeCxDhY6JSVzg-1; Thu, 19 Dec 2024 08:47:09 -0500 X-MC-Unique: 7W4j6AnJMKeCxDhY6JSVzg-1 X-Mimecast-MFC-AGG-ID: 7W4j6AnJMKeCxDhY6JSVzg Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-385e1fd40acso480647f8f.3 for ; Thu, 19 Dec 2024 05:47:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734616028; x=1735220828; 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=tAy3E0d3vqb6yzl4turJ5CZsZIeaB8ajvmYgZE3Ve7Q=; b=Y6gpW5BGgKb8ycwZ0LhCqCIEyktvPggHN/U9romUorprMs2hPNH22Z65wJmpyg0Vko L+QgGLDqLXYjISMfSTqNhJVDahiggfe9xGGWex/rYDvDTSxvuF3QA0yiqGogLs/1Ibzh rzHtPK1HEHR5vpW1dci4n8/N18wP+fjpNoPXaFVO4UpUoFz8bbKf2WS9XlnSigl5RE57 6tCeJIU0gO99Lyi8uh7nzWxaEsPFHZsgngR3c2RhoNY9HaxBiJWIIheliMpKozfP+bfv u5u4HX8NmxMUmKZSFef+xE13Ztb/ETmzzk1ng1dHoxOO/0gzE9WzG+HPLXEmhek6abQO vPpQ== X-Forwarded-Encrypted: i=1; AJvYcCXdK15hKlByWrG1AWYWfzK7xBfYbop+9reapliZXDO9oj0IU+u1j5OZt30FPwcQcgQKJGVEkRuLeQ==@kvack.org X-Gm-Message-State: AOJu0YytZgCA65KLBa9kEAcZyiFpYhvNVSQ6RJbwv8V7vsYF1krQXw+3 oAX3ekPWLR6AGyOP18yeyDOIgEGmMdkx/AFsXKHxrZnYPTGwNmelpw8c3P6ywjTzts2dpZXnUYn mOn3y7Hu5nvUF2xkjenJ/odQXjPGMNPUc2bSoK98jKg06c2ayn1XxTYPHzUI= X-Gm-Gg: ASbGncvMI9sfwlBl4J5yXcxIoFJ+ocGKG1nrdHeaxMkunHImd/m4Gi2HqsJ79qNNOLZ 3j/cmVJcKJGFsTNqckD2iaMGIUWeZm7LUQAxPXZdK/be0AUtGC9uHEUPUGAEB0DCtRJKL2f4KRZ fGsEQw6vU6SzUTDvAGNPbnEN24CnURnnkiFsTWMiVuo2XpWHJmCpFcd+hXb0yWp7q9d3SoBCSNd 3u7VHLjfvHdvbgwW7thrb5p38ypPdtnduYxK0TCBkFrpUGd1vH/efAVmr9Wc+v+dKL3dK842zlk mWmuKgCM8mezSar+Muq+4LAPPJL8LRQM72FzyXWywExaNJzz7MxMw0EM0l4P4z9wFuzQ2PaQ6f3 kG2iPsA== X-Received: by 2002:a05:6000:4b0b:b0:386:3b93:6ccf with SMTP id ffacd0b85a97d-388e4d5f125mr6123815f8f.32.1734616028170; Thu, 19 Dec 2024 05:47:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IGstKj/Up5xji29eYqvh+3j1TNKaAzgg/P1Frg720shwPH6GYTxKtSV6Ap5jmooiKVkINB/2Q== X-Received: by 2002:a05:6000:4b0b:b0:386:3b93:6ccf with SMTP id ffacd0b85a97d-388e4d5f125mr6123787f8f.32.1734616027781; Thu, 19 Dec 2024 05:47:07 -0800 (PST) Received: from ?IPV6:2003:cb:c749:6600:b73a:466c:e610:686? (p200300cbc7496600b73a466ce6100686.dip0.t-ipconnect.de. [2003:cb:c749:6600:b73a:466c:e610:686]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c828bd3sm1592237f8f.10.2024.12.19.05.47.05 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Dec 2024 05:47:06 -0800 (PST) Message-ID: <189f4767-e7c2-4522-b943-b644126bf897@redhat.com> Date: Thu, 19 Dec 2024 14:47:05 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: add maybe_lru_add_drain() that only drains when threshold is exceeded To: Rik van Riel , Andrew Morton Cc: "Huang, Ying" , Chris Li , Ryan Roberts , "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel-team@meta.com References: <20241218115604.7e56bedb@fangorn> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20241218115604.7e56bedb@fangorn> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: WXpc4nngkXGC-f3N_fgvksLcWuN1M8K-LuTxU9i05-c_1734616028 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: B3C9AC0009 X-Stat-Signature: 3oqyn6nw1w91kjj3ogjytsdfpgdr1ao8 X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1734615994-982253 X-HE-Meta: U2FsdGVkX19GsPtccHTVDmVMwMyg7A5Lk68H0F/+jDFePF08tWewCGTVRIidO0d2sOKP374QrkaWD0mNlgwYWwdQjVmtH43yiYBiRdBxeloDedp4bYPt3wAhxs5Mws2KGlFof5b6jEGITIH6w8zQfcO816+/SuTsy1vf4HySVbJK+tcHisYcmlg6EoMhTS3PA8tjdt6S8FI/3vC2tMTEFbAfNTQiX3fJJFlHPkFQa+kWcfuBSQO7gJ4zVKSYD2Jk1peI8amfu58TOdvelDT5ss6iMzjz8l0V9tjS9m459aVgpW91bXuCfwcdg6JExGICz7UiWCdOK/fC49sepMW0JAy2CAZx4nUEtgawOyDxJGCLJN9Zawno9U9CrfuCVpdvKqhuS87e77jF/3ZQiED0pxQOeaskuuHWRsIuduf50Ji36fumYwwooHv/XYYYEHN3sLiwHwm3+AQF75S4v7pFv0FFvzeUBTcNJJhw2uh6PEZpkjCkxrVwfXnG+BBZYF8tReFNRb5D0kgEjF2JLYeRg1ppIEQbJGK+QmryC88JTmpEszyGlnRYZsgq/Ot85A47Nrf/1NA8kpOU88JuIv6PPW21K0SG6UGZXNIqOwccO+DUfhusub83THQy4h/cnnLPYdgZWuoHOS7FuzN3kwz+/7kpI5ZPXoAy2qokqFco6AkjWjcSWcaBjQG3xUsLfx18SfsI6O8db/wVNI0Jzynj6V0jqWTji/YR+1PoZK51/7EtoA08vabZjt6ysUfqvz1q8NajZOQUS2CSDjjfHpfuEGRUn317g9Sb3YgKMvzAH8mfzc8QGZqmzXgCDaIVdfY1npntW7+59IPTw8+ElSFbBhCR4zJZc2YzLOfq5C3ROuF/jS3osH7axZ6Xj/zyZaiUWyF8H7KljTGC6tTGyyGJXllOR/QpNU4OphUT1huE/Ki/yCg4L1G0eLsYglHVINY9+fBWiksd1XKcsCA+D48 udyB4WUN cT8MFI8dctqpHe0FC942E/yzV/qlnkzyKoEDMJ1TV/Prg0cQdhqYIkwW8yd0kmswOY19vHCJT3ZmaJTFyPIQqTPFzvAP1JUhqMq/zDb2kPsgQrh903kBzCwhvRENjyAk1ez2wiv5AAP9OcZNjurSXGHufu0NPuAVAnFsSQO10+cyIOpYeCR0IAZJ1uv8TukzRLN90urVV3B9N+//b4H7rgPM3r0Jx/B3AFH2oZiaI7EOc6GaoJg/D7LLE6fKPBftTm8LjOsb31QExxtoayC4PNHTLm25bCykMyb5yyyvYcDrH2ZHRmMffbrQWN+N6LxW4RmRW+baaxOxxGqkQhxlXqCw4Pvk9cupdcrquMbzrv5VRUnfYUtJb2x2ZA8+iB03t3/YiYqfRnbRV6MQfRsSTTFvTggXIkZx4Ktbc0LQJaO9KkhSuGiz/ih/ipmR8wPQD21p2lthwlanQSwA9vJhVHzALEzOE8+QdlGi1RVch1Oeo4bUkjA41yC1Ybl6ybU8vNIvk 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 18.12.24 17:56, Rik van Riel wrote: > The lru_add_drain() call in zap_page_range_single() always takes some locks, > and will drain the buffers even when there is only a single page pending. > > We probably don't need to do that, since we already deal fine with zap_page_range > encountering pages that are still in the buffers of other CPUs. > > On an AMD Milan CPU, will-it-scale the tlb_flush2_threads test performance with > 36 threads (one for each core) increases from 526k to 730k loops per second. > > The overhead in this case was on the lruvec locks, taking the lock to flush > a single page. There may be other spots where this variant could be appropriate. > > Signed-off-by: Rik van Riel > --- > include/linux/swap.h | 1 + > mm/memory.c | 2 +- > mm/swap.c | 18 ++++++++++++++++++ > mm/swap_state.c | 2 +- > 4 files changed, 21 insertions(+), 2 deletions(-) > > diff --git a/include/linux/swap.h b/include/linux/swap.h > index dd5ac833150d..a2f06317bd4b 100644 > --- a/include/linux/swap.h > +++ b/include/linux/swap.h > @@ -391,6 +391,7 @@ static inline void lru_cache_enable(void) > } > > extern void lru_cache_disable(void); > +extern void maybe_lru_add_drain(void); > extern void lru_add_drain(void); > extern void lru_add_drain_cpu(int cpu); > extern void lru_add_drain_cpu_zone(struct zone *zone); > diff --git a/mm/memory.c b/mm/memory.c > index 2635f7bceab5..1767c65b93ad 100644 > --- a/mm/memory.c > +++ b/mm/memory.c > @@ -1919,7 +1919,7 @@ void zap_page_range_single(struct vm_area_struct *vma, unsigned long address, > struct mmu_notifier_range range; > struct mmu_gather tlb; > > - lru_add_drain(); > + maybe_lru_add_drain(); > mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, vma->vm_mm, > address, end); > hugetlb_zap_begin(vma, &range.start, &range.end); > diff --git a/mm/swap.c b/mm/swap.c > index 9caf6b017cf0..001664a652ff 100644 > --- a/mm/swap.c > +++ b/mm/swap.c > @@ -777,6 +777,24 @@ void lru_add_drain(void) > mlock_drain_local(); > } > > +static bool should_lru_add_drain(void) > +{ > + struct cpu_fbatches *fbatches = this_cpu_ptr(&cpu_fbatches); > + int pending = folio_batch_count(&fbatches->lru_add); > + pending += folio_batch_count(&fbatches->lru_deactivate); > + pending += folio_batch_count(&fbatches->lru_deactivate_file); > + pending += folio_batch_count(&fbatches->lru_lazyfree); > + > + /* Don't bother draining unless we have several pages pending. */ > + return pending > SWAP_CLUSTER_MAX; > +} > + > +void maybe_lru_add_drain(void) > +{ > + if (should_lru_add_drain()) > + lru_add_drain(); > +} > + > /* > * It's called from per-cpu workqueue context in SMP case so > * lru_add_drain_cpu and invalidate_bh_lrus_cpu should run on > diff --git a/mm/swap_state.c b/mm/swap_state.c > index 3a0cf965f32b..1ae4cd7b041e 100644 > --- a/mm/swap_state.c > +++ b/mm/swap_state.c > @@ -317,7 +317,7 @@ void free_pages_and_swap_cache(struct encoded_page **pages, int nr) > struct folio_batch folios; > unsigned int refs[PAGEVEC_SIZE]; > > - lru_add_drain(); > + maybe_lru_add_drain(); I'm wondering about the reason+effect of this existing call. Seems to date back to the beginning of git. Likely it doesn't make sense to have effectively-free pages in the LRU+mlock cache. But then, this only considers the local CPU LRU/mlock caches ... hmmm So .... do we need this at all? :) -- Cheers, David / dhildenb