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 66930C83F03 for ; Fri, 4 Jul 2025 10:27:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E94436B0285; Fri, 4 Jul 2025 06:26:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id E45366B0289; Fri, 4 Jul 2025 06:26:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C97126B028A; Fri, 4 Jul 2025 06:26:55 -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 B26BD6B0289 for ; Fri, 4 Jul 2025 06:26:55 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8B2EF1A0298 for ; Fri, 4 Jul 2025 10:26:55 +0000 (UTC) X-FDA: 83626203990.24.62ED85D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf15.hostedemail.com (Postfix) with ESMTP id 6505CA0006 for ; Fri, 4 Jul 2025 10:26:53 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VPQzNtCj; spf=pass (imf15.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=1751624813; 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=DAmNizoml8pi0FWiSRf1K1mTve+PnYDWvVyOK7ajbGc=; b=iz9lCsFoT2KHsK8IOZc9OEtmSJJElVmDJP+zRc8d+fK7UUAuX0EwC/LhSyaDLoZrJ9esK/ jODvr8uprY28R8yu4ZhXWlZ51dj0oLwY0Okwkslxf23aNi1DYMEfbBD26TR5LdlCxpoDG5 zJmoga1nvdPSKLQcSn7cx5oelPYINSw= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=VPQzNtCj; spf=pass (imf15.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=1751624813; a=rsa-sha256; cv=none; b=OSM8/ZIUH9SAF92ITStXecAgSRxHzo2ckcCL04m6mZa4E73ZlhExip0gudVEtW30WlLmVa 6p4FcPsJ3NF++qw/BDuxmK8YTbVZN3b/6OyxGaFYf6NPREil0CZW0WPVSZpeECcJRu00zA z9Zt2SSGWUbPPZQ9thxCi/N0vAzgne0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751624812; 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=DAmNizoml8pi0FWiSRf1K1mTve+PnYDWvVyOK7ajbGc=; b=VPQzNtCj+9NMuQCVHJssLc+AtDuM/8UqTCUeI1IZQjx7XfoeLPq6iQPnaOt0mbk4wqm7m1 mMhmgbm5QHcRVQ8Sq1BUaJKtpShBf+EDEq4OwoGM9VvcPjbEjpJSQ+9zDjvnO36qov8H4E 0h5xL3nMb83YQVh3CpeM/CjMKcnl1DI= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-206-AMrS3UWuPeyaJskRBLnfog-1; Fri, 04 Jul 2025 06:26:51 -0400 X-MC-Unique: AMrS3UWuPeyaJskRBLnfog-1 X-Mimecast-MFC-AGG-ID: AMrS3UWuPeyaJskRBLnfog_1751624810 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3a4f7f1b932so500538f8f.2 for ; Fri, 04 Jul 2025 03:26:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751624810; x=1752229610; 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=DAmNizoml8pi0FWiSRf1K1mTve+PnYDWvVyOK7ajbGc=; b=Fi6tlao1JnSZQNpd+OOthcdI+C+VEUIFFYcKhAQxacfMUaynOT1DquL6cT9wRdm8sU p6neMZ0B6h0DyYlBsuXOGk3LF5cqHlSgA8Tx0Mh+aeDl+VKJ9G6wZg7dm/zEvoZei4ml yLdaDYiqCsiY6/fhJVxHk8io1qjOhyBxAMO3/+4WCaZY4v68o0+KJHBq7WgtZbtRsqls uA+iM9YYSE21e2iXgVvpEMIK+2qqMI4yuuMC6E/S24eHu6v2sRch6T/3UhUtc5D4Fbit UXl7SE9al0yn0rMHZTnDvng3rEtC8oCYOpbeu/teq72gaQ9MKUCYcofxS4YqyGqob4Hu Wm/Q== X-Gm-Message-State: AOJu0Yy9chyMrSFC+kfC7A9ZjxKg8ErdcrIrUye1p1QuyJwwCQ+NdYYx LWpx1W08QoyaWxjmu6HIf37OeOGIIiM3mDN0zXpwW6S+hTPtjo1PLEj6RxdRWyset+bTzEQ/9hV 85ZLXZRdv1gyUYXIwm5KqXlaTb6DHM8siCgyFePOFv6Y755pvM1g6mKcGw0Tr X-Gm-Gg: ASbGncvRMFFZX2oLBkUnP185IVRESOoMwL62e2pnP06bxj4Hl+Lpj1xy37VrKAiQt0p lHkTkqmb6quHKXLok8pQ83mk3rTNuec05DfumLjfUksBS7KLpM/TpZQi2T/DyRubdNYd77ND1cG XoDuBCCrqlB3KbilS1d26YK4rjDPO5y8XZlX2f/3tlnThwPQHba5tIby3hRs5SWbiefXUv/RTXC HlyqeqqXa2noxSTjdwIWhgSCtXaoJnYKZ39NW0n70Md8E3PntVEftEdqYAzeYGKLSTmnwHgvqJU Ck72aP27SE2Gg21iaixUeEulBiwpc5CZKHX4h9YSzOoDU6nLRDKA3QkB2xEdFCcEmQmKE5e6XPG Qqf2g0w== X-Received: by 2002:a05:6000:2906:b0:3a6:e2d5:f14c with SMTP id ffacd0b85a97d-3b4970294bamr1229504f8f.30.1751624810318; Fri, 04 Jul 2025 03:26:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGU9MKO4L2eImwXLAzlEGTAbbgXQLTQHWpn061Frnhroy+xSoAIVNW9jaIe3vRaTd6Fz7itPA== X-Received: by 2002:a05:6000:2906:b0:3a6:e2d5:f14c with SMTP id ffacd0b85a97d-3b4970294bamr1229434f8f.30.1751624809815; Fri, 04 Jul 2025 03:26:49 -0700 (PDT) Received: from localhost (p200300d82f2c5500098823f9faa07232.dip0.t-ipconnect.de. [2003:d8:2f2c:5500:988:23f9:faa0:7232]) by smtp.gmail.com with UTF8SMTPSA id ffacd0b85a97d-3b47030bc5asm2113887f8f.20.2025.07.04.03.26.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Jul 2025 03:26:49 -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 v2 29/29] mm/balloon_compaction: provide single balloon_page_insert() and balloon_mapping_gfp_mask() Date: Fri, 4 Jul 2025 12:25:23 +0200 Message-ID: <20250704102524.326966-30-david@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250704102524.326966-1-david@redhat.com> References: <20250704102524.326966-1-david@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Lf4cIY73JbutTFLIUI5Mq6nab8Z-YBcY08no8A6jkr8_1751624810 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true X-Rspam-User: X-Rspamd-Queue-Id: 6505CA0006 X-Rspamd-Server: rspam09 X-Stat-Signature: y9hmiu36y4bt1c1n1jtsk35zkkkx69oi X-HE-Tag: 1751624813-301655 X-HE-Meta: U2FsdGVkX19E6UzAdXmB7WwKCQ/FH7kVZmlUxgeq/5DmfhFCwWg889m1DHk/Rsecw/Jz3FZ4loEZFIqoFqI8ssLoaDF5S6c9Plw9QfuVJZLZI+21mGIuHGm8VGMV7JBh/swCS7ZGbunt7hk5tkAyl/zdNtSLxgODWiTlnwPdwPF4IT1rTdblIFdE4E/qgKXpX1+LKZgyJhkcxCK6xw2YpE1boQZH8ZFyWB1z0xxFKn3LCx5X8Kio2c00IdBjBKBBuxJK1EQ4X7okAUr2x5IkS3Ox4w9MH7hE7aWiCkdW4tdD4J0qRmTgoh4AQ5swB5EEUneJvQatkxdfknYkc2ru3AU3Sw5Ou+S3SfdjNZfkkkIBBXL2LZCEw6w6tVy4gHTAC6i8Zu48Qva2jm+CRLB06uaOL+kPJ+DaGR3c3xCV9ulYr+C0K6/VwoYWNOtRwUAgvXAg0taL0002rdPSVNU7hEYY5fXlb1NVPFU1IVtzdWP5IU6h0kc7WN1dPqR+yN0XWBN2LrWwCj+6DpZQ7Ju3I8QJ3EljT7bA0oIzsNmGgh/hiAgCzHYcd/6/stE6y1JjC4+usAnAwUAIReIAKx2rzZW/9LBrrDTSAmKsNpGGrx6zBS3Zsg7YYIfAgW1VPsfIQRJgPJIsxsYr0KYwvvIagPsO/jzSvWwKEp6wkJHsymsow3ZQflIupXhXshk7E+2FDRhY7DYC7MjQru4HczPkgKxXW2os5Q3ZfKtXy9Pq53WCRnrk+ltqU97WUd/mBez5wuDnF0QJEuBCaZ1c9NgEdXrAHSMga0v8Ej1M+Qs1xGuR+I0aPuqbfT5mgcTvHyXW9V0FVP392punHOL0t95NF+Sr4bY++kdixnbEdLbstcutiqNpiZ/SEWugK5QGbi4LCLRBrEyzeu06Ps/mDh2qB75mMrtbti6lmUmOeGbmhGca2JYCqCH2qR0jikYmR/dp8WFgQChL7PSJ4XfxKds 4Msqhgwt UjVZjmpDNctw3MasoI4rAs2gYzvkxYfSGyvK4fu1HTxCpLJnYFeDaCinzg1he+hGMXMNdcFXKGLWUeM6YGwYYQDxawMyjhnWfeTPP4ZaGpIUt7john2I96DjhrYNAVWXu94tuwNbUkB8oscDoD5w8SmWukAHhObdaZoXsWo+APwig6u2B0pvgzeb13euWN1EDB99lc7WvkxRoyvVkCSP7xtLA4pVyV+btA9NCLtRksnEgcbSSFEapSQeQrhQx9NtbFHeKaQXpysTo1YQ/ZaUVHbN+b2UiJdeNz0/wlLhloIm8iAfuw6Lf6jpW+SF31GMtUysINgz30dAp2UK+/cOCjxIIvq4WcCon3LAQS797JM+OatZ4YNsqQQV3Oeo3JB9bbMyTnbqFQkJrrE8LcGoI+/a2w27DlD6mGuoeoPBtUMz1zaoYxEFcQrXi6Ur1kXgljwVmxOeMJeo4ba7pROtTxwgJbvj7pNSLwj522Py6slRo0zXIrtxsH5Ce3e1lY+P1jzLXXnOtNesMyEqeStjaEckpw91zDFmdyRJRhgx5VB0BJbrbsm2NT+4iNEvHL0bzuWOnOTp2jOCIdAgOLe3cPhnoV4r6lpiGDL4pRTrt65j5foiBiTfDVC4ppDbVtgeoa8qFdyCED1ozwVP1Jt10W0e26D7TMwqdC/NnCtR4kgDsoLB5QVEKoKlpsA== 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 just special-case based on IS_ENABLED(CONFIG_BALLOON_COMPACTION) like we did for balloon_page_finalize(). Reviewed-by: Lorenzo Stoakes Signed-off-by: David Hildenbrand --- include/linux/balloon_compaction.h | 42 +++++++++++------------------- 1 file changed, 15 insertions(+), 27 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index 2fecfead91d26..7cfe48769239e 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -77,6 +77,15 @@ static inline void balloon_devinfo_init(struct balloon_dev_info *balloon) #ifdef CONFIG_BALLOON_COMPACTION extern const struct movable_operations balloon_mops; +/* + * balloon_page_device - get the b_dev_info descriptor for the balloon device + * that enqueues the given page. + */ +static inline struct balloon_dev_info *balloon_page_device(struct page *page) +{ + return (struct balloon_dev_info *)page_private(page); +} +#endif /* CONFIG_BALLOON_COMPACTION */ /* * balloon_page_insert - insert a page into the balloon's page list and make @@ -91,41 +100,20 @@ static inline void balloon_page_insert(struct balloon_dev_info *balloon, struct page *page) { __SetPageOffline(page); - SetPageMovableOps(page); - set_page_private(page, (unsigned long)balloon); - list_add(&page->lru, &balloon->pages); -} - -/* - * balloon_page_device - get the b_dev_info descriptor for the balloon device - * that enqueues the given page. - */ -static inline struct balloon_dev_info *balloon_page_device(struct page *page) -{ - return (struct balloon_dev_info *)page_private(page); -} - -static inline gfp_t balloon_mapping_gfp_mask(void) -{ - return GFP_HIGHUSER_MOVABLE; -} - -#else /* !CONFIG_BALLOON_COMPACTION */ - -static inline void balloon_page_insert(struct balloon_dev_info *balloon, - struct page *page) -{ - __SetPageOffline(page); + if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) { + SetPageMovableOps(page); + set_page_private(page, (unsigned long)balloon); + } list_add(&page->lru, &balloon->pages); } static inline gfp_t balloon_mapping_gfp_mask(void) { + if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) + return GFP_HIGHUSER_MOVABLE; return GFP_HIGHUSER; } -#endif /* CONFIG_BALLOON_COMPACTION */ - /* * balloon_page_finalize - prepare a balloon page that was removed from the * balloon list for release to the page allocator -- 2.49.0