From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1285F28CF7A for ; Mon, 30 Jun 2025 13:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288461; cv=none; b=IHu9PeEj3qiQ6LZUI6MyVqeIvqm5mYpxVT0OJPxYOiqzFY0YBxO+f0I1fx07rFOzbaFChBx8QTffLEhqxDbcEhxvTj604xAxlUFKgULVxgXLdZJoAG1xMYwp5LzgcLp1kzjLM3CJdUGnF14WELiFmH2YMiilxRjOPbAMyd28pno= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751288461; c=relaxed/simple; bh=h679pTWyf5chDo0jTdgc5eTOddfWMzqMz/6J3iuD7Gs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hRZO5ntOuHKSt9fNiPa96TgJPkyS/gvBO4apntkcPrnGJ6hRp76iOL/vXiEqz1mxrcM2v9AWqUiIV79rfAw5V0Vcx9G0WB58w3lWYpsTvaQQQf5eDd80mSK5yUjIpG6MDeLc5kWr7QJPyZAbEib5pPJJijPCk6HOQPH21x9bERA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=F72IRsZh; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="F72IRsZh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751288456; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rZbSryMy27xk/lWuJyIeQilPAEeTxdVw8qHGMwbITkw=; b=F72IRsZhgUaNCQ9KWEm2+NjuXmOBC0FC77Abp0mvaTwo3LAynBC0Kr7G3lNezokosgTQe7 DdH9SBclnBNmF9hc/y58rbrJAUNMlP7J1hIkNL79EZD360c+S2QvrQwjm7Fnlwyeib87QH MdPl1hME2rHM2+wOJWTKkiFjLXMjjq0= 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-416-vkQFNDUyMjWhBFtd6VL0Cw-1; Mon, 30 Jun 2025 09:00:53 -0400 X-MC-Unique: vkQFNDUyMjWhBFtd6VL0Cw-1 X-Mimecast-MFC-AGG-ID: vkQFNDUyMjWhBFtd6VL0Cw_1751288452 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-3a4eee2398bso1690602f8f.1 for ; Mon, 30 Jun 2025 06:00:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751288452; x=1751893252; 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=rZbSryMy27xk/lWuJyIeQilPAEeTxdVw8qHGMwbITkw=; b=upoc+HPu99XgxHZKRNu6Hhru6HtAfepEaJTxVgdN3kZjZJI1z4Ri15FMd5REB989+s kckQP2YP41tYeX7KQJkP2ZuL1Zvpvugfx6sPVlC2PzNvfXORORhRhqJoBfk9KsTLHHmV hwhuYOWvU0ngIgZ9ZWNsDf5/URGrHiwE3fkpHv8LvFydcDVdxsu8DL70YaYJuk22pYrt a9Sb/IMh0ZYhcMW1aKcf9ewK9VJAAH/EvY0pJyTUqMmreb3aRAUMWJ+HPy/JEQUkdP+i rSIifFbfgY9Us+plktlk+9q4QHEm9MJm96FVB/W6C4uMptR/ODr/hnSGvbjblaH6pgej M+Dg== X-Forwarded-Encrypted: i=1; AJvYcCViPt9tgoDyfwWTgYr8K20N3oz6297MrDmboySQcxJCiVqF4ZF9ffr6z9/Rl6MkExlMbsdxfQIhR7g=@vger.kernel.org X-Gm-Message-State: AOJu0Ywsu3ylqiBA0k2X8nWgpgXGNjvONKmc7pzI3UaA77m+X21jNFXG 6OrEzP5TfRejia3BcsRJPs5FjLJWt3hkwjhKtZqr6qVa+2+jiOLfkHWMYapurA7McJSDzKbo3tB mxWJEUJn0NjO35OYmSTqgkd1wcS1dFjJzlZuSAc0RFeBmze9an5E17uUtaM1e/g== X-Gm-Gg: ASbGncuZh1U5a9UUM2fHCzQcm5E/BzPKuacL3mmz7MhpN2g9Qv8LjSmnagQu0UanZ0k cOG/KO4hIPas86okuY/uAWSiZnGuohTz93Kkt24hV42EU7v0j8SbiFjsXuxvHMcF5G8wrQheypd paAHzpVzEQS7DXfjU36b9LMgy4PjxYdoJmQ3LM+87T3p24hylVJM1/75H5XDXP+uZc+yMg/NHCD Hr8zQoArDfKsGQuaLsruT/ZC7Vs6TtUXfvZ8fBjEttzrv2Vc3Mu3+BepsfJ98RDKf7hr50cgi4l mYLbscis+4GmuZ+BqbTJI13RxV0vOmdvNu5Z7TquWfX14hbWv3IkRK0jDKQK64YLhqESe0IrsTa hREca/GE= X-Received: by 2002:adf:a143:0:b0:3a5:8565:44d1 with SMTP id ffacd0b85a97d-3a8fe8917d5mr8134441f8f.25.1751288451625; Mon, 30 Jun 2025 06:00:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEcHR74Vg3fOLDK1bhOkeMb0O7J5iWXrvKqq6qclu6yGGjB1xdv/xPEmRceAckepewzfNXHQQ== X-Received: by 2002:adf:a143:0:b0:3a5:8565:44d1 with SMTP id ffacd0b85a97d-3a8fe8917d5mr8134296f8f.25.1751288450453; Mon, 30 Jun 2025 06:00:50 -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 5b1f17b1804b1-453823b6d50sm167133055e9.30.2025.06.30.06.00.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 30 Jun 2025 06:00: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 v1 13/29] mm/balloon_compaction: stop using __ClearPageMovable() Date: Mon, 30 Jun 2025 14:59:54 +0200 Message-ID: <20250630130011.330477-14-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> Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit We can just look at the balloon device (stored in page->private), to see if the page is still part of the balloon. As isolated balloon pages cannot get released (they are taken off the balloon list while isolated), we don't have to worry about this case in the putback and migration callback. Add a WARN_ON_ONCE for now. Signed-off-by: David Hildenbrand --- include/linux/balloon_compaction.h | 4 +--- mm/balloon_compaction.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon_compaction.h index bfc6e50bd004b..9bce8e9f5018c 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon_compaction.h @@ -136,10 +136,8 @@ static inline gfp_t balloon_mapping_gfp_mask(void) */ static inline void balloon_page_finalize(struct page *page) { - if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) { - __ClearPageMovable(page); + if (IS_ENABLED(CONFIG_BALLOON_COMPACTION)) set_page_private(page, 0); - } /* PageOffline is sticky until the page is freed to the buddy. */ } diff --git a/mm/balloon_compaction.c b/mm/balloon_compaction.c index ec176bdb8a78b..e4f1a122d786b 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon_compaction.c @@ -206,6 +206,9 @@ static bool balloon_page_isolate(struct page *page, isolate_mode_t mode) struct balloon_dev_info *b_dev_info = balloon_page_device(page); unsigned long flags; + if (!b_dev_info) + return false; + spin_lock_irqsave(&b_dev_info->pages_lock, flags); list_del(&page->lru); b_dev_info->isolated_pages++; @@ -219,6 +222,10 @@ static void balloon_page_putback(struct page *page) struct balloon_dev_info *b_dev_info = balloon_page_device(page); unsigned long flags; + /* Isolated balloon pages cannot get deflated. */ + if (WARN_ON_ONCE(!b_dev_info)) + return; + spin_lock_irqsave(&b_dev_info->pages_lock, flags); list_add(&page->lru, &b_dev_info->pages); b_dev_info->isolated_pages--; @@ -234,6 +241,10 @@ static int balloon_page_migrate(struct page *newpage, struct page *page, VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageLocked(newpage), newpage); + /* Isolated balloon pages cannot get deflated. */ + if (WARN_ON_ONCE(!balloon)) + return -EAGAIN; + return balloon->migratepage(balloon, newpage, page, mode); } -- 2.49.0