[Linux-nvdimm] [PATCH v2 00/10] evacuate struct page from the block layer, introduce __pfn_t
by Dan Williams
Changes since v1 [1]:
1/ added include/asm-generic/pfn.h for the __pfn_t definition and helpers.
2/ added kmap_atomic_pfn_t()
3/ rebased on v4.1-rc2
[1]: http://marc.info/?l=linux-kernel&m=142653770511970&w=2
---
A lead in note, this looks scarier than it is. Most of the code thrash
is automated via Coccinelle. Also the subtle differences behind an
'unsigned long pfn' and a '__pfn_t' are mitigated by type-safety and a
Kconfig option (default disabled CONFIG_PMEM_IO) that globally controls
whether a pfn and a __pfn_t are equivalent.
The motivation for this change is persistent memory and the desire to
use it not only via the pmem driver, but also as a memory target for I/O
(DAX, O_DIRECT, DMA, RDMA, etc) in other parts of the kernel. Aside
from the pmem driver and DAX, persistent memory is not able to be used
in these I/O scenarios due to the lack of a backing struct page, i.e.
persistent memory is not part of the memmap. This patchset takes the
position that the solution is to teach I/O paths that want to operate on
persistent memory to do so by referencing a __pfn_t. The alternatives
are discussed in the changelog for "[PATCH v2 01/10] arch: introduce
__pfn_t for persistent memory i/o", copied here:
Alternatives:
1/ Provide struct page coverage for persistent memory in
DRAM. The expectation is that persistent memory capacities make
this untenable in the long term.
2/ Provide struct page coverage for persistent memory with
persistent memory. While persistent memory may have near DRAM
performance characteristics it may not have the same
write-endurance of DRAM. Given the update frequency of struct
page objects it may not be suitable for persistent memory.
3/ Dynamically allocate struct page. This appears to be on
the order of the complexity of converting code paths to use
__pfn_t references instead of struct page, and the amount of
setup required to establish a valid struct page reference is
mostly wasted when the only usage in the block stack is to
perform a page_to_pfn() conversion for dma-mapping. Instances
of kmap() / kmap_atomic() usage appear to be the only occasions
in the block stack where struct page is non-trivially used. A
new kmap_atomic_pfn_t() is proposed to handle those cases.
---
Dan Williams (9):
arch: introduce __pfn_t for persistent memory i/o
block: add helpers for accessing a bio_vec page
block: convert .bv_page to .bv_pfn bio_vec
dma-mapping: allow archs to optionally specify a ->map_pfn() operation
scatterlist: use sg_phys()
x86: support dma_map_pfn()
x86: support kmap_atomic_pfn_t() for persistent memory
dax: convert to __pfn_t
block: base support for pfn i/o
Matthew Wilcox (1):
scatterlist: support "page-less" (__pfn_t only) entries
arch/Kconfig | 6 ++
arch/arm/mm/dma-mapping.c | 2 -
arch/microblaze/kernel/dma.c | 2 -
arch/powerpc/sysdev/axonram.c | 6 +-
arch/x86/Kconfig | 7 ++
arch/x86/kernel/Makefile | 1
arch/x86/kernel/amd_gart_64.c | 22 +++++-
arch/x86/kernel/kmap.c | 95 ++++++++++++++++++++++++++
arch/x86/kernel/pci-nommu.c | 22 +++++-
arch/x86/kernel/pci-swiotlb.c | 4 +
arch/x86/pci/sta2x11-fixup.c | 4 +
arch/x86/xen/pci-swiotlb-xen.c | 4 +
block/bio-integrity.c | 8 +-
block/bio.c | 82 ++++++++++++++++------
block/blk-core.c | 13 +++-
block/blk-integrity.c | 7 +-
block/blk-lib.c | 2 -
block/blk-merge.c | 15 ++--
block/bounce.c | 26 ++++---
drivers/block/aoe/aoecmd.c | 8 +-
drivers/block/brd.c | 6 +-
drivers/block/drbd/drbd_bitmap.c | 5 +
drivers/block/drbd/drbd_main.c | 6 +-
drivers/block/drbd/drbd_receiver.c | 4 +
drivers/block/drbd/drbd_worker.c | 3 +
drivers/block/floppy.c | 6 +-
drivers/block/loop.c | 13 ++--
drivers/block/nbd.c | 8 +-
drivers/block/nvme-core.c | 2 -
drivers/block/pktcdvd.c | 11 ++-
drivers/block/pmem.c | 16 +++-
drivers/block/ps3disk.c | 2 -
drivers/block/ps3vram.c | 2 -
drivers/block/rbd.c | 2 -
drivers/block/rsxx/dma.c | 2 -
drivers/block/umem.c | 2 -
drivers/block/zram/zram_drv.c | 10 +--
drivers/dma/ste_dma40.c | 5 -
drivers/iommu/amd_iommu.c | 21 ++++--
drivers/iommu/intel-iommu.c | 26 +++++--
drivers/iommu/iommu.c | 2 -
drivers/md/bcache/btree.c | 4 +
drivers/md/bcache/debug.c | 6 +-
drivers/md/bcache/movinggc.c | 2 -
drivers/md/bcache/request.c | 6 +-
drivers/md/bcache/super.c | 10 +--
drivers/md/bcache/util.c | 5 +
drivers/md/bcache/writeback.c | 2 -
drivers/md/dm-crypt.c | 12 ++-
drivers/md/dm-io.c | 2 -
drivers/md/dm-log-writes.c | 14 ++--
drivers/md/dm-verity.c | 2 -
drivers/md/raid1.c | 50 +++++++-------
drivers/md/raid10.c | 38 +++++-----
drivers/md/raid5.c | 6 +-
drivers/mmc/card/queue.c | 4 +
drivers/s390/block/dasd_diag.c | 2 -
drivers/s390/block/dasd_eckd.c | 14 ++--
drivers/s390/block/dasd_fba.c | 6 +-
drivers/s390/block/dcssblk.c | 8 +-
drivers/s390/block/scm_blk.c | 2 -
drivers/s390/block/scm_blk_cluster.c | 2 -
drivers/s390/block/xpram.c | 2 -
drivers/scsi/mpt2sas/mpt2sas_transport.c | 6 +-
drivers/scsi/mpt3sas/mpt3sas_transport.c | 6 +-
drivers/scsi/sd_dif.c | 4 +
drivers/staging/android/ion/ion_chunk_heap.c | 4 +
drivers/staging/lustre/lustre/llite/lloop.c | 2 -
drivers/target/target_core_file.c | 4 +
drivers/xen/biomerge.c | 4 +
drivers/xen/swiotlb-xen.c | 29 +++++---
fs/9p/vfs_addr.c | 2 -
fs/block_dev.c | 2 -
fs/btrfs/check-integrity.c | 6 +-
fs/btrfs/compression.c | 12 ++-
fs/btrfs/disk-io.c | 5 +
fs/btrfs/extent_io.c | 8 +-
fs/btrfs/file-item.c | 8 +-
fs/btrfs/inode.c | 19 +++--
fs/btrfs/raid56.c | 4 +
fs/btrfs/volumes.c | 2 -
fs/buffer.c | 4 +
fs/dax.c | 9 +-
fs/direct-io.c | 2 -
fs/exofs/ore.c | 4 +
fs/exofs/ore_raid.c | 2 -
fs/ext4/page-io.c | 2 -
fs/ext4/readpage.c | 4 +
fs/f2fs/data.c | 4 +
fs/f2fs/segment.c | 2 -
fs/gfs2/lops.c | 4 +
fs/jfs/jfs_logmgr.c | 4 +
fs/logfs/dev_bdev.c | 10 +--
fs/mpage.c | 2 -
fs/splice.c | 2 -
include/asm-generic/dma-mapping-common.h | 30 ++++++++
include/asm-generic/memory_model.h | 1
include/asm-generic/pfn.h | 67 ++++++++++++++++++
include/asm-generic/scatterlist.h | 10 +++
include/crypto/scatterwalk.h | 10 +++
include/linux/bio.h | 24 ++++---
include/linux/blk_types.h | 20 +++++
include/linux/blkdev.h | 6 +-
include/linux/dma-debug.h | 23 +++++-
include/linux/dma-mapping.h | 8 ++
include/linux/highmem.h | 23 ++++++
include/linux/mm.h | 1
include/linux/scatterlist.h | 91 ++++++++++++++++++++++---
include/linux/swiotlb.h | 4 +
init/Kconfig | 13 ++++
kernel/power/block_io.c | 2 -
lib/dma-debug.c | 10 ++-
lib/iov_iter.c | 22 +++---
lib/swiotlb.c | 20 ++++-
mm/page_io.c | 10 +--
net/ceph/messenger.c | 2 -
116 files changed, 896 insertions(+), 372 deletions(-)
create mode 100644 arch/x86/kernel/kmap.c
create mode 100644 include/asm-generic/pfn.h
5 years
[GIT PULL v4 00/21] libnd: non-volatile memory device support
by Dan Williams
Jens, please pull from...
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm tags/libnd-for-jens
...to receive the libnd sub-system for the next merge window. This has
been through 3 rounds of review. Incremental diffstats and links to
previous postings:
v1: 39 files changed, 13102 insertions(+), 36 deletions(-)
https://lists.01.org/pipermail/linux-nvdimm/2015-April/000484.html
v2: 30 files changed, 3166 insertions(+), 3935 deletions(-)
https://lists.01.org/pipermail/linux-nvdimm/2015-April/000574.html
v3: 33 files changed, 2202 insertions(+), 1233 deletions(-)
https://lists.01.org/pipermail/linux-nvdimm/2015-May/000804.html
v4: Full diffstat since v3
Documentation/blockdev/libnd.txt | 2 +-
arch/x86/Kconfig | 4 ++
arch/x86/kernel/pmem.c | 92 +++++++++++++++++++++++------------
drivers/acpi/nfit.c | 20 ++++----
drivers/acpi/nfit.h | 4 +-
drivers/block/Kconfig | 8 ---
drivers/block/Makefile | 1 -
drivers/block/e820_pmem.c | 100 --------------------------------------
drivers/block/nd/Kconfig | 10 ++++
drivers/block/nd/btt.h | 2 +-
drivers/block/nd/namespace_devs.c | 5 +-
drivers/block/nd/pmem.c | 2 +-
drivers/block/nd/test/nfit.c | 10 ++--
include/acpi/acuuid.h | 16 +++---
14 files changed, 105 insertions(+), 171 deletions(-)
delete mode 100644 drivers/block/e820_pmem.c
1/ Kill drivers/block/e820_pmem.c, we can just register pmem
regions directly from arch/x86/kernel/pmem.c without need for an
intermediary driver (Christoph).
2/ Update to latest NFIT UUID definitions (Toshi). This
merges cleanly with, and is identical to the include/acpi/
NFIT enabling in Rafael's linux-pm.git/bleeding-edge branch.
3/ Fix up some miscellaneous checkpatch issues (Robert).
This branch has passed a full run through Fengguang's 0-day-kbuild-robot
with no outstanding reports, and it passes* our unit tests defined in
the ndctl repo (https://github.com/pmem/ndctl). As you can see the
magnitude of the review feedback has dropped off precipitously so I feel
confident in recommending this branch as a merge candidate. Some
general notes and credits appear in the tag-message below.
Thanks Jens!
* We have a handful of minor features pending behind this release that
are exercised in the latest unit tests. However, these patches have
been held back to save the libnd review effort from chasing a moving
target.
===
The following changes since commit 4c1eaa2344fb26bb5e936fb4d8ee307343ea0089:
drivers/block/pmem: Fix 32-bit build warning in pmem_alloc() (2015-04-01 17:03:57 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/djbw/nvdimm tags/libnd-for-jens
for you to fetch changes up to dbcc765a7830454abb78e5352147324605455116:
libnd: Non-Volatile Devices (2015-05-27 02:48:52 -0400)
----------------------------------------------------------------
Initial LIBND submission
The LIBND sub-system provides generic support for non-volatile memory
devices. It extends the kernel's existing X86_PMEM_LEGACY support to also
enable devices that conform to the NVDIMM Firmware Interface Table (NFIT)
specification published with ACPI 6 (http://www.uefi.org/specifications).
NFIT describes devices that may include both a BLK (mmio aperture I/O)
mode of operation as well as PMEM (direct cpu load/store to a persistent
memory range). In addition to the generic LIBND bus driver implementation
and the I/O drivers (BLK and PMEM), a driver for layering atomic sector
update semantics on top of byte-addressable-memory, BTT, is also included.
See Documentation/blockdev/libnd.txt and Documentation/blockdev/btt.txt
for more details.
Thanks to: Ross Zwisler, Jeff Moyer, Vishal Verma, Christoph Hellwig,
Ingo Molnar, Neil Brown, Boaz Harrosh, Robert Elliott, Matthew Wilcox,
Andy Rudoff, Linda Knippers, Toshi Kani, Nicholas Moulin, Rafael
Wysocki, and Bob Moore.
----------------------------------------------------------------
Dan Williams (18):
e820, efi: add ACPI 6.0 persistent memory types
libnd, nfit: initial libnd infrastructure and NFIT support
libnd: control character device and libnd bus sysfs attributes
libnd, nfit: dimm/memory-devices
libnd: control (ioctl) messages for libnd bus and dimm devices
libnd, nd_dimm: dimm driver and base libnd device-driver infrastructure
libnd, nfit: regions (block-data-window, persistent memory, volatile memory)
libnd: support for legacy (non-aliasing) nvdimms
libnd, nd_pmem: add libnd support to the pmem driver
libnd, nfit: add interleave-set state-tracking infrastructure
libnd: namespace indices: read and validate
libnd: pmem label sets and namespace instantiation.
libnd: blk labels and namespace instantiation
libnd: write pmem label set
libnd: write blk label set
libnd: infrastructure for btt devices
nfit-test: manufactured NFITs for interface development
libnd: Non-Volatile Devices
Ross Zwisler (2):
pmem: Dynamically allocate partition numbers
libnd, nfit, nd_blk: driver for BLK-mode access persistent memory
Vishal Verma (1):
nd_btt: atomic sector updates
Documentation/blockdev/btt.txt | 273 ++++++
Documentation/blockdev/libnd.txt | 804 ++++++++++++++++++
MAINTAINERS | 39 +-
arch/arm64/kernel/efi.c | 1 +
arch/ia64/kernel/efi.c | 4 +
arch/x86/Kconfig | 4 +
arch/x86/boot/compressed/eboot.c | 4 +
arch/x86/include/uapi/asm/e820.h | 1 +
arch/x86/kernel/e820.c | 28 +-
arch/x86/kernel/pmem.c | 92 +-
arch/x86/platform/efi/efi.c | 3 +
drivers/acpi/Kconfig | 27 +
drivers/acpi/Makefile | 1 +
drivers/acpi/nfit.c | 1474 ++++++++++++++++++++++++++++++++
drivers/acpi/nfit.h | 160 ++++
drivers/block/Kconfig | 13 +-
drivers/block/Makefile | 2 +-
drivers/block/nd/Kconfig | 101 +++
drivers/block/nd/Makefile | 29 +
drivers/block/nd/blk.c | 252 ++++++
drivers/block/nd/btt.c | 1438 +++++++++++++++++++++++++++++++
drivers/block/nd/btt.h | 186 ++++
drivers/block/nd/btt_devs.c | 443 ++++++++++
drivers/block/nd/bus.c | 770 +++++++++++++++++
drivers/block/nd/core.c | 472 ++++++++++
drivers/block/nd/dimm.c | 115 +++
drivers/block/nd/dimm_devs.c | 516 +++++++++++
drivers/block/nd/label.c | 922 ++++++++++++++++++++
drivers/block/nd/label.h | 143 ++++
drivers/block/nd/namespace_devs.c | 1702 +++++++++++++++++++++++++++++++++++++
drivers/block/nd/nd-private.h | 111 +++
drivers/block/nd/nd.h | 257 ++++++
drivers/block/{ => nd}/pmem.c | 107 ++-
drivers/block/nd/region.c | 189 ++++
drivers/block/nd/region_devs.c | 667 +++++++++++++++
drivers/block/nd/test/Makefile | 5 +
drivers/block/nd/test/iomap.c | 151 ++++
drivers/block/nd/test/nfit.c | 1171 +++++++++++++++++++++++++
drivers/block/nd/test/nfit_test.h | 28 +
include/acpi/actbl1.h | 154 ++++
include/acpi/acuuid.h | 89 ++
include/linux/efi.h | 3 +-
include/linux/libnd.h | 129 +++
include/linux/nd.h | 98 +++
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/ndctl.h | 199 +++++
46 files changed, 13289 insertions(+), 89 deletions(-)
create mode 100644 Documentation/blockdev/btt.txt
create mode 100644 Documentation/blockdev/libnd.txt
create mode 100644 drivers/acpi/nfit.c
create mode 100644 drivers/acpi/nfit.h
create mode 100644 drivers/block/nd/Kconfig
create mode 100644 drivers/block/nd/Makefile
create mode 100644 drivers/block/nd/blk.c
create mode 100644 drivers/block/nd/btt.c
create mode 100644 drivers/block/nd/btt.h
create mode 100644 drivers/block/nd/btt_devs.c
create mode 100644 drivers/block/nd/bus.c
create mode 100644 drivers/block/nd/core.c
create mode 100644 drivers/block/nd/dimm.c
create mode 100644 drivers/block/nd/dimm_devs.c
create mode 100644 drivers/block/nd/label.c
create mode 100644 drivers/block/nd/label.h
create mode 100644 drivers/block/nd/namespace_devs.c
create mode 100644 drivers/block/nd/nd-private.h
create mode 100644 drivers/block/nd/nd.h
rename drivers/block/{ => nd}/pmem.c (70%)
create mode 100644 drivers/block/nd/region.c
create mode 100644 drivers/block/nd/region_devs.c
create mode 100644 drivers/block/nd/test/Makefile
create mode 100644 drivers/block/nd/test/iomap.c
create mode 100644 drivers/block/nd/test/nfit.c
create mode 100644 drivers/block/nd/test/nfit_test.h
create mode 100644 include/acpi/acuuid.h
create mode 100644 include/linux/libnd.h
create mode 100644 include/linux/nd.h
create mode 100644 include/uapi/linux/ndctl.h
5 years
[PATCH v2 0/4] pmem api, generic ioremap_cache, and memremap
by Dan Williams
The pmem api is responsible for shepherding data out to persistent
media. The pmem driver uses this api, when available, to assert that
data is durable by the time bio_endio() is invoked. When an
architecture or cpu can not make persistence guarantees the driver warns
and falls back to "best effort" implementation.
Changes since v1 [1]:
1/ Rebase on tip/master + Toshi's ioremap_wt() patches and enable
ioremap_cache() to be used generically in drivers. Fix
devm_ioremap_resource() in the process.
2/ Rather than add yet another instance of "force cast away __iomem for
non-io-memory" take the opportunity to introduce memremap() for this use
case and fix up the current users that botch their handling of the
__iomem annotation.
3/ Mandate that consumers of the pmem api handle the case when archs, or
cpus within an arch are not able to make durability guarantees for
writes to persistent memory. See pmem_ops in drivers/block/pmem.c
4/ Drop the persistent_flush() api as there are no users until the BLK
driver is introduced, and even then it is not a "flush to persistence"
it is an invalidation of a previous mmio aperture setting
(io_flush_cache_range()).
5/ Add persistent_remap() to the pmem api for the arch to pick its
desired memory type that corresponds to the assumptions of
persistent_copy() and persistent_sync().
[1]: https://lists.01.org/pipermail/linux-nvdimm/2015-May/000929.html
This boots and processes pmem writes on x86, cross-compile 0day results
are still pending.
---
Dan Williams (3):
arch/*/asm/io.h: add ioremap_cache() to all architectures
devm: fix ioremap_cache() usage
arch: introduce memremap()
Ross Zwisler (1):
arch, x86: cache management apis for persistent memory
arch/arc/include/asm/io.h | 1
arch/arm/include/asm/io.h | 2 +
arch/arm64/include/asm/io.h | 2 +
arch/arm64/kernel/efi.c | 4 +
arch/arm64/kernel/smp_spin_table.c | 10 ++--
arch/avr32/include/asm/io.h | 1
arch/frv/include/asm/io.h | 6 ++
arch/m32r/include/asm/io.h | 1
arch/m68k/include/asm/io_mm.h | 7 +++
arch/m68k/include/asm/io_no.h | 5 ++
arch/metag/include/asm/io.h | 5 ++
arch/microblaze/include/asm/io.h | 1
arch/mn10300/include/asm/io.h | 1
arch/nios2/include/asm/io.h | 1
arch/s390/include/asm/io.h | 1
arch/sparc/include/asm/io_32.h | 1
arch/sparc/include/asm/io_64.h | 1
arch/tile/include/asm/io.h | 1
arch/x86/Kconfig | 1
arch/x86/include/asm/cacheflush.h | 24 +++++++++
arch/x86/include/asm/io.h | 7 +++
arch/x86/kernel/crash_dump_64.c | 6 +-
arch/x86/kernel/kdebugfs.c | 8 +--
arch/x86/kernel/ksysfs.c | 28 +++++-----
arch/x86/mm/ioremap.c | 10 +---
arch/xtensa/include/asm/io.h | 3 +
drivers/acpi/apei/einj.c | 8 +--
drivers/acpi/apei/erst.c | 14 +++--
drivers/block/pmem.c | 62 +++++++++++++++++++++--
drivers/firmware/google/memconsole.c | 4 +
include/asm-generic/io.h | 8 +++
include/asm-generic/iomap.h | 4 +
include/linux/device.h | 5 ++
include/linux/io.h | 38 ++++++++++++++
include/linux/pmem.h | 93 ++++++++++++++++++++++++++++++++++
lib/Kconfig | 3 +
lib/devres.c | 48 ++++++++----------
37 files changed, 347 insertions(+), 78 deletions(-)
create mode 100644 include/linux/pmem.h
5 years
[PATCH v11 0/12] Support Write-Through mapping on x86
by Toshi Kani
This patchset adds support of Write-Through (WT) mapping on x86.
The study below shows that using WT mapping may be useful for
non-volatile memory.
http://www.hpl.hp.com/techreports/2012/HPL-2012-236.pdf
The patchset consists of the following changes.
- Patch 1/12 to 2/12 refactor !pat_enable paths
- Patch 3/12 to 8/12 add ioremap_wt()
- Patch 9/12 adds pgprot_writethrough()
- Patch 10/12 to 11/12 add set_memory_wt()
- Patch 12/12 changes the pmem driver to call ioremap_wt()
All new/modified interfaces have been tested.
---
v11:
- Reordered the refactor changes from patch 10-11 to 1-2.
(Borislav Petkov)
- Changed BUG() to panic(). (Borislav Petkov)
- Rebased to tip/master and resolved conflicts.
v10:
- Removed ioremap_writethrough(). (Thomas Gleixner)
- Clarified and cleaned up multiple comments and functions.
(Thomas Gleixner)
- Changed ioremap_change_attr() to accept the WT type.
v9:
- Changed to export the set_xxx_wt() interfaces with GPL.
(Ingo Molnar)
- Changed is_new_memtype_allowed() to handle WT cases.
- Changed arch-specific io.h to define ioremap_wt().
- Changed the pmem driver to use ioremap_wt().
- Rebased to 4.1-rc3 and resolved minor conflicts.
v8:
- Rebased to 4.0-rc1 and resolved conflicts with 9d34cfdf4 in
patch 5/7.
v7:
- Rebased to 3.19-rc3 as Juergen's patchset for the PAT management
has been accepted.
v6:
- Dropped the patch moving [set|get]_page_memtype() to pat.c
since the tip branch already has this change.
- Fixed an issue when CONFIG_X86_PAT is not defined.
v5:
- Clarified comment of why using slot 7. (Andy Lutomirski,
Thomas Gleixner)
- Moved [set|get]_page_memtype() to pat.c. (Thomas Gleixner)
- Removed BUG() from set_page_memtype(). (Thomas Gleixner)
v4:
- Added set_memory_wt() by adding WT support of regular memory.
v3:
- Dropped the set_memory_wt() patch. (Andy Lutomirski)
- Refactored the !pat_enabled handling. (H. Peter Anvin,
Andy Lutomirski)
- Added the picture of PTE encoding. (Konrad Rzeszutek Wilk)
v2:
- Changed WT to use slot 7 of the PAT MSR. (H. Peter Anvin,
Andy Lutomirski)
- Changed to have conservative checks to exclude all Pentium 2, 3,
M, and 4 families. (Ingo Molnar, Henrique de Moraes Holschuh,
Andy Lutomirski)
- Updated documentation to cover WT interfaces and usages.
(Andy Lutomirski, Yigal Korman)
---
Toshi Kani (12):
1/12 x86, mm, pat: Cleanup init flags in pat_init()
2/12 x86, mm, pat: Refactor !pat_enable handling
3/12 x86, mm, pat: Set WT to PA7 slot of PAT MSR
4/12 x86, mm, pat: Change reserve_memtype() for WT
5/12 x86, asm: Change is_new_memtype_allowed() for WT
6/12 x86, mm, asm-gen: Add ioremap_wt() for WT
7/12 arch/*/asm/io.h: Add ioremap_wt() to all architectures
8/12 video/fbdev, asm/io.h: Remove ioremap_writethrough()
9/12 x86, mm, pat: Add pgprot_writethrough() for WT
10/12 x86, mm, asm: Add WT support to set_page_memtype()
11/12 x86, mm: Add set_memory_wt() for WT
12/12 drivers/block/pmem: Map NVDIMM with ioremap_wt()
---
Documentation/x86/pat.txt | 13 +-
arch/arc/include/asm/io.h | 1 +
arch/arm/include/asm/io.h | 1 +
arch/arm64/include/asm/io.h | 1 +
arch/avr32/include/asm/io.h | 1 +
arch/frv/include/asm/io.h | 4 +-
arch/m32r/include/asm/io.h | 1 +
arch/m68k/include/asm/io_mm.h | 4 +-
arch/m68k/include/asm/io_no.h | 4 +-
arch/metag/include/asm/io.h | 3 +
arch/microblaze/include/asm/io.h | 2 +-
arch/mn10300/include/asm/io.h | 1 +
arch/nios2/include/asm/io.h | 1 +
arch/s390/include/asm/io.h | 1 +
arch/sparc/include/asm/io_32.h | 1 +
arch/sparc/include/asm/io_64.h | 1 +
arch/tile/include/asm/io.h | 2 +-
arch/x86/include/asm/cacheflush.h | 6 +-
arch/x86/include/asm/io.h | 2 +
arch/x86/include/asm/pgtable.h | 8 +-
arch/x86/include/asm/pgtable_types.h | 3 +
arch/x86/mm/init.c | 6 +-
arch/x86/mm/iomap_32.c | 12 +-
arch/x86/mm/ioremap.c | 29 ++++-
arch/x86/mm/pageattr.c | 65 +++++++---
arch/x86/mm/pat.c | 229 +++++++++++++++++++++++------------
arch/xtensa/include/asm/io.h | 1 +
drivers/block/pmem.c | 4 +-
drivers/video/fbdev/amifb.c | 4 +-
drivers/video/fbdev/atafb.c | 3 +-
drivers/video/fbdev/hpfb.c | 4 +-
include/asm-generic/io.h | 9 ++
include/asm-generic/iomap.h | 4 +
include/asm-generic/pgtable.h | 4 +
34 files changed, 310 insertions(+), 125 deletions(-)
5 years
[PATCH v10 0/12] Support Write-Through mapping on x86
by Toshi Kani
This patchset adds support of Write-Through (WT) mapping on x86.
The study below shows that using WT mapping may be useful for
non-volatile memory.
http://www.hpl.hp.com/techreports/2012/HPL-2012-236.pdf
The patchset consists of the following changes.
- Patch 1/12 to 6/12 add ioremap_wt()
- Patch 7/12 adds pgprot_writethrough()
- Patch 8/12 to 9/12 add set_memory_wt()
- Patch 10/12 to 11/12 refactor !pat_enable paths
- Patch 12/12 changes the pmem driver to call ioremap_wt()
All new/modified interfaces have been tested.
---
v10:
- Removed ioremap_writethrough(). (Thomas Gleixner)
- Clarified and cleaned up multiple comments and functions.
(Thomas Gleixner)
- Changed ioremap_change_attr() to accept the WT type.
v9:
- Changed to export the set_xxx_wt() interfaces with GPL.
(Ingo Molnar)
- Changed is_new_memtype_allowed() to handle WT cases.
- Changed arch-specific io.h to define ioremap_wt().
- Changed the pmem driver to use ioremap_wt().
- Rebased to 4.1-rc3 and resolved minor conflicts.
v8:
- Rebased to 4.0-rc1 and resolved conflicts with 9d34cfdf4 in
patch 5/7.
v7:
- Rebased to 3.19-rc3 as Juergen's patchset for the PAT management
has been accepted.
v6:
- Dropped the patch moving [set|get]_page_memtype() to pat.c
since the tip branch already has this change.
- Fixed an issue when CONFIG_X86_PAT is not defined.
v5:
- Clarified comment of why using slot 7. (Andy Lutomirski,
Thomas Gleixner)
- Moved [set|get]_page_memtype() to pat.c. (Thomas Gleixner)
- Removed BUG() from set_page_memtype(). (Thomas Gleixner)
v4:
- Added set_memory_wt() by adding WT support of regular memory.
v3:
- Dropped the set_memory_wt() patch. (Andy Lutomirski)
- Refactored the !pat_enabled handling. (H. Peter Anvin,
Andy Lutomirski)
- Added the picture of PTE encoding. (Konrad Rzeszutek Wilk)
v2:
- Changed WT to use slot 7 of the PAT MSR. (H. Peter Anvin,
Andy Lutomirski)
- Changed to have conservative checks to exclude all Pentium 2, 3,
M, and 4 families. (Ingo Molnar, Henrique de Moraes Holschuh,
Andy Lutomirski)
- Updated documentation to cover WT interfaces and usages.
(Andy Lutomirski, Yigal Korman)
---
Toshi Kani (12):
1/12 x86, mm, pat: Set WT to PA7 slot of PAT MSR
2/12 x86, mm, pat: Change reserve_memtype() for WT
3/12 x86, asm: Change is_new_memtype_allowed() for WT
4/12 x86, mm, asm-gen: Add ioremap_wt() for WT
5/12 arch/*/asm/io.h: Add ioremap_wt() to all architectures
6/12 video/fbdev, asm/io.h: Remove ioremap_writethrough()
7/12 x86, mm, pat: Add pgprot_writethrough() for WT
8/12 x86, mm, asm: Add WT support to set_page_memtype()
9/12 x86, mm: Add set_memory_wt() for WT
10/12 x86, mm, pat: Cleanup init flags in pat_init()
11/12 x86, mm, pat: Refactor !pat_enable handling
12/12 drivers/block/pmem: Map NVDIMM with ioremap_wt()
---
Documentation/x86/pat.txt | 13 +-
arch/arc/include/asm/io.h | 1 +
arch/arm/include/asm/io.h | 1 +
arch/arm64/include/asm/io.h | 1 +
arch/avr32/include/asm/io.h | 1 +
arch/frv/include/asm/io.h | 4 +-
arch/m32r/include/asm/io.h | 1 +
arch/m68k/include/asm/io_mm.h | 4 +-
arch/m68k/include/asm/io_no.h | 4 +-
arch/metag/include/asm/io.h | 3 +
arch/microblaze/include/asm/io.h | 2 +-
arch/mn10300/include/asm/io.h | 1 +
arch/nios2/include/asm/io.h | 1 +
arch/s390/include/asm/io.h | 1 +
arch/sparc/include/asm/io_32.h | 1 +
arch/sparc/include/asm/io_64.h | 1 +
arch/tile/include/asm/io.h | 2 +-
arch/x86/include/asm/cacheflush.h | 6 +-
arch/x86/include/asm/io.h | 2 +
arch/x86/include/asm/pgtable.h | 8 +-
arch/x86/include/asm/pgtable_types.h | 3 +
arch/x86/mm/init.c | 6 +-
arch/x86/mm/iomap_32.c | 12 +-
arch/x86/mm/ioremap.c | 29 ++++-
arch/x86/mm/pageattr.c | 65 +++++++---
arch/x86/mm/pat.c | 232 +++++++++++++++++++++++------------
arch/xtensa/include/asm/io.h | 1 +
drivers/block/pmem.c | 4 +-
drivers/video/fbdev/amifb.c | 4 +-
drivers/video/fbdev/atafb.c | 3 +-
drivers/video/fbdev/hpfb.c | 4 +-
include/asm-generic/io.h | 9 ++
include/asm-generic/iomap.h | 4 +
include/asm-generic/pgtable.h | 4 +
34 files changed, 311 insertions(+), 127 deletions(-)
5 years
Get Found Online, Get More Customers!
by SEO MAX PACK
All SEO efforts are more successful when they
are a part of the powerful SEO campaign.
Some of what you`ll get:
- 400 High PR backlinks MIX
- 25 PR 3-10 Social Bookmarks
- 23 PR 3-6 Dofollow Backlinks
- 60 PR 2-7 Actual Page High PR Backlinks
- 350 High PR Directory Submissions
- 250 wiki backlinks
- 90 RSS feeds submitted
- 1500 Dofollow Backlinks
- 300 EDU&GOV Backlinks
- 1500 PR1-5 Blog Comments
Full reports provided, one time payment, 7-8 days delivery time.
For Full Details please read the attached .html file
Unsubscribe option is available on the footer of our website
5 years
Get Found Online, Get More Customers!
by SEO MAX PACK
All SEO efforts are more successful when they
are a part of the powerful SEO campaign.
Some of what you`ll get:
- 400 High PR backlinks MIX
- 25 PR 3-10 Social Bookmarks
- 23 PR 3-6 Dofollow Backlinks
- 60 PR 2-7 Actual Page High PR Backlinks
- 350 High PR Directory Submissions
- 250 wiki backlinks
- 90 RSS feeds submitted
- 1500 Dofollow Backlinks
- 300 EDU&GOV Backlinks
- 1500 PR1-5 Blog Comments
Full reports provided, one time payment, 7-8 days delivery time.
For Full Details please read the attached .html file
Unsubscribe option is available on the footer of our website
5 years
[libnd-for-next PATCH] libnd: miscellaneous sparse fixes
by Dan Williams
It seems 0day is slowly leaking out new sparse reports for libnd.
Indeed running sparse locally reveals a small trove. Most are
straightforward but there are a few that remain open:
"drivers/block/nd/region.c:74:9: warning: context imbalance in
'nd_region_acquire_lane' - wrong count at exit
drivers/block/nd/region.c:88:36: warning: context imbalance in
'nd_region_release_lane' - unexpected unlock"
Not sure how to tell sparse that nd_region_acquire_lane() may nest,
conditionally acquires the lock at the top level, but only conditionally
if we have more cpus than we have lanes.
"drivers/block/nd/label.c:105:26: warning: Initializer entry defined twice
drivers/block/nd/label.c:105:33: also defined here
drivers/block/nd/pmem.c:166:25: warning: incorrect type in assignment
(different address spaces)
drivers/block/nd/pmem.c:166:25: expected void *virt_addr
drivers/block/nd/pmem.c:166:25: got void [noderef] <asn:2>*
drivers/block/nd/pmem.c:198:21: warning: incorrect type in argument 1
(different address spaces)
drivers/block/nd/pmem.c:198:21: expected void volatile [noderef] <asn:2>*addr
drivers/block/nd/pmem.c:198:21: got void *virt_addr
drivers/block/nd/pmem.c:212:21: warning: incorrect type in argument 1
(different address spaces)
drivers/block/nd/pmem.c:212:21: expected void volatile [noderef] <asn:2>*addr
drivers/block/nd/pmem.c:212:21: got void *virt_addr"
These are the result of ioremap() vs memcpy() where we know the virtual
address returned by ioremap() has no io side effects. The plan is to
introduce memremap() for these cases, as other users of ioremap() in the
kernel have this same problem.
Reported-by: kbuild test robot <fengguang.wu(a)intel.com>
Signed-off-by: Dan Williams <dan.j.williams(a)intel.com>
---
drivers/block/nd/btt.c | 2 ++
drivers/block/nd/bus.c | 6 +++--
drivers/block/nd/label.c | 48 ++++++++++++++++++++++-------------------
drivers/block/nd/label.h | 4 ++-
drivers/block/nd/nd-private.h | 5 ----
drivers/block/nd/nd.h | 4 +++
drivers/block/nd/region.c | 2 +-
7 files changed, 38 insertions(+), 33 deletions(-)
diff --git a/drivers/block/nd/btt.c b/drivers/block/nd/btt.c
index a4287b6f4224..932177294f75 100644
--- a/drivers/block/nd/btt.c
+++ b/drivers/block/nd/btt.c
@@ -863,6 +863,7 @@ static int lba_to_arena(struct btt *btt, sector_t sector, __u32 *premap,
* readability, since they index into an array of locks
*/
static void lock_map(struct arena_info *arena, u32 premap)
+ __acquires(&arena->map_locks[idx].lock)
{
u32 idx = (premap * MAP_ENT_SIZE / L1_CACHE_BYTES) % arena->nfree;
@@ -870,6 +871,7 @@ static void lock_map(struct arena_info *arena, u32 premap)
}
static void unlock_map(struct arena_info *arena, u32 premap)
+ __releases(&arena->map_locks[idx].lock)
{
u32 idx = (premap * MAP_ENT_SIZE / L1_CACHE_BYTES) % arena->nfree;
diff --git a/drivers/block/nd/bus.c b/drivers/block/nd/bus.c
index dc69ccfae53a..8d13051714d3 100644
--- a/drivers/block/nd/bus.c
+++ b/drivers/block/nd/bus.c
@@ -337,7 +337,7 @@ static ssize_t devtype_show(struct device *dev, struct device_attribute *attr,
{
return sprintf(buf, "%s\n", dev->type->name);
}
-DEVICE_ATTR_RO(devtype);
+static DEVICE_ATTR_RO(devtype);
static struct attribute *nd_device_attributes[] = {
&dev_attr_modalias.attr,
@@ -374,7 +374,7 @@ void nd_bus_destroy_ndctl(struct nd_bus *nd_bus)
device_destroy(nd_class, MKDEV(nd_bus_major, nd_bus->id));
}
-static const struct nd_cmd_desc const __nd_cmd_dimm_descs[] = {
+static const struct nd_cmd_desc __nd_cmd_dimm_descs[] = {
[ND_CMD_IMPLEMENTED] = { },
[ND_CMD_SMART] = {
.out_num = 2,
@@ -420,7 +420,7 @@ const struct nd_cmd_desc *nd_cmd_dimm_desc(int cmd)
}
EXPORT_SYMBOL_GPL(nd_cmd_dimm_desc);
-static const struct nd_cmd_desc const __nd_cmd_bus_descs[] = {
+static const struct nd_cmd_desc __nd_cmd_bus_descs[] = {
[ND_CMD_IMPLEMENTED] = { },
[ND_CMD_ARS_CAP] = {
.in_num = 2,
diff --git a/drivers/block/nd/label.c b/drivers/block/nd/label.c
index 5052db591bec..e0f495e90728 100644
--- a/drivers/block/nd/label.c
+++ b/drivers/block/nd/label.c
@@ -21,6 +21,10 @@
#include <asm-generic/io-64-nonatomic-lo-hi.h>
+#ifndef __io_virt
+#define __io_virt(x) ((void __force *) (x))
+#endif
+
static u32 best_seq(u32 a, u32 b)
{
a &= NSINDEX_SEQ_MASK;
@@ -114,7 +118,7 @@ int nd_label_validate(struct nd_dimm_drvdata *ndd)
}
sum_save = readq(&nsindex[i]->checksum);
writeq(0, &nsindex[i]->checksum);
- sum = nd_fletcher64((void * __force) nsindex[i],
+ sum = nd_fletcher64(__io_virt(nsindex[i]),
sizeof_namespace_index(ndd), 1);
writeq(sum_save, &nsindex[i]->checksum);
if (sum != sum_save) {
@@ -190,21 +194,17 @@ void nd_label_copy(struct nd_dimm_drvdata *ndd,
struct nd_namespace_index __iomem *dst,
struct nd_namespace_index __iomem *src)
{
- void *s, *d;
-
if (dst && src)
/* pass */;
else
return;
- d = (void * __force) dst;
- s = (void * __force) src;
- memcpy(d, s, sizeof_namespace_index(ndd));
+ memcpy(__io_virt(dst), __io_virt(src), sizeof_namespace_index(ndd));
}
static struct nd_namespace_label __iomem *nd_label_base(struct nd_dimm_drvdata *ndd)
{
- void *base = to_namespace_index(ndd, 0);
+ void __iomem *base = to_namespace_index(ndd, 0);
return base + 2 * sizeof_namespace_index(ndd);
}
@@ -224,20 +224,23 @@ static int to_slot(struct nd_dimm_drvdata *ndd,
* preamble_index - common variable initialization for nd_label_* routines
* @nd_dimm: dimm container for the relevant label set
* @idx: namespace_index index
- * @nsindex: on return set to the currently active namespace index
+ * @nsindex_out: on return set to the currently active namespace index
* @free: on return set to the free label bitmap in the index
* @nslot: on return set to the number of slots in the label space
*/
static bool preamble_index(struct nd_dimm_drvdata *ndd, int idx,
- struct nd_namespace_index **nsindex,
+ struct nd_namespace_index __iomem **nsindex_out,
unsigned long **free, u32 *nslot)
{
- *nsindex = to_namespace_index(ndd, idx);
- if (*nsindex == NULL)
+ struct nd_namespace_index __iomem *nsindex;
+
+ nsindex = to_namespace_index(ndd, idx);
+ if (nsindex == NULL)
return false;
- *free = (unsigned long __force *) (*nsindex)->free;
- *nslot = readl(&(*nsindex)->nslot);
+ *free = __io_virt(nsindex->free);
+ *nslot = readl(&nsindex->nslot);
+ *nsindex_out = nsindex;
return true;
}
@@ -252,7 +255,7 @@ char *nd_label_gen_id(struct nd_label_id *label_id, u8 *uuid, u32 flags)
}
static bool preamble_current(struct nd_dimm_drvdata *ndd,
- struct nd_namespace_index **nsindex,
+ struct nd_namespace_index __iomem **nsindex,
unsigned long **free, u32 *nslot)
{
return preamble_index(ndd, ndd->ns_current, nsindex,
@@ -260,7 +263,7 @@ static bool preamble_current(struct nd_dimm_drvdata *ndd,
}
static bool preamble_next(struct nd_dimm_drvdata *ndd,
- struct nd_namespace_index **nsindex,
+ struct nd_namespace_index __iomem **nsindex,
unsigned long **free, u32 *nslot)
{
return preamble_index(ndd, ndd->ns_next, nsindex,
@@ -420,12 +423,13 @@ u32 nd_label_nfree(struct nd_dimm_drvdata *ndd)
static int nd_label_write_index(struct nd_dimm_drvdata *ndd, int index, u32 seq,
unsigned long flags)
{
- struct nd_namespace_index *nsindex = to_namespace_index(ndd, index);
+ struct nd_namespace_index __iomem *nsindex;
unsigned long offset;
u64 checksum;
u32 nslot;
int rc;
+ nsindex = to_namespace_index(ndd, index);
if (flags & ND_NSINDEX_INIT)
nslot = nd_dimm_num_label_slots(ndd);
else
@@ -450,7 +454,7 @@ static int nd_label_write_index(struct nd_dimm_drvdata *ndd, int index, u32 seq,
writew(1, &nsindex->minor);
writeq(0, &nsindex->checksum);
if (flags & ND_NSINDEX_INIT) {
- unsigned long *free = (unsigned long __force *) nsindex->free;
+ unsigned long *free = __io_virt(nsindex->free);
u32 nfree = ALIGN(nslot, BITS_PER_LONG);
int last_bits, i;
@@ -458,11 +462,11 @@ static int nd_label_write_index(struct nd_dimm_drvdata *ndd, int index, u32 seq,
for (i = 0, last_bits = nfree - nslot; i < last_bits; i++)
clear_bit_le(nslot + i, free);
}
- checksum = nd_fletcher64((void * __force) nsindex,
+ checksum = nd_fletcher64(__io_virt(nsindex),
sizeof_namespace_index(ndd), 1);
writeq(checksum, &nsindex->checksum);
rc = nd_dimm_set_config_data(ndd, readq(&nsindex->myoff),
- nsindex, sizeof_namespace_index(ndd));
+ __io_virt(nsindex), sizeof_namespace_index(ndd));
if (rc < 0)
return rc;
@@ -526,7 +530,7 @@ static int __pmem_label_update(struct nd_region *nd_region,
/* update label */
offset = nd_label_offset(ndd, nd_label);
- rc = nd_dimm_set_config_data(ndd, offset, nd_label,
+ rc = nd_dimm_set_config_data(ndd, offset, __io_virt(nd_label),
sizeof(struct nd_namespace_label));
if (rc < 0)
return rc;
@@ -552,7 +556,7 @@ static int __pmem_label_update(struct nd_region *nd_region,
static void del_label(struct nd_mapping *nd_mapping, int l)
{
- struct nd_namespace_label __iomem *next_label, __iomem *nd_label;
+ struct nd_namespace_label __iomem *next_label, *nd_label;
struct nd_dimm_drvdata *ndd = to_ndd(nd_mapping);
unsigned int slot;
int j;
@@ -709,7 +713,7 @@ static int __blk_label_update(struct nd_region *nd_region,
/* update label */
offset = nd_label_offset(ndd, nd_label);
- rc = nd_dimm_set_config_data(ndd, offset, nd_label,
+ rc = nd_dimm_set_config_data(ndd, offset, __io_virt(nd_label),
sizeof(struct nd_namespace_label));
if (rc < 0)
goto abort;
diff --git a/drivers/block/nd/label.h b/drivers/block/nd/label.h
index a26cebc9f389..71fac593e50f 100644
--- a/drivers/block/nd/label.h
+++ b/drivers/block/nd/label.h
@@ -124,8 +124,8 @@ static inline int nd_label_next_nsindex(int index)
struct nd_dimm_drvdata;
int nd_label_validate(struct nd_dimm_drvdata *ndd);
void nd_label_copy(struct nd_dimm_drvdata *ndd,
- struct nd_namespace_index *dst,
- struct nd_namespace_index *src);
+ struct nd_namespace_index __iomem *dst,
+ struct nd_namespace_index __iomem *src);
size_t sizeof_namespace_index(struct nd_dimm_drvdata *ndd);
int nd_label_active_count(struct nd_dimm_drvdata *ndd);
struct nd_namespace_label __iomem *nd_label_active(
diff --git a/drivers/block/nd/nd-private.h b/drivers/block/nd/nd-private.h
index b0571e334af9..e0eb5799ef3f 100644
--- a/drivers/block/nd/nd-private.h
+++ b/drivers/block/nd/nd-private.h
@@ -73,11 +73,6 @@ static inline void nd_btt_notify_ndio(struct nd_bus *nd_bus, struct nd_io *ndio)
struct nd_bus *walk_to_nd_bus(struct device *nd_dev);
int __init nd_bus_init(void);
void nd_bus_exit(void);
-int __init nd_dimm_init(void);
-int __init nd_region_init(void);
-void __init nd_region_init_locks(void);
-void nd_dimm_exit(void);
-int nd_region_exit(void);
void nd_region_probe_start(struct nd_bus *nd_bus, struct device *dev);
void nd_region_probe_end(struct nd_bus *nd_bus, struct device *dev, int rc);
struct nd_region;
diff --git a/drivers/block/nd/nd.h b/drivers/block/nd/nd.h
index b830801c9892..e826fa3dfeac 100644
--- a/drivers/block/nd/nd.h
+++ b/drivers/block/nd/nd.h
@@ -231,6 +231,10 @@ void nd_init_ndio(struct nd_io *ndio, nd_rw_bytes_fn rw_bytes,
void ndio_del_claim(struct nd_io_claim *ndio_claim);
struct nd_io_claim *ndio_add_claim(struct nd_io *ndio, struct device *holder,
ndio_notify_remove_fn notify_remove);
+int __init nd_dimm_init(void);
+int __init nd_region_init(void);
+void nd_dimm_exit(void);
+void nd_region_exit(void);
struct nd_dimm;
struct nd_dimm_drvdata *to_ndd(struct nd_mapping *nd_mapping);
int nd_dimm_init_nsarea(struct nd_dimm_drvdata *ndd);
diff --git a/drivers/block/nd/region.c b/drivers/block/nd/region.c
index 75ae27279f0e..5af7701ad6ea 100644
--- a/drivers/block/nd/region.c
+++ b/drivers/block/nd/region.c
@@ -180,7 +180,7 @@ int __init nd_region_init(void)
return nd_driver_register(&nd_region_driver);
}
-void __exit nd_region_exit(void)
+void nd_region_exit(void)
{
driver_unregister(&nd_region_driver.drv);
}
5 years
