From patchwork Wed Oct 5 09:01:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Atanasov X-Patchwork-Id: 12999069 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 C8AE7C433FE for ; Wed, 5 Oct 2022 09:04:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 523CB6B0073; Wed, 5 Oct 2022 05:04:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D4A58E0002; Wed, 5 Oct 2022 05:04:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 375CA8E0001; Wed, 5 Oct 2022 05:04:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1C8426B0073 for ; Wed, 5 Oct 2022 05:04:34 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D6CB4A0F52 for ; Wed, 5 Oct 2022 09:04:33 +0000 (UTC) X-FDA: 79986310026.10.B1F01D2 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf10.hostedemail.com (Postfix) with ESMTP id 79B7AC0005 for ; Wed, 5 Oct 2022 09:04:33 +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 1og0GJ-007ckN-PT; Wed, 05 Oct 2022 11:02:44 +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: [PATCH v4 1/7] Make place for common balloon code Date: Wed, 5 Oct 2022 12:01:51 +0300 Message-Id: <20221005090158.2801592-2-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221005090158.2801592-1-alexander.atanasov@virtuozzo.com> References: <20221005090158.2801592-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=1664960673; 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=y/+cM0zrwn4/ZJh84dZM28O0ojwBSlEoGD1rJZIAfaw=; b=vGqbAQWzfhUO0cfPgg3TvT//fzgLcvLpTG+2/tzbD8pa6DXVWBYdeTZTQzuAqxvZZeD4hV JPJt70oC6mq3sq7gHxpKEt8OWEyuJM5Purz99b2TAcMJKsWNHh4IzTcc0VUSGmtMMxj07v qiyzgdrszv4t5W/9qJMPb1XNI1P27rI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf10.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=1664960673; a=rsa-sha256; cv=none; b=IMhp2b0yL//WUdsWMkHeESsbpxxg9tr04tH1NYkQPAaYWVCKTqXSLxtfvL65Yi7ik890iP WfXSCrcchIbUnRas1oADgg+qnX7ZdCRqbtKwve5nYpZNuLBdAJv/TjoEUhuCfVVUDc8Coh Or7CQ8W/i7ZS97/T2extF5Xu3aeXAcI= X-Stat-Signature: 7q3huh565fpzs6cu46zxan4qha6p8k6k X-Rspam-User: X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 79B7AC0005 Authentication-Results: imf10.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf10.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com X-HE-Tag: 1664960673-88148 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: 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 which do not actually use it. Drop externs from function delcarations. 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 8656ab794786..745eb0ada366 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21572,8 +21572,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 9a564f836403..550cb0663f50 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -112,7 +112,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 6a1597c92261..a4c8bb334dde 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 382dbe97329f..0274e2cb8430 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -54,7 +54,6 @@ #include #include -#include #include #include "internal.h" From patchwork Wed Oct 5 09:01:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Atanasov X-Patchwork-Id: 12999068 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 6B854C433FE for ; Wed, 5 Oct 2022 09:03:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 377876B0072; Wed, 5 Oct 2022 05:03:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3271B6B0073; Wed, 5 Oct 2022 05:03:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1EE598E0001; Wed, 5 Oct 2022 05:03: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 0DAE16B0072 for ; Wed, 5 Oct 2022 05:03:55 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C44A21C6798 for ; Wed, 5 Oct 2022 09:03:54 +0000 (UTC) X-FDA: 79986308388.08.E2B5620 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf26.hostedemail.com (Postfix) with ESMTP id 2FD1A140023 for ; Wed, 5 Oct 2022 09:03:53 +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 1og0GL-007ckN-6V; Wed, 05 Oct 2022 11:02:45 +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: [PATCH v4 2/7] Enable balloon drivers to report inflated memory Date: Wed, 5 Oct 2022 12:01:52 +0300 Message-Id: <20221005090158.2801592-3-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20221005090158.2801592-1-alexander.atanasov@virtuozzo.com> References: <20221005090158.2801592-1-alexander.atanasov@virtuozzo.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664960634; a=rsa-sha256; cv=none; b=ZNU0lNrq0pZ3Hl6FIoc1C2idHqhl7HE3km/3aEbSC/Kenl8sCYOEptVCcaYCpEt7AyzKKw gdYndEeUU9yOOXkVkomydApb2hSZfnulKTPGUrDJQgUryqwwTzLStmztMskZ6sYk/BnwcB huyfFXai1tFVITsH02hsZoXQaE69ZDQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com; dmarc=pass (policy=quarantine) header.from=virtuozzo.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664960634; 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=W1Qualv07jAb7hBW1fXyEkKq4YxXnRaD0fxYQrBWXEw=; b=6+w0hSh80dGUnjDWN9tzOmhNR7J5x0bdPap6Tm74k9oXPkNOkG7TfMY+OveETuesxj3f2Y BbTu4Ei7vdYPMiNtzbSZdSmJCZIRdhMMyoxhYSwmYYhhbD2sOmDHN6kCdHpC7lvca2ckmt ry4i0/pfQ/TvEjggigNBEaoKePvePqE= X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 2FD1A140023 X-Rspam-User: Authentication-Results: imf26.hostedemail.com; dkim=none; spf=pass (imf26.hostedemail.com: domain of alexander.atanasov@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=alexander.atanasov@virtuozzo.com; dmarc=pass (policy=quarantine) header.from=virtuozzo.com X-Stat-Signature: 35idasyif5caxhxktrpknwyugjr7z4kk X-HE-Tag: 1664960633-862903 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. Create balloon notifier to propagate changes. Signed-off-by: Alexander Atanasov --- include/linux/balloon.h | 18 ++++++++++++++++++ mm/balloon.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/include/linux/balloon.h b/include/linux/balloon.h index 46ac8f61f607..59657da77d95 100644 --- a/include/linux/balloon.h +++ b/include/linux/balloon.h @@ -57,6 +57,24 @@ 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); + +#define BALLOON_CHANGED_TOTAL 0 +#define BALLOON_CHANGED_FREE 1 + +int register_balloon_notifier(struct notifier_block *nb); +void unregister_balloon_notifier(struct notifier_block *nb); + +#define balloon_notifier(fn, pri) ({ \ + static struct notifier_block fn##_mem_nb __meminitdata =\ + { .notifier_call = fn, .priority = pri }; \ + register_balloon_notifier(&fn##_mem_nb); \ +}) + 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..8e1d5855fef8 100644 --- a/mm/balloon.c +++ b/mm/balloon.c @@ -7,8 +7,44 @@ #include #include #include +#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); +SRCU_NOTIFIER_HEAD_STATIC(balloon_chain); + +int register_balloon_notifier(struct notifier_block *nb) +{ + return srcu_notifier_chain_register(&balloon_chain, nb); +} +EXPORT_SYMBOL(register_balloon_notifier); + +void unregister_balloon_notifier(struct notifier_block *nb) +{ + srcu_notifier_chain_unregister(&balloon_chain, nb); +} +EXPORT_SYMBOL(unregister_balloon_notifier); + +static int balloon_notify(unsigned long val) +{ + return srcu_notifier_call_chain(&balloon_chain, val, NULL); +} + +void balloon_set_inflated_total(long inflated_kb) +{ + atomic_long_set(&mem_balloon_inflated_total_kb, inflated_kb); + balloon_notify(BALLOON_CHANGED_TOTAL); +} +EXPORT_SYMBOL(balloon_set_inflated_total); + +void balloon_set_inflated_free(long inflated_kb) +{ + atomic_long_set(&mem_balloon_inflated_free_kb, inflated_kb); + balloon_notify(BALLOON_CHANGED_FREE); +} +EXPORT_SYMBOL(balloon_set_inflated_free); + static void balloon_page_enqueue_one(struct balloon_dev_info *b_dev_info, struct page *page) {