From patchwork Wed Oct 19 09:56:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Atanasov X-Patchwork-Id: 13011540 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 5D4A7C433FE for ; Wed, 19 Oct 2022 09:57:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D60CA6B0073; Wed, 19 Oct 2022 05:57:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D10C46B0074; Wed, 19 Oct 2022 05:57:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C00956B0075; Wed, 19 Oct 2022 05:57:47 -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 B0EA06B0073 for ; Wed, 19 Oct 2022 05:57:47 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5A711A0BC5 for ; Wed, 19 Oct 2022 09:57:47 +0000 (UTC) X-FDA: 80037247374.11.F1DACA3 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf27.hostedemail.com (Postfix) with ESMTP id C6E9E40027 for ; Wed, 19 Oct 2022 09:57:46 +0000 (UTC) Received: from dev011.ch-qa.sw.ru ([172.29.1.16]) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1ol5lY-00B8K8-H0; Wed, 19 Oct 2022 11:56:27 +0200 From: Alexander Atanasov To: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Nadav Amit , VMware PV-Drivers Reviewers , Arnd Bergmann , Greg Kroah-Hartman , "Michael S. Tsirkin" , David Hildenbrand , Jason Wang , Andrew Morton Cc: kernel@openvz.org, Alexander Atanasov , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, virtualization@lists.linux-foundation.org, linux-mm@kvack.org Subject: [RFC PATCH v5 1/8] mm: Make a place for a common balloon code Date: Wed, 19 Oct 2022 12:56:13 +0300 Message-Id: <20221019095620.124909-2-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> References: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666173466; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DGTyZAGRS2D+a0n+uYhvjtY6hVGJmKzgXjY6AYnqSB8=; b=XuDCCBAZZC1JY4lU5yCZ/QBmuuIP4YODYR3rzQjFJNZgkOMwruoe+H+TLfyI/qj6JBMDoZ xWzhtMP+5UjgD1MVPOOvpUS94pxO2saORdXsnderkY2KK6Xa8rkAThaqIVI9PGAvk0nB0y KwKKb7jEsgXQtJEUQgi0gXGpTV87jio= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf27.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666173466; a=rsa-sha256; cv=none; b=jvfEQ9ClL/AehyMkSuAFswFYt4KaeZmcbFejlJt3MN33urOUxuGWl26RX833nT4hEKNGLR gCZBr+kBxIs3ClE0/2QOJB+N3H6McjTMnoJLPSRgKtGx1u00ZpcPzPKSU8Z5BkVFMGFBzC 9zSyQW9aOtCHHNlYplnplBRhsGdmf5I= Authentication-Results: imf27.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf27.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com X-Stat-Signature: wyj4w36myfe9ehswfj9qyk93gstjb3qg X-Rspamd-Queue-Id: C6E9E40027 X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1666173466-348919 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: The file already contains code that is common along balloon drivers so rename it to reflect its contents. mm/balloon_compaction.c -> mm/balloon.c include/linux/balloon_compaction.h -> include/linux/balloon.h Remove it from files that do not actually use it. Drop externs from function declarations. Signed-off-by: Alexander Atanasov Acked-by: Nadav Amit --- MAINTAINERS | 4 ++-- arch/powerpc/platforms/pseries/cmm.c | 2 +- drivers/misc/vmw_balloon.c | 2 +- drivers/virtio/virtio_balloon.c | 2 +- include/linux/{balloon_compaction.h => balloon.h} | 12 +++++------- mm/Makefile | 2 +- mm/{balloon_compaction.c => balloon.c} | 4 +--- mm/migrate.c | 1 - mm/vmscan.c | 1 - 9 files changed, 12 insertions(+), 18 deletions(-) rename include/linux/{balloon_compaction.h => balloon.h} (93%) rename mm/{balloon_compaction.c => balloon.c} (99%) diff --git a/MAINTAINERS b/MAINTAINERS index cf0f18502372..3f5a4e409562 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21744,8 +21744,8 @@ L: virtualization@lists.linux-foundation.org S: Maintained F: drivers/virtio/virtio_balloon.c F: include/uapi/linux/virtio_balloon.h -F: include/linux/balloon_compaction.h -F: mm/balloon_compaction.c +F: include/linux/balloon.h +F: mm/balloon.c VIRTIO CRYPTO DRIVER M: Gonglei diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c index 5f4037c1d7fe..1d40f6416d6a 100644 --- a/arch/powerpc/platforms/pseries/cmm.c +++ b/arch/powerpc/platforms/pseries/cmm.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/misc/vmw_balloon.c b/drivers/misc/vmw_balloon.c index 61a2be712bf7..91d4d2a285c5 100644 --- a/drivers/misc/vmw_balloon.c +++ b/drivers/misc/vmw_balloon.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 3f78a3a1eb75..d0c27c680721 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/include/linux/balloon_compaction.h b/include/linux/balloon.h similarity index 93% rename from include/linux/balloon_compaction.h rename to include/linux/balloon.h index 5ca2d5699620..46ac8f61f607 100644 --- a/include/linux/balloon_compaction.h +++ b/include/linux/balloon.h @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * include/linux/balloon_compaction.h - * * Common interface definitions for making balloon pages movable by compaction. * * Balloon page migration makes use of the general non-lru movable page @@ -59,13 +57,13 @@ struct balloon_dev_info { struct page *page, enum migrate_mode mode); }; -extern struct page *balloon_page_alloc(void); -extern void balloon_page_enqueue(struct balloon_dev_info *b_dev_info, +struct page *balloon_page_alloc(void); +void balloon_page_enqueue(struct balloon_dev_info *b_dev_info, struct page *page); -extern struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info); -extern size_t balloon_page_list_enqueue(struct balloon_dev_info *b_dev_info, +struct page *balloon_page_dequeue(struct balloon_dev_info *b_dev_info); +size_t balloon_page_list_enqueue(struct balloon_dev_info *b_dev_info, struct list_head *pages); -extern size_t balloon_page_list_dequeue(struct balloon_dev_info *b_dev_info, +size_t balloon_page_list_dequeue(struct balloon_dev_info *b_dev_info, struct list_head *pages, size_t n_req_pages); static inline void balloon_devinfo_init(struct balloon_dev_info *balloon) diff --git a/mm/Makefile b/mm/Makefile index 8e105e5b3e29..f73a9b200c91 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -116,7 +116,7 @@ obj-$(CONFIG_ZSMALLOC) += zsmalloc.o obj-$(CONFIG_Z3FOLD) += z3fold.o obj-$(CONFIG_GENERIC_EARLY_IOREMAP) += early_ioremap.o obj-$(CONFIG_CMA) += cma.o -obj-$(CONFIG_MEMORY_BALLOON) += balloon_compaction.o +obj-$(CONFIG_MEMORY_BALLOON) += balloon.o obj-$(CONFIG_PAGE_EXTENSION) += page_ext.o obj-$(CONFIG_PAGE_TABLE_CHECK) += page_table_check.o obj-$(CONFIG_CMA_DEBUGFS) += cma_debug.o diff --git a/mm/balloon_compaction.c b/mm/balloon.c similarity index 99% rename from mm/balloon_compaction.c rename to mm/balloon.c index 22c96fed70b5..22b3e876bc78 100644 --- a/mm/balloon_compaction.c +++ b/mm/balloon.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * mm/balloon_compaction.c - * * Common interface for making balloon pages movable by compaction. * * Copyright (C) 2012, Red Hat, Inc. Rafael Aquini @@ -9,7 +7,7 @@ #include #include #include -#include +#include static void balloon_page_enqueue_one(struct balloon_dev_info *b_dev_info, struct page *page) diff --git a/mm/migrate.c b/mm/migrate.c index 1379e1912772..74c21b1cb2ec 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/mm/vmscan.c b/mm/vmscan.c index 04d8b88e5216..5a4e17bf4193 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -59,7 +59,6 @@ #include #include -#include #include #include "internal.h" From patchwork Wed Oct 19 09:56:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Atanasov X-Patchwork-Id: 13011539 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 08D66C4332F for ; Wed, 19 Oct 2022 09:56:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F85D6B0072; Wed, 19 Oct 2022 05:56:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A9786B0073; Wed, 19 Oct 2022 05:56:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 598716B0074; Wed, 19 Oct 2022 05:56:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4A1EF6B0072 for ; Wed, 19 Oct 2022 05:56:49 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D9C2C1607DA for ; Wed, 19 Oct 2022 09:56:48 +0000 (UTC) X-FDA: 80037244896.30.CAE02DE Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf12.hostedemail.com (Postfix) with ESMTP id 3936840013 for ; Wed, 19 Oct 2022 09:56:47 +0000 (UTC) Received: from dev011.ch-qa.sw.ru ([172.29.1.16]) by relay.virtuozzo.com with esmtp (Exim 4.95) (envelope-from ) id 1ol5la-00B8K8-3t; Wed, 19 Oct 2022 11:56:28 +0200 From: Alexander Atanasov To: "Michael S. Tsirkin" , David Hildenbrand , Andrew Morton Cc: kernel@openvz.org, Alexander Atanasov , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [RFC PATCH v5 2/8] mm: Enable balloon drivers to report inflated memory Date: Wed, 19 Oct 2022 12:56:14 +0300 Message-Id: <20221019095620.124909-3-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> References: <20221019095620.124909-1-alexander.atanasov@virtuozzo.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666173408; a=rsa-sha256; cv=none; b=ncQuSmyXE0FcKW/ev7IjUD6/eWn+Hx24czAgXVuHG+iEpdTn5Uf0BPU/N/B3raex8ob8ux ihjRealcVNHSz6SjCW+AqR7gFi4w8pIm6tbZhGnyUp26tIlBWQaohSoj8QW1yLcXgr2GOb U9IO3hIj15aneE4BRwUUUek35mnq3Uo= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf12.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666173408; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eH/0PNfBQFD/UE1s0SF9vXZ+c1loynZS8MwxGGWgzQQ=; b=ou+39oIa37ndICDH/+bgATbPJMQmn8ga4FnlqeerMcMYZxky6/C113t1NHHR2XQALiJPmO 69VVrB2SR1FDBeuKEzCQaH46INXZSrm/lm2kqqiEq7K3Qd9zEAddMkYcRlGKfdhWjuykcL aMUWSONg6C/YVdkqEWzhdjue+ZpZN4U= X-Rspamd-Queue-Id: 3936840013 Authentication-Results: imf12.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf12.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com X-Rspam-User: X-Rspamd-Server: rspam08 X-Stat-Signature: xibmp9311oxqtk1hnmh7mkzwqo17mcrz X-HE-Tag: 1666173407-381095 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: Add counters to be updated by the balloon drivers. Signed-off-by: Alexander Atanasov --- include/linux/balloon.h | 6 ++++++ mm/balloon.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/linux/balloon.h b/include/linux/balloon.h index 46ac8f61f607..dd8fb8ac5737 100644 --- a/include/linux/balloon.h +++ b/include/linux/balloon.h @@ -57,6 +57,12 @@ struct balloon_dev_info { struct page *page, enum migrate_mode mode); }; +extern atomic_long_t mem_balloon_inflated_total_kb; +extern atomic_long_t mem_balloon_inflated_free_kb; + +void balloon_set_inflated_total(long inflated_kb); +void balloon_set_inflated_free(long inflated_kb); + struct page *balloon_page_alloc(void); void balloon_page_enqueue(struct balloon_dev_info *b_dev_info, struct page *page); diff --git a/mm/balloon.c b/mm/balloon.c index 22b3e876bc78..59f606bf4390 100644 --- a/mm/balloon.c +++ b/mm/balloon.c @@ -9,6 +9,21 @@ #include #include +atomic_long_t mem_balloon_inflated_total_kb = ATOMIC_LONG_INIT(0); +atomic_long_t mem_balloon_inflated_free_kb = ATOMIC_LONG_INIT(0); + +void balloon_set_inflated_total(long inflated_kb) +{ + atomic_long_set(&mem_balloon_inflated_total_kb, inflated_kb); +} +EXPORT_SYMBOL(balloon_set_inflated_total); + +void balloon_set_inflated_free(long inflated_kb) +{ + atomic_long_set(&mem_balloon_inflated_free_kb, inflated_kb); +} +EXPORT_SYMBOL(balloon_set_inflated_free); + static void balloon_page_enqueue_one(struct balloon_dev_info *b_dev_info, struct page *page) {