* + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree
@ 2021-09-15 3:37 akpm
2021-09-19 5:48 ` Matthew Wilcox
0 siblings, 1 reply; 4+ messages in thread
From: akpm @ 2021-09-15 3:37 UTC (permalink / raw)
To: davem, horms, kuba, liumh1, marcelo.leitner, mm-commits, pshelar,
ulf.hansson, vyasevich, willy
The patch titled
Subject: include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.h
has been added to the -mm tree. Its filename is
include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Mianhan Liu <liumh1@shanghaitech.edu.cn>
Subject: include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.h
nr_free_buffer_pages could be exposed through mm.h instead of swap.h. The
advantage of this change is that it can reduce the obsolete includes. For
example, net/ipv4/tcp.c wouldn't need swap.h any more since it has already
included mm.h. Similarly, after checking all the other files, it comes
that tcp.c, udp.c meter.c ,... follow the same rule, so these files can
have swap.h removed too.
Moreover, after preprocessing all the files that use nr_free_buffer_pages,
it turns out that those files have already included mm.h.Thus, we can move
nr_free_buffer_pages from swap.h to mm.h safely. This change will not
affect the compilation of other files.
Link: https://lkml.kernel.org/r/20210912133640.1624-1-liumh1@shanghaitech.edu.cn
Signed-off-by: Mianhan Liu <liumh1@shanghaitech.edu.cn>
Cc: Jakub Kicinski <kuba@kernel.org>
CC: Ulf Hansson <ulf.hansson@linaro.org>
Cc: "David S . Miller" <davem@davemloft.net>
Cc: Simon Horman <horms@verge.net.au>
Cc: Pravin B Shelar <pshelar@ovn.org>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
drivers/mmc/core/mmc_test.c | 1 -
include/linux/mm.h | 2 ++
include/linux/swap.h | 1 -
net/ipv4/tcp.c | 1 -
net/ipv4/udp.c | 1 -
net/netfilter/ipvs/ip_vs_ctl.c | 1 -
net/openvswitch/meter.c | 1 -
net/sctp/protocol.c | 1 -
8 files changed, 2 insertions(+), 7 deletions(-)
--- a/drivers/mmc/core/mmc_test.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/drivers/mmc/core/mmc_test.c
@@ -10,7 +10,6 @@
#include <linux/slab.h>
#include <linux/scatterlist.h>
-#include <linux/swap.h> /* For nr_free_buffer_pages() */
#include <linux/list.h>
#include <linux/debugfs.h>
--- a/include/linux/mm.h~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/include/linux/mm.h
@@ -875,6 +875,8 @@ void put_pages_list(struct list_head *pa
void split_page(struct page *page, unsigned int order);
void copy_huge_page(struct page *dst, struct page *src);
+unsigned long nr_free_buffer_pages(void);
+
/*
* Compound pages have a destructor function. Provide a
* prototype for that function and accessor functions.
--- a/include/linux/swap.h~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/include/linux/swap.h
@@ -335,7 +335,6 @@ void workingset_update_node(struct xa_no
/* linux/mm/page_alloc.c */
extern unsigned long totalreserve_pages;
-extern unsigned long nr_free_buffer_pages(void);
/* Definition of global_zone_page_state not available yet */
#define nr_free_pages() global_zone_page_state(NR_FREE_PAGES)
--- a/net/ipv4/tcp.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/net/ipv4/tcp.c
@@ -260,7 +260,6 @@
#include <linux/random.h>
#include <linux/memblock.h>
#include <linux/highmem.h>
-#include <linux/swap.h>
#include <linux/cache.h>
#include <linux/err.h>
#include <linux/time.h>
--- a/net/ipv4/udp.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/net/ipv4/udp.c
@@ -78,7 +78,6 @@
#include <asm/ioctls.h>
#include <linux/memblock.h>
#include <linux/highmem.h>
-#include <linux/swap.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/module.h>
--- a/net/netfilter/ipvs/ip_vs_ctl.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/net/netfilter/ipvs/ip_vs_ctl.c
@@ -24,7 +24,6 @@
#include <linux/sysctl.h>
#include <linux/proc_fs.h>
#include <linux/workqueue.h>
-#include <linux/swap.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
--- a/net/openvswitch/meter.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/net/openvswitch/meter.c
@@ -12,7 +12,6 @@
#include <linux/openvswitch.h>
#include <linux/netlink.h>
#include <linux/rculist.h>
-#include <linux/swap.h>
#include <net/netlink.h>
#include <net/genetlink.h>
--- a/net/sctp/protocol.c~include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh
+++ a/net/sctp/protocol.c
@@ -33,7 +33,6 @@
#include <linux/seq_file.h>
#include <linux/memblock.h>
#include <linux/highmem.h>
-#include <linux/swap.h>
#include <linux/slab.h>
#include <net/net_namespace.h>
#include <net/protocol.h>
_
Patches currently in -mm which might be from liumh1@shanghaitech.edu.cn are
include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree
2021-09-15 3:37 + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree akpm
@ 2021-09-19 5:48 ` Matthew Wilcox
2021-09-19 22:38 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Matthew Wilcox @ 2021-09-19 5:48 UTC (permalink / raw)
To: akpm
Cc: davem, horms, kuba, liumh1, marcelo.leitner, mm-commits, pshelar,
ulf.hansson, vyasevich
On Tue, Sep 14, 2021 at 08:37:47PM -0700, akpm@linux-foundation.org wrote:
> ------------------------------------------------------
> From: Mianhan Liu <liumh1@shanghaitech.edu.cn>
> Subject: include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.h
>
> nr_free_buffer_pages could be exposed through mm.h instead of swap.h. The
> advantage of this change is that it can reduce the obsolete includes. For
> example, net/ipv4/tcp.c wouldn't need swap.h any more since it has already
> included mm.h. Similarly, after checking all the other files, it comes
> that tcp.c, udp.c meter.c ,... follow the same rule, so these files can
> have swap.h removed too.
>
> Moreover, after preprocessing all the files that use nr_free_buffer_pages,
> it turns out that those files have already included mm.h.Thus, we can move
> nr_free_buffer_pages from swap.h to mm.h safely. This change will not
> affect the compilation of other files.
i don't think that moving more crap into mm.h is an improvement.
if anything, we should be moving more things out of mm.h.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree
2021-09-19 5:48 ` Matthew Wilcox
@ 2021-09-19 22:38 ` Andrew Morton
2021-09-19 22:57 ` Matthew Wilcox
0 siblings, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2021-09-19 22:38 UTC (permalink / raw)
To: Matthew Wilcox
Cc: davem, horms, kuba, liumh1, marcelo.leitner, mm-commits, pshelar,
ulf.hansson, vyasevich
On Sun, 19 Sep 2021 06:48:38 +0100 Matthew Wilcox <willy@infradead.org> wrote:
> On Tue, Sep 14, 2021 at 08:37:47PM -0700, akpm@linux-foundation.org wrote:
> > ------------------------------------------------------
> > From: Mianhan Liu <liumh1@shanghaitech.edu.cn>
> > Subject: include/linux/mm.h: move nr_free_buffer_pages from swap.h to mm.h
> >
> > nr_free_buffer_pages could be exposed through mm.h instead of swap.h. The
> > advantage of this change is that it can reduce the obsolete includes. For
> > example, net/ipv4/tcp.c wouldn't need swap.h any more since it has already
> > included mm.h. Similarly, after checking all the other files, it comes
> > that tcp.c, udp.c meter.c ,... follow the same rule, so these files can
> > have swap.h removed too.
> >
> > Moreover, after preprocessing all the files that use nr_free_buffer_pages,
> > it turns out that those files have already included mm.h.Thus, we can move
> > nr_free_buffer_pages from swap.h to mm.h safely. This change will not
> > affect the compilation of other files.
>
> i don't think that moving more crap into mm.h is an improvement.
> if anything, we should be moving more things out of mm.h.
nr_free_buffer_pages() is part of the page allocation API and gfp.h
seems a more appropriate place for its declaration.
I expect this would also permit a reduction in the #include sprawl?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree
2021-09-19 22:38 ` Andrew Morton
@ 2021-09-19 22:57 ` Matthew Wilcox
0 siblings, 0 replies; 4+ messages in thread
From: Matthew Wilcox @ 2021-09-19 22:57 UTC (permalink / raw)
To: Andrew Morton
Cc: davem, horms, kuba, liumh1, marcelo.leitner, mm-commits, pshelar,
ulf.hansson, vyasevich
On Sun, Sep 19, 2021 at 03:38:50PM -0700, Andrew Morton wrote:
> > i don't think that moving more crap into mm.h is an improvement.
> > if anything, we should be moving more things out of mm.h.
>
> nr_free_buffer_pages() is part of the page allocation API and gfp.h
> seems a more appropriate place for its declaration.
>
> I expect this would also permit a reduction in the #include sprawl?
It must ... mm.h includes gfp.h, so everything else about this patchset
should continue to work. Maybe we could even remove mm.h from some files.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-09-19 22:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-15 3:37 + include-linux-mmh-move-nr_free_buffer_pages-from-swaph-to-mmh.patch added to -mm tree akpm
2021-09-19 5:48 ` Matthew Wilcox
2021-09-19 22:38 ` Andrew Morton
2021-09-19 22:57 ` Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox