From 3d2fe039af7de7687e5f482ef1013219842e9651 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 15 Dec 2019 21:25:30 -0500 Subject: [PATCH] fixes for 4.9 Signed-off-by: Sasha Levin --- queue-4.9/powerpc-fix-vdso-clock_getres.patch | 138 ++++++++++++ ...ended-attributes-on-the-root-directo.patch | 211 ++++++++++++++++++ queue-4.9/series | 2 + 3 files changed, 351 insertions(+) create mode 100644 queue-4.9/powerpc-fix-vdso-clock_getres.patch create mode 100644 queue-4.9/reiserfs-fix-extended-attributes-on-the-root-directo.patch diff --git a/queue-4.9/powerpc-fix-vdso-clock_getres.patch b/queue-4.9/powerpc-fix-vdso-clock_getres.patch new file mode 100644 index 00000000000..521011a19f7 --- /dev/null +++ b/queue-4.9/powerpc-fix-vdso-clock_getres.patch @@ -0,0 +1,138 @@ +From e8e22d7c2ecb2370ec0ad8842dba5b0d983e4fba Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 2 Dec 2019 07:57:29 +0000 +Subject: powerpc: Fix vDSO clock_getres() + +From: Vincenzo Frascino + +[ Upstream commit 552263456215ada7ee8700ce022d12b0cffe4802 ] + +clock_getres in the vDSO library has to preserve the same behaviour +of posix_get_hrtimer_res(). + +In particular, posix_get_hrtimer_res() does: + sec = 0; + ns = hrtimer_resolution; +and hrtimer_resolution depends on the enablement of the high +resolution timers that can happen either at compile or at run time. + +Fix the powerpc vdso implementation of clock_getres keeping a copy of +hrtimer_resolution in vdso data and using that directly. + +Fixes: a7f290dad32e ("[PATCH] powerpc: Merge vdso's and add vdso support to 32 bits kernel") +Cc: stable@vger.kernel.org +Signed-off-by: Vincenzo Frascino +Reviewed-by: Christophe Leroy +Acked-by: Shuah Khan +[chleroy: changed CLOCK_REALTIME_RES to CLOCK_HRTIMER_RES] +Signed-off-by: Christophe Leroy +Signed-off-by: Michael Ellerman +Link: https://lore.kernel.org/r/a55eca3a5e85233838c2349783bcb5164dae1d09.1575273217.git.christophe.leroy@c-s.fr +Signed-off-by: Sasha Levin +--- + arch/powerpc/include/asm/vdso_datapage.h | 2 ++ + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vdso32/gettimeofday.S | 7 +++++-- + arch/powerpc/kernel/vdso64/gettimeofday.S | 7 +++++-- + 5 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/arch/powerpc/include/asm/vdso_datapage.h b/arch/powerpc/include/asm/vdso_datapage.h +index 1afe90ade595e..674c03350cd11 100644 +--- a/arch/powerpc/include/asm/vdso_datapage.h ++++ b/arch/powerpc/include/asm/vdso_datapage.h +@@ -86,6 +86,7 @@ struct vdso_data { + __s32 wtom_clock_nsec; + struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ + __u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */ ++ __u32 hrtimer_res; /* hrtimer resolution */ + __u32 syscall_map_64[SYSCALL_MAP_SIZE]; /* map of syscalls */ + __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ + }; +@@ -107,6 +108,7 @@ struct vdso_data { + __s32 wtom_clock_nsec; + struct timespec stamp_xtime; /* xtime as at tb_orig_stamp */ + __u32 stamp_sec_fraction; /* fractional seconds of stamp_xtime */ ++ __u32 hrtimer_res; /* hrtimer resolution */ + __u32 syscall_map_32[SYSCALL_MAP_SIZE]; /* map of syscalls */ + __u32 dcache_block_size; /* L1 d-cache block size */ + __u32 icache_block_size; /* L1 i-cache block size */ +diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c +index 14fbbd9035ca7..5e55893d147c3 100644 +--- a/arch/powerpc/kernel/asm-offsets.c ++++ b/arch/powerpc/kernel/asm-offsets.c +@@ -383,6 +383,7 @@ int main(void) + DEFINE(WTOM_CLOCK_NSEC, offsetof(struct vdso_data, wtom_clock_nsec)); + DEFINE(STAMP_XTIME, offsetof(struct vdso_data, stamp_xtime)); + DEFINE(STAMP_SEC_FRAC, offsetof(struct vdso_data, stamp_sec_fraction)); ++ DEFINE(CLOCK_HRTIMER_RES, offsetof(vdso_data, hrtimer_res)); + DEFINE(CFG_ICACHE_BLOCKSZ, offsetof(struct vdso_data, icache_block_size)); + DEFINE(CFG_DCACHE_BLOCKSZ, offsetof(struct vdso_data, dcache_block_size)); + DEFINE(CFG_ICACHE_LOGBLOCKSZ, offsetof(struct vdso_data, icache_log_block_size)); +@@ -411,7 +412,6 @@ int main(void) + DEFINE(CLOCK_REALTIME, CLOCK_REALTIME); + DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC); + DEFINE(NSEC_PER_SEC, NSEC_PER_SEC); +- DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC); + + #ifdef CONFIG_BUG + DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry)); +diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c +index ab7b661b6da3a..3c6258a1656b4 100644 +--- a/arch/powerpc/kernel/time.c ++++ b/arch/powerpc/kernel/time.c +@@ -862,6 +862,7 @@ void update_vsyscall_old(struct timespec *wall_time, struct timespec *wtm, + vdso_data->wtom_clock_nsec = wtm->tv_nsec; + vdso_data->stamp_xtime = *wall_time; + vdso_data->stamp_sec_fraction = frac_sec; ++ vdso_data->hrtimer_res = hrtimer_resolution; + smp_wmb(); + ++(vdso_data->tb_update_count); + } +diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S +index 7b341b86216c2..9b24466570c84 100644 +--- a/arch/powerpc/kernel/vdso32/gettimeofday.S ++++ b/arch/powerpc/kernel/vdso32/gettimeofday.S +@@ -160,12 +160,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) + cror cr0*4+eq,cr0*4+eq,cr1*4+eq + bne cr0,99f + ++ mflr r12 ++ .cfi_register lr,r12 ++ bl __get_datapage@local /* get data page */ ++ lwz r5, CLOCK_HRTIMER_RES(r3) ++ mtlr r12 + li r3,0 + cmpli cr0,r4,0 + crclr cr0*4+so + beqlr +- lis r5,CLOCK_REALTIME_RES@h +- ori r5,r5,CLOCK_REALTIME_RES@l + stw r3,TSPC32_TV_SEC(r4) + stw r5,TSPC32_TV_NSEC(r4) + blr +diff --git a/arch/powerpc/kernel/vdso64/gettimeofday.S b/arch/powerpc/kernel/vdso64/gettimeofday.S +index 09b2a49f6dd53..c973378e1f2bc 100644 +--- a/arch/powerpc/kernel/vdso64/gettimeofday.S ++++ b/arch/powerpc/kernel/vdso64/gettimeofday.S +@@ -145,12 +145,15 @@ V_FUNCTION_BEGIN(__kernel_clock_getres) + cror cr0*4+eq,cr0*4+eq,cr1*4+eq + bne cr0,99f + ++ mflr r12 ++ .cfi_register lr,r12 ++ bl V_LOCAL_FUNC(__get_datapage) ++ lwz r5, CLOCK_HRTIMER_RES(r3) ++ mtlr r12 + li r3,0 + cmpldi cr0,r4,0 + crclr cr0*4+so + beqlr +- lis r5,CLOCK_REALTIME_RES@h +- ori r5,r5,CLOCK_REALTIME_RES@l + std r3,TSPC64_TV_SEC(r4) + std r5,TSPC64_TV_NSEC(r4) + blr +-- +2.20.1 + diff --git a/queue-4.9/reiserfs-fix-extended-attributes-on-the-root-directo.patch b/queue-4.9/reiserfs-fix-extended-attributes-on-the-root-directo.patch new file mode 100644 index 00000000000..22019e37307 --- /dev/null +++ b/queue-4.9/reiserfs-fix-extended-attributes-on-the-root-directo.patch @@ -0,0 +1,211 @@ +From b9ed4f12a91ed354558008c88a2de98ecda18d1a Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Thu, 24 Oct 2019 10:31:27 -0400 +Subject: reiserfs: fix extended attributes on the root directory + +From: Jeff Mahoney + +[ Upstream commit 60e4cf67a582d64f07713eda5fcc8ccdaf7833e6 ] + +Since commit d0a5b995a308 (vfs: Add IOP_XATTR inode operations flag) +extended attributes haven't worked on the root directory in reiserfs. + +This is due to reiserfs conditionally setting the sb->s_xattrs handler +array depending on whether it located or create the internal privroot +directory. It necessarily does this after the root inode is already +read in. The IOP_XATTR flag is set during inode initialization, so +it never gets set on the root directory. + +This commit unconditionally assigns sb->s_xattrs and clears IOP_XATTR on +internal inodes. The old return values due to the conditional assignment +are handled via open_xa_root, which now returns EOPNOTSUPP as the VFS +would have done. + +Link: https://lore.kernel.org/r/20191024143127.17509-1-jeffm@suse.com +CC: stable@vger.kernel.org +Fixes: d0a5b995a308 ("vfs: Add IOP_XATTR inode operations flag") +Signed-off-by: Jeff Mahoney +Signed-off-by: Jan Kara +Signed-off-by: Sasha Levin +--- + fs/reiserfs/inode.c | 12 ++++++++++-- + fs/reiserfs/namei.c | 7 +++++-- + fs/reiserfs/reiserfs.h | 2 ++ + fs/reiserfs/super.c | 2 ++ + fs/reiserfs/xattr.c | 19 ++++++++++++------- + fs/reiserfs/xattr_acl.c | 4 +--- + 6 files changed, 32 insertions(+), 14 deletions(-) + +diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c +index bd4c727f4610b..9531b6c18ac7b 100644 +--- a/fs/reiserfs/inode.c ++++ b/fs/reiserfs/inode.c +@@ -2102,6 +2102,15 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, + goto out_inserted_sd; + } + ++ /* ++ * Mark it private if we're creating the privroot ++ * or something under it. ++ */ ++ if (IS_PRIVATE(dir) || dentry == REISERFS_SB(sb)->priv_root) { ++ inode->i_flags |= S_PRIVATE; ++ inode->i_opflags &= ~IOP_XATTR; ++ } ++ + if (reiserfs_posixacl(inode->i_sb)) { + reiserfs_write_unlock(inode->i_sb); + retval = reiserfs_inherit_default_acl(th, dir, dentry, inode); +@@ -2116,8 +2125,7 @@ int reiserfs_new_inode(struct reiserfs_transaction_handle *th, + reiserfs_warning(inode->i_sb, "jdm-13090", + "ACLs aren't enabled in the fs, " + "but vfs thinks they are!"); +- } else if (IS_PRIVATE(dir)) +- inode->i_flags |= S_PRIVATE; ++ } + + if (security->name) { + reiserfs_write_unlock(inode->i_sb); +diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c +index 1ec728cf82d13..1c900f3220898 100644 +--- a/fs/reiserfs/namei.c ++++ b/fs/reiserfs/namei.c +@@ -377,10 +377,13 @@ static struct dentry *reiserfs_lookup(struct inode *dir, struct dentry *dentry, + + /* + * Propagate the private flag so we know we're +- * in the priv tree ++ * in the priv tree. Also clear IOP_XATTR ++ * since we don't have xattrs on xattr files. + */ +- if (IS_PRIVATE(dir)) ++ if (IS_PRIVATE(dir)) { + inode->i_flags |= S_PRIVATE; ++ inode->i_opflags &= ~IOP_XATTR; ++ } + } + reiserfs_write_unlock(dir->i_sb); + if (retval == IO_ERROR) { +diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h +index d920a646b5784..3e78a394fdb84 100644 +--- a/fs/reiserfs/reiserfs.h ++++ b/fs/reiserfs/reiserfs.h +@@ -1167,6 +1167,8 @@ static inline int bmap_would_wrap(unsigned bmap_nr) + return bmap_nr > ((1LL << 16) - 1); + } + ++extern const struct xattr_handler *reiserfs_xattr_handlers[]; ++ + /* + * this says about version of key of all items (but stat data) the + * object consists of +diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c +index dec6c93044fa3..cd2d555b3a6dd 100644 +--- a/fs/reiserfs/super.c ++++ b/fs/reiserfs/super.c +@@ -2026,6 +2026,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent) + if (replay_only(s)) + goto error_unlocked; + ++ s->s_xattr = reiserfs_xattr_handlers; ++ + if (bdev_read_only(s->s_bdev) && !(s->s_flags & MS_RDONLY)) { + SWARN(silent, s, "clm-7000", + "Detected readonly device, marking FS readonly"); +diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c +index 9e313fc7fdc70..dbc2ada9884f1 100644 +--- a/fs/reiserfs/xattr.c ++++ b/fs/reiserfs/xattr.c +@@ -121,13 +121,13 @@ static struct dentry *open_xa_root(struct super_block *sb, int flags) + struct dentry *xaroot; + + if (d_really_is_negative(privroot)) +- return ERR_PTR(-ENODATA); ++ return ERR_PTR(-EOPNOTSUPP); + + inode_lock_nested(d_inode(privroot), I_MUTEX_XATTR); + + xaroot = dget(REISERFS_SB(sb)->xattr_root); + if (!xaroot) +- xaroot = ERR_PTR(-ENODATA); ++ xaroot = ERR_PTR(-EOPNOTSUPP); + else if (d_really_is_negative(xaroot)) { + int err = -ENODATA; + +@@ -609,6 +609,10 @@ int reiserfs_xattr_set(struct inode *inode, const char *name, + int error, error2; + size_t jbegin_count = reiserfs_xattr_nblocks(inode, buffer_size); + ++ /* Check before we start a transaction and then do nothing. */ ++ if (!d_really_is_positive(REISERFS_SB(inode->i_sb)->priv_root)) ++ return -EOPNOTSUPP; ++ + if (!(flags & XATTR_REPLACE)) + jbegin_count += reiserfs_xattr_jcreate_nblocks(inode); + +@@ -831,8 +835,7 @@ ssize_t reiserfs_listxattr(struct dentry * dentry, char *buffer, size_t size) + if (d_really_is_negative(dentry)) + return -EINVAL; + +- if (!dentry->d_sb->s_xattr || +- get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1) ++ if (get_inode_sd_version(d_inode(dentry)) == STAT_DATA_V1) + return -EOPNOTSUPP; + + dir = open_xa_dir(d_inode(dentry), XATTR_REPLACE); +@@ -872,6 +875,7 @@ static int create_privroot(struct dentry *dentry) + } + + d_inode(dentry)->i_flags |= S_PRIVATE; ++ d_inode(dentry)->i_opflags &= ~IOP_XATTR; + reiserfs_info(dentry->d_sb, "Created %s - reserved for xattr " + "storage.\n", PRIVROOT_NAME); + +@@ -885,7 +889,7 @@ static int create_privroot(struct dentry *dentry) { return 0; } + #endif + + /* Actual operations that are exported to VFS-land */ +-static const struct xattr_handler *reiserfs_xattr_handlers[] = { ++const struct xattr_handler *reiserfs_xattr_handlers[] = { + #ifdef CONFIG_REISERFS_FS_XATTR + &reiserfs_xattr_user_handler, + &reiserfs_xattr_trusted_handler, +@@ -956,8 +960,10 @@ int reiserfs_lookup_privroot(struct super_block *s) + if (!IS_ERR(dentry)) { + REISERFS_SB(s)->priv_root = dentry; + d_set_d_op(dentry, &xattr_lookup_poison_ops); +- if (d_really_is_positive(dentry)) ++ if (d_really_is_positive(dentry)) { + d_inode(dentry)->i_flags |= S_PRIVATE; ++ d_inode(dentry)->i_opflags &= ~IOP_XATTR; ++ } + } else + err = PTR_ERR(dentry); + inode_unlock(d_inode(s->s_root)); +@@ -986,7 +992,6 @@ int reiserfs_xattr_init(struct super_block *s, int mount_flags) + } + + if (d_really_is_positive(privroot)) { +- s->s_xattr = reiserfs_xattr_handlers; + inode_lock(d_inode(privroot)); + if (!REISERFS_SB(s)->xattr_root) { + struct dentry *dentry; +diff --git a/fs/reiserfs/xattr_acl.c b/fs/reiserfs/xattr_acl.c +index d92a1dc6ee70f..1f1fdfd3bc5cc 100644 +--- a/fs/reiserfs/xattr_acl.c ++++ b/fs/reiserfs/xattr_acl.c +@@ -316,10 +316,8 @@ reiserfs_inherit_default_acl(struct reiserfs_transaction_handle *th, + * would be useless since permissions are ignored, and a pain because + * it introduces locking cycles + */ +- if (IS_PRIVATE(dir)) { +- inode->i_flags |= S_PRIVATE; ++ if (IS_PRIVATE(inode)) + goto apply_umask; +- } + + err = posix_acl_create(dir, &inode->i_mode, &default_acl, &acl); + if (err) +-- +2.20.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 3518f090e8c..d52e5b7aeda 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -163,3 +163,5 @@ scsi-qla2xxx-fix-dma-unmap-leak.patch scsi-qla2xxx-fix-session-lookup-in-qlt_abort_work.patch scsi-qla2xxx-fix-qla24xx_process_bidir_cmd.patch scsi-qla2xxx-always-check-the-qla2x00_wait_for_hba_o.patch +powerpc-fix-vdso-clock_getres.patch +reiserfs-fix-extended-attributes-on-the-root-directo.patch -- 2.47.3