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 369E9C83030 for ; Mon, 30 Jun 2025 13:00:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 173F06B00A9; Mon, 30 Jun 2025 09:00:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 154806B00AA; Mon, 30 Jun 2025 09:00:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F08116B00AB; Mon, 30 Jun 2025 09:00:27 -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 E24CB6B00A9 for ; Mon, 30 Jun 2025 09:00:27 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 657E7121D35 for ; Mon, 30 Jun 2025 13:00:27 +0000 (UTC) X-FDA: 83612075694.18.956F5E5 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 23966180018 for ; Mon, 30 Jun 2025 13:00:24 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KA23lTrs; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1751288425; 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=vHobTg7XvxQoQvHc7BqhmkvgPgA9teVJeg3iNB7bef+9092aPKjvl7eHy9hDtB29/Y/mG3 B8z1J/UYA45JWKzTYOVQEmZHFQ/IBTf/7BOnVuAbOCRlzqP4YLr19QWnx8fqrmJZv4Gaaa qsjOEwXblrE4g72jsA1rCbo+gaRvrO0= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=KA23lTrs; spf=pass (imf16.hostedemail.com: domain of dhildenb@redhat.com designates 170.10.133.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=1751288425; a=rsa-sha256; cv=none; b=KnlIV/Njenvt2JishP+WumQlsYAMCnQ8jfrpNapjkZCMM12ip7sjSauJzYRrBLQmuy1tWs L5YGRB0rz79Eu4U/O0UxM3YvfoG+oP8sea9z3PJS+eeNgB9Ovl2SEQJcesBJsIhNAHN9nK P3pCaIr5dac1146oyhCa6H1rcuILzj0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288424; 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=KA23lTrsg5hxMGRxTsiVIEFrrnamiNQkhofFOnm1l4Lpq2W70Lk5q119hCk2PeRwAYynw1 M46/VNeKJ0TUrnJnYr+P2wsCPHem8GGhchUXY/IJarLcO4UEax+8riuu18hDHEFwIO6DLh IoTIuO0HdMxrwiBE8VaokpSpmd3H0IU= 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-550-k6T0BjX4Mj2qy3NA7LdMSw-1; Mon, 30 Jun 2025 09:00:22 -0400 X-MC-Unique: k6T0BjX4Mj2qy3NA7LdMSw-1 X-Mimecast-MFC-AGG-ID: k6T0BjX4Mj2qy3NA7LdMSw_1751288421 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a50816ccc6so1396389f8f.1 for ; Mon, 30 Jun 2025 06:00:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288421; x=1751893221; 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=EyQXdvv0qC2jtf8f0yL/uv7/6SNyLWeW6ryyEtAVpyd3P8xBzBEmKzHHRC5LTknyNS okc9EkIDSe64COdC9hUH3WcXOTQho9xw+95Em9OQZOHFb1sTA3YWwmVtd+36B0Pg/hAP NPmMGcqM5PCO76u3frzMix70bx2GX2pl0B+0uTK36i0/6BoMQ0epFFPRwaMYM71pzoVw VnZjvWqYN2wWsIal6YZz5XIAPzVf8QFtm4t6MsHEtqmcSdUgYEBhl7yUHC7ww7WBBWyL NVYSqYdqGZrcRvGy80oBc9stc5ph8Zd7gVLRtozeHuWSrw3CCqvUFSbnJuRS7TZVuTZo Ux2Q== X-Gm-Message-State: AOJu0YyCdXTpA1p/rh+QgBKAUPADSlCBBFtFtalcA1a4Qh2tj97YIw0T 6RYeHBQIvf1UyX8f2cfYCrJPp5YuebncbQKCBDaVmJ+NmhcHjlcMq76B89/M1kpcRvfXfFPcMt9 iX6fL8EWLjWxNApDK9F7fD7tYMSajkWjfzGaG0qWyUo17mWN7PRWH X-Gm-Gg: ASbGncuWSNYB1WuuP6qwXdC6FQmbuk8d9T909ykMFwRRzR1GFToiUAABl9hWE55U4GU xDU6NHARFobXw8VUVCqysZRjQ0UM9zZNZVCwAUsb6QqCzuQQrTXV+LkAtdtKagLHc+AxbPAI5no 6mb0og/xdDbZg788gG/BCfzT4iC57SWtiyxY/LOttcf/T22oJW0XJc73RPjsyEJzN3sxE+65OUy QYg5pRqlG1PNreXvAdEE6PXGh/LPkXVvhO+R7JNtThaUNTHNlwqEnkLFoUx/2pxhUmbCs3RThdu BF5c5g92qpRX083b2NtzAaqPeAYKyhHk3a5R9KkC7gPcFyHWi4LrKPu2WDkbtol4fXDjuBDkTTl ua2jt7IM= X-Received: by 2002:a05:6000:4186:b0:3a4:db49:94aa with SMTP id ffacd0b85a97d-3a8f482c7a3mr12061880f8f.21.1751288420612; Mon, 30 Jun 2025 06:00:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0gb3C+C+LV4oU6wKBD78SFqxqmgRCphVWjbRDEuvh0xGGV6ZK62AjmpQKGwfy92kungebyQ== X-Received: by 2002:a05:6000:4186:b0:3a4:db49:94aa with SMTP id ffacd0b85a97d-3a8f482c7a3mr12061792f8f.21.1751288419988; Mon, 30 Jun 2025 06:00:19 -0700 (PDT) Received: from localhost (p200300d82f40b30053f7d260aff47256.dip0.t-ipconnect.de. [2003:d8:2f40:b300:53f7:d260:aff4:7256]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3a88c7facf9sm10288204f8f.22.2025.06.30.06.00.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00:19 -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 v1 02/29] mm/balloon_compaction: convert balloon_page_delete() to balloon_page_finalize() Date: Mon, 30 Jun 2025 14:59:43 +0200 Message-ID: <20250630130011.330477-3-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250630130011.330477-1-david@redhat.com> References: <20250630130011.330477-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: yCG11P3x3Go69D7BvlofCSKuHXX9sqgZmaX6tVb5RkI_1751288421 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 23966180018 X-Stat-Signature: xzaxmod4a711ektoiiiyrfuoq4h441wb X-Rspam-User: X-HE-Tag: 1751288424-220614 X-HE-Meta: U2FsdGVkX18v7A+r6y/2Jqwtx0hGgpZ8YvluTUwd7hWrd3gjPwWJf/LyfKpeQKOm45iwnxv+W23vdhIxswQvagFfyG3wJdBCoIqZluVs98NLiBFzZOEXDNYPdT1FnkC5UYN5793qO/6p/4iSqsaJ45v4I5rP15v36pkC5pqxULjg7aew4CwhV2TFYfK8p3JoGFbeS/5kD6CpicuKrk/X7706VIabwtsVvCIXCi6v64G/OuRGaBFnU2doLb3kwNZsNKq4RMjWRTlL2ghdSvoHpHkHJFMEsRjPfm8NVJcX7ALPbKxWH1JTUHG9Kng5G9AueCc2La0pBN9plNUhcWOmPP3T2fO4faCFrP8YDailGAHrgyRucpyH2kADDBtj2oXw98Q1a6B5P9hPudu2SqRrzLujLEttoAjajLOpIYjftAOvZmuO0HfJk+Fd4yEP8CXJXpun/3Owvi9EjhdddYtcL2ALeQW6kA500MJpyAW1a8QkdDAURCunhFMnZUqbwHT2VdfnaqdJkmGxNq95zd3IeKO1JRdSdNzk39t040KuAfGhY8w0axHcCppDbE+7wgEd6bamkAqWEPZ+j+AIIj9PSrNgXQFBx14JwzZgkyANP3kgA7fkKvbcJwXruu9oPDzjqMZIrfCYffY6PpUHiWyDkTckuy99UfyakplPaYpQiHYkvHR85Y24OVhTKbXL86ozLEkgI4cv15icyaG+dgzVGGBiHF5ByMY9F8VFMJQxsBlFI04+iT6u3DlYO9NYi4omTHuv57zz8yUlH+TZXUd1+vYST2x2vJcUdl7kTkea9vgMGAWqVbN+IKY9QMFTnWN7QEEU0246TZdWD2mJatKPazJ/TaCKd1MteCHzlMlSHIPXxchsAXSc511P2G8FCZyjJZ5J5YR3LC0yCltyHQHBoEEQGJYDA+9mAyWGXWXI7CuqYejDDmhMI8nRGCgwQY/9coHkgeBvuoEreu0+1iI tHxNHfYe qWOe0nNn5TG0QhSIWxUYejP8LAkf5xX4V+x56HqgirrvB8PkcnatJno8hiW17TC1oDNmwgkQuIVkuspMqnW3Az+YTEnFQYgnkAnAXT9i+8ZvDfIH0YFJ+OlTxw16AQOi3WAOnD+omyMtmvnIHEi/nsTvkGRvgyNzkVP4l9PoVeyvr5cUobdKMYsFKk2uRjmOSyxnIMJstsDFsZdi1F9HS6mYCKyKROi+gp7PUQFgVp5La0hQrlQhPDnC51FWDDjLJaCWd74zPl1KHbr90X37Ox/c2piybY9O/0SJYuRTy2kPTnRxFtLG78+4qrHi94gneZpbGOEyABy1xOtE0dLFWKcd3Xxldj9sqjluVMY0a3E5IkoHhtNoComLOqQ8IuA2HUWxfJwAS4pTMM4icudcJPfCZ95HY8Hz7MgL3GtO+U7bPuaPge1DJIP0k20QDZpbL3xlz6ff5nsECdsavMhkg4Elh0mtEx6DKvVC4daMfvTsmSfr1F36r2NRUZD/wrkvVDzhpZlyKv6eKGB0YStlbx5sB6MEMBRNVvrR9+zn9MXHiOc72eMDg1Lna+keP7raDXOVJ11FZZijyoY4i+MoUbENXwU3sNoUea69gf8g+paRbgGj8n4buDGbU4N8JQweLsAIr3YaQBlzxkymv2HXhK90nbFJ5VJ8MvFUO 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