January 2021 - Linux-stable-mirror

build failures in v4.4.y/v4.9.y stable queues

by Guenter Roeck

Building s390:defconfig ... failed Building s390:allmodconfig ... failed Building s390:performance_defconfig ... failed -------------- Error log: arch/s390/kernel/smp.c: In function 'cpu_configure_store': arch/s390/kernel/smp.c:1009:8: error: implicit declaration of function 'smp_get_base_cpu' The problem affects v4.4.y and v4.9.y stable queues. Guenter

4 years, 3 months

2
1
0 0

[PATCH v3 mips-next 0/7] MIPS: vmlinux.lds.S sections fixes & cleanup

by Alexander Lobakin

This series hunts the problems discovered after manual enabling of ARCH_WANT_LD_ORPHAN_WARN. Notably: - adds the missing PAGE_ALIGNED_DATA() section affecting VDSO placement (marked for stable); - properly stops .eh_frame section generation. Compile and runtime tested on MIPS32R2 CPS board with no issues using two different toolkits: - Binutils 2.35.1, GCC 10.2.0; - LLVM stack 11.0.0. Since v2 [1]: - stop discarding .eh_frame and just prevent it from generating (Kees); - drop redundant sections assertions (Fangrui); - place GOT table in .text instead of asserting as it's not empty when building with LLVM (Nathan); - catch compound literals in generic definitions when building with LD_DEAD_CODE_DATA_ELIMINATION (Kees); - collect two Reviewed-bys (Kees). Since v1 [0]: - catch .got entries too as LLD may produce it (Nathan); - check for unwanted sections to be zero-sized instead of discarding (Fangrui). [0] https://lore.kernel.org/linux-mips/20210104121729.46981-1-alobakin@pm.me [1] https://lore.kernel.org/linux-mips/20210106200713.31840-1-alobakin@pm.me Alexander Lobakin (7): MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section MIPS: vmlinux.lds.S: add ".gnu.attributes" to DISCARDS MIPS: properly stop .eh_frame generation MIPS: vmlinux.lds.S: catch bad .rel.dyn at link time MIPS: vmlinux.lds.S: explicitly declare .got table vmlinux.lds.h: catch compound literals into data and BSS MIPS: select ARCH_WANT_LD_ORPHAN_WARN arch/mips/Kconfig | 1 + arch/mips/include/asm/asm.h | 18 ++++++++++++++++++ arch/mips/kernel/vmlinux.lds.S | 15 ++++++++++++++- include/asm-generic/vmlinux.lds.h | 6 +++--- 4 files changed, 36 insertions(+), 4 deletions(-) -- 2.30.0

4 years, 3 months

1
8
0 0

[PATCH v2 mips-next 0/4] MIPS: vmlinux.lds.S sections fix & cleanup

by Alexander Lobakin

This series hunts the problems discovered after manual enabling of ARCH_WANT_LD_ORPHAN_WARN, notably the missing PAGE_ALIGNED_DATA() section affecting VDSO placement (marked for stable). Compile and runtime tested on MIPS32R2 CPS board with no issues. Since v1 [0]: - catch .got entries too as LLD may produce it (Nathan); - check for unwanted sections to be zero-sized instead of discarding (Fangrui). [0] https://lore.kernel.org/linux-mips/20210104121729.46981-1-alobakin@pm.me Alexander Lobakin (4): MIPS: vmlinux.lds.S: add missing PAGE_ALIGNED_DATA() section MIPS: vmlinux.lds.S: add ".gnu.attributes" to DISCARDS MIPS: vmlinux.lds.S: catch bad .got, .plt and .rel.dyn at link time MIPS: select ARCH_WANT_LD_ORPHAN_WARN arch/mips/Kconfig | 1 + arch/mips/kernel/vmlinux.lds.S | 39 +++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) -- 2.30.0

4 years, 3 months

4
14
0 0

[PATCH] arm64: tegra: Add power-domain for Tegra210 HDA

by Sameer Pujar

HDA initialization is failing occasionally on Tegra210 and following print is observed in the boot log. Because of this probe() fails and no sound card is registered. [16.800802] tegra-hda 70030000.hda: no codecs found! Codecs request a state change and enumeration by the controller. In failure cases this does not seem to happen as STATETS register reads 0. The problem seems to be related to the HDA codec dependency on SOR power domain. If it is gated during HDA probe then the failure is observed. Building Tegra HDA driver into kernel image avoids this failure but does not completely address the dependency part. Fix this problem by adding 'power-domains' DT property for Tegra210 HDA. Note that Tegra186 and Tegra194 HDA do this already. Fixes: 742af7e7a0a1 ("arm64: tegra: Add Tegra210 support") Depends-on: 96d1f078ff0 ("arm64: tegra: Add SOR power-domain for Tegra210") Cc: <stable(a)vger.kernel.org> Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> --- arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/nvidia/tegra210.dtsi b/arch/arm64/boot/dts/nvidia/tegra210.dtsi index 4fbf8c1..fd33b4d 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210.dtsi @@ -997,6 +997,7 @@ <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + power-domains = <&pd_sor>; status = "disabled"; }; -- 2.7.4

