[RFC ndctl PATCH 0/3] Rename monitor.conf to ndctl.conf as a ndctl global config file
by QI Fuli
From: QI Fuli <qi.fuli(a)fujitsu.com>
This patch set is to rename monitor.conf to ndctl.conf, and make it a
global ndctl configuration file that all ndctl commands can refer to.
As this patch set has been pending until now, I would like to know if
current idea works or not. If yes, I will finish the documents and test.
Signed-off-by: QI Fuli <qi.fuli(a)fujitsu.com>
QI Fuli (3):
ndctl, ccan: import ciniparser
ndctl, util: add parse-configs helper
ndctl, rename monitor.conf to ndctl.conf
Makefile.am | 8 +-
ccan/ciniparser/ciniparser.c | 480 +++++++++++++++++++++++++++++
ccan/ciniparser/ciniparser.h | 262 ++++++++++++++++
ccan/ciniparser/dictionary.c | 266 ++++++++++++++++
ccan/ciniparser/dictionary.h | 166 ++++++++++
configure.ac | 8 +-
ndctl/Makefile.am | 9 +-
ndctl/monitor.c | 127 ++------
ndctl/{monitor.conf => ndctl.conf} | 16 +-
util/parse-configs.c | 47 +++
util/parse-configs.h | 26 ++
11 files changed, 1294 insertions(+), 121 deletions(-)
create mode 100644 ccan/ciniparser/ciniparser.c
create mode 100644 ccan/ciniparser/ciniparser.h
create mode 100644 ccan/ciniparser/dictionary.c
create mode 100644 ccan/ciniparser/dictionary.h
rename ndctl/{monitor.conf => ndctl.conf} (82%)
create mode 100644 util/parse-configs.c
create mode 100644 util/parse-configs.h
--
2.30.2
1 hour, 41 minutes
[PATCH v19 0/8] mm: introduce memfd_secret system call to create "secret" memory areas
by Mike Rapoport
From: Mike Rapoport <rppt(a)linux.ibm.com>
Hi,
@Andrew, this is based on v5.13-rc1, I can rebase whatever way you prefer.
This is an implementation of "secret" mappings backed by a file descriptor.
The file descriptor backing secret memory mappings is created using a
dedicated memfd_secret system call The desired protection mode for the
memory is configured using flags parameter of the system call. The mmap()
of the file descriptor created with memfd_secret() will create a "secret"
memory mapping. The pages in that mapping will be marked as not present in
the direct map and will be present only in the page table of the owning mm.
Although normally Linux userspace mappings are protected from other users,
such secret mappings are useful for environments where a hostile tenant is
trying to trick the kernel into giving them access to other tenants
mappings.
It's designed to provide the following protections:
* Enhanced protection (in conjunction with all the other in-kernel
attack prevention systems) against ROP attacks. Seceretmem makes "simple"
ROP insufficient to perform exfiltration, which increases the required
complexity of the attack. Along with other protections like the kernel
stack size limit and address space layout randomization which make finding
gadgets is really hard, absence of any in-kernel primitive for accessing
secret memory means the one gadget ROP attack can't work. Since the only
way to access secret memory is to reconstruct the missing mapping entry,
the attacker has to recover the physical page and insert a PTE pointing to
it in the kernel and then retrieve the contents. That takes at least three
gadgets which is a level of difficulty beyond most standard attacks.
* Prevent cross-process secret userspace memory exposures. Once the secret
memory is allocated, the user can't accidentally pass it into the kernel to
be transmitted somewhere. The secreremem pages cannot be accessed via the
direct map and they are disallowed in GUP.
* Harden against exploited kernel flaws. In order to access secretmem, a
kernel-side attack would need to either walk the page tables and create new
ones, or spawn a new privileged uiserspace process to perform secrets
exfiltration using ptrace.
In the future the secret mappings may be used as a mean to protect guest memory
in a virtual machine host.
For demonstration of secret memory usage we've created a userspace library
https://git.kernel.org/pub/scm/linux/kernel/git/jejb/secret-memory-preloa...
that does two things: the first is act as a preloader for openssl to
redirect all the OPENSSL_malloc calls to secret memory meaning any secret
keys get automatically protected this way and the other thing it does is
expose the API to the user who needs it. We anticipate that a lot of the
use cases would be like the openssl one: many toolkits that deal with
secret keys already have special handling for the memory to try to give
them greater protection, so this would simply be pluggable into the
toolkits without any need for user application modification.
Hiding secret memory mappings behind an anonymous file allows usage of
the page cache for tracking pages allocated for the "secret" mappings as
well as using address_space_operations for e.g. page migration callbacks.
The anonymous file may be also used implicitly, like hugetlb files, to
implement mmap(MAP_SECRET) and use the secret memory areas with "native" mm
ABIs in the future.
Removing of the pages from the direct map may cause its fragmentation on
architectures that use large pages to map the physical memory which affects
the system performance. However, the original Kconfig text for
CONFIG_DIRECT_GBPAGES said that gigabyte pages in the direct map "... can
improve the kernel's performance a tiny bit ..." (commit 00d1c5e05736
("x86: add gbpages switches")) and the recent report [1] showed that "...
although 1G mappings are a good default choice, there is no compelling
evidence that it must be the only choice". Hence, it is sufficient to have
secretmem disabled by default with the ability of a system administrator to
enable it at boot time.
In addition, there is also a long term goal to improve management of the
direct map.
[1] https://lore.kernel.org/linux-mm/213b4567-46ce-f116-9cdf-bbd0c884eb3c@lin...
v19:
* block /dev/mem mmap access, per David
* disallow mmap/mprotect with PROT_EXEC, per Kees
* simplify return in page_is_secretmem(), per Matthew
* use unsigned int for syscall falgs, per Yury
v18: https://lore.kernel.org/lkml/20210303162209.8609-1-rppt@kernel.org
* rebase on v5.12-rc1
* merge kfence fix into the original patch
* massage commit message of the patch introducing the memfd_secret syscall
v17: https://lore.kernel.org/lkml/20210208084920.2884-1-rppt@kernel.org
* Remove pool of large pages backing secretmem allocations, per Michal Hocko
* Add secretmem pages to unevictable LRU, per Michal Hocko
* Use GFP_HIGHUSER as secretmem mapping mask, per Michal Hocko
* Make secretmem an opt-in feature that is disabled by default
v16: https://lore.kernel.org/lkml/20210121122723.3446-1-rppt@kernel.org
* Fix memory leak intorduced in v15
* Clean the data left from previous page user before handing the page to
the userspace
v15: https://lore.kernel.org/lkml/20210120180612.1058-1-rppt@kernel.org
* Add riscv/Kconfig update to disable set_memory operations for nommu
builds (patch 3)
* Update the code around add_to_page_cache() per Matthew's comments
(patches 6,7)
* Add fixups for build/checkpatch errors discovered by CI systems
Older history:
v14: https://lore.kernel.org/lkml/20201203062949.5484-1-rppt@kernel.org
v13: https://lore.kernel.org/lkml/20201201074559.27742-1-rppt@kernel.org
v12: https://lore.kernel.org/lkml/20201125092208.12544-1-rppt@kernel.org
v11: https://lore.kernel.org/lkml/20201124092556.12009-1-rppt@kernel.org
v10: https://lore.kernel.org/lkml/20201123095432.5860-1-rppt@kernel.org
v9: https://lore.kernel.org/lkml/20201117162932.13649-1-rppt@kernel.org
v8: https://lore.kernel.org/lkml/20201110151444.20662-1-rppt@kernel.org
v7: https://lore.kernel.org/lkml/20201026083752.13267-1-rppt@kernel.org
v6: https://lore.kernel.org/lkml/20200924132904.1391-1-rppt@kernel.org
v5: https://lore.kernel.org/lkml/20200916073539.3552-1-rppt@kernel.org
v4: https://lore.kernel.org/lkml/20200818141554.13945-1-rppt@kernel.org
v3: https://lore.kernel.org/lkml/20200804095035.18778-1-rppt@kernel.org
v2: https://lore.kernel.org/lkml/20200727162935.31714-1-rppt@kernel.org
v1: https://lore.kernel.org/lkml/20200720092435.17469-1-rppt@kernel.org
rfc-v2: https://lore.kernel.org/lkml/20200706172051.19465-1-rppt@kernel.org/
rfc-v1: https://lore.kernel.org/lkml/20200130162340.GA14232@rapoport-lnx/
rfc-v0: https://lore.kernel.org/lkml/1572171452-7958-1-git-send-email-rppt@kernel...
Mike Rapoport (8):
mmap: make mlock_future_check() global
riscv/Kconfig: make direct map manipulation options depend on MMU
set_memory: allow set_direct_map_*_noflush() for multiple pages
set_memory: allow querying whether set_direct_map_*() is actually enabled
mm: introduce memfd_secret system call to create "secret" memory areas
PM: hibernate: disable when there are active secretmem users
arch, mm: wire up memfd_secret system call where relevant
secretmem: test: add basic selftest for memfd_secret(2)
arch/arm64/include/asm/Kbuild | 1 -
arch/arm64/include/asm/cacheflush.h | 6 -
arch/arm64/include/asm/kfence.h | 2 +-
arch/arm64/include/asm/set_memory.h | 17 ++
arch/arm64/include/uapi/asm/unistd.h | 1 +
arch/arm64/kernel/machine_kexec.c | 1 +
arch/arm64/mm/mmu.c | 6 +-
arch/arm64/mm/pageattr.c | 23 +-
arch/riscv/Kconfig | 4 +-
arch/riscv/include/asm/set_memory.h | 4 +-
arch/riscv/include/asm/unistd.h | 1 +
arch/riscv/mm/pageattr.c | 8 +-
arch/x86/entry/syscalls/syscall_32.tbl | 1 +
arch/x86/entry/syscalls/syscall_64.tbl | 1 +
arch/x86/include/asm/set_memory.h | 4 +-
arch/x86/mm/pat/set_memory.c | 8 +-
drivers/char/mem.c | 4 +
include/linux/secretmem.h | 54 ++++
include/linux/set_memory.h | 16 +-
include/linux/syscalls.h | 1 +
include/uapi/asm-generic/unistd.h | 7 +-
include/uapi/linux/magic.h | 1 +
kernel/power/hibernate.c | 5 +-
kernel/power/snapshot.c | 4 +-
kernel/sys_ni.c | 2 +
mm/Kconfig | 4 +
mm/Makefile | 1 +
mm/gup.c | 12 +
mm/internal.h | 3 +
mm/mlock.c | 3 +-
mm/mmap.c | 5 +-
mm/secretmem.c | 254 +++++++++++++++++++
mm/vmalloc.c | 5 +-
scripts/checksyscalls.sh | 4 +
tools/testing/selftests/vm/.gitignore | 1 +
tools/testing/selftests/vm/Makefile | 3 +-
tools/testing/selftests/vm/memfd_secret.c | 296 ++++++++++++++++++++++
tools/testing/selftests/vm/run_vmtests.sh | 17 ++
38 files changed, 744 insertions(+), 46 deletions(-)
create mode 100644 arch/arm64/include/asm/set_memory.h
create mode 100644 include/linux/secretmem.h
create mode 100644 mm/secretmem.c
create mode 100644 tools/testing/selftests/vm/memfd_secret.c
base-commit: 6efb943b8616ec53a5e444193dccf1af9ad627b5
--
2.28.0
17 hours, 26 minutes
[GIT PULL] libnvdimm fixes for 5.13-rc2
by Dan Williams
Hi Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
tags/libnvdimm-fixes-5.13-rc2
...to receive a regression fix for a bootup crash condition introduced
in -rc1 and some other minor fixups. This has all appeared in -next
with no reported issues.
---
The following changes since commit 6efb943b8616ec53a5e444193dccf1af9ad627b5:
Linux 5.13-rc1 (2021-05-09 14:17:44 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
tags/libnvdimm-fixes-5.13-rc2
for you to fetch changes up to e9cfd259c6d386f6235395a13bd4f357a979b2d0:
ACPI: NFIT: Fix support for variable 'SPA' structure size
(2021-05-12 12:38:25 -0700)
----------------------------------------------------------------
libnvdimm fixes for 5.13-rc2
- Fix regression in ACPI NFIT table handling leading to crashes and
driver load failures.
- Move the nvdimm mailing list
- Miscellaneous minor fixups
----------------------------------------------------------------
Dan Williams (2):
MAINTAINERS: Move nvdimm mailing list
ACPI: NFIT: Fix support for variable 'SPA' structure size
Wan Jiabing (1):
libnvdimm: Remove duplicate struct declaration
Zou Wei (1):
tools/testing/nvdimm: Make symbol '__nfit_test_ioremap' static
Documentation/ABI/obsolete/sysfs-class-dax | 2 +-
Documentation/ABI/removed/sysfs-bus-nfit | 2 +-
Documentation/ABI/testing/sysfs-bus-nfit | 40 ++++++++++++-------------
Documentation/ABI/testing/sysfs-bus-papr-pmem | 4 +--
Documentation/driver-api/nvdimm/nvdimm.rst | 2 +-
MAINTAINERS | 14 ++++-----
drivers/acpi/nfit/core.c | 15 +++++++---
include/linux/libnvdimm.h | 1 -
tools/testing/nvdimm/test/iomap.c | 2 +-
tools/testing/nvdimm/test/nfit.c | 42 ++++++++++++++++-----------
10 files changed, 69 insertions(+), 55 deletions(-)
1 day, 8 hours
[GIT PULL] dax fixes for v5.13-rc2
by Dan Williams
Hi Linus, please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
tags/dax-fixes-5.13-rc2
...to receive a fix for a hang condition in the filesystem-dax core
when exercised by virtiofs. This bug has been there from the
beginning, but the condition has not triggered on other filesystems
since they hold a lock over invalidation events.
The changes have appeared in -next with no reported issues. The
patches were originally against v5.12 so you will see a minor conflict
with Willy's nr_exceptional changes. My proposed conflict resolution
appended below.
---
The following changes since commit 9f4ad9e425a1d3b6a34617b8ea226d56a119a717:
Linux 5.12 (2021-04-25 13:49:08 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
tags/dax-fixes-5.13-rc2
for you to fetch changes up to 237388320deffde7c2d65ed8fc9eef670dc979b3:
dax: Wake up all waiters after invalidating dax entry (2021-05-07
15:55:44 -0700)
----------------------------------------------------------------
dax fixes for 5.13-rc2
- Fix a hang condition (missed wakeups with virtiofs when invalidating
entries)
----------------------------------------------------------------
Vivek Goyal (3):
dax: Add an enum for specifying dax wakup mode
dax: Add a wakeup mode parameter to put_unlocked_entry()
dax: Wake up all waiters after invalidating dax entry
fs/dax.c | 35 +++++++++++++++++++++++------------
1 file changed, 23 insertions(+), 12 deletions(-)
diff --cc fs/dax.c
index 69216241392f,df5485b4bddf..62352cbcf0f4
--- a/fs/dax.c
+++ b/fs/dax.c
@@@ -524,8 -535,8 +535,8 @@@ retry
dax_disassociate_entry(entry, mapping, false);
xas_store(xas, NULL); /* undo the PMD join */
- dax_wake_entry(xas, entry, true);
+ dax_wake_entry(xas, entry, WAKE_ALL);
- mapping->nrexceptional--;
+ mapping->nrpages -= PG_PMD_NR;
entry = NULL;
xas_set(xas, index);
}
@@@ -661,10 -672,10 +672,10 @@@ static int __dax_invalidate_entry(struc
goto out;
dax_disassociate_entry(entry, mapping, trunc);
xas_store(&xas, NULL);
- mapping->nrexceptional--;
+ mapping->nrpages -= 1UL << dax_entry_order(entry);
ret = 1;
out:
- put_unlocked_entry(&xas, entry);
+ put_unlocked_entry(&xas, entry, WAKE_ALL);
xas_unlock_irq(&xas);
return ret;
}
1 day, 8 hours
【重要なお知らせ】【MyJCB】ご利用確認のお願い
by JCBカード株式会社
【MyJCBカード】利用いただき、ありがとうございます。
このたび、ご本人様のご利用かどうかを確認させていただきたいお取引がありましたので、誠に勝手ながら、カードのご利用を一部制限させていただき、ご連絡させていただきました。
つきましては、以下へアクセスの上、カードのご利用確認にご協力をお願い致します。
お客様にはご迷惑、ご心配をお掛けし、誠に申し訳ございません。
何卒ご理解いただきたくお願い申しあげます。
ご回答をいただけない場合、カードのご利用制限が継続されることもございますので、予めご了承下さい。
■ご利用確認はこちら
弊社は、インターネット上の不正行為の防止・抑制の観点からサイトとしての信頼性・正当性を高めるため、
大変お手数ではございますが、下記ＵＲＬからログインいただき、
ご不便とご心配をおかけしまして誠に申し訳ございませんが、
何とぞご理解賜りたくお願い申しあげます。
──────────────────────────────────
株式会社ジェーシービー
━━━━━━━━━━━━━━━
■発行者■
株式会社ジェーシービー
東京都港区南青山5-1-22
──────────────────────────────────
©JCB Co., Ltd. 2000
無断転載および再配布を禁じます。
1 day, 16 hours
【重要なお知らせ】【MyJCB】ご利用確認のお願い
by 株式会社ジェーシービー
【MyJCBカード】利用いただき、ありがとうございます。
このたび、ご本人様のご利用かどうかを確認させていただきたいお取引がありましたので、誠に勝手ながら、カードのご利用を一部制限させていただき、ご連絡させていただきました。
つきましては、以下へアクセスの上、カードのご利用確認にご協力をお願い致します。
お客様にはご迷惑、ご心配をお掛けし、誠に申し訳ございません。
何卒ご理解いただきたくお願い申しあげます。
ご回答をいただけない場合、カードのご利用制限が継続されることもございますので、予めご了承下さい。
■ご利用確認はこちら
弊社は、インターネット上の不正行為の防止・抑制の観点からサイトとしての信頼性・正当性を高めるため、
大変お手数ではございますが、下記ＵＲＬからログインいただき、
ご不便とご心配をおかけしまして誠に申し訳ございませんが、
何とぞご理解賜りたくお願い申しあげます。
──────────────────────────────────
株式会社ジェーシービー
━━━━━━━━━━━━━━━
■発行者■
株式会社ジェーシービー
東京都港区南青山5-1-22
──────────────────────────────────
©JCB Co., Ltd. 2000
無断転載および再配布を禁じます。
1 day, 22 hours
Re: [PATCH v5 5/7] fsdax: Dedup file range to use a compare function
by Darrick J. Wong
On Fri, May 14, 2021 at 08:35:44AM +0000, ruansy.fnst(a)fujitsu.com wrote:
>
>
> > -----Original Message-----
> > From: Darrick J. Wong <djwong(a)kernel.org>
> > Subject: Re: [PATCH v5 5/7] fsdax: Dedup file range to use a compare function
> >
> > On Tue, May 11, 2021 at 11:09:31AM +0800, Shiyang Ruan wrote:
> > > With dax we cannot deal with readpage() etc. So, we create a dax
> > > comparison funciton which is similar with
> > > vfs_dedupe_file_range_compare().
> > > And introduce dax_remap_file_range_prep() for filesystem use.
> > >
> > > Signed-off-by: Goldwyn Rodrigues <rgoldwyn(a)suse.com>
> > > Signed-off-by: Shiyang Ruan <ruansy.fnst(a)fujitsu.com>
> > > ---
> > > fs/dax.c | 56
> > +++++++++++++++++++++++++++++++++++++++++++
> > > fs/remap_range.c | 57
> > +++++++++++++++++++++++++++++++++++++-------
> > > fs/xfs/xfs_reflink.c | 8 +++++--
> > > include/linux/dax.h | 4 ++++
> > > include/linux/fs.h | 12 ++++++----
> > > 5 files changed, 123 insertions(+), 14 deletions(-)
> > >
> > > diff --git a/fs/dax.c b/fs/dax.c
> > > index ee9d28a79bfb..dedf1be0155c 100644
> > > --- a/fs/dax.c
> > > +++ b/fs/dax.c
> > > @@ -1853,3 +1853,59 @@ vm_fault_t dax_finish_sync_fault(struct vm_fault
> > *vmf,
> > > return dax_insert_pfn_mkwrite(vmf, pfn, order); }
> > > EXPORT_SYMBOL_GPL(dax_finish_sync_fault);
> > > +
> > > +static loff_t dax_range_compare_actor(struct inode *ino1, loff_t pos1,
> > > + struct inode *ino2, loff_t pos2, loff_t len, void *data,
> > > + struct iomap *smap, struct iomap *dmap) {
> > > + void *saddr, *daddr;
> > > + bool *same = data;
> > > + int ret;
> > > +
> > > + if (smap->type == IOMAP_HOLE && dmap->type == IOMAP_HOLE) {
> > > + *same = true;
> > > + return len;
> > > + }
> > > +
> > > + if (smap->type == IOMAP_HOLE || dmap->type == IOMAP_HOLE) {
> > > + *same = false;
> > > + return 0;
> > > + }
> > > +
> > > + ret = dax_iomap_direct_access(smap, pos1, ALIGN(pos1 + len, PAGE_SIZE),
> > > + &saddr, NULL);
> > > + if (ret < 0)
> > > + return -EIO;
> > > +
> > > + ret = dax_iomap_direct_access(dmap, pos2, ALIGN(pos2 + len, PAGE_SIZE),
> > > + &daddr, NULL);
> > > + if (ret < 0)
> > > + return -EIO;
> > > +
> > > + *same = !memcmp(saddr, daddr, len);
> > > + return len;
> > > +}
> > > +
> > > +int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
> > > + struct inode *dest, loff_t destoff, loff_t len, bool *is_same,
> > > + const struct iomap_ops *ops)
> > > +{
> > > + int id, ret = 0;
> > > +
> > > + id = dax_read_lock();
> > > + while (len) {
> > > + ret = iomap_apply2(src, srcoff, dest, destoff, len, 0, ops,
> > > + is_same, dax_range_compare_actor);
> > > + if (ret < 0 || !*is_same)
> > > + goto out;
> > > +
> > > + len -= ret;
> > > + srcoff += ret;
> > > + destoff += ret;
> > > + }
> > > + ret = 0;
> > > +out:
> > > + dax_read_unlock(id);
> > > + return ret;
> > > +}
> > > +EXPORT_SYMBOL_GPL(dax_dedupe_file_range_compare);
> > > diff --git a/fs/remap_range.c b/fs/remap_range.c index
> > > e4a5fdd7ad7b..7bc4c8e3aa9f 100644
> > > --- a/fs/remap_range.c
> > > +++ b/fs/remap_range.c
> > > @@ -14,6 +14,7 @@
> > > #include <linux/compat.h>
> > > #include <linux/mount.h>
> > > #include <linux/fs.h>
> > > +#include <linux/dax.h>
> > > #include "internal.h"
> > >
> > > #include <linux/uaccess.h>
> > > @@ -199,9 +200,9 @@ static void vfs_unlock_two_pages(struct page *page1,
> > struct page *page2)
> > > * Compare extents of two files to see if they are the same.
> > > * Caller must have locked both inodes to prevent write races.
> > > */
> > > -static int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
> > > - struct inode *dest, loff_t destoff,
> > > - loff_t len, bool *is_same)
> > > +int vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
> > > + struct inode *dest, loff_t destoff,
> > > + loff_t len, bool *is_same)
> > > {
> > > loff_t src_poff;
> > > loff_t dest_poff;
> > > @@ -280,6 +281,7 @@ static int vfs_dedupe_file_range_compare(struct
> > > inode *src, loff_t srcoff,
> > > out_error:
> > > return error;
> > > }
> > > +EXPORT_SYMBOL(vfs_dedupe_file_range_compare);
> > >
> > > /*
> > > * Check that the two inodes are eligible for cloning, the ranges
> > > make @@ -289,9 +291,11 @@ static int
> > vfs_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
> > > * If there's an error, then the usual negative error code is returned.
> > > * Otherwise returns 0 with *len set to the request length.
> > > */
> > > -int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > - struct file *file_out, loff_t pos_out,
> > > - loff_t *len, unsigned int remap_flags)
> > > +static int
> > > +__generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *len, unsigned int remap_flags,
> > > + const struct iomap_ops *dax_read_ops)
> > > {
> > > struct inode *inode_in = file_inode(file_in);
> > > struct inode *inode_out = file_inode(file_out); @@ -351,8 +355,17 @@
> > > int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > if (remap_flags & REMAP_FILE_DEDUP) {
> > > bool is_same = false;
> > >
> > > - ret = vfs_dedupe_file_range_compare(inode_in, pos_in,
> > > - inode_out, pos_out, *len, &is_same);
> > > + if (!IS_DAX(inode_in))
> > > + ret = vfs_dedupe_file_range_compare(inode_in, pos_in,
> > > + inode_out, pos_out, *len, &is_same); #ifdef
> > CONFIG_FS_DAX
> > > + else if (dax_read_ops)
> > > + ret = dax_dedupe_file_range_compare(inode_in, pos_in,
> > > + inode_out, pos_out, *len, &is_same,
> > > + dax_read_ops);
> > > +#endif /* CONFIG_FS_DAX */
> >
> > Hmm, can you add an entry to the !IS_ENABLED(CONFIG_DAX) part of dax.h
> > that defines dax_dedupe_file_range_compare as a dummy function that returns
> > -EOPNOTSUPP? We try not to sprinkle preprocessor directives into the middle
> > of functions, per Linus rules.
>
> I found that it's ok to build without the #ifdef and #endif here, even
> though CONFIG_FS_DAX is disabled.
> And like other dax functions in fs/dax.c, such as dax_iomap_rw(), it
> is declared in include/linux/dax.h without IS_ENABLED() or #ifdef
> wrapped. And xfs calls it directly and it won't cause build error.
> So, I think I could just remove the #ifdef here, but I am not sure if
> this obeys the rule.
If it doesn't break the build (yay kbuild robot!) then it's probably
ok.
> >
> > > + else
> > > + return -EINVAL;
> > > if (ret)
> > > return ret;
> > > if (!is_same)
> > > @@ -370,6 +383,34 @@ int generic_remap_file_range_prep(struct file
> > > *file_in, loff_t pos_in,
> > >
> > > return ret;
> > > }
> > > +
> > > +#ifdef CONFIG_FS_DAX
> > > +int dax_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *len, unsigned int remap_flags,
> > > + const struct iomap_ops *ops) {
> > > + return __generic_remap_file_range_prep(file_in, pos_in, file_out,
> > > + pos_out, len, remap_flags, ops); } #else int
> > > +dax_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *len, unsigned int remap_flags,
> > > + const struct iomap_ops *ops) {
> > > + return -EOPNOTSUPP;
> > > +}
> > > +#endif /* CONFIG_FS_DAX */
> > > +EXPORT_SYMBOL(dax_remap_file_range_prep);
> >
> > I think this symbol belongs in fs/dax.c and the declaration in dax.h?
>
> For the function name, it does should belong to fs/dax. But if so,
> __generic_remap_file_range_prep() needs to be called in fs/dax. I
> don't think this is good.
Why not? FS_DAX is a boolean, so fs/dax.o will get linked into the same
vmlinux file as fs/remap_range.o.
--D
>
>
> --
> Thanks,
> Ruan Shiyang.
>
> >
> > --D
> >
> > > +int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *len, unsigned int remap_flags) {
> > > + return __generic_remap_file_range_prep(file_in, pos_in, file_out,
> > > + pos_out, len, remap_flags, NULL); }
> > > EXPORT_SYMBOL(generic_remap_file_range_prep);
> > >
> > > loff_t do_clone_file_range(struct file *file_in, loff_t pos_in, diff
> > > --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index
> > > 060695d6d56a..d25434f93235 100644
> > > --- a/fs/xfs/xfs_reflink.c
> > > +++ b/fs/xfs/xfs_reflink.c
> > > @@ -1329,8 +1329,12 @@ xfs_reflink_remap_prep(
> > > if (IS_DAX(inode_in) || IS_DAX(inode_out))
> > > goto out_unlock;
> > >
> > > - ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,
> > > - len, remap_flags);
> > > + if (!IS_DAX(inode_in))
> > > + ret = generic_remap_file_range_prep(file_in, pos_in, file_out,
> > > + pos_out, len, remap_flags);
> > > + else
> > > + ret = dax_remap_file_range_prep(file_in, pos_in, file_out,
> > > + pos_out, len, remap_flags, &xfs_read_iomap_ops);
> > > if (ret || *len == 0)
> > > goto out_unlock;
> > >
> > > diff --git a/include/linux/dax.h b/include/linux/dax.h index
> > > 3275e01ed33d..32e1c34349f2 100644
> > > --- a/include/linux/dax.h
> > > +++ b/include/linux/dax.h
> > > @@ -239,6 +239,10 @@ int dax_invalidate_mapping_entry_sync(struct
> > address_space *mapping,
> > > pgoff_t index);
> > > s64 dax_iomap_zero(loff_t pos, u64 length, struct iomap *iomap,
> > > struct iomap *srcmap);
> > > +int dax_dedupe_file_range_compare(struct inode *src, loff_t srcoff,
> > > + struct inode *dest, loff_t destoff,
> > > + loff_t len, bool *is_same,
> > > + const struct iomap_ops *ops);
> > > static inline bool dax_mapping(struct address_space *mapping) {
> > > return mapping->host && IS_DAX(mapping->host); diff --git
> > > a/include/linux/fs.h b/include/linux/fs.h index
> > > c3c88fdb9b2a..e2c348553d87 100644
> > > --- a/include/linux/fs.h
> > > +++ b/include/linux/fs.h
> > > @@ -71,6 +71,7 @@ struct fsverity_operations; struct fs_context;
> > > struct fs_parameter_spec; struct fileattr;
> > > +struct iomap_ops;
> > >
> > > extern void __init inode_init(void);
> > > extern void __init inode_init_early(void); @@ -2126,10 +2127,13 @@
> > > extern ssize_t vfs_copy_file_range(struct file *, loff_t , struct file
> > > *, extern ssize_t generic_copy_file_range(struct file *file_in, loff_t pos_in,
> > > struct file *file_out, loff_t pos_out,
> > > size_t len, unsigned int flags); -extern int
> > > generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > - struct file *file_out, loff_t pos_out,
> > > - loff_t *count,
> > > - unsigned int remap_flags);
> > > +int generic_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *count, unsigned int remap_flags); int
> > > +dax_remap_file_range_prep(struct file *file_in, loff_t pos_in,
> > > + struct file *file_out, loff_t pos_out,
> > > + loff_t *len, unsigned int remap_flags,
> > > + const struct iomap_ops *ops);
> > > extern loff_t do_clone_file_range(struct file *file_in, loff_t pos_in,
> > > struct file *file_out, loff_t pos_out,
> > > loff_t len, unsigned int remap_flags);
> > > --
> > > 2.31.1
> > >
> > >
> > >
2 days, 8 hours
[RFC 0/4] Add perf interface to expose nvdimm performance stats
by Kajol Jain
Patchset adds performance stats reporting support for nvdimm.
Added interface includes support for a pmu register function and
callbacks to be used by arch/platform specific drivers.
User could use standard perf tool to access perf events exposed via pmu.
Patchset adds a structure called nvdimm_pmu which can
be used to add platform specific data like supported event list and
callbacks to pmu functions like event_init/add/delete/read.
Patchset includes an implements the to expose IBM pseries platform nmem*
device performance stats using this interface.
Result from power9 pseries lpar with 2 nvdimm device:
command:# perf list nmem
nmem0/cchrhcnt/ [Kernel PMU event]
nmem0/cchwhcnt/ [Kernel PMU event]
nmem0/critrscu/ [Kernel PMU event]
nmem0/ctlresct/ [Kernel PMU event]
nmem0/ctlrestm/ [Kernel PMU event]
nmem0/fastwcnt/ [Kernel PMU event]
nmem0/hostlcnt/ [Kernel PMU event]
nmem0/hostldur/ [Kernel PMU event]
nmem0/hostscnt/ [Kernel PMU event]
nmem0/hostsdur/ [Kernel PMU event]
nmem0/medrcnt/ [Kernel PMU event]
nmem0/medrdur/ [Kernel PMU event]
nmem0/medwcnt/ [Kernel PMU event]
nmem0/medwdur/ [Kernel PMU event]
nmem0/memlife/ [Kernel PMU event]
nmem0/noopstat/ [Kernel PMU event]
nmem0/ponsecs/ [Kernel PMU event]
nmem1/cchrhcnt/ [Kernel PMU event]
nmem1/cchwhcnt/ [Kernel PMU event]
nmem1/critrscu/ [Kernel PMU event]
...
nmem1/noopstat/ [Kernel PMU event]
nmem1/ponsecs/ [Kernel PMU event]
Patch1:
Introduces the nvdimm_pmu structure, common function for pmu
register along with callback routine check.
Pacth2
Add code in arch/powerpc/platform/pseries/papr_scm.c to expose
nmem* pmu. It fills in the nvdimm_pmu structure with event attrs
and event callback functions and then registers the pmu by adding
callback to register_nvdimm_pmu.
Patch3:
Sysfs documentation patch
Patch4:
Adds cpuhotplug support.
Kajol Jain (4):
drivers/nvdimm: Add perf interface to expose nvdimm performance stats
powerpc/papr_scm: Add perf interface support
powerpc/papr_scm: Document papr_scm sysfs event format entries
powerpc/papr_scm: Add cpu hotplug support for nvdimm pmu device
Documentation/ABI/testing/sysfs-bus-papr-pmem | 31 ++
arch/powerpc/include/asm/device.h | 5 +
arch/powerpc/platforms/pseries/papr_scm.c | 346 +++++++++++++++++-
drivers/nvdimm/Makefile | 1 +
drivers/nvdimm/nd_perf.c | 111 ++++++
include/linux/nd.h | 31 ++
6 files changed, 524 insertions(+), 1 deletion(-)
create mode 100644 drivers/nvdimm/nd_perf.c
--
2.27.0
2 days, 13 hours
RE: [PATCH v3 0/3] fsdax: Factor helper functions to simplify the
code
by ruansy.fnst＠fujitsu.com
>
> Hi, Dan
>
> Do you have any comments on this?
Ping
>
>
> --
> Thanks,
> Ruan Shiyang.
>
> > -----Original Message-----
> > From: Shiyang Ruan <ruansy.fnst(a)fujitsu.com>
> > Sent: Thursday, April 22, 2021 9:45 PM
> > Subject: [PATCH v3 0/3] fsdax: Factor helper functions to simplify the
> > code
> >
> > From: Shiyang Ruan <ruansy.fnst(a)cn.fujitsu.com>
> >
> > The page fault part of fsdax code is little complex. In order to add
> > CoW feature and make it easy to understand, I was suggested to factor
> > some helper functions to simplify the current dax code.
> >
> > This is separated from the previous patchset called "V3 fsdax,xfs: Add
> > reflink&dedupe support for fsdax", and the previous comments are here[1].
> >
> > [1]:
> > https://patchwork.kernel.org/project/linux-nvdimm/patch/20210319015237
> > .99
> > 3880-3-ruansy.fnst(a)fujitsu.com/
> >
> > Changes from V2:
> > - fix the type of 'major' in patch 2
> > - Rebased on v5.12-rc8
> >
> > Changes from V1:
> > - fix Ritesh's email address
> > - simplify return logic in dax_fault_cow_page()
> >
> > (Rebased on v5.12-rc8)
> > ==
> >
> > Shiyang Ruan (3):
> > fsdax: Factor helpers to simplify dax fault code
> > fsdax: Factor helper: dax_fault_actor()
> > fsdax: Output address in dax_iomap_pfn() and rename it
> >
> > fs/dax.c | 443
> > +++++++++++++++++++++++++++++--------------------------
> > 1 file changed, 234 insertions(+), 209 deletions(-)
> >
> > --
> > 2.31.1
>
>
2 days, 14 hours
[PATCH v5 0/7] fsdax,xfs: Add reflink&dedupe support for fsdax
by Shiyang Ruan
This patchset is attempt to add CoW support for fsdax, and take XFS,
which has both reflink and fsdax feature, as an example.
Changes from V4:
- Fix the mistake of breaking dax layout for two inodes
- Add CONFIG_FS_DAX judgement for fsdax code in remap_range.c
- Fix other small problems and mistakes
Changes from V3:
- Take out the first 3 patches as a cleanup patchset[1], which has been
sent yesterday.
- Fix usage of code in dax_iomap_cow_copy()
- Add comments for macro definitions
- Fix other code style problems and mistakes
One of the key mechanism need to be implemented in fsdax is CoW. Copy
the data from srcmap before we actually write data to the destance
iomap. And we just copy range in which data won't be changed.
Another mechanism is range comparison. In page cache case, readpage()
is used to load data on disk to page cache in order to be able to
compare data. In fsdax case, readpage() does not work. So, we need
another compare data with direct access support.
With the two mechanisms implemented in fsdax, we are able to make reflink
and fsdax work together in XFS.
Some of the patches are picked up from Goldwyn's patchset. I made some
changes to adapt to this patchset.
(Rebased on v5.13-rc1 and patchset[1])
[1]: https://lkml.org/lkml/2021/4/22/575
Shiyang Ruan (7):
fsdax: Introduce dax_iomap_cow_copy()
fsdax: Replace mmap entry in case of CoW
fsdax: Add dax_iomap_cow_copy() for dax_iomap_zero
iomap: Introduce iomap_apply2() for operations on two files
fsdax: Dedup file range to use a compare function
fs/xfs: Handle CoW for fsdax write() path
fs/xfs: Add dax dedupe support
fs/dax.c | 206 +++++++++++++++++++++++++++++++++++------
fs/iomap/apply.c | 52 +++++++++++
fs/iomap/buffered-io.c | 2 +-
fs/remap_range.c | 57 ++++++++++--
fs/xfs/xfs_bmap_util.c | 3 +-
fs/xfs/xfs_file.c | 11 +--
fs/xfs/xfs_inode.c | 66 ++++++++++++-
fs/xfs/xfs_inode.h | 1 +
fs/xfs/xfs_iomap.c | 61 +++++++++++-
fs/xfs/xfs_iomap.h | 4 +
fs/xfs/xfs_iops.c | 7 +-
fs/xfs/xfs_reflink.c | 15 +--
include/linux/dax.h | 7 +-
include/linux/fs.h | 12 ++-
include/linux/iomap.h | 7 +-
15 files changed, 449 insertions(+), 62 deletions(-)
--
2.31.1
2 days, 16 hours
