]>
www.infradead.org Git - users/jedix/linux-maple.git/log
Baolin Wang [Tue, 24 Aug 2021 00:00:16 +0000 (10:00 +1000)]
mm: migrate: introduce a local variable to get the number of pages
Use thp_nr_pages() instead of compound_nr() to get the number of pages for
THP page, meanwhile introducing a local variable 'nr_pages' to avoid
getting the number of pages repeatedly.
Link: https://lkml.kernel.org/r/a8e331ac04392ee230c79186330fb05e86a2aa77.1629447552.git.baolin.wang@linux.alibaba.com
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Yang Shi <shy828301@gmail.com>
Cc: Alistair Popple <apopple@nvidia.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Baolin Wang [Tue, 24 Aug 2021 00:00:15 +0000 (10:00 +1000)]
mm: migrate: simplify the file-backed pages validation when migrating its mapping
Patch series "Some cleanup for page migration", v3.
This patchset does some cleanups and improvements for page migration.
This patch (of 4):
There is no need to validate the file-backed page's refcount before trying
to freeze the page's expected refcount, instead we can rely on the
folio_ref_freeze() to validate if the page has the expected refcount
before migrating its mapping.
Moreover we are always under the page lock when migrating the page
mapping, which means nowhere else can remove it from the page cache, so we
can remove the xas_load() validation under the i_pages lock.
Link: https://lkml.kernel.org/r/cover.1629447552.git.baolin.wang@linux.alibaba.com
Link: https://lkml.kernel.org/r/df4c129fd8e86a95dbc55f4663d77441cc0d3bd1.1629447552.git.baolin.wang@linux.alibaba.com
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Suggested-by: Matthew Wilcox <willy@infradead.org>
Cc: Yang Shi <shy828301@gmail.com>
Cc: Alistair Popple <apopple@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Matthew Wilcox (Oracle) [Tue, 24 Aug 2021 00:00:15 +0000 (10:00 +1000)]
mm: move kvmalloc-related functions to slab.h
Not all files in the kernel should include mm.h. Migrating callers from
kmalloc to kvmalloc is easier if the kvmalloc functions are in slab.h.
[akpm@linux-foundation.org: move the new kvrealloc() also]
Link: https://lkml.kernel.org/r/20210622215757.3525604-1-willy@infradead.org
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Randy Dunlap [Tue, 24 Aug 2021 00:00:15 +0000 (10:00 +1000)]
mm/workingset: correct kernel-doc notations
Use the documented kernel-doc format to prevent kernel-doc warnings.
mm/workingset.c:256: warning: No description found for return value of 'workingset_eviction'
mm/workingset.c:285: warning: Function parameter or member 'folio' not described in 'workingset_refault'
mm/workingset.c:285: warning: Excess function parameter 'page' description in 'workingset_refault'
Link: https://lkml.kernel.org/r/20210808203153.10678-1-rdunlap@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Stephen Rothwell [Thu, 2 Sep 2021 05:16:45 +0000 (15:16 +1000)]
Merge branch 'akpm-current/current'
Stephen Rothwell [Thu, 2 Sep 2021 04:27:19 +0000 (14:27 +1000)]
Merge remote-tracking branch 'folio/for-next'
# Conflicts:
# mm/filemap.c
# mm/rmap.c
# mm/util.c
Stephen Rothwell [Thu, 2 Sep 2021 04:25:36 +0000 (14:25 +1000)]
Merge remote-tracking branch 'cxl/next'
Stephen Rothwell [Thu, 2 Sep 2021 04:10:14 +0000 (14:10 +1000)]
Merge remote-tracking branch 'rust/rust-next'
Stephen Rothwell [Thu, 2 Sep 2021 04:08:04 +0000 (14:08 +1000)]
Merge remote-tracking branch 'memblock/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 04:05:54 +0000 (14:05 +1000)]
Merge remote-tracking branch 'kunit-next/kunit'
Stephen Rothwell [Thu, 2 Sep 2021 04:03:42 +0000 (14:03 +1000)]
Merge remote-tracking branch 'kgdb/kgdb/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 04:02:04 +0000 (14:02 +1000)]
Merge remote-tracking branch 'auxdisplay/auxdisplay'
Stephen Rothwell [Thu, 2 Sep 2021 03:59:47 +0000 (13:59 +1000)]
Merge remote-tracking branch 'hyperv/hyperv-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:59:46 +0000 (13:59 +1000)]
Merge remote-tracking branch 'nvmem/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:59:44 +0000 (13:59 +1000)]
Merge remote-tracking branch 'slimbus/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:58:08 +0000 (13:58 +1000)]
Merge remote-tracking branch 'gnss/gnss-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:42:47 +0000 (13:42 +1000)]
Merge remote-tracking branch 'kspp/for-next/kspp'
# Conflicts:
# Makefile
Stephen Rothwell [Thu, 2 Sep 2021 03:41:08 +0000 (13:41 +1000)]
Merge remote-tracking branch 'ntb/ntb-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:39:32 +0000 (13:39 +1000)]
Merge remote-tracking branch 'at24/at24/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:36:46 +0000 (13:36 +1000)]
Merge remote-tracking branch 'nvdimm/libnvdimm-for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:34:37 +0000 (13:34 +1000)]
Merge remote-tracking branch 'rtc/rtc-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:34:31 +0000 (13:34 +1000)]
Merge remote-tracking branch 'coresight/next'
Stephen Rothwell [Thu, 2 Sep 2021 03:32:23 +0000 (13:32 +1000)]
Merge remote-tracking branch 'livepatching/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:30:47 +0000 (13:30 +1000)]
Merge remote-tracking branch 'kselftest/next'
Stephen Rothwell [Thu, 2 Sep 2021 03:16:56 +0000 (13:16 +1000)]
Merge remote-tracking branch 'userns/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:15:18 +0000 (13:15 +1000)]
Merge remote-tracking branch 'pwm/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:13:04 +0000 (13:13 +1000)]
Merge remote-tracking branch 'pinctrl/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:05:22 +0000 (13:05 +1000)]
Merge remote-tracking branch 'gpio-brgl/gpio/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:03:11 +0000 (13:03 +1000)]
Merge remote-tracking branch 'rpmsg/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 03:00:58 +0000 (13:00 +1000)]
Merge remote-tracking branch 'vhost/linux-next'
# Conflicts:
# drivers/virtio/virtio.c
# include/uapi/linux/virtio_ids.h
Stephen Rothwell [Thu, 2 Sep 2021 02:50:11 +0000 (12:50 +1000)]
Merge remote-tracking branch 'scsi/for-next'
# Conflicts:
# drivers/scsi/st.c
Stephen Rothwell [Thu, 2 Sep 2021 02:50:09 +0000 (12:50 +1000)]
Merge remote-tracking branch 'cgroup/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:47:42 +0000 (12:47 +1000)]
Merge remote-tracking branch 'dmaengine/next'
Stephen Rothwell [Thu, 2 Sep 2021 02:38:01 +0000 (12:38 +1000)]
Merge remote-tracking branch 'vfio/next'
Stephen Rothwell [Thu, 2 Sep 2021 02:36:22 +0000 (12:36 +1000)]
Merge remote-tracking branch 'extcon/extcon-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:34:46 +0000 (12:34 +1000)]
Merge remote-tracking branch 'usb/usb-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:33:10 +0000 (12:33 +1000)]
Merge remote-tracking branch 'ipmi/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:31:03 +0000 (12:31 +1000)]
Merge remote-tracking branch 'chrome-platform/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:26:37 +0000 (12:26 +1000)]
Merge remote-tracking branch 'drivers-x86/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:26:37 +0000 (12:26 +1000)]
Merge remote-tracking branch 'percpu/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:24:30 +0000 (12:24 +1000)]
Merge remote-tracking branch 'xen-tip/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 02:09:06 +0000 (12:09 +1000)]
Merge remote-tracking branch 'kvms390/next'
Stephen Rothwell [Thu, 2 Sep 2021 02:09:03 +0000 (12:09 +1000)]
Merge remote-tracking branch 'kvm-arm/next'
Stephen Rothwell [Thu, 2 Sep 2021 02:09:02 +0000 (12:09 +1000)]
Merge remote-tracking branch 'kvm/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:53:40 +0000 (11:53 +1000)]
Merge remote-tracking branch 'rcu/rcu/next'
# Conflicts:
# kernel/time/tick-internal.h
Stephen Rothwell [Thu, 2 Sep 2021 01:48:18 +0000 (11:48 +1000)]
Merge remote-tracking branch 'ftrace/for-next'
# Conflicts:
# MAINTAINERS
Stephen Rothwell [Thu, 2 Sep 2021 01:46:36 +0000 (11:46 +1000)]
Merge remote-tracking branch 'tip/auto-latest'
Stephen Rothwell [Thu, 2 Sep 2021 01:44:23 +0000 (11:44 +1000)]
Merge remote-tracking branch 'mailbox/mailbox-for-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:41:56 +0000 (11:41 +1000)]
Merge remote-tracking branch 'devicetree/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:39:15 +0000 (11:39 +1000)]
Merge remote-tracking branch 'iommu/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:36:59 +0000 (11:36 +1000)]
Merge remote-tracking branch 'watchdog/master'
Stephen Rothwell [Thu, 2 Sep 2021 01:36:59 +0000 (11:36 +1000)]
Merge remote-tracking branch 'keys/keys-next'
# Conflicts:
# certs/system_keyring.c
Stephen Rothwell [Thu, 2 Sep 2021 01:34:41 +0000 (11:34 +1000)]
Merge remote-tracking branch 'integrity/next-integrity'
Stephen Rothwell [Thu, 2 Sep 2021 01:32:12 +0000 (11:32 +1000)]
Merge remote-tracking branch 'apparmor/apparmor-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:32:11 +0000 (11:32 +1000)]
Merge remote-tracking branch 'security/next-testing'
Stephen Rothwell [Thu, 2 Sep 2021 01:30:35 +0000 (11:30 +1000)]
Merge remote-tracking branch 'backlight/for-backlight-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:28:23 +0000 (11:28 +1000)]
Merge remote-tracking branch 'mfd/for-mfd-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:26:16 +0000 (11:26 +1000)]
Merge remote-tracking branch 'block/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:24:36 +0000 (11:24 +1000)]
Merge remote-tracking branch 'input/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:22:58 +0000 (11:22 +1000)]
Merge remote-tracking branch 'modules/modules-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)]
Merge remote-tracking branch 'imx-drm/imx-drm/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:20:50 +0000 (11:20 +1000)]
Merge remote-tracking branch 'amdgpu/drm-next'
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
Stephen Rothwell [Thu, 2 Sep 2021 01:11:54 +0000 (11:11 +1000)]
Merge remote-tracking branch 'drm-misc/for-linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 01:10:14 +0000 (11:10 +1000)]
Merge remote-tracking branch 'nand/nand/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:08:36 +0000 (11:08 +1000)]
Merge remote-tracking branch 'mtd/mtd/next'
Stephen Rothwell [Thu, 2 Sep 2021 01:06:53 +0000 (11:06 +1000)]
Merge remote-tracking branch 'bluetooth/master'
Stephen Rothwell [Thu, 2 Sep 2021 00:55:10 +0000 (10:55 +1000)]
Merge remote-tracking branch 'rdma/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:40:19 +0000 (10:40 +1000)]
Merge remote-tracking branch 'swiotlb/linux-next'
# Conflicts:
# kernel/dma/direct.c
Stephen Rothwell [Thu, 2 Sep 2021 00:38:43 +0000 (10:38 +1000)]
Merge remote-tracking branch 'dlm/next'
Stephen Rothwell [Thu, 2 Sep 2021 00:37:06 +0000 (10:37 +1000)]
Merge remote-tracking branch 'ieee1394/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:34:51 +0000 (10:34 +1000)]
Merge remote-tracking branch 'thermal/thermal/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:33:16 +0000 (10:33 +1000)]
Merge remote-tracking branch 'cpupower/cpupower'
Stephen Rothwell [Thu, 2 Sep 2021 00:30:43 +0000 (10:30 +1000)]
Merge remote-tracking branch 'pm/linux-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)]
Merge remote-tracking branch 'v4l-dvb-next/master'
Stephen Rothwell [Thu, 2 Sep 2021 00:27:17 +0000 (10:27 +1000)]
Merge remote-tracking branch 'jc_docs/docs-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:27:16 +0000 (10:27 +1000)]
Merge remote-tracking branch 'i2c/i2c/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:25:36 +0000 (10:25 +1000)]
Merge remote-tracking branch 'hid/for-next'
Stephen Rothwell [Thu, 2 Sep 2021 00:23:59 +0000 (10:23 +1000)]
Merge remote-tracking branch 'pstore/for-next/pstore'
Stephen Rothwell [Thu, 2 Sep 2021 00:10:47 +0000 (10:10 +1000)]
Merge remote-tracking branch 'pci/next'
# Conflicts:
# MAINTAINERS
# drivers/net/ethernet/broadcom/bnx2.c
# drivers/net/ethernet/broadcom/bnxt/bnxt.c
Stephen Rothwell [Wed, 1 Sep 2021 23:55:20 +0000 (09:55 +1000)]
Merge remote-tracking branch 'printk/for-next'
# Conflicts:
# MAINTAINERS
Stephen Rothwell [Wed, 1 Sep 2021 23:39:59 +0000 (09:39 +1000)]
Merge remote-tracking branch 'vfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:58 +0000 (09:39 +1000)]
Merge remote-tracking branch 'zonefs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:56 +0000 (09:39 +1000)]
Merge remote-tracking branch 'xfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:55 +0000 (09:39 +1000)]
Merge remote-tracking branch 'v9fs/9p-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:53 +0000 (09:39 +1000)]
Merge remote-tracking branch 'overlayfs/overlayfs-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:52 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ntfs3/master'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:51 +0000 (09:39 +1000)]
Merge remote-tracking branch 'cel/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:50 +0000 (09:39 +1000)]
Merge remote-tracking branch 'nfs-anna/linux-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:49 +0000 (09:39 +1000)]
Merge remote-tracking branch 'fuse/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:48 +0000 (09:39 +1000)]
Merge remote-tracking branch 'f2fs/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:45 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ext4/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:43 +0000 (09:39 +1000)]
Merge remote-tracking branch 'ext3/for_next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:41 +0000 (09:39 +1000)]
Merge remote-tracking branch 'erofs/dev'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:40 +0000 (09:39 +1000)]
Merge remote-tracking branch 'configfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:40 +0000 (09:39 +1000)]
Merge remote-tracking branch 'btrfs/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:39 +0000 (09:39 +1000)]
Merge remote-tracking branch 'fscache/fscache-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:39:37 +0000 (09:39 +1000)]
Merge remote-tracking branch 'pidfd/for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:29 +0000 (09:24 +1000)]
Merge remote-tracking branch 'xtensa/xtensa-for-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:28 +0000 (09:24 +1000)]
Merge remote-tracking branch 'uml/linux-next'
Stephen Rothwell [Wed, 1 Sep 2021 23:24:24 +0000 (09:24 +1000)]
Merge remote-tracking branch 'sh/for-next'