On Thu, 4 May 2023 10:39:51 +0000 Niklas Cassel <Niklas.Cassel@xxxxxxx> wrote:
> On Thu, Apr 27, 2023 at 03:33:45PM -0700, Andrew Morton wrote:
> >
> > Linus, please merge this cycles's batch of MM changes. This is almost
> > everything - I'll have another 5-10 patches next week.
>
> (cut)
>
> > The following changes since commit ef832747a82dfbc22a3702219cc716f449b24e4a:
> >
> > nilfs2: initialize unused bytes in segment summary blocks (2023-04-18 14:22:14 -0700)
> >
> > are available in the Git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2023-04-27-15-30
> >
> > for you to fetch changes up to 4d4b6d66db63ceed399f1fb1a4b24081d2590eb1:
> >
> > mm,unmap: avoid flushing TLB in batch if PTE is inaccessible (2023-04-27 13:42:16 -0700)
> >
> > ----------------------------------------------------------------
>
> Hello Andrew,
>
> It seems like the changes in mm/dmapool.c somehow got omitted in this PR.
>
> $ git log --oneline 4d4b6d66db63ceed399f1fb1a4b24081d2590eb1 --not v6.3 mm/dmapool.c
> 2d55c16c0c54 dmapool: create/destroy cleanup
> a4de12a032fa dmapool: link blocks across pages
> 9d062a8a4c6d dmapool: don't memset on free twice
> 887aef615818 dmapool: simplify freeing
> 2591b516533b dmapool: consolidate page initialization
> 36d1a28921a4 dmapool: rearrange page alloc failure handling
> 52e7d5653979 dmapool: move debug code to own functions
> 19f504584038 dmapool: speedup DMAPOOL_DEBUG with init_on_alloc
> 347e4e44c0a9 dmapool: cleanup integer types
> 65216545436b dmapool: use sysfs_emit() instead of scnprintf()
> 7f796d141c07 dmapool: remove checks for dev == NULL
>
> $ git diff 4d4b6d66db63ceed399f1fb1a4b24081d2590eb1 v6.3 mm/dmapool.c
> <empty>
>
> It seems like the final commit, 2d55c16c0c54 ("dmapool: create/destroy
> cleanup") somehow reverted all the previous changes to this file.
>
>
> Looking at how that patch looked like on the list:
> https://patchwork.kernel.org/project/linux-mm/patch/20230126215125.4069751-13-kbusch@xxxxxxxx/
> the diff is way smaller than what can be seen in 2d55c16c0c54.
Well I don't know how I did this, sorry.
The patch "dmapool: create/destroy cleanup" was OK in mm-unstable (and
linux-next) from Jan 26 to Feb 26, so the series has had decent
linux-next testing. It became messed up on Feb 26.
I've reconstituted
dmapool: remove checks for dev == NULL
dmapool: use sysfs_emit() instead of scnprintf()
dmapool: cleanup integer types
dmapool: speedup DMAPOOL_DEBUG with init_on_alloc
dmapool: move debug code to own functions
dmapool: rearrange page alloc failure handling
dmapool: consolidate page initialization
dmapool: simplify freeing
dmapool: don't memset on free twice
dmapool: link blocks across pages
dmapool: create/destroy cleanup
and pushed the result out to the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.
3a64f2e22553 dmapool: create/destroy cleanup
1d1e67d45a37 dmapool: link blocks across pages
7e54c3f0e123 dmapool: don't memset on free twice
cb569a63de3b dmapool: simplify freeing
874938254ae7 dmapool: consolidate page initialization
b97304656ad5 dmapool: rearrange page alloc failure handling
c31e8ec45299 dmapool: move debug code to own functions
1e05e5bdce74 dmapool: speedup DMAPOOL_DEBUG with init_on_alloc
7ea3ff961459 dmapool: cleanup integer types
adf388b29d25 dmapool: use sysfs_emit() instead of scnprintf()
8491f7f301ad dmapool: remove checks for dev == NULL
Please check that all is as expected.
> Additionally, you might want to pick up:
> https://patchwork.kernel.org/project/linux-mm/patch/20230221165400.1595247-1-kbusch@xxxxxxxx/
> as it has a Fixes tag that references one of the commits above.
That fix has been folded into "dmapool: link blocks across pages".
