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 3D626C71157 for ; Wed, 18 Jun 2025 17:40:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDC426B00A3; Wed, 18 Jun 2025 13:40:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C3D8B6B00A4; Wed, 18 Jun 2025 13:40:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A1B266B00A5; Wed, 18 Jun 2025 13:40:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 8461F6B00A3 for ; Wed, 18 Jun 2025 13:40:28 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 48824C07E1 for ; Wed, 18 Jun 2025 17:40:28 +0000 (UTC) X-FDA: 83569235736.20.84A1F00 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf19.hostedemail.com (Postfix) with ESMTP id 154C31A000A for ; Wed, 18 Jun 2025 17:40:25 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LtO0rv1k; spf=pass (imf19.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750268426; 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=hwmXAEBDYo8DkjDdp6VkbgoCuZIqYMKAJtJSkdjCkPU=; b=u+FznXGKwbZyn0HYQDIPadolT/SBBnKFs3EaqueymFd09R+mFUGFJnbfK5740CyI5RTRsA D0kuH3fSz2f+uYT6xPUMyMZic/ul3vU/45h29OZz76Z/dOLj620qLCwWGi4ffxXvKPI7mV FDHDn6PS7frIzXsjskEHjtO/5g9FQJs= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=LtO0rv1k; spf=pass (imf19.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhildenb@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750268426; a=rsa-sha256; cv=none; b=UAO8mjw0VT39LxHMomaFEgpvxVgqIamPrvh2bcx/qF1gnG19/YKLd4vC0udtupgwPjC75K xCdIHVyJIMsTv2wDs3fWiJ7FYlW+ZAO82RVocpCwTVjCkqaFmLPqbXoVV1FiRuURc26eJY ZunaIUxvNn43/B4Yd4+SS7P+u8JoCdM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750268425; 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; bh=hwmXAEBDYo8DkjDdp6VkbgoCuZIqYMKAJtJSkdjCkPU=; b=LtO0rv1kmmtMQysEqiTi2wckTA+8gI/KcHuPyKUTc0+0ZqMrgYeFgovTza3YI05YdqDAgC h18zd2v89szmURdQ0EaJYlJyidN20OJejvRsRpNKzMFnYpr7aYNfq9bUVTgQd84XheGQtz 4k7poyKdP7zb5A/CkafM+frvB1UndBo= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-Qva8yhM6N0ibio6j_72ueQ-1; Wed, 18 Jun 2025 13:40:24 -0400 X-MC-Unique: Qva8yhM6N0ibio6j_72ueQ-1 X-Mimecast-MFC-AGG-ID: Qva8yhM6N0ibio6j_72ueQ_1750268423 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-450d244bfabso59186475e9.0 for ; Wed, 18 Jun 2025 10:40:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750268423; x=1750873223; 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=hwmXAEBDYo8DkjDdp6VkbgoCuZIqYMKAJtJSkdjCkPU=; b=vi3q30orzBYC/XewiEijV3791cbFbdJ5Z5PBPBXc/yKUTzI5vVlQlv1h7sbROUeMhE 7lGyLO2dDmb6cSJuRKpjsX1HkSLYOSw6foPRqrwgsZg1bEfia7lR+eWi5MzUAhOSWMHe V3/WojPaUz86Pp1A/hYc0PSAYBhZl+MamOZHkuBAbUWGzouKXXfPMOyBAFhJGcB9oxBM p67/MBwPMnS+OGd5ViPTEIhW9B/GrOkwFuMFo0XWh1OoqKEhmFZxjQPGPuCfG+vdQg5c bMn5XN+VFiTyaOc5soCbnk+wGFb+xJw9anU1ZsV7Y1rhJxRs++FJq+iuo7w7VWw7D78y X8Bg== X-Gm-Message-State: AOJu0YyZQvWHdLBXHbPRKAPj93AvzRuGkkOyYC0DqF+daJrS9C+p2Sgz 8e0oHEzXnx5CNZbeL/B79HN/Spe6SNPxBGheq0f/9Q1VtyGtoI2/n2n7g9fcm5T3sBHoCMNPqVK MXSh834k9YPH000YLqjhH+GmEoF3TBhFKiXrJzPXAa1y/Hd2I5XUn X-Gm-Gg: ASbGncsnLTTqgh1PO60YDkqIv+mKB3b+wobtqwyguTVoGOOMSX73MwZA3qflRgYkVHy kLsWEvIF+Wq4lJ0oE2M1fO9pAHB9lov9vlrbB/HbmpHD+Z67YIDIp4JMjYAgQs+3uyfL0VULGOS APGzGHFM2ZM3kCCyDB5K2w8a5c3oofxRwwcYe/jxu8ITYpcNYHUsDzs+WCUe7kMuzhUX9DWZK7A nlUbdgysdecSb4r67qdV/TFE565WddvE/37cWJyCVD8wGX5tfmW6Pz/M8/Huvh8PHb5VEJPVb6d h4U0JtlXVpx3OMF+oQro/2BjKpR+ncvM/esYufv5yNxQepzqSeF3OUntGPHydDJWSBx+mMZ/5yO AhuR0ew== X-Received: by 2002:a05:600c:1d8c:b0:43c:e70d:44f0 with SMTP id 5b1f17b1804b1-4533caad0aemr171055415e9.19.1750268422792; Wed, 18 Jun 2025 10:40:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFFNY4J8Mn4IFBBexw6iB/8oHFBQjZ0Pcfadu7y3OlxCDXC24glKPTWmaukP08KWSs+L7QyIw== X-Received: by 2002:a05:600c:1d8c:b0:43c:e70d:44f0 with SMTP id 5b1f17b1804b1-4533caad0aemr171055095e9.19.1750268422300; Wed, 18 Jun 2025 10:40:22 -0700 (PDT) Received: from localhost (p200300d82f2d2400405203b5fff94ed0.dip0.t-ipconnect.de. [2003:d8:2f2d:2400:4052:3b5:fff9:4ed0]) by smtp.gmail.com with UTF8SMTPSA id 5b1f17b1804b1-4535ebcecdcsm3339075e9.36.2025.06.18.10.40.20 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Jun 2025 10:40:21 -0700 (PDT) From: David Hildenbrand To: linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, linux-doc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux.dev, linux-fsdevel@vger.kernel.org, David Hildenbrand , Andrew Morton , Jonathan Corbet , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Jerrin Shaji George , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , Jason Wang , Xuan Zhuo , =?UTF-8?q?Eugenio=20P=C3=A9rez?= , Alexander Viro , Christian Brauner , Jan Kara , Zi Yan , Matthew Brost , Joshua Hahn , Rakie Kim , Byungchul Park , Gregory Price , Ying Huang , Alistair Popple , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , "Matthew Wilcox (Oracle)" , Minchan Kim , Sergey Senozhatsky , Brendan Jackman , Johannes Weiner , Jason Gunthorpe , John Hubbard , Peter Xu , Xu Xin , Chengming Zhou , Miaohe Lin , Naoya Horiguchi , Oscar Salvador , Rik van Riel , Harry Yoo , Qi Zheng , Shakeel Butt Subject: [PATCH RFC 02/29] mm/balloon_compaction: convert balloon_page_delete() to balloon_page_finalize() Date: Wed, 18 Jun 2025 19:39:45 +0200 Message-ID: <20250618174014.1168640-3-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250618174014.1168640-1-david@redhat.com> References: <20250618174014.1168640-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: gvNEDF96vXPw9loMsOSuIOK-xo3aHKsliqLkmvJEQJY_1750268423 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Queue-Id: 154C31A000A X-Stat-Signature: scqw3fru1qerp5z76e73uxoi48gc3nbp X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1750268425-794977 X-HE-Meta: U2FsdGVkX1/vkEGTl7tSmK074eOLf1RgRvdwHRn9td3D51Z0HSlVES0tbeGKQcgrmO/9RRe94WfLG2M+lyTPqM5lYYn4zIowo8RUh61doQBnBfT3Yes7qnKAJYbwCjXpEWt7PeSbdMJk1PhRUWamWz3/p/yfIrHIZK1Lf2jMykoUxJ3GGemIYQVWYmP+VeuqpWTL3JllhqnKslmb+KQE4FN1482+AIJtReMzguF0JPHpJjv4EtLRnhQxmdgdnb+seIPIvotYRqWNeab4uJLC3cL+fkfHI2kyvaa9hF8Mev61jEpsf0zR/4y/fMlKnP5nwlZUqSki7IKCeV1rLAIE6s0nZub42c1S6IG726o11tXWAQGcqZ4Hul/DggmcnYcrtJ5rzEjZAw0ZJt95OPkZeKmG830kqnjYIQpsglwbDxP6zYNBB/i9CcbRyXuoS2a+Ax4POj3RKF1zeyKEBYS/djLX6fYlw3MR+NJifY0+Wybw0lmRyEjAR3rX2NEcKINCNMsLBOn1WBSOHmzTRX7GzYWEQSMSWEqVLwpAgTtZcCjoBF9nQOrpEeXsRywbt++nhqxTp+UQ2H3z96fj/5++cFDOJey5Y3abQzguuBt+b7S5b4h0kSYjAkKxCNLvnQTvpmf1Mg1fJ4h9zJMFWHL/8LMupNBfbtZGg7Oc8FQKOA8CYSNVIuACpVR5oaadpEAYntowfaK1zEKPReK4QWNuFT3jAgR8jWrT4fbjeLyNXOjJVVwGPJRPRoramPNTqK9o1SSXs/Aelm6JH9MQrnamyhlJTSQaTp3PxaZBKhwtH3oiRAvMLg7kvns+DzLefKlzHK0dArEfQg2sKfR6iblr8ZbZV4irvMX2CF0H3BBwgwYafRY8id7pwZGd+OY/xFeBlKgEcCwIIy3y1d0xfGtSGN21J6F2B6p3fKYUSMwdR+AYPEmWXHSXZcRL+C/bTRAxXDmyF/L3062zb+PbP6X SkZBa23F OmLfa9kN93/j+DGC6ZGmYkc0qt0wz1Tnz4SZQYKkiOyn49yql1iddRHs/VXPZM2RI0gBOz7xX21jr/svFn8ZYVX5YW7g6fh7WsWBrOd7nQoL0y+4IchCfZHLkyebgLXIS2d8AZdBpquKenwsKKOLxD+qWE2rtfE7SW+mS2uYqQNLUpiZ7g14suoUe+vnHtozxQxiFOkJXKES6zOY3Zs5f5ZCs9gbjiIzvrNWxH2NmJSmIZk5OFslPauHNgyFm9spNjHF0dC8LYw+MYPWTXJ8aL6yicI8vh22zUIcSuIOrZse1HnMrVSXg/OPc7d8Qz3c9nJRPTbR1gA50egbB1A+KMLWvE4t/mWjZjSGuXr169Iuky6CrB2whTZXKtpG0ww6wB7TCUJq9CvdvENpD3zNbu8axJKOPD4UHbonFbmM0BGecV7UjNAfLSxF85Sj6+joR1z0cLQhHLHcg0yE+THfEyMXcVceLb8BqkcruQ+dA7wkyfqJTMl/q3GTpuLAkKzpkpB9tiAMSsIA8MJt8erlZy13FQ1UeVCHEUeeKobstZk4ogpJ/HvJGpm+SETvggrnG1PFZsEu+E1M3/6mQKFdunuFhySWeRzjr+wIC 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: Let's move the removal of the page from the balloon list into the single caller, to remove the dependency on the PG_isolated flag and clarify locking requirements. We'll shuffle the operations a bit such that they logically make more sense (e.g., remove from the list before clearing flags). In balloon migration functions we can now move the balloon_page_finalize() out of the balloon lock and perform the finalization just before dropping the balloon reference. Document that the page lock is currently required when modifying the movability aspects of a page; hopefully we can soon decouple this from the page lock. Signed-off-by: David Hildenbrand --- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 3 +- drivers/virtio/virtio_balloon.c | 4 +-- include/linux/balloon_compaction.h | 43 +++++++++++----------------- mm/balloon_compaction.c | 3 +- 5 files changed, 21 insertions(+), 34 deletions(-) diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index 5f4037c1d7fe8..5e0a718d1be7b 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -532,7 +532,6 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info, spin_lock_irqsave(&b_dev_info->pages_lock, flags); balloon_page_insert(b_dev_info, newpage); - balloon_page_delete(page); b_dev_info->isolated_pages--; spin_unlock_irqrestore(&b_dev_info->pages_lock, flags); @@ -542,6 +541,7 @@ static int cmm_migratepage(struct balloon_dev_info *b_dev_info, */ plpar_page_set_active(page); + balloon_page_finalize(page); /* balloon page list reference */ put_page(page); diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index c817d8c216413..6653fc53c951c 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -1778,8 +1778,7 @@ static int vmballoon_migratepage(struct balloon_dev_info *b_dev_info, * @pages_lock . We keep holding @comm_lock since we will need it in a * second. */ - balloon_page_delete(page); - + balloon_page_finalize(page); put_page(page); /* Inflate */ diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 89da052f4f687..e299e18346a30 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -866,15 +866,13 @@ static int virtballoon_migratepage(struct balloon_dev_info *vb_dev_info, tell_host(vb, vb->inflate_vq); /* balloon's page migration 2nd step -- deflate "page" */ - spin_lock_irqsave(&vb_dev_info->pages_lock, flags); - balloon_page_delete(page); - spin_unlock_irqrestore(&vb_dev_info->pages_lock, flags); vb->num_pfns = VIRTIO_BALLOON_PAGES_PER_PAGE; set_page_pfns(vb, vb->pfns, page); tell_host(vb, vb->deflate_vq); mutex_unlock(&vb->balloon_lock); + balloon_page_finalize(page); put_page(page); /* balloon reference */ return MIGRATEPAGE_SUCCESS; diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 5ca2d56996201..b9f19da37b089 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -97,27 +97,6 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, list_add(&page->lru, &balloon->pages); } -/* - * balloon_page_delete - delete a page from balloon's page list and clear - * the page->private assignement accordingly. - * @page : page to be released from balloon's page list - * - * Caller must ensure the page is locked and the spin_lock protecting balloon - * pages list is held before deleting a page from the balloon device. - */ -static inline void balloon_page_delete(struct page *page) -{ - __ClearPageOffline(page); - __ClearPageMovable(page); - set_page_private(page, 0); - /* - * No touch page.lru field once @page has been isolated - * because VM is using the field. - */ - if (!PageIsolated(page)) - list_del(&page->lru); -} - /* * balloon_page_device - get the b_dev_info descriptor for the balloon device * that enqueues the given page. @@ -141,12 +120,6 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, list_add(&page->lru, &balloon->pages); } -static inline void balloon_page_delete(struct page *page) -{ - __ClearPageOffline(page); - list_del(&page->lru); -} - static inline gfp_t balloon_mapping_gfp_mask(void) { return GFP_HIGHUSER; @@ -154,6 +127,22 @@ static inline gfp_t balloon_mapping_gfp_mask(void) #endif /* CONFIG_BALLOON_COMPACTION */ +/* + * balloon_page_finalize - prepare a balloon page that was removed from the + * balloon list for release to the page allocator + * @page: page to be released to the page allocator + * + * Caller must ensure that the page is locked. + */ +static inline void balloon_page_finalize(struct page *page) +{ + if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) { + __ClearPageMovable(page); + set_page_private(page, 0); + } + __ClearPageOffline(page); +} + /* * balloon_page_push - insert a page into a page list. * @head : pointer to list diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index fcb60233aa35d..ec176bdb8a78b 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -94,7 +94,8 @@ size_t balloon_page_list_dequeue(struct balloon_dev_info *b_dev_info, if (!trylock_page(page)) continue; - balloon_page_delete(page); + list_del(&page->lru); + balloon_page_finalize(page); __count_vm_event(BALLOON_DEFLATE); list_add(&page->lru, pages); unlock_page(page); -- 2.49.0