erofs: ensure valid f_path for page cache sharing
Gao Xiang
maintainerPATCH 1/1 erofs: ensure valid f_path for page cache sharing
Previously, backing files for page cache sharing were set up with f_path left as NULL (only f_inode was valid). It worked, but a recent mincore fix relies on f_path.mnt and crashes (found by "erofs/028" on 7.2-rc4):
BUG: kernel NULL pointer dereference, address: 0000000000000018 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: Oops: 0000 [#1] SMP PTI CPU: 3 UID: 0 PID: 675528 Comm: fincore Not tainted 7.2.0-rc4-00002-g[]-dirty #1 PREEMPT(lazy) Hardware name: Red Hat KVM, BIOS 1.16.0-4.al8 04/01/2014 RIP: 0010:__do_sys_mincore+0xc0/0x2c0 ...
Specify valid paths using valid disconnected dentries together with erofs_ishare_mnt instead of leaving f_path empty, so they are more like real backing files in a pseudo filesystem and standard backing_file_open() can be used directly.
--- fs/erofs/Kconfig | 1 + fs/erofs/internal.h | 4 +-- fs/erofs/ishare.c | 60 ++++++++++++++++++++++----------------------- 3 files changed, 33 insertions(+), 32 deletions(-)
fs/erofs/Kconfig +1 -0
@@ -189,6 +189,7 @@ config EROFS_FS_PCPU_KTHREAD_HIPRI config EROFS_FS_PAGE_CACHE_SHARE bool "EROFS page cache share support (experimental)" depends on EROFS_FS && EROFS_FS_XATTR + select FS_STACK help This enables page cache sharing among inodes with identical content fingerprints on the same machine.
fs/erofs/internal.h +2 -2
@@ -288,8 +288,8 @@ struct erofs_inode {struct erofs_inode_fingerprint fingerprint; spinlock_t ishare_lock; }; -/* for each real inode */ -struct inode *sharedinode; +/* for each real filesystem inode */ +struct dentry *sharedentry; };#endif /* the corresponding vfs inode */
fs/erofs/ishare.c +30 -30
116 lines not on this page · raw message
Signature · 1 line
2.47.3
Thanks,
Hongbo
Gao Xiang
maintainerPATCH v2 1/1 erofs: ensure valid f_path for page cache sharing
In reply to Gao XiangPreviously, backing files for page cache sharing were set up with f_path left as NULL (only f_inode was valid). It worked, but a recent mincore fix relies on f_path.mnt and crashes (found by "erofs/028" on 7.2-rc4):
BUG: kernel NULL pointer dereference, address: 0000000000000018 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: Oops: 0000 [#1] SMP PTI CPU: 3 UID: 0 PID: 675528 Comm: fincore Not tainted 7.2.0-rc4-00002-g[]-dirty #1 PREEMPT(lazy) Hardware name: Red Hat KVM, BIOS 1.16.0-4.al8 04/01/2014 RIP: 0010:__do_sys_mincore+0xc0/0x2c0 ...
Specify valid paths using valid disconnected dentries together with erofs_ishare_mnt instead of leaving f_path empty, so they are more like real backing files in a pseudo filesystem and standard backing_file_open() can be used directly.
---
v2:
- resolve sashiko's reports.
fs/erofs/Kconfig | 1 + fs/erofs/internal.h | 4 ++-- fs/erofs/ishare.c | 58 ++++++++++++++++++++++----------------------- 3 files changed, 31 insertions(+), 32 deletions(-)
fs/erofs/Kconfig +1 -0
@@ -189,6 +189,7 @@ config EROFS_FS_PCPU_KTHREAD_HIPRI config EROFS_FS_PAGE_CACHE_SHARE bool "EROFS page cache share support (experimental)" depends on EROFS_FS && EROFS_FS_XATTR + select FS_STACK help This enables page cache sharing among inodes with identical content fingerprints on the same machine.
fs/erofs/internal.h +2 -2
@@ -288,8 +288,8 @@ struct erofs_inode {struct erofs_inode_fingerprint fingerprint; spinlock_t ishare_lock; }; -/* for each real inode */ -struct inode *sharedinode; +/* for each real filesystem inode */ +struct dentry *sharedentry; };#endif /* the corresponding vfs inode */
fs/erofs/ishare.c +28 -30
114 lines not on this page · raw message
Signature · 1 line
2.47.3