4 years, 3 months

2
1
0 0

[PATCH 5.10 00/63] 5.10.5-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.5 release. There are 63 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Wed, 06 Jan 2021 15:56:52 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.5-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.10.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 5.10.5-rc1 Dan Williams <dan.j.williams(a)intel.com> device-dax: Fix range release Chunguang Xu <brookxu(a)tencent.com> ext4: avoid s_mb_prefetch to be zero in individual scenarios Hyeongseok Kim <hyeongseok(a)gmail.com> dm verity: skip verity work if I/O error when system is shutting down Takashi Iwai <tiwai(a)suse.de> ALSA: pcm: Clear the full allocated memory at hw_params Pavel Begunkov <asml.silence(a)gmail.com> io_uring: remove racy overflow list fast checks Heiko Carstens <hca(a)linux.ibm.com> s390: always clear kernel stack backchain before calling functions Thomas Gleixner <tglx(a)linutronix.de> tick/sched: Remove bogus boot "safety" check Jake Wang <haonan.wang2(a)amd.com> drm/amd/display: updated wm table for Renoir Jeff Layton <jlayton(a)kernel.org> ceph: fix inode refcount leak when ceph_fill_inode on non-I_NEW inode fails Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.2: Don't error when exiting early on a READ_PLUS buffer overflow Gabriel Krisman Bertazi <krisman(a)collabora.com> um: ubd: Submit all data segments atomically Christopher Obbard <chris.obbard(a)collabora.com> um: random: Register random as hwrng-core device Zhang Qilong <zhangqilong3(a)huawei.com> watchdog: rti-wdt: fix reference leak in rti_wdt_probe Eric Biggers <ebiggers(a)google.com> fs/namespace.c: WARN if mnt_count has become negative Nicholas Piggin <npiggin(a)gmail.com> powerpc/64: irq replay remove decrementer overflow check Jessica Yu <jeyu(a)kernel.org> module: delay kobject uevent until after module init call Daeho Jeong <daehojeong(a)google.com> f2fs: fix race of pending_pages in decompression Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: avoid race condition for shrinker count Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a pNFS layout related use-after-free race when freeing the inode Qinglang Miao <miaoqinglang(a)huawei.com> i3c master: fix missing destroy_workqueue() on error in i3c_master_register Qinglang Miao <miaoqinglang(a)huawei.com> powerpc: sysdev: add missing iounmap() on error in mpic_msgr_probe() Zheng Liang <zhengliang6(a)huawei.com> rtc: pl031: fix resource leak in pl031_probe Jan Kara <jack(a)suse.cz> quota: Don't overflow quota file offsets Miroslav Benes <mbenes(a)suse.cz> module: set MODULE_STATE_GOING state when a module fails to load Dinghao Liu <dinghao.liu(a)zju.edu.cn> rtc: sun6i: Fix memleak in sun6i_rtc_clk_init Xiaoguang Wang <xiaoguang.wang(a)linux.alibaba.com> io_uring: check kthread stopped flag when sq thread is unparked Boqun Feng <boqun.feng(a)gmail.com> fcntl: Fix potential deadlock in send_sig{io, urg}() Theodore Ts'o <tytso(a)mit.edu> ext4: check for invalid block size early when mounting a file system Randy Dunlap <rdunlap(a)infradead.org> bfs: don't use WARNING: string when it's just info. Takashi Iwai <tiwai(a)suse.de> ALSA: rawmidi: Access runtime->avail always in spinlock Takashi Iwai <tiwai(a)suse.de> ALSA: seq: Use bool for snd_seq_queue internal flags Chao Yu <chao(a)kernel.org> f2fs: fix shift-out-of-bounds in sanity_check_raw_super() Mauro Carvalho Chehab <mchehab+huawei(a)kernel.org> media: gp8psk: initialize stats at power control logic Anant Thazhemadam <anant.thazhemadam(a)gmail.com> misc: vmw_vmci: fix kernel info-leak by initializing dbells in vmci_ctx_get_chkpt_doorbells() Rustam Kovhaev <rkovhaev(a)gmail.com> reiserfs: add check for an invalid ih_entry_count Daniel Vetter <daniel.vetter(a)ffwll.ch> fbcon: Disable accelerated scrolling Anant Thazhemadam <anant.thazhemadam(a)gmail.com> Bluetooth: hci_h5: close serdev device and free hu in h5_close Randy Dunlap <rdunlap(a)infradead.org> scsi: cxgb4i: Fix TLS dependency Randy Dunlap <rdunlap(a)infradead.org> zlib: move EXPORT_SYMBOL() and MODULE_LICENSE() out of dfltcc_syms.c Qinglang Miao <miaoqinglang(a)huawei.com> cgroup: Fix memory leak when parsing multiple source parameters Arnaldo Carvalho de Melo <acme(a)redhat.com> tools headers UAPI: Sync linux/const.h with the kernel headers Petr Vorel <petr.vorel(a)gmail.com> uapi: move constants from <linux/kernel.h> to <linux/const.h> Pavel Begunkov <asml.silence(a)gmail.com> kernel/io_uring: cancel io_uring before task works Pavel Begunkov <asml.silence(a)gmail.com> io_uring: fix io_sqe_files_unregister() hangs Pavel Begunkov <asml.silence(a)gmail.com> io_uring: add a helper for setting a ref node Jens Axboe <axboe(a)kernel.dk> io_uring: use bottom half safe lock for fixed file data Jens Axboe <axboe(a)kernel.dk> io_uring: don't assume mm is constant across submits Ilya Leoshkevich <iii(a)linux.ibm.com> lib/zlib: fix inflating zlib streams on s390 Baoquan He <bhe(a)redhat.com> mm: memmap defer init doesn't work as expected Mike Kravetz <mike.kravetz(a)oracle.com> mm/hugetlb: fix deadlock in hugetlb_cow error path Bart Van Assche <bvanassche(a)acm.org> scsi: block: Fix a race in the runtime power management code Viresh Kumar <viresh.kumar(a)linaro.org> opp: Call the missing clk_put() on error Quanyang Wang <quanyang.wang(a)windriver.com> opp: fix memory leak in _allocate_opp_table Serge Semin <Sergey.Semin(a)baikalelectronics.ru> spi: dw-bt1: Fix undefined devm_mux_control_get symbol Jamie Iles <jamie(a)nuviainc.com> jffs2: Fix NULL pointer dereference in rp_size fs option parsing lizhe <lizhe67(a)huawei.com> jffs2: Allow setting rp_size to zero during remounting Pavel Begunkov <asml.silence(a)gmail.com> io_uring: close a small race gap for files cancel Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Add get_dig_frontend implementation for DCEx Kevin Vigor <kvigor(a)gmail.com> md/raid10: initialize r10_bio->read_slot before use. Michal Kubecek <mkubecek(a)suse.cz> ethtool: fix string set id check Ivan Vecera <ivecera(a)redhat.com> ethtool: fix error paths in ethnl_set_channels() Paolo Abeni <pabeni(a)redhat.com> mptcp: fix security context on server socket Davide Caratti <dcaratti(a)redhat.com> net/sched: sch_taprio: reset child qdiscs before freeing them ------------- Diffstat: Documentation/gpu/todo.rst | 18 ++ Makefile | 4 +- arch/ia64/mm/init.c | 4 +- arch/powerpc/kernel/irq.c | 53 +----- arch/powerpc/kernel/time.c | 9 +- arch/powerpc/platforms/powernv/opal.c | 2 +- arch/powerpc/sysdev/mpic_msgr.c | 2 +- arch/s390/kernel/entry.S | 12 +- arch/um/drivers/random.c | 101 +++-------- arch/um/drivers/ubd_kern.c | 191 +++++++++++++-------- block/blk-pm.c | 15 +- drivers/bluetooth/hci_h5.c | 8 +- drivers/char/hw_random/Kconfig | 16 +- drivers/dax/bus.c | 44 +++-- .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 12 +- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 44 ++++- .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 2 + drivers/i3c/master.c | 5 +- drivers/md/dm-verity-target.c | 12 +- drivers/md/raid10.c | 3 +- drivers/media/usb/dvb-usb/gp8psk.c | 2 +- drivers/misc/vmw_vmci/vmci_context.c | 2 +- drivers/opp/core.c | 9 +- drivers/rtc/rtc-pl031.c | 6 +- drivers/rtc/rtc-sun6i.c | 8 +- drivers/scsi/cxgbi/cxgb4i/Kconfig | 1 + drivers/spi/Kconfig | 3 +- drivers/video/fbdev/core/fbcon.c | 45 +---- drivers/watchdog/rti_wdt.c | 4 +- fs/bfs/inode.c | 2 +- fs/ceph/inode.c | 2 + fs/ext4/mballoc.c | 9 +- fs/ext4/super.c | 40 ++--- fs/f2fs/checkpoint.c | 2 +- fs/f2fs/compress.c | 2 - fs/f2fs/data.c | 58 +++++-- fs/f2fs/debug.c | 11 +- fs/f2fs/f2fs.h | 11 +- fs/f2fs/node.c | 29 ++-- fs/f2fs/node.h | 4 +- fs/f2fs/shrinker.c | 4 +- fs/f2fs/super.c | 9 +- fs/fcntl.c | 10 +- fs/file.c | 2 - fs/io_uring.c | 91 ++++++---- fs/jffs2/jffs2_fs_sb.h | 1 + fs/jffs2/super.c | 17 +- fs/namespace.c | 9 +- fs/nfs/nfs42xdr.c | 36 ++-- fs/nfs/nfs4super.c | 2 +- fs/nfs/pnfs.c | 33 +++- fs/nfs/pnfs.h | 5 + fs/pnode.h | 2 +- fs/quota/quota_tree.c | 8 +- fs/reiserfs/stree.c | 6 + include/linux/mm.h | 5 +- include/uapi/linux/const.h | 5 + include/uapi/linux/ethtool.h | 2 +- include/uapi/linux/kernel.h | 9 +- include/uapi/linux/lightnvm.h | 2 +- include/uapi/linux/mroute6.h | 2 +- include/uapi/linux/netfilter/x_tables.h | 2 +- include/uapi/linux/netlink.h | 2 +- include/uapi/linux/sysctl.h | 2 +- kernel/cgroup/cgroup-v1.c | 2 + kernel/exit.c | 2 + kernel/module.c | 6 +- kernel/time/tick-sched.c | 7 - lib/zlib_dfltcc/Makefile | 2 +- lib/zlib_dfltcc/dfltcc.c | 6 +- lib/zlib_dfltcc/dfltcc_deflate.c | 3 + lib/zlib_dfltcc/dfltcc_inflate.c | 4 +- lib/zlib_dfltcc/dfltcc_syms.c | 17 -- mm/hugetlb.c | 22 ++- mm/memory_hotplug.c | 2 +- mm/page_alloc.c | 8 +- net/ethtool/channels.c | 6 +- net/ethtool/strset.c | 2 +- net/mptcp/protocol.c | 2 + net/sched/sch_taprio.c | 17 +- sound/core/pcm_native.c | 9 +- sound/core/rawmidi.c | 49 ++++-- sound/core/seq/seq_queue.h | 8 +- tools/include/uapi/linux/const.h | 5 + 84 files changed, 713 insertions(+), 539 deletions(-)

