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 1C718C28D13 for ; Mon, 22 Aug 2022 11:39:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6CC698D0005; Mon, 22 Aug 2022 07:39:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67CB28D0001; Mon, 22 Aug 2022 07:39:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5459F8D0005; Mon, 22 Aug 2022 07:39:49 -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 484DE8D0001 for ; Mon, 22 Aug 2022 07:39:49 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 16880C078A for ; Mon, 22 Aug 2022 11:39:49 +0000 (UTC) X-FDA: 79827034098.26.7EA0B41 Received: from relay.virtuozzo.com (relay.virtuozzo.com [130.117.225.111]) by imf24.hostedemail.com (Postfix) with ESMTP id 9E2AC180059 for ; Mon, 22 Aug 2022 11:39:48 +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 1oQ5jS-00Gyo9-4U; Mon, 22 Aug 2022 13:38:01 +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 v3 1/4] Make place for common balloon code Date: Mon, 22 Aug 2022 14:37:44 +0300 Message-Id: <20220822113747.3630776-2-alexander.atanasov@virtuozzo.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220822113747.3630776-1-alexander.atanasov@virtuozzo.com> References: <20220822113747.3630776-1-alexander.atanasov@virtuozzo.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661168388; a=rsa-sha256; cv=none; b=U14rkhrNLWWL3k9+p5/K9bKiaWn1qe9M/15HaAFY+sMypUT0V5gYjcC6JDt+hzDnUNunbJ n93mo8Ia9jd7x4cDI2iWoG6jllbIqCAf75G9flvRs4JQYYxygM2JxFQ9+hNqecpF5QX9bt 4J1fDBi4mFWxfZ4LAK75lD2Pe3C0uP8= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf24.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=1661168388; 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=C95e2VAZzGF/jFU3CW0GeGdzvog2yGQel62y9+ojkCo=; b=DHp67JtOY2bobZjsM5LEFEYn8IvjlZxo70Nbxx8GkyjMzWNPXYBY8yP2S07ImLjxTSp5eB /xs9ciTjjmtAdEvMESggs5GMeKthp2aRNaPswtaDaB5/zQffyrseh1HPEqI8CS0Qkb24Dd mWbSyxMh6vKlX6mYZzSrhW+zGzCgcgg= X-Stat-Signature: 4c16bdew6pr6upp96gojuiwucork86x3 Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=virtuozzo.com; spf=pass (imf24.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: rspam12 X-Rspamd-Queue-Id: 9E2AC180059 X-HE-Tag: 1661168388-893230 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: mm/balloon_compaction.c -> mm/balloon.c File already contains code that is common along balloon drivers so rename it to reflect its contents. 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 --- 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 9d7f64dc0efe..98d6ff5f226d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -21494,8 +21494,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 b2b1431352dc..f21d65b0d2e2 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -54,7 +54,6 @@ #include #include -#include #include #include "internal.h" -- 2.31.1