mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 11:19:37 +00:00
![Linus Torvalds](/assets/img/avatar_default.png)
* A rework of the filesytem-dax implementation provides for detection of
unmap operations (truncate / hole punch) colliding with in-progress
device-DMA. A fix for these collisions remains a work-in-progress
pending resolution of truncate latency and starvation regressions.
* The of_pmem driver expands the users of libnvdimm outside of x86 and
ACPI to describe an implementation of persistent memory on PowerPC with
Open Firmware / Device tree.
* Address Range Scrub (ARS) handling is completely rewritten to account for
the fact that ARS may run for 100s of seconds and there is no platform
defined way to cancel it. ARS will now no longer block namespace
initialization.
* The NVDIMM Namespace Label implementation is updated to handle label
areas as small as 1K, down from 128K.
* Miscellaneous cleanups and updates to unit test infrastructure.
-----BEGIN PGP SIGNATURE-----
iQIcBAABAgAGBQJazDt5AAoJEB7SkWpmfYgCqGMQALLwdPeY87cUK7AvQ2IXj46B
lJgeVuHPzyQDbC03AS5uUYnnU3I5lFd7i4y7ZrywNpFs4lsb/bNmbUpQE5xp+Yvc
1MJ/JYDIP5X4misWYm3VJo85N49+VqSRgAQk52PBigwnZ7M6/u4cSptXM9//c9JL
/NYbat6IjjY6Tx49Tec6+F3GMZjsFLcuTVkQcREoOyOqVJE4YpP0vhNjEe0vq6vr
EsSWiqEI5VFH4PfJwKdKj/64IKB4FGKj2A5cEgjQBxW2vw7tTJnkRkdE3jDUjqtg
xYAqGp/Dqs4+bgdYlT817YhiOVrcr5mOHj7TKWQrBPgzKCbcG5eKDmfT8t+3NEga
9kBlgisqIcG72lwZNA7QkEHxq1Omy9yc1hUv9qz2YA0G+J1WE8l1T15k1DOFwV57
qIrLLUypklNZLxvrzNjclempboKc4JCUlj+TdN5E5Y6pRs55UWTXaP7Xf5O7z0vf
l/uiiHkc3MPH73YD2PSEGFJ8m8EU0N8xhrcz3M9E2sHgYCnbty1Lw3FH0/GhThVA
ya1mMeDdb8A2P7gWCBk1Lqeig+rJKXSey4hKM6D0njOEtMQO1H4tFqGjyfDX1xlJ
3plUR9WBVEYzN5+9xWbwGag/ezGZ+NfcVO2gmy6yXiEph796BxRAZx/18zKRJr0m
9eGJG1H+JspcbtLF9iHn
=acZQ
-----END PGP SIGNATURE-----
Merge tag 'libnvdimm-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull libnvdimm updates from Dan Williams:
"This cycle was was not something I ever want to repeat as there were
several late changes that have only now just settled.
Half of the branch up to commit d2c997c0f1
("fs, dax: use
page->mapping to warn...") have been in -next for several releases.
The of_pmem driver and the address range scrub rework were late
arrivals, and the dax work was scaled back at the last moment.
The of_pmem driver missed a previous merge window due to an oversight.
A sense of obligation to rectify that miss is why it is included for
4.17. It has acks from PowerPC folks. Stephen reported a build failure
that only occurs when merging it with your latest tree, for now I have
fixed that up by disabling modular builds of of_pmem. A test merge
with your tree has received a build success report from the 0day robot
over 156 configs.
An initial version of the ARS rework was submitted before the merge
window. It is self contained to libnvdimm, a net code reduction, and
passing all unit tests.
The filesystem-dax changes are based on the wait_var_event()
functionality from tip/sched/core. However, late review feedback
showed that those changes regressed truncate performance to a large
degree. The branch was rewound to drop the truncate behavior change
and now only includes preparation patches and cleanups (with full acks
and reviews). The finalization of this dax-dma-vs-trnucate work will
need to wait for 4.18.
Summary:
- A rework of the filesytem-dax implementation provides for detection
of unmap operations (truncate / hole punch) colliding with
in-progress device-DMA. A fix for these collisions remains a
work-in-progress pending resolution of truncate latency and
starvation regressions.
- The of_pmem driver expands the users of libnvdimm outside of x86
and ACPI to describe an implementation of persistent memory on
PowerPC with Open Firmware / Device tree.
- Address Range Scrub (ARS) handling is completely rewritten to
account for the fact that ARS may run for 100s of seconds and there
is no platform defined way to cancel it. ARS will now no longer
block namespace initialization.
- The NVDIMM Namespace Label implementation is updated to handle
label areas as small as 1K, down from 128K.
- Miscellaneous cleanups and updates to unit test infrastructure"
* tag 'libnvdimm-for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: (39 commits)
libnvdimm, of_pmem: workaround OF_NUMA=n build error
nfit, address-range-scrub: add module option to skip initial ars
nfit, address-range-scrub: rework and simplify ARS state machine
nfit, address-range-scrub: determine one platform max_ars value
powerpc/powernv: Create platform devs for nvdimm buses
doc/devicetree: Persistent memory region bindings
libnvdimm: Add device-tree based driver
libnvdimm: Add of_node to region and bus descriptors
libnvdimm, region: quiet region probe
libnvdimm, namespace: use a safe lookup for dimm device name
libnvdimm, dimm: fix dpa reservation vs uninitialized label area
libnvdimm, testing: update the default smart ctrl_temperature
libnvdimm, testing: Add emulation for smart injection commands
nfit, address-range-scrub: introduce nfit_spa->ars_state
libnvdimm: add an api to cast a 'struct nd_region' to its 'struct device'
nfit, address-range-scrub: fix scrub in-progress reporting
dax, dm: allow device-mapper to operate without dax support
dax: introduce CONFIG_DAX_DRIVER
fs, dax: use page->mapping to warn if truncate collides with a busy page
ext2, dax: introduce ext2_dax_aops
...
426 lines
11 KiB
C
426 lines
11 KiB
C
/*
|
|
* Copyright(c) 2013-2015 Intel Corporation. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of version 2 of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*/
|
|
#ifndef __ND_H__
|
|
#define __ND_H__
|
|
#include <linux/libnvdimm.h>
|
|
#include <linux/badblocks.h>
|
|
#include <linux/blkdev.h>
|
|
#include <linux/device.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/ndctl.h>
|
|
#include <linux/types.h>
|
|
#include <linux/nd.h>
|
|
#include "label.h"
|
|
|
|
enum {
|
|
/*
|
|
* Limits the maximum number of block apertures a dimm can
|
|
* support and is an input to the geometry/on-disk-format of a
|
|
* BTT instance
|
|
*/
|
|
ND_MAX_LANES = 256,
|
|
INT_LBASIZE_ALIGNMENT = 64,
|
|
NVDIMM_IO_ATOMIC = 1,
|
|
};
|
|
|
|
struct nvdimm_drvdata {
|
|
struct device *dev;
|
|
int nslabel_size;
|
|
struct nd_cmd_get_config_size nsarea;
|
|
void *data;
|
|
int ns_current, ns_next;
|
|
struct resource dpa;
|
|
struct kref kref;
|
|
};
|
|
|
|
struct nd_region_data {
|
|
int ns_count;
|
|
int ns_active;
|
|
unsigned int hints_shift;
|
|
void __iomem *flush_wpq[0];
|
|
};
|
|
|
|
static inline void __iomem *ndrd_get_flush_wpq(struct nd_region_data *ndrd,
|
|
int dimm, int hint)
|
|
{
|
|
unsigned int num = 1 << ndrd->hints_shift;
|
|
unsigned int mask = num - 1;
|
|
|
|
return ndrd->flush_wpq[dimm * num + (hint & mask)];
|
|
}
|
|
|
|
static inline void ndrd_set_flush_wpq(struct nd_region_data *ndrd, int dimm,
|
|
int hint, void __iomem *flush)
|
|
{
|
|
unsigned int num = 1 << ndrd->hints_shift;
|
|
unsigned int mask = num - 1;
|
|
|
|
ndrd->flush_wpq[dimm * num + (hint & mask)] = flush;
|
|
}
|
|
|
|
static inline struct nd_namespace_index *to_namespace_index(
|
|
struct nvdimm_drvdata *ndd, int i)
|
|
{
|
|
if (i < 0)
|
|
return NULL;
|
|
|
|
return ndd->data + sizeof_namespace_index(ndd) * i;
|
|
}
|
|
|
|
static inline struct nd_namespace_index *to_current_namespace_index(
|
|
struct nvdimm_drvdata *ndd)
|
|
{
|
|
return to_namespace_index(ndd, ndd->ns_current);
|
|
}
|
|
|
|
static inline struct nd_namespace_index *to_next_namespace_index(
|
|
struct nvdimm_drvdata *ndd)
|
|
{
|
|
return to_namespace_index(ndd, ndd->ns_next);
|
|
}
|
|
|
|
unsigned sizeof_namespace_label(struct nvdimm_drvdata *ndd);
|
|
|
|
#define namespace_label_has(ndd, field) \
|
|
(offsetof(struct nd_namespace_label, field) \
|
|
< sizeof_namespace_label(ndd))
|
|
|
|
#define nd_dbg_dpa(r, d, res, fmt, arg...) \
|
|
dev_dbg((r) ? &(r)->dev : (d)->dev, "%s: %.13s: %#llx @ %#llx " fmt, \
|
|
(r) ? dev_name((d)->dev) : "", res ? res->name : "null", \
|
|
(unsigned long long) (res ? resource_size(res) : 0), \
|
|
(unsigned long long) (res ? res->start : 0), ##arg)
|
|
|
|
#define for_each_dpa_resource(ndd, res) \
|
|
for (res = (ndd)->dpa.child; res; res = res->sibling)
|
|
|
|
#define for_each_dpa_resource_safe(ndd, res, next) \
|
|
for (res = (ndd)->dpa.child, next = res ? res->sibling : NULL; \
|
|
res; res = next, next = next ? next->sibling : NULL)
|
|
|
|
struct nd_percpu_lane {
|
|
int count;
|
|
spinlock_t lock;
|
|
};
|
|
|
|
struct nd_label_ent {
|
|
struct list_head list;
|
|
struct nd_namespace_label *label;
|
|
};
|
|
|
|
enum nd_mapping_lock_class {
|
|
ND_MAPPING_CLASS0,
|
|
ND_MAPPING_UUID_SCAN,
|
|
};
|
|
|
|
struct nd_mapping {
|
|
struct nvdimm *nvdimm;
|
|
u64 start;
|
|
u64 size;
|
|
int position;
|
|
struct list_head labels;
|
|
struct mutex lock;
|
|
/*
|
|
* @ndd is for private use at region enable / disable time for
|
|
* get_ndd() + put_ndd(), all other nd_mapping to ndd
|
|
* conversions use to_ndd() which respects enabled state of the
|
|
* nvdimm.
|
|
*/
|
|
struct nvdimm_drvdata *ndd;
|
|
};
|
|
|
|
struct nd_region {
|
|
struct device dev;
|
|
struct ida ns_ida;
|
|
struct ida btt_ida;
|
|
struct ida pfn_ida;
|
|
struct ida dax_ida;
|
|
unsigned long flags;
|
|
struct device *ns_seed;
|
|
struct device *btt_seed;
|
|
struct device *pfn_seed;
|
|
struct device *dax_seed;
|
|
u16 ndr_mappings;
|
|
u64 ndr_size;
|
|
u64 ndr_start;
|
|
int id, num_lanes, ro, numa_node;
|
|
void *provider_data;
|
|
struct kernfs_node *bb_state;
|
|
struct badblocks bb;
|
|
struct nd_interleave_set *nd_set;
|
|
struct nd_percpu_lane __percpu *lane;
|
|
struct nd_mapping mapping[0];
|
|
};
|
|
|
|
struct nd_blk_region {
|
|
int (*enable)(struct nvdimm_bus *nvdimm_bus, struct device *dev);
|
|
int (*do_io)(struct nd_blk_region *ndbr, resource_size_t dpa,
|
|
void *iobuf, u64 len, int rw);
|
|
void *blk_provider_data;
|
|
struct nd_region nd_region;
|
|
};
|
|
|
|
/*
|
|
* Lookup next in the repeating sequence of 01, 10, and 11.
|
|
*/
|
|
static inline unsigned nd_inc_seq(unsigned seq)
|
|
{
|
|
static const unsigned next[] = { 0, 2, 3, 1 };
|
|
|
|
return next[seq & 3];
|
|
}
|
|
|
|
struct btt;
|
|
struct nd_btt {
|
|
struct device dev;
|
|
struct nd_namespace_common *ndns;
|
|
struct btt *btt;
|
|
unsigned long lbasize;
|
|
u64 size;
|
|
u8 *uuid;
|
|
int id;
|
|
int initial_offset;
|
|
u16 version_major;
|
|
u16 version_minor;
|
|
};
|
|
|
|
enum nd_pfn_mode {
|
|
PFN_MODE_NONE,
|
|
PFN_MODE_RAM,
|
|
PFN_MODE_PMEM,
|
|
};
|
|
|
|
struct nd_pfn {
|
|
int id;
|
|
u8 *uuid;
|
|
struct device dev;
|
|
unsigned long align;
|
|
unsigned long npfns;
|
|
enum nd_pfn_mode mode;
|
|
struct nd_pfn_sb *pfn_sb;
|
|
struct nd_namespace_common *ndns;
|
|
};
|
|
|
|
struct nd_dax {
|
|
struct nd_pfn nd_pfn;
|
|
};
|
|
|
|
enum nd_async_mode {
|
|
ND_SYNC,
|
|
ND_ASYNC,
|
|
};
|
|
|
|
int nd_integrity_init(struct gendisk *disk, unsigned long meta_size);
|
|
void wait_nvdimm_bus_probe_idle(struct device *dev);
|
|
void nd_device_register(struct device *dev);
|
|
void nd_device_unregister(struct device *dev, enum nd_async_mode mode);
|
|
void nd_device_notify(struct device *dev, enum nvdimm_event event);
|
|
int nd_uuid_store(struct device *dev, u8 **uuid_out, const char *buf,
|
|
size_t len);
|
|
ssize_t nd_size_select_show(unsigned long current_size,
|
|
const unsigned long *supported, char *buf);
|
|
ssize_t nd_size_select_store(struct device *dev, const char *buf,
|
|
unsigned long *current_size, const unsigned long *supported);
|
|
int __init nvdimm_init(void);
|
|
int __init nd_region_init(void);
|
|
int __init nd_label_init(void);
|
|
void nvdimm_exit(void);
|
|
void nd_region_exit(void);
|
|
struct nvdimm;
|
|
struct nvdimm_drvdata *to_ndd(struct nd_mapping *nd_mapping);
|
|
int nvdimm_check_config_data(struct device *dev);
|
|
int nvdimm_init_nsarea(struct nvdimm_drvdata *ndd);
|
|
int nvdimm_init_config_data(struct nvdimm_drvdata *ndd);
|
|
int nvdimm_set_config_data(struct nvdimm_drvdata *ndd, size_t offset,
|
|
void *buf, size_t len);
|
|
long nvdimm_clear_poison(struct device *dev, phys_addr_t phys,
|
|
unsigned int len);
|
|
void nvdimm_set_aliasing(struct device *dev);
|
|
void nvdimm_set_locked(struct device *dev);
|
|
void nvdimm_clear_locked(struct device *dev);
|
|
struct nd_btt *to_nd_btt(struct device *dev);
|
|
|
|
struct nd_gen_sb {
|
|
char reserved[SZ_4K - 8];
|
|
__le64 checksum;
|
|
};
|
|
|
|
u64 nd_sb_checksum(struct nd_gen_sb *sb);
|
|
#if IS_ENABLED(CONFIG_BTT)
|
|
int nd_btt_probe(struct device *dev, struct nd_namespace_common *ndns);
|
|
bool is_nd_btt(struct device *dev);
|
|
struct device *nd_btt_create(struct nd_region *nd_region);
|
|
#else
|
|
static inline int nd_btt_probe(struct device *dev,
|
|
struct nd_namespace_common *ndns)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline bool is_nd_btt(struct device *dev)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline struct device *nd_btt_create(struct nd_region *nd_region)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
struct nd_pfn *to_nd_pfn(struct device *dev);
|
|
#if IS_ENABLED(CONFIG_NVDIMM_PFN)
|
|
|
|
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
|
|
#define PFN_DEFAULT_ALIGNMENT HPAGE_PMD_SIZE
|
|
#else
|
|
#define PFN_DEFAULT_ALIGNMENT PAGE_SIZE
|
|
#endif
|
|
|
|
int nd_pfn_probe(struct device *dev, struct nd_namespace_common *ndns);
|
|
bool is_nd_pfn(struct device *dev);
|
|
struct device *nd_pfn_create(struct nd_region *nd_region);
|
|
struct device *nd_pfn_devinit(struct nd_pfn *nd_pfn,
|
|
struct nd_namespace_common *ndns);
|
|
int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig);
|
|
extern struct attribute_group nd_pfn_attribute_group;
|
|
#else
|
|
static inline int nd_pfn_probe(struct device *dev,
|
|
struct nd_namespace_common *ndns)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline bool is_nd_pfn(struct device *dev)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline struct device *nd_pfn_create(struct nd_region *nd_region)
|
|
{
|
|
return NULL;
|
|
}
|
|
|
|
static inline int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
#endif
|
|
|
|
struct nd_dax *to_nd_dax(struct device *dev);
|
|
#if IS_ENABLED(CONFIG_NVDIMM_DAX)
|
|
int nd_dax_probe(struct device *dev, struct nd_namespace_common *ndns);
|
|
bool is_nd_dax(struct device *dev);
|
|
struct device *nd_dax_create(struct nd_region *nd_region);
|
|
#else
|
|
static inline int nd_dax_probe(struct device *dev,
|
|
struct nd_namespace_common *ndns)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline bool is_nd_dax(struct device *dev)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
static inline struct device *nd_dax_create(struct nd_region *nd_region)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
int nd_region_to_nstype(struct nd_region *nd_region);
|
|
int nd_region_register_namespaces(struct nd_region *nd_region, int *err);
|
|
u64 nd_region_interleave_set_cookie(struct nd_region *nd_region,
|
|
struct nd_namespace_index *nsindex);
|
|
u64 nd_region_interleave_set_altcookie(struct nd_region *nd_region);
|
|
void nvdimm_bus_lock(struct device *dev);
|
|
void nvdimm_bus_unlock(struct device *dev);
|
|
bool is_nvdimm_bus_locked(struct device *dev);
|
|
int nvdimm_revalidate_disk(struct gendisk *disk);
|
|
void nvdimm_drvdata_release(struct kref *kref);
|
|
void put_ndd(struct nvdimm_drvdata *ndd);
|
|
int nd_label_reserve_dpa(struct nvdimm_drvdata *ndd);
|
|
void nvdimm_free_dpa(struct nvdimm_drvdata *ndd, struct resource *res);
|
|
struct resource *nvdimm_allocate_dpa(struct nvdimm_drvdata *ndd,
|
|
struct nd_label_id *label_id, resource_size_t start,
|
|
resource_size_t n);
|
|
resource_size_t nvdimm_namespace_capacity(struct nd_namespace_common *ndns);
|
|
struct nd_namespace_common *nvdimm_namespace_common_probe(struct device *dev);
|
|
int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns);
|
|
int nvdimm_namespace_detach_btt(struct nd_btt *nd_btt);
|
|
const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
|
|
char *name);
|
|
unsigned int pmem_sector_size(struct nd_namespace_common *ndns);
|
|
void nvdimm_badblocks_populate(struct nd_region *nd_region,
|
|
struct badblocks *bb, const struct resource *res);
|
|
#if IS_ENABLED(CONFIG_ND_CLAIM)
|
|
int nvdimm_setup_pfn(struct nd_pfn *nd_pfn, struct dev_pagemap *pgmap);
|
|
int devm_nsio_enable(struct device *dev, struct nd_namespace_io *nsio);
|
|
void devm_nsio_disable(struct device *dev, struct nd_namespace_io *nsio);
|
|
#else
|
|
static inline int nvdimm_setup_pfn(struct nd_pfn *nd_pfn,
|
|
struct dev_pagemap *pgmap)
|
|
{
|
|
return -ENXIO;
|
|
}
|
|
static inline int devm_nsio_enable(struct device *dev,
|
|
struct nd_namespace_io *nsio)
|
|
{
|
|
return -ENXIO;
|
|
}
|
|
static inline void devm_nsio_disable(struct device *dev,
|
|
struct nd_namespace_io *nsio)
|
|
{
|
|
}
|
|
#endif
|
|
int nd_blk_region_init(struct nd_region *nd_region);
|
|
int nd_region_activate(struct nd_region *nd_region);
|
|
void __nd_iostat_start(struct bio *bio, unsigned long *start);
|
|
static inline bool nd_iostat_start(struct bio *bio, unsigned long *start)
|
|
{
|
|
struct gendisk *disk = bio->bi_disk;
|
|
|
|
if (!blk_queue_io_stat(disk->queue))
|
|
return false;
|
|
|
|
*start = jiffies;
|
|
generic_start_io_acct(disk->queue, bio_data_dir(bio),
|
|
bio_sectors(bio), &disk->part0);
|
|
return true;
|
|
}
|
|
static inline void nd_iostat_end(struct bio *bio, unsigned long start)
|
|
{
|
|
struct gendisk *disk = bio->bi_disk;
|
|
|
|
generic_end_io_acct(disk->queue, bio_data_dir(bio), &disk->part0,
|
|
start);
|
|
}
|
|
static inline bool is_bad_pmem(struct badblocks *bb, sector_t sector,
|
|
unsigned int len)
|
|
{
|
|
if (bb->count) {
|
|
sector_t first_bad;
|
|
int num_bad;
|
|
|
|
return !!badblocks_check(bb, sector, len / 512, &first_bad,
|
|
&num_bad);
|
|
}
|
|
|
|
return false;
|
|
}
|
|
resource_size_t nd_namespace_blk_validate(struct nd_namespace_blk *nsblk);
|
|
const u8 *nd_dev_to_uuid(struct device *dev);
|
|
bool pmem_should_map_pages(struct device *dev);
|
|
#endif /* __ND_H__ */
|