4 years, 3 months

10
75
0 0

[PATCH 4.19 7/7] proc: Use a list of inodes to flush from proc

by Wen Yang

From: "Eric W. Biederman" <ebiederm(a)xmission.com> [ Upstream commit 7bc3e6e55acf065500a24621f3b313e7e5998acf ] Rework the flushing of proc to use a list of directory inodes that need to be flushed. The list is kept on struct pid not on struct task_struct, as there is a fixed connection between proc inodes and pids but at least for the case of de_thread the pid of a task_struct changes. This removes the dependency on proc_mnt which allows for different mounts of proc having different mount options even in the same pid namespace and this allows for the removal of proc_mnt which will trivially the first mount of proc to honor it's mount options. This flushing remains an optimization. The functions pid_delete_dentry and pid_revalidate ensure that ordinary dcache management will not attempt to use dentries past the point their respective task has died. When unused the shrinker will eventually be able to remove these dentries. There is a case in de_thread where proc_flush_pid can be called early for a given pid. Which winds up being safe (if suboptimal) as this is just an optiimization. Only pid directories are put on the list as the other per pid files are children of those directories and d_invalidate on the directory will get them as well. So that the pid can be used during flushing it's reference count is taken in release_task and dropped in proc_flush_pid. Further the call of proc_flush_pid is moved after the tasklist_lock is released in release_task so that it is certain that the pid has already been unhashed when flushing it taking place. This removes a small race where a dentry could recreated. As struct pid is supposed to be small and I need a per pid lock I reuse the only lock that currently exists in struct pid the the wait_pidfd.lock. The net result is that this adds all of this functionality with just a little extra list management overhead and a single extra pointer in struct pid. v2: Initialize pid->inodes. I somehow failed to get that initialization into the initial version of the patch. A boot failure was reported by "kernel test robot <lkp(a)intel.com>", and failure to initialize that pid->inodes matches all of the reported symptoms. Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com> Fixes: f333c700c610 ("pidns: Add a limit on the number of pid namespaces") Fixes: 60347f6716aa ("pid namespaces: prepare proc_flust_task() to flush entries from multiple proc trees") Cc: <stable(a)vger.kernel.org> # 4.19.x: b3e583825266: clone: add CLONE_PIDFD Cc: <stable(a)vger.kernel.org> # 4.19.x: b53b0b9d9a61: pidfd: add polling support Cc: <stable(a)vger.kernel.org> # 4.19.x: 0afa5ca82212: proc: Rename in proc_inode rename sysctl_inodes sibling_inodes Cc: <stable(a)vger.kernel.org> # 4.19.x: 26dbc60f385f: proc: Generalize proc_sys_prune_dcache into proc_prune_siblings_dcache Cc: <stable(a)vger.kernel.org> # 4.19.x: 71448011ea2a: proc: Clear the pieces of proc_inode that proc_evict_inode cares about Cc: <stable(a)vger.kernel.org> # 4.19.x: f90f3cafe8d5: Use d_invalidate in proc_prune_siblings_dcache Cc: <stable(a)vger.kernel.org> # 4.19.x Signed-off-by: Wen Yang <wenyang(a)linux.alibaba.com> --- fs/proc/base.c | 111 ++++++++++++++++-------------------------------- fs/proc/inode.c | 2 +- fs/proc/internal.h | 1 + include/linux/pid.h | 1 + include/linux/proc_fs.h | 4 +- kernel/exit.c | 4 +- kernel/pid.c | 1 + 7 files changed, 45 insertions(+), 79 deletions(-) diff --git a/fs/proc/base.c b/fs/proc/base.c index 5e705fa..ea74c7c 100644 --- a/fs/proc/base.c +++ b/fs/proc/base.c @@ -1741,11 +1741,25 @@ void task_dump_owner(struct task_struct *task, umode_t mode, *rgid = gid; } +void proc_pid_evict_inode(struct proc_inode *ei) +{ + struct pid *pid = ei->pid; + + if (S_ISDIR(ei->vfs_inode.i_mode)) { + spin_lock(&pid->wait_pidfd.lock); + hlist_del_init_rcu(&ei->sibling_inodes); + spin_unlock(&pid->wait_pidfd.lock); + } + + put_pid(pid); +} + struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *task, umode_t mode) { struct inode * inode; struct proc_inode *ei; + struct pid *pid; /* We need a new inode */ @@ -1763,10 +1777,18 @@ struct inode *proc_pid_make_inode(struct super_block * sb, /* * grab the reference to task. */ - ei->pid = get_task_pid(task, PIDTYPE_PID); - if (!ei->pid) + pid = get_task_pid(task, PIDTYPE_PID); + if (!pid) goto out_unlock; + /* Let the pid remember us for quick removal */ + ei->pid = pid; + if (S_ISDIR(mode)) { + spin_lock(&pid->wait_pidfd.lock); + hlist_add_head_rcu(&ei->sibling_inodes, &pid->inodes); + spin_unlock(&pid->wait_pidfd.lock); + } + task_dump_owner(task, 0, &inode->i_uid, &inode->i_gid); security_task_to_inode(task, inode); @@ -3067,90 +3089,29 @@ static struct dentry *proc_tgid_base_lookup(struct inode *dir, struct dentry *de .permission = proc_pid_permission, }; -static void proc_flush_task_mnt(struct vfsmount *mnt, pid_t pid, pid_t tgid) -{ - struct dentry *dentry, *leader, *dir; - char buf[10 + 1]; - struct qstr name; - - name.name = buf; - name.len = snprintf(buf, sizeof(buf), "%u", pid); - /* no ->d_hash() rejects on procfs */ - dentry = d_hash_and_lookup(mnt->mnt_root, &name); - if (dentry) { - d_invalidate(dentry); - dput(dentry); - } - - if (pid == tgid) - return; - - name.name = buf; - name.len = snprintf(buf, sizeof(buf), "%u", tgid); - leader = d_hash_and_lookup(mnt->mnt_root, &name); - if (!leader) - goto out; - - name.name = "task"; - name.len = strlen(name.name); - dir = d_hash_and_lookup(leader, &name); - if (!dir) - goto out_put_leader; - - name.name = buf; - name.len = snprintf(buf, sizeof(buf), "%u", pid); - dentry = d_hash_and_lookup(dir, &name); - if (dentry) { - d_invalidate(dentry); - dput(dentry); - } - - dput(dir); -out_put_leader: - dput(leader); -out: - return; -} - /** - * proc_flush_task - Remove dcache entries for @task from the /proc dcache. - * @task: task that should be flushed. + * proc_flush_pid - Remove dcache entries for @pid from the /proc dcache. + * @pid: pid that should be flushed. * - * When flushing dentries from proc, one needs to flush them from global - * proc (proc_mnt) and from all the namespaces' procs this task was seen - * in. This call is supposed to do all of this job. - * - * Looks in the dcache for - * /proc/@pid - * /proc/@tgid/task/@pid - * if either directory is present flushes it and all of it'ts children - * from the dcache. + * This function walks a list of inodes (that belong to any proc + * filesystem) that are attached to the pid and flushes them from + * the dentry cache. * * It is safe and reasonable to cache /proc entries for a task until * that task exits. After that they just clog up the dcache with * useless entries, possibly causing useful dcache entries to be - * flushed instead. This routine is proved to flush those useless - * dcache entries at process exit time. + * flushed instead. This routine is provided to flush those useless + * dcache entries when a process is reaped. * * NOTE: This routine is just an optimization so it does not guarantee - * that no dcache entries will exist at process exit time it - * just makes it very unlikely that any will persist. + * that no dcache entries will exist after a process is reaped + * it just makes it very unlikely that any will persist. */ -void proc_flush_task(struct task_struct *task) +void proc_flush_pid(struct pid *pid) { - int i; - struct pid *pid, *tgid; - struct upid *upid; - - pid = task_pid(task); - tgid = task_tgid(task); - - for (i = 0; i <= pid->level; i++) { - upid = &pid->numbers[i]; - proc_flush_task_mnt(upid->ns->proc_mnt, upid->nr, - tgid->numbers[i].nr); - } + proc_invalidate_siblings_dcache(&pid->inodes, &pid->wait_pidfd.lock); + put_pid(pid); } static struct dentry *proc_pid_instantiate(struct dentry * dentry, diff --git a/fs/proc/inode.c b/fs/proc/inode.c index fad579e..83c640a 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -41,7 +41,7 @@ static void proc_evict_inode(struct inode *inode) /* Stop tracking associated processes */ if (ei->pid) { - put_pid(ei->pid); + proc_pid_evict_inode(ei); ei->pid = NULL; } diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 1db693b..be55ee2 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -158,6 +158,7 @@ extern int proc_pid_statm(struct seq_file *, struct pid_namespace *, extern const struct dentry_operations pid_dentry_operations; extern int pid_getattr(const struct path *, struct kstat *, u32, unsigned int); extern int proc_setattr(struct dentry *, struct iattr *); +extern void proc_pid_evict_inode(struct proc_inode *); extern struct inode *proc_pid_make_inode(struct super_block *, struct task_struct *, umode_t); extern void pid_update_inode(struct task_struct *, struct inode *); extern int pid_delete_dentry(const struct dentry *); diff --git a/include/linux/pid.h b/include/linux/pid.h index a82d2f7..08efbe1 100644 --- a/include/linux/pid.h +++ b/include/linux/pid.h @@ -61,6 +61,7 @@ struct pid unsigned int level; /* lists of tasks that use this pid */ struct hlist_head tasks[PIDTYPE_MAX]; + struct hlist_head inodes; /* wait queue for pidfd notifications */ wait_queue_head_t wait_pidfd; struct rcu_head rcu; diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index d0e1f15..94bf352 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -17,7 +17,7 @@ typedef int (*proc_write_t)(struct file *, char *, size_t); extern void proc_root_init(void); -extern void proc_flush_task(struct task_struct *); +extern void proc_flush_pid(struct pid *); extern struct proc_dir_entry *proc_symlink(const char *, struct proc_dir_entry *, const char *); @@ -80,7 +80,7 @@ static inline void proc_root_init(void) { } -static inline void proc_flush_task(struct task_struct *task) +static inline void proc_flush_pid(struct pid *pid) { } diff --git a/kernel/exit.c b/kernel/exit.c index 65133eb..55996ba 100644 --- a/kernel/exit.c +++ b/kernel/exit.c @@ -185,6 +185,7 @@ static void delayed_put_task_struct(struct rcu_head *rhp) void release_task(struct task_struct *p) { struct task_struct *leader; + struct pid *thread_pid; int zap_leader; repeat: /* don't need to get the RCU readlock here - the process is dead and @@ -193,11 +194,11 @@ void release_task(struct task_struct *p) atomic_dec(&__task_cred(p)->user->processes); rcu_read_unlock(); - proc_flush_task(p); cgroup_release(p); write_lock_irq(&tasklist_lock); ptrace_release_task(p); + thread_pid = get_pid(p->thread_pid); __exit_signal(p); /* @@ -220,6 +221,7 @@ void release_task(struct task_struct *p) } write_unlock_irq(&tasklist_lock); + proc_flush_pid(thread_pid); release_thread(p); call_rcu(&p->rcu, delayed_put_task_struct); diff --git a/kernel/pid.c b/kernel/pid.c index 3ba6fcb..65df035 100644 --- a/kernel/pid.c +++ b/kernel/pid.c @@ -215,6 +215,7 @@ struct pid *alloc_pid(struct pid_namespace *ns) INIT_HLIST_HEAD(&pid->tasks[type]); init_waitqueue_head(&pid->wait_pidfd); + INIT_HLIST_HEAD(&pid->inodes); upid = pid->numbers + ns->level; spin_lock_irq(&pidmap_lock); -- 1.8.3.1

4 years, 3 months

1
0
0 0

[PATCH 4.19 6/7] proc: Use d_invalidate in proc_prune_siblings_dcache

by Wen Yang

From: "Eric W. Biederman" <ebiederm(a)xmission.com> [ Upstream commit f90f3cafe8d56d593fc509a4185da1d5800efea4 ] The function d_prune_aliases has the problem that it will only prune aliases thare are completely unused. It will not remove aliases for the dcache or even think of removing mounts from the dcache. For that behavior d_invalidate is needed. To use d_invalidate replace d_prune_aliases with d_find_alias followed by d_invalidate and dput. For completeness the directory and the non-directory cases are separated because in theory (although not in currently in practice for proc) directories can only ever have a single dentry while non-directories can have hardlinks and thus multiple dentries. As part of this separation use d_find_any_alias for directories to spare d_find_alias the extra work of doing that. Plus the differences between d_find_any_alias and d_find_alias makes it clear why the directory and non-directory code and not share code. To make it clear these routines now invalidate dentries rename proc_prune_siblings_dache to proc_invalidate_siblings_dcache, and rename proc_sys_prune_dcache proc_sys_invalidate_dcache. V2: Split the directory and non-directory cases. To make this code robust to future changes in proc. Signed-off-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: <stable(a)vger.kernel.org> # 4.19.x Signed-off-by: Wen Yang <wenyang(a)linux.alibaba.com> --- fs/proc/inode.c | 16 ++++++++++++++-- fs/proc/internal.h | 2 +- fs/proc/proc_sysctl.c | 8 ++++---- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 45b4344..fad579e 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -118,7 +118,7 @@ void __init proc_init_kmemcache(void) BUILD_BUG_ON(sizeof(struct proc_dir_entry) >= SIZEOF_PDE); } -void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock) +void proc_invalidate_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock) { struct inode *inode; struct proc_inode *ei; @@ -147,7 +147,19 @@ void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock) continue; } - d_prune_aliases(inode); + if (S_ISDIR(inode->i_mode)) { + struct dentry *dir = d_find_any_alias(inode); + if (dir) { + d_invalidate(dir); + dput(dir); + } + } else { + struct dentry *dentry; + while ((dentry = d_find_alias(inode))) { + d_invalidate(dentry); + dput(dentry); + } + } iput(inode); deactivate_super(sb); diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 6cae472..1db693b 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -210,7 +210,7 @@ struct pde_opener { extern const struct inode_operations proc_pid_link_inode_operations; void proc_init_kmemcache(void); -void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock); +void proc_invalidate_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock); void set_proc_pid_nlink(void); extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *); extern int proc_fill_super(struct super_block *, void *data, int flags); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 57b16bf..f8f1f8a 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -262,9 +262,9 @@ static void unuse_table(struct ctl_table_header *p) complete(p->unregistering); } -static void proc_sys_prune_dcache(struct ctl_table_header *head) +static void proc_sys_invalidate_dcache(struct ctl_table_header *head) { - proc_prune_siblings_dcache(&head->inodes, &sysctl_lock); + proc_invalidate_siblings_dcache(&head->inodes, &sysctl_lock); } /* called under sysctl_lock, will reacquire if has to wait */ @@ -286,10 +286,10 @@ static void start_unregistering(struct ctl_table_header *p) spin_unlock(&sysctl_lock); } /* - * Prune dentries for unregistered sysctls: namespaced sysctls + * Invalidate dentries for unregistered sysctls: namespaced sysctls * can have duplicate names and contaminate dcache very badly. */ - proc_sys_prune_dcache(p); + proc_sys_invalidate_dcache(p); /* * do not remove from the list until nobody holds it; walking the * list in do_sysctl() relies on that. -- 1.8.3.1

4 years, 3 months

1
0
0 0

[PATCH 4.19 5/7] proc: Clear the pieces of proc_inode that proc_evict_inode cares about

by Wen Yang

From: "Eric W. Biederman" <ebiederm(a)xmission.com> [ Upstream commit 71448011ea2a1cd36d8f5cbdab0ed716c454d565 ] This just keeps everything tidier, and allows for using flags like SLAB_TYPESAFE_BY_RCU where slabs are not always cleared before reuse. I don't see reuse without reinitializing happening with the proc_inode but I had a false alarm while reworking flushing of proc dentries and indoes when a process dies that caused me to tidy this up. The code is a little easier to follow and reason about this way so I figured the changes might as well be kept. Signed-off-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Cc: <stable(a)vger.kernel.org> # 4.19.x Signed-off-by: Wen Yang <wenyang(a)linux.alibaba.com> --- fs/proc/inode.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index fffc7e4..45b4344 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -34,21 +34,27 @@ static void proc_evict_inode(struct inode *inode) { struct proc_dir_entry *de; struct ctl_table_header *head; + struct proc_inode *ei = PROC_I(inode); truncate_inode_pages_final(&inode->i_data); clear_inode(inode); /* Stop tracking associated processes */ - put_pid(PROC_I(inode)->pid); + if (ei->pid) { + put_pid(ei->pid); + ei->pid = NULL; + } /* Let go of any associated proc directory entry */ - de = PDE(inode); - if (de) + de = ei->pde; + if (de) { pde_put(de); + ei->pde = NULL; + } - head = PROC_I(inode)->sysctl; + head = ei->sysctl; if (head) { - RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL); + RCU_INIT_POINTER(ei->sysctl, NULL); proc_sys_evict_inode(inode, head); } } -- 1.8.3.1

4 years, 3 months

1
0
0 0

[PATCH 4.19 4/7] proc: Generalize proc_sys_prune_dcache into proc_prune_siblings_dcache

by Wen Yang

From: "Eric W. Biederman" <ebiederm(a)xmission.com> [ Upstream commit 26dbc60f385ff9cff475ea2a3bad02e80fd6fa43 ] This prepares the way for allowing the pid part of proc to use this dcache pruning code as well. Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com> Cc: <stable(a)vger.kernel.org> # 4.19.x Signed-off-by: Wen Yang <wenyang(a)linux.alibaba.com> --- fs/proc/inode.c | 38 ++++++++++++++++++++++++++++++++++++++ fs/proc/internal.h | 1 + fs/proc/proc_sysctl.c | 35 +---------------------------------- 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index e5334ed..fffc7e4 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -112,6 +112,44 @@ void __init proc_init_kmemcache(void) BUILD_BUG_ON(sizeof(struct proc_dir_entry) >= SIZEOF_PDE); } +void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock) +{ + struct inode *inode; + struct proc_inode *ei; + struct hlist_node *node; + struct super_block *sb; + + rcu_read_lock(); + for (;;) { + node = hlist_first_rcu(inodes); + if (!node) + break; + ei = hlist_entry(node, struct proc_inode, sibling_inodes); + spin_lock(lock); + hlist_del_init_rcu(&ei->sibling_inodes); + spin_unlock(lock); + + inode = &ei->vfs_inode; + sb = inode->i_sb; + if (!atomic_inc_not_zero(&sb->s_active)) + continue; + inode = igrab(inode); + rcu_read_unlock(); + if (unlikely(!inode)) { + deactivate_super(sb); + rcu_read_lock(); + continue; + } + + d_prune_aliases(inode); + iput(inode); + deactivate_super(sb); + + rcu_read_lock(); + } + rcu_read_unlock(); +} + static int proc_show_options(struct seq_file *seq, struct dentry *root) { struct super_block *sb = root->d_sb; diff --git a/fs/proc/internal.h b/fs/proc/internal.h index d922c01..6cae472 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -210,6 +210,7 @@ struct pde_opener { extern const struct inode_operations proc_pid_link_inode_operations; void proc_init_kmemcache(void); +void proc_prune_siblings_dcache(struct hlist_head *inodes, spinlock_t *lock); void set_proc_pid_nlink(void); extern struct inode *proc_get_inode(struct super_block *, struct proc_dir_entry *); extern int proc_fill_super(struct super_block *, void *data, int flags); diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index 0f578f6..57b16bf 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -264,40 +264,7 @@ static void unuse_table(struct ctl_table_header *p) static void proc_sys_prune_dcache(struct ctl_table_header *head) { - struct inode *inode; - struct proc_inode *ei; - struct hlist_node *node; - struct super_block *sb; - - rcu_read_lock(); - for (;;) { - node = hlist_first_rcu(&head->inodes); - if (!node) - break; - ei = hlist_entry(node, struct proc_inode, sibling_inodes); - spin_lock(&sysctl_lock); - hlist_del_init_rcu(&ei->sibling_inodes); - spin_unlock(&sysctl_lock); - - inode = &ei->vfs_inode; - sb = inode->i_sb; - if (!atomic_inc_not_zero(&sb->s_active)) - continue; - inode = igrab(inode); - rcu_read_unlock(); - if (unlikely(!inode)) { - deactivate_super(sb); - rcu_read_lock(); - continue; - } - - d_prune_aliases(inode); - iput(inode); - deactivate_super(sb); - - rcu_read_lock(); - } - rcu_read_unlock(); + proc_prune_siblings_dcache(&head->inodes, &sysctl_lock); } /* called under sysctl_lock, will reacquire if has to wait */ -- 1.8.3.1

4 years, 3 months

1
0
0 0

[PATCH 4.19 3/7] proc: Rename in proc_inode rename sysctl_inodes sibling_inodes

by Wen Yang

From: "Eric W. Biederman" <ebiederm(a)xmission.com> [ Upstream commit 0afa5ca82212247456f9de1468b595a111fee633 ] I about to need and use the same functionality for pid based inodes and there is no point in adding a second field when this field is already here and serving the same purporse. Just give the field a generic name so it is clear that it is no longer sysctl specific. Also for good measure initialize sibling_inodes when proc_inode is initialized. Signed-off-by: Eric W. Biederman <ebiederm(a)xmission.com> Cc: <stable(a)vger.kernel.org> # 4.19.x Signed-off-by: Wen Yang <wenyang(a)linux.alibaba.com> --- fs/proc/inode.c | 1 + fs/proc/internal.h | 2 +- fs/proc/proc_sysctl.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/fs/proc/inode.c b/fs/proc/inode.c index 31bf3bb..e5334ed 100644 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@ -70,6 +70,7 @@ static struct inode *proc_alloc_inode(struct super_block *sb) ei->pde = NULL; ei->sysctl = NULL; ei->sysctl_entry = NULL; + INIT_HLIST_NODE(&ei->sibling_inodes); ei->ns_ops = NULL; inode = &ei->vfs_inode; return inode; diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 95b1419..d922c01 100644 --- a/fs/proc/internal.h +++ b/fs/proc/internal.h @@ -91,7 +91,7 @@ struct proc_inode { struct proc_dir_entry *pde; struct ctl_table_header *sysctl; struct ctl_table *sysctl_entry; - struct hlist_node sysctl_inodes; + struct hlist_node sibling_inodes; const struct proc_ns_operations *ns_ops; struct inode vfs_inode; } __randomize_layout; diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index c95f32b..0f578f6 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c @@ -274,9 +274,9 @@ static void proc_sys_prune_dcache(struct ctl_table_header *head) node = hlist_first_rcu(&head->inodes); if (!node) break; - ei = hlist_entry(node, struct proc_inode, sysctl_inodes); + ei = hlist_entry(node, struct proc_inode, sibling_inodes); spin_lock(&sysctl_lock); - hlist_del_init_rcu(&ei->sysctl_inodes); + hlist_del_init_rcu(&ei->sibling_inodes); spin_unlock(&sysctl_lock); inode = &ei->vfs_inode; @@ -478,7 +478,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, } ei->sysctl = head; ei->sysctl_entry = table; - hlist_add_head_rcu(&ei->sysctl_inodes, &head->inodes); + hlist_add_head_rcu(&ei->sibling_inodes, &head->inodes); head->count++; spin_unlock(&sysctl_lock); @@ -509,7 +509,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb, void proc_sys_evict_inode(struct inode *inode, struct ctl_table_header *head) { spin_lock(&sysctl_lock); - hlist_del_init_rcu(&PROC_I(inode)->sysctl_inodes); + hlist_del_init_rcu(&PROC_I(inode)->sibling_inodes); if (!--head->count) kfree_rcu(head, rcu); spin_unlock(&sysctl_lock); -- 1.8.3.1

4 years, 3 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror January 2021