May 2023 - Linux-stable-mirror

[PATCH v1 1/5] hostfs: Fix ephemeral inodes

by Mickaël Salaün

hostfs creates a new inode for each opened or created file, which created useless inode allocations and forbade identifying a host file with a kernel inode. Fix this uncommon filesystem behavior by tying kernel inodes to host file's inode and device IDs. Even if the host filesystem inodes may be recycled, this cannot happen while a file referencing it is open, which is the case with hostfs. It should be noted that hostfs inode IDs may not be unique for the same hostfs superblock because multiple host's (backed) superblocks may be used. Delete inodes when dropping them to force backed host's file descriptors closing. This enables to entirely remove ARCH_EPHEMERAL_INODES, and then makes Landlock fully supported by UML. This is very useful for testing (ongoing and backported) changes. These changes also factor out and simplify some helpers thanks to the new hostfs_inode_update() and the hostfs_iget() revamp: read_name(), hostfs_create(), hostfs_lookup(), hostfs_mknod(), and hostfs_fill_sb_common(). A following commit with new Landlock tests check this new hostfs inode consistency. Cc: Anton Ivanov <anton.ivanov(a)cambridgegreys.com> Cc: Johannes Berg <johannes(a)sipsolutions.net> Cc: Richard Weinberger <richard(a)nod.at> Cc: <stable(a)vger.kernel.org> # 5.15.x: ce72750f04d6: hostfs: Fix writeback of dirty pages Cc: <stable(a)vger.kernel.org> # 5.15+ Signed-off-by: Mickaël Salaün <mic(a)digikod.net> Link: https://lore.kernel.org/r/20230309165455.175131-2-mic@digikod.net --- arch/Kconfig | 7 -- arch/um/Kconfig | 1 - fs/hostfs/hostfs.h | 1 + fs/hostfs/hostfs_kern.c | 213 +++++++++++++++++++------------------- fs/hostfs/hostfs_user.c | 1 + security/landlock/Kconfig | 2 +- 6 files changed, 109 insertions(+), 116 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index e3511afbb7f2..d5f0841ac3c1 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -1156,13 +1156,6 @@ config COMPAT_32BIT_TIME config ARCH_NO_PREEMPT bool -config ARCH_EPHEMERAL_INODES - def_bool n - help - An arch should select this symbol if it doesn't keep track of inode - instances on its own, but instead relies on something else (e.g. the - host kernel for an UML kernel). - config ARCH_SUPPORTS_RT bool diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 541a9b18e343..4057d5267c6a 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -5,7 +5,6 @@ menu "UML-specific options" config UML bool default y - select ARCH_EPHEMERAL_INODES select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV diff --git a/fs/hostfs/hostfs.h b/fs/hostfs/hostfs.h index 69cb796f6270..0239e3af3945 100644 --- a/fs/hostfs/hostfs.h +++ b/fs/hostfs/hostfs.h @@ -65,6 +65,7 @@ struct hostfs_stat { unsigned long long blocks; unsigned int maj; unsigned int min; + dev_t dev; }; extern int stat_file(const char *path, struct hostfs_stat *p, int fd); diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 28b4f15c19eb..19496f732016 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -26,6 +26,7 @@ struct hostfs_inode_info { fmode_t mode; struct inode vfs_inode; struct mutex open_mutex; + dev_t dev; }; static inline struct hostfs_inode_info *HOSTFS_I(struct inode *inode) @@ -182,14 +183,6 @@ static char *follow_link(char *link) return ERR_PTR(n); } -static struct inode *hostfs_iget(struct super_block *sb) -{ - struct inode *inode = new_inode(sb); - if (!inode) - return ERR_PTR(-ENOMEM); - return inode; -} - static int hostfs_statfs(struct dentry *dentry, struct kstatfs *sf) { /* @@ -228,6 +221,7 @@ static struct inode *hostfs_alloc_inode(struct super_block *sb) return NULL; hi->fd = -1; hi->mode = 0; + hi->dev = 0; inode_init_once(&hi->vfs_inode); mutex_init(&hi->open_mutex); return &hi->vfs_inode; @@ -240,6 +234,7 @@ static void hostfs_evict_inode(struct inode *inode) if (HOSTFS_I(inode)->fd != -1) { close_file(&HOSTFS_I(inode)->fd); HOSTFS_I(inode)->fd = -1; + HOSTFS_I(inode)->dev = 0; } } @@ -265,6 +260,7 @@ static int hostfs_show_options(struct seq_file *seq, struct dentry *root) static const struct super_operations hostfs_sbops = { .alloc_inode = hostfs_alloc_inode, .free_inode = hostfs_free_inode, + .drop_inode = generic_delete_inode, .evict_inode = hostfs_evict_inode, .statfs = hostfs_statfs, .show_options = hostfs_show_options, @@ -512,18 +508,31 @@ static const struct address_space_operations hostfs_aops = { .write_end = hostfs_write_end, }; -static int read_name(struct inode *ino, char *name) +static int hostfs_inode_update(struct inode *ino, const struct hostfs_stat *st) +{ + set_nlink(ino, st->nlink); + i_uid_write(ino, st->uid); + i_gid_write(ino, st->gid); + ino->i_atime = + (struct timespec64){ st->atime.tv_sec, st->atime.tv_nsec }; + ino->i_mtime = + (struct timespec64){ st->mtime.tv_sec, st->mtime.tv_nsec }; + ino->i_ctime = + (struct timespec64){ st->ctime.tv_sec, st->ctime.tv_nsec }; + ino->i_size = st->size; + ino->i_blocks = st->blocks; + return 0; +} + +static int hostfs_inode_set(struct inode *ino, void *data) { + struct hostfs_stat *st = data; dev_t rdev; - struct hostfs_stat st; - int err = stat_file(name, &st, -1); - if (err) - return err; /* Reencode maj and min with the kernel encoding.*/ - rdev = MKDEV(st.maj, st.min); + rdev = MKDEV(st->maj, st->min); - switch (st.mode & S_IFMT) { + switch (st->mode & S_IFMT) { case S_IFLNK: ino->i_op = &hostfs_link_iops; break; @@ -535,7 +544,7 @@ static int read_name(struct inode *ino, char *name) case S_IFBLK: case S_IFIFO: case S_IFSOCK: - init_special_inode(ino, st.mode & S_IFMT, rdev); + init_special_inode(ino, st->mode & S_IFMT, rdev); ino->i_op = &hostfs_iops; break; case S_IFREG: @@ -547,17 +556,42 @@ static int read_name(struct inode *ino, char *name) return -EIO; } - ino->i_ino = st.ino; - ino->i_mode = st.mode; - set_nlink(ino, st.nlink); - i_uid_write(ino, st.uid); - i_gid_write(ino, st.gid); - ino->i_atime = (struct timespec64){ st.atime.tv_sec, st.atime.tv_nsec }; - ino->i_mtime = (struct timespec64){ st.mtime.tv_sec, st.mtime.tv_nsec }; - ino->i_ctime = (struct timespec64){ st.ctime.tv_sec, st.ctime.tv_nsec }; - ino->i_size = st.size; - ino->i_blocks = st.blocks; - return 0; + HOSTFS_I(ino)->dev = st->dev; + ino->i_ino = st->ino; + ino->i_mode = st->mode; + return hostfs_inode_update(ino, st); +} + +static int hostfs_inode_test(struct inode *inode, void *data) +{ + const struct hostfs_stat *st = data; + + return inode->i_ino == st->ino && HOSTFS_I(inode)->dev == st->dev; +} + +static struct inode *hostfs_iget(struct super_block *sb, char *name) +{ + struct inode *inode; + struct hostfs_stat st; + int err = stat_file(name, &st, -1); + + if (err) + return ERR_PTR(err); + + inode = iget5_locked(sb, st.ino, hostfs_inode_test, hostfs_inode_set, + &st); + if (!inode) + return ERR_PTR(-ENOMEM); + + if (inode->i_state & I_NEW) { + unlock_new_inode(inode); + } else { + spin_lock(&inode->i_lock); + hostfs_inode_update(inode, &st); + spin_unlock(&inode->i_lock); + } + + return inode; } static int hostfs_create(struct mnt_idmap *idmap, struct inode *dir, @@ -565,62 +599,48 @@ static int hostfs_create(struct mnt_idmap *idmap, struct inode *dir, { struct inode *inode; char *name; - int error, fd; - - inode = hostfs_iget(dir->i_sb); - if (IS_ERR(inode)) { - error = PTR_ERR(inode); - goto out; - } + int fd; - error = -ENOMEM; name = dentry_name(dentry); if (name == NULL) - goto out_put; + return -ENOMEM; fd = file_create(name, mode & 0777); - if (fd < 0) - error = fd; - else - error = read_name(inode, name); + if (fd < 0) { + __putname(name); + return fd; + } + inode = hostfs_iget(dir->i_sb, name); __putname(name); - if (error) - goto out_put; + if (IS_ERR(inode)) + return PTR_ERR(inode); HOSTFS_I(inode)->fd = fd; HOSTFS_I(inode)->mode = FMODE_READ | FMODE_WRITE; d_instantiate(dentry, inode); return 0; - - out_put: - iput(inode); - out: - return error; } static struct dentry *hostfs_lookup(struct inode *ino, struct dentry *dentry, unsigned int flags) { - struct inode *inode; + struct inode *inode = NULL; char *name; - int err; - - inode = hostfs_iget(ino->i_sb); - if (IS_ERR(inode)) - goto out; - err = -ENOMEM; name = dentry_name(dentry); - if (name) { - err = read_name(inode, name); - __putname(name); - } - if (err) { - iput(inode); - inode = (err == -ENOENT) ? NULL : ERR_PTR(err); + if (name == NULL) + return ERR_PTR(-ENOMEM); + + inode = hostfs_iget(ino->i_sb, name); + __putname(name); + if (IS_ERR(inode)) { + if (PTR_ERR(inode) == -ENOENT) + inode = NULL; + else + return ERR_CAST(inode); } - out: + return d_splice_alias(inode, dentry); } @@ -704,35 +724,23 @@ static int hostfs_mknod(struct mnt_idmap *idmap, struct inode *dir, char *name; int err; - inode = hostfs_iget(dir->i_sb); - if (IS_ERR(inode)) { - err = PTR_ERR(inode); - goto out; - } - - err = -ENOMEM; name = dentry_name(dentry); if (name == NULL) - goto out_put; + return -ENOMEM; err = do_mknod(name, mode, MAJOR(dev), MINOR(dev)); - if (err) - goto out_free; + if (err) { + __putname(name); + return err; + } - err = read_name(inode, name); + inode = hostfs_iget(dir->i_sb, name); __putname(name); - if (err) - goto out_put; + if (IS_ERR(inode)) + return PTR_ERR(inode); d_instantiate(dentry, inode); return 0; - - out_free: - __putname(name); - out_put: - iput(inode); - out: - return err; } static int hostfs_rename2(struct mnt_idmap *idmap, @@ -929,49 +937,40 @@ static int hostfs_fill_sb_common(struct super_block *sb, void *d, int silent) sb->s_maxbytes = MAX_LFS_FILESIZE; err = super_setup_bdi(sb); if (err) - goto out; + return err; /* NULL is printed as '(null)' by printf(): avoid that. */ if (req_root == NULL) req_root = ""; - err = -ENOMEM; sb->s_fs_info = host_root_path = kasprintf(GFP_KERNEL, "%s/%s", root_ino, req_root); if (host_root_path == NULL) - goto out; - - root_inode = new_inode(sb); - if (!root_inode) - goto out; + return -ENOMEM; - err = read_name(root_inode, host_root_path); - if (err) - goto out_put; + root_inode = hostfs_iget(sb, host_root_path); + if (IS_ERR(root_inode)) + return PTR_ERR(root_inode); if (S_ISLNK(root_inode->i_mode)) { - char *name = follow_link(host_root_path); - if (IS_ERR(name)) { - err = PTR_ERR(name); - goto out_put; - } - err = read_name(root_inode, name); + char *name; + + iput(root_inode); + name = follow_link(host_root_path); + if (IS_ERR(name)) + return PTR_ERR(name); + + root_inode = hostfs_iget(sb, name); kfree(name); - if (err) - goto out_put; + if (IS_ERR(root_inode)) + return PTR_ERR(root_inode); } - err = -ENOMEM; sb->s_root = d_make_root(root_inode); if (sb->s_root == NULL) - goto out; + return -ENOMEM; return 0; - -out_put: - iput(root_inode); -out: - return err; } static struct dentry *hostfs_read_sb(struct file_system_type *type, diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c index 5ecc4706172b..840619e39a1a 100644 --- a/fs/hostfs/hostfs_user.c +++ b/fs/hostfs/hostfs_user.c @@ -36,6 +36,7 @@ static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) p->blocks = buf->st_blocks; p->maj = os_major(buf->st_rdev); p->min = os_minor(buf->st_rdev); + p->dev = buf->st_dev; } int stat_file(const char *path, struct hostfs_stat *p, int fd) diff --git a/security/landlock/Kconfig b/security/landlock/Kconfig index 8e33c4e8ffb8..c1e862a38410 100644 --- a/security/landlock/Kconfig +++ b/security/landlock/Kconfig @@ -2,7 +2,7 @@ config SECURITY_LANDLOCK bool "Landlock support" - depends on SECURITY && !ARCH_EPHEMERAL_INODES + depends on SECURITY select SECURITY_PATH help Landlock is a sandboxing mechanism that enables processes to restrict -- 2.39.2

1 year

3
6
0 0

[PATCH 5.10 000/124] 5.10.178-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.10.178 release. There are 124 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 Thu, 20 Apr 2023 12:02:44 +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.178-r… 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.178-rc1 Kuniyuki Iwashima <kuniyu(a)amazon.com> sysctl: Fix data-races in proc_dou8vec_minmax(). Valentin Schneider <vschneid(a)redhat.com> panic, kexec: make __crash_kexec() NMI safe Valentin Schneider <vschneid(a)redhat.com> kexec: turn all kexec_mutex acquisitions into trylocks Arnd Bergmann <arnd(a)arndb.de> kexec: move locking into do_kexec_load Nathan Chancellor <nathan(a)kernel.org> riscv: Handle zicsr/zifencei issues between clang and binutils Masahiro Yamada <masahiroy(a)kernel.org> kbuild: check CONFIG_AS_IS_LLVM instead of LLVM_IAS Nathan Chancellor <nathan(a)kernel.org> kbuild: Switch to 'f' variants of integrated assembler flag Masahiro Yamada <masahiroy(a)kernel.org> kbuild: check the minimum assembler version in Kconfig Steve Clevenger <scclevenger(a)os.amperecomputing.com> coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug George Cherian <george.cherian(a)marvell.com> watchdog: sbsa_wdog: Make sure the timeout programming is within the limits Waiman Long <longman(a)redhat.com> cgroup/cpuset: Add cpuset_can_fork() and cpuset_cancel_fork() methods Waiman Long <longman(a)redhat.com> cgroup/cpuset: Make cpuset_fork() handle CLONE_INTO_CGROUP properly Waiman Long <longman(a)redhat.com> cgroup/cpuset: Skip spread flags update on v2 Waiman Long <longman(a)redhat.com> cgroup/cpuset: Change references of cpuset_mutex to cpuset_rwsem Gregor Herburger <gregor.herburger(a)tq-group.com> i2c: ocores: generate stop condition after timeout in polling mode Matija Glavinic Pecotic <matija.glavinic-pecotic.ext(a)nokia.com> x86/rtc: Remove __init for runtime functions Vincent Guittot <vincent.guittot(a)linaro.org> sched/fair: Fix imbalance overflow zgpeng <zgpeng.linux(a)gmail.com> sched/fair: Move calculate of avg_load to a better location Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/papr_scm: Update the NUMA distance table for the target node Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/pseries: Add support for FORM2 associativity Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/pseries: Add a helper for form1 cpu distance Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/pseries: Consolidate different NUMA distance update code paths Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/pseries: Rename TYPE1_AFFINITY to FORM1_AFFINITY Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com> powerpc/pseries: rename min_common_depth to primary_domain_index ZhaoLong Wang <wangzhaolong1(a)huawei.com> ubi: Fix deadlock caused by recursively holding work_sem Lee Jones <lee.jones(a)linaro.org> mtd: ubi: wl: Fix a couple of kernel-doc issues Zhihao Cheng <chengzhihao1(a)huawei.com> ubi: Fix failure attaching when vid_hdr offset equals to (sub)page size Waiman Long <longman(a)redhat.com> cgroup/cpuset: Wake up cpuset_attach_wq tasks in cpuset_cancel_attach() Basavaraj Natikar <Basavaraj.Natikar(a)amd.com> x86/PCI: Add quirk for AMD XHCI controller that loses MSI-X state in D3hot Jiri Kosina <jkosina(a)suse.cz> scsi: ses: Handle enclosure with just a primary component gracefully Ivan Bornyakov <i.bornyakov(a)metrotek.ru> net: sfp: initialize sfp->i2c_block_size at sfp allocation Mathis Salmen <mathis.salmen(a)matsal.de> riscv: add icache flush for nommu sigreturn trampoline Robbie Harwood <rharwood(a)redhat.com> asymmetric_keys: log on fatal failures in PE/pkcs7 Robbie Harwood <rharwood(a)redhat.com> verify_pefile: relax wrapper length check Hans de Goede <hdegoede(a)redhat.com> drm: panel-orientation-quirks: Add quirk for Lenovo Yoga Book X90F Hans de Goede <hdegoede(a)redhat.com> efi: sysfb_efi: Add quirk for Lenovo Yoga Book X91F/L Alexander Stein <alexander.stein(a)ew.tq-group.com> i2c: imx-lpi2c: clean rx/tx buffers upon new message Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> wifi: mwifiex: mark OF related data as maybe unused Grant Grundler <grundler(a)chromium.org> power: supply: cros_usbpd: reclassify "default case!" as debug Andrii Nakryiko <andrii(a)kernel.org> libbpf: Fix single-line struct definition output in btf_dump Roman Gushchin <roman.gushchin(a)linux.dev> net: macb: fix a memory corruption in extended buffer descriptor mode Eric Dumazet <edumazet(a)google.com> udp6: fix potential access to stale information Saravanan Vajravel <saravanan.vajravel(a)broadcom.com> RDMA/core: Fix GID entry ref leak when create_ah fails Xin Long <lucien.xin(a)gmail.com> sctp: fix a potential overflow in sctp_ifwdtsn_skip Ziyang Xuan <william.xuanziyang(a)huawei.com> net: qrtr: Fix an uninit variable access bug in qrtr_tx_resume() Denis Plotnikov <den-plotnikov(a)yandex-team.ru> qlcnic: check pci_reset_function result Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> drm/armada: Fix a potential double free in an error handling path YueHaibing <yuehaibing(a)huawei.com> tcp: restrict net.ipv4.tcp_app_win Eric Dumazet <edumazet(a)google.com> tcp: convert elligible sysctls to u8 Eric Dumazet <edumazet(a)google.com> ipv4: shrink netns_ipv4 with sysctl conversions Eric Dumazet <edumazet(a)google.com> sysctl: add proc_dou8vec_minmax() Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> niu: Fix missing unwind goto in niu_alloc_channels() Zheng Wang <zyytlz.wz(a)163.com> 9p/xen : Fix use after free bug in xen_9pfs_front_remove due to race condition Mark Zhang <markzhang(a)nvidia.com> RDMA/cma: Allow UD qp_type to join multicast only Maher Sanalla <msanalla(a)nvidia.com> IB/mlx5: Add support for 400G_8X lane speed Meir Lichtinger <meirl(a)mellanox.com> IB/mlx5: Add support for NDR link speed Chunyan Zhang <chunyan.zhang(a)unisoc.com> clk: sprd: set max_register according to mapping range Christophe Kerello <christophe.kerello(a)foss.st.com> mtd: rawnand: stm32_fmc2: use timings.mode instead of checking tRC_min Christophe Kerello <christophe.kerello(a)foss.st.com> mtd: rawnand: stm32_fmc2: remove unsupported EDO mode Arseniy Krasnov <avkrasnov(a)sberdevices.ru> mtd: rawnand: meson: fix bitmask for length in command word Bang Li <libang.linuxer(a)gmail.com> mtdblock: tolerate corrected bit-flips Daniel Vetter <daniel.vetter(a)ffwll.ch> fbmem: Reject FB_ACTIVATE_KD_TEXT from userspace Christoph Hellwig <hch(a)lst.de> btrfs: fix fast csum implementation detection David Sterba <dsterba(a)suse.com> btrfs: print checksum type and implementation at mount time Min Li <lm0963hack(a)gmail.com> Bluetooth: Fix race condition in hidp_session_thread Luiz Augusto von Dentz <luiz.von.dentz(a)intel.com> Bluetooth: L2CAP: Fix use-after-free in l2cap_disconnect_{req,rsp} Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: hda/sigmatel: fix S/PDIF out on Intel D*45* motherboards Xu Biang <xubiang(a)hust.edu.cn> ALSA: firewire-tascam: add missing unwind goto in snd_tscm_stream_start_duplex() Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: i2c/cs8427: fix iec958 mixer control deactivation Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: hda/sigmatel: add pin overrides for Intel DP45SG motherboard Oswald Buddenhagen <oswald.buddenhagen(a)gmx.de> ALSA: emu10k1: fix capture interrupt handler unlinking Kornel Dulęba <korneld(a)chromium.org> Revert "pinctrl: amd: Disable and mask interrupts on resume" Eduard Zingerman <eddyz87(a)gmail.com> bpftool: Print newline before '}' for struct with padding only fields Heming Zhao <ocfs2-devel(a)oss.oracle.com> ocfs2: fix freeing uninitialized resource on ocfs2_dlm_shutdown Gaosheng Cui <cuigaosheng1(a)huawei.com> Revert "media: ti: cal: fix possible memory leak in cal_ctx_create()" Robert Foss <robert.foss(a)linaro.org> drm/bridge: lt9611: Fix PLL being unable to lock Tommi Rantala <tommi.t.rantala(a)nokia.com> selftests: intel_pstate: ftime() is deprecated Rongwei Wang <rongwei.wang(a)linux.alibaba.com> mm/swap: fix swap_info_struct race between swapoff and get_swap_pages() Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Fix race while reader and writer are on the same page Karol Herbst <kherbst(a)redhat.com> drm/nouveau/disp: Support more modes by checking with lower bpc Boris Brezillon <boris.brezillon(a)collabora.com> drm/panfrost: Fix the panfrost_mmu_map_fault_addr() error path Jason Montleon <jmontleo(a)redhat.com> ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots() Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Free error logs of tracing instances Michal Sojka <michal.sojka(a)cvut.cz> can: isotp: isotp_ops: fix poll() to not report false EPOLLOUT events Oleksij Rempel <linux(a)rempel-privat.de> can: j1939: j1939_tp_tx_dat_new(): fix out-of-bounds memory access Zheng Yejian <zhengyejian1(a)huawei.com> ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct() John Keeping <john(a)metanate.com> ftrace: Mark get_lock_parent_ip() __always_inline Kan Liang <kan.liang(a)linux.intel.com> perf/core: Fix the same task check in perf_event_set_output Zhong Jinghua <zhongjinghua(a)huawei.com> scsi: iscsi_tcp: Check that sock is valid before iscsi_set_param() Nuno Sá <nuno.sa(a)analog.com> iio: adc: ad7791: fix IRQ flags Jeremy Soller <jeremy(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo X370SNW Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: serial: renesas,scif: Fix 4th IRQ for 4-IRQ SCIFs Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix sysfs interface lifetime Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix potential UAF of struct nilfs_sc_info in nilfs_segctor_thread() Sherry Sun <sherry.sun(a)nxp.com> tty: serial: fsl_lpuart: avoid checking for transfer complete when UARTCTRL_SBK is asserted in lpuart32_tx_empty Biju Das <biju.das.jz(a)bp.renesas.com> tty: serial: sh-sci: Fix Rx on RZ/G2L SCI Biju Das <biju.das.jz(a)bp.renesas.com> tty: serial: sh-sci: Fix transmit end interrupt handler Kai-Heng Feng <kai.heng.feng(a)canonical.com> iio: light: cm32181: Unregister second I2C client if present William Breathitt Gray <william.gray(a)linaro.org> iio: dac: cio-dac: Fix max DAC write value check for 12-bit Lars-Peter Clausen <lars(a)metafoo.de> iio: adc: ti-ads7950: Set `can_sleep` flag for GPIO chip Bjørn Mork <bjorn(a)mork.no> USB: serial: option: add Quectel RM500U-CN modem Enrico Sau <enrico.sau(a)gmail.com> USB: serial: option: add Telit FE990 compositions RD Babiera <rdbabiera(a)google.com> usb: typec: altmodes/displayport: Fix configure initial pin assignment Kees Jan Koster <kjkoster(a)kjkoster.org> USB: serial: cp210x: add Silicon Labs IFS-USB-DATACABLE IDs D Scott Phillips <scott(a)os.amperecomputing.com> xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu Wayne Chang <waynec(a)nvidia.com> usb: xhci: tegra: fix sleep in atomic call Dai Ngo <dai.ngo(a)oracle.com> NFSD: callback request does not use correct credential for AUTH_SYS Jeff Layton <jlayton(a)kernel.org> sunrpc: only free unix grouplist after RCU settles Corinna Vinschen <vinschen(a)redhat.com> net: stmmac: fix up RX flow hash indirection table when setting channels Siddharth Vadapalli <s-vadapalli(a)ti.com> net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe Dhruva Gole <d-gole(a)ti.com> gpio: davinci: Add irq chip flag to skip set wake Ziyang Xuan <william.xuanziyang(a)huawei.com> ipv6: Fix an uninit variable access bug in __ip6_make_skb() Sricharan Ramabadhran <quic_srichara(a)quicinc.com> net: qrtr: Do not do DEL_SERVER broadcast after DEL_CLIENT Xin Long <lucien.xin(a)gmail.com> sctp: check send stream number after wait_for_sndbuf Jakub Kicinski <kuba(a)kernel.org> net: don't let netpoll invoke NAPI if in xmit context Eric Dumazet <edumazet(a)google.com> icmp: guard against too small mtu Ziyang Xuan <william.xuanziyang(a)huawei.com> net: qrtr: Fix a refcount bug in qrtr_recvmsg() Luca Weiss <luca(a)z3ntu.xyz> net: qrtr: combine nameservice into main module Felix Fietkau <nbd(a)nbd.name> wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta Nico Boehr <nrb(a)linux.ibm.com> KVM: s390: pv: fix external interruption loop not always detected Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: sprd: Explicitly set .polarity in .get_state() Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: cros-ec: Explicitly set .polarity in .get_state() Mohammed Gamal <mgamal(a)redhat.com> Drivers: vmbus: Check for channel allocation before looking up relids Randy Dunlap <rdunlap(a)infradead.org> gpio: GPIO_REGMAP: select REGMAP instead of depending on it ------------- Diffstat: .../devicetree/bindings/serial/renesas,scif.yaml | 4 +- Documentation/networking/ip-sysctl.rst | 2 + Documentation/powerpc/associativity.rst | 104 +++++ Documentation/sound/hd-audio/models.rst | 2 +- Makefile | 12 +- arch/powerpc/include/asm/firmware.h | 7 +- arch/powerpc/include/asm/prom.h | 3 +- arch/powerpc/include/asm/topology.h | 6 +- arch/powerpc/kernel/prom_init.c | 3 +- arch/powerpc/mm/numa.c | 433 ++++++++++++++++----- arch/powerpc/platforms/pseries/firmware.c | 3 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 + arch/powerpc/platforms/pseries/hotplug-memory.c | 2 + arch/powerpc/platforms/pseries/lpar.c | 4 +- arch/powerpc/platforms/pseries/papr_scm.c | 7 + arch/riscv/Kconfig | 22 ++ arch/riscv/Makefile | 12 +- arch/riscv/kernel/signal.c | 9 +- arch/s390/kvm/intercept.c | 32 +- arch/x86/kernel/sysfb_efi.c | 8 + arch/x86/kernel/x86_init.c | 4 +- arch/x86/pci/fixup.c | 21 + crypto/asymmetric_keys/pkcs7_verify.c | 10 +- crypto/asymmetric_keys/verify_pefile.c | 32 +- drivers/clk/sprd/common.c | 9 +- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpu/drm/armada/armada_drv.c | 1 - drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 +- drivers/gpu/drm/nouveau/dispnv50/disp.c | 32 ++ drivers/gpu/drm/nouveau/nouveau_dp.c | 8 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + drivers/hv/connection.c | 4 + drivers/hwtracing/coresight/coresight-etm4x-core.c | 2 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 2 + drivers/i2c/busses/i2c-ocores.c | 35 +- drivers/iio/adc/ad7791.c | 2 +- drivers/iio/adc/ti-ads7950.c | 1 + drivers/iio/dac/cio-dac.c | 4 +- drivers/iio/light/cm32181.c | 12 + drivers/infiniband/core/cma.c | 60 +-- drivers/infiniband/core/verbs.c | 2 + drivers/infiniband/hw/mlx5/main.c | 16 + drivers/media/platform/ti-vpe/cal.c | 4 +- drivers/mtd/mtdblock.c | 12 +- drivers/mtd/nand/raw/meson_nand.c | 6 +- drivers/mtd/nand/raw/stm32_fmc2_nand.c | 3 + drivers/mtd/ubi/build.c | 21 +- drivers/mtd/ubi/wl.c | 5 +- drivers/net/ethernet/cadence/macb_main.c | 4 + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 8 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- drivers/net/ethernet/sun/niu.c | 2 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 +- drivers/net/phy/sfp.c | 13 +- drivers/net/wireless/marvell/mwifiex/pcie.c | 2 +- drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- drivers/pinctrl/pinctrl-amd.c | 36 +- drivers/power/supply/cros_usbpd-charger.c | 2 +- drivers/pwm/pwm-cros-ec.c | 1 + drivers/pwm/pwm-sprd.c | 1 + drivers/scsi/iscsi_tcp.c | 3 +- drivers/scsi/ses.c | 20 +- drivers/tty/serial/fsl_lpuart.c | 8 +- drivers/tty/serial/sh-sci.c | 10 +- drivers/usb/host/xhci-tegra.c | 6 +- drivers/usb/host/xhci.c | 6 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 10 + drivers/usb/typec/altmodes/displayport.c | 6 +- drivers/video/fbdev/core/fbmem.c | 2 + drivers/watchdog/sbsa_gwdt.c | 1 + fs/btrfs/disk-io.c | 17 + fs/btrfs/super.c | 2 - fs/nfsd/nfs4callback.c | 4 +- fs/nilfs2/segment.c | 3 +- fs/nilfs2/super.c | 2 + fs/nilfs2/the_nilfs.c | 12 +- fs/ocfs2/dlmglue.c | 8 +- fs/ocfs2/super.c | 3 +- fs/proc/proc_sysctl.c | 6 + include/linux/ftrace.h | 2 +- include/linux/kexec.h | 2 +- include/linux/sysctl.h | 2 + include/net/netns/ipv4.h | 100 ++--- init/Kconfig | 12 + kernel/cgroup/cpuset.c | 214 +++++++--- kernel/events/core.c | 2 +- kernel/kexec.c | 41 +- kernel/kexec_core.c | 28 +- kernel/kexec_file.c | 4 +- kernel/kexec_internal.h | 15 +- kernel/ksysfs.c | 7 +- kernel/sched/fair.c | 15 +- kernel/sysctl.c | 65 ++++ kernel/trace/ftrace.c | 15 +- kernel/trace/ring_buffer.c | 13 +- kernel/trace/trace.c | 1 + mm/swapfile.c | 3 +- net/9p/trans_xen.c | 4 + net/bluetooth/hidp/core.c | 2 +- net/bluetooth/l2cap_core.c | 24 +- net/can/isotp.c | 17 +- net/can/j1939/transport.c | 5 +- net/core/netpoll.c | 19 +- net/ipv4/icmp.c | 5 + net/ipv4/sysctl_net_ipv4.c | 203 +++++----- net/ipv6/ip6_output.c | 7 +- net/ipv6/udp.c | 8 +- net/mac80211/sta_info.c | 3 +- net/qrtr/Makefile | 3 +- net/qrtr/{qrtr.c => af_qrtr.c} | 15 + net/qrtr/ns.c | 15 +- net/sctp/socket.c | 4 + net/sctp/stream_interleave.c | 3 +- net/sunrpc/svcauth_unix.c | 17 +- scripts/Kconfig.include | 6 + scripts/as-version.sh | 69 ++++ scripts/dummy-tools/gcc | 6 + sound/firewire/tascam/tascam-stream.c | 2 +- sound/i2c/cs8427.c | 7 +- sound/pci/emu10k1/emupcm.c | 4 +- sound/pci/hda/patch_realtek.c | 1 + sound/pci/hda/patch_sigmatel.c | 10 + sound/soc/codecs/hdac_hdmi.c | 17 +- tools/lib/bpf/btf_dump.c | 11 +- tools/testing/selftests/intel_pstate/aperf.c | 22 +- 128 files changed, 1652 insertions(+), 615 deletions(-)

1 year

12
140
0 0

[PATCH 1/2] mfd: pm8008: fix module autoloading

by Johan Hovold

Add the missing module device table alias to that the driver can be autoloaded when built as a module. Fixes: 6b149f3310a4 ("mfd: pm8008: Add driver for QCOM PM8008 PMIC") Cc: stable(a)vger.kernel.org # 5.14 Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- drivers/mfd/qcom-pm8008.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c index 837246aab4ac..29ec3901564b 100644 --- a/drivers/mfd/qcom-pm8008.c +++ b/drivers/mfd/qcom-pm8008.c @@ -199,6 +199,7 @@ static const struct of_device_id pm8008_match[] = { { .compatible = "qcom,pm8008", }, { }, }; +MODULE_DEVICE_TABLE(of, pm8008_match); static struct i2c_driver pm8008_mfd_driver = { .driver = { -- 2.39.3

1 year

4
7
0 0

[PATCH V3] blk-cgroup: Flush stats before releasing blkcg_gq

by Ming Lei

As noted by Michal, the blkg_iostat_set's in the lockless list hold reference to blkg's to protect against their removal. Those blkg's hold reference to blkcg. When a cgroup is being destroyed, cgroup_rstat_flush() is only called at css_release_work_fn() which is called when the blkcg reference count reaches 0. This circular dependency will prevent blkcg and some blkgs from being freed after they are made offline. It is less a problem if the cgroup to be destroyed also has other controllers like memory that will call cgroup_rstat_flush() which will clean up the reference count. If block is the only controller that uses rstat, these offline blkcg and blkgs may never be freed leaking more and more memory over time. To prevent this potential memory leak: - flush blkcg per-cpu stats list in __blkg_release(), when no new stat can be added - add global blkg_stat_lock for covering concurrent parent blkg stat update - don't grab bio->bi_blkg reference when adding the stats into blkcg's per-cpu stat list since all stats are guaranteed to be consumed before releasing blkg instance, and grabbing blkg reference for stats was the most fragile part of original patch Based on Waiman's patch: https://lore.kernel.org/linux-block/20221215033132.230023-3-longman@redhat.… Fixes: 3b8cc6298724 ("blk-cgroup: Optimize blkcg_rstat_flush()") Cc: stable(a)vger.kernel.org Reported-by: Jay Shin <jaeshin(a)redhat.com> Cc: Waiman Long <longman(a)redhat.com> Cc: Tejun Heo <tj(a)kernel.org> Cc: mkoutny(a)suse.com Cc: Yosry Ahmed <yosryahmed(a)google.com> Signed-off-by: Ming Lei <ming.lei(a)redhat.com> --- V3: - add one global blkg_stat_lock for avoiding concurrent update on blkg stat; this way is easier for backport, also won't cause contention; V2: - remove kernel/cgroup change, and call blkcg_rstat_flush() to flush stat directly block/blk-cgroup.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 0ce64dd73cfe..f0b5c9c41cde 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -34,6 +34,8 @@ #include "blk-ioprio.h" #include "blk-throttle.h" +static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu); + /* * blkcg_pol_mutex protects blkcg_policy[] and policy [de]activation. * blkcg_pol_register_mutex nests outside of it and synchronizes entire @@ -56,6 +58,8 @@ static LIST_HEAD(all_blkcgs); /* protected by blkcg_pol_mutex */ bool blkcg_debug_stats = false; +static DEFINE_RAW_SPINLOCK(blkg_stat_lock); + #define BLKG_DESTROY_BATCH_SIZE 64 /* @@ -163,10 +167,20 @@ static void blkg_free(struct blkcg_gq *blkg) static void __blkg_release(struct rcu_head *rcu) { struct blkcg_gq *blkg = container_of(rcu, struct blkcg_gq, rcu_head); + struct blkcg *blkcg = blkg->blkcg; + int cpu; #ifdef CONFIG_BLK_CGROUP_PUNT_BIO WARN_ON(!bio_list_empty(&blkg->async_bios)); #endif + /* + * Flush all the non-empty percpu lockless lists before releasing + * us, given these stat belongs to us. + * + * blkg_stat_lock is for serializing blkg stat update + */ + for_each_possible_cpu(cpu) + __blkcg_rstat_flush(blkcg, cpu); /* release the blkcg and parent blkg refs this blkg has been holding */ css_put(&blkg->blkcg->css); @@ -951,23 +965,26 @@ static void blkcg_iostat_update(struct blkcg_gq *blkg, struct blkg_iostat *cur, u64_stats_update_end_irqrestore(&blkg->iostat.sync, flags); } -static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) +static void __blkcg_rstat_flush(struct blkcg *blkcg, int cpu) { - struct blkcg *blkcg = css_to_blkcg(css); struct llist_head *lhead = per_cpu_ptr(blkcg->lhead, cpu); struct llist_node *lnode; struct blkg_iostat_set *bisc, *next_bisc; - /* Root-level stats are sourced from system-wide IO stats */ - if (!cgroup_parent(css->cgroup)) - return; - rcu_read_lock(); lnode = llist_del_all(lhead); if (!lnode) goto out; + /* + * For covering concurrent parent blkg update from blkg_release(). + * + * When flushing from cgroup, cgroup_rstat_lock is always held, so + * this lock won't cause contention most of time. + */ + raw_spin_lock(&blkg_stat_lock); + /* * Iterate only the iostat_cpu's queued in the lockless list. */ @@ -991,13 +1008,19 @@ static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) if (parent && parent->parent) blkcg_iostat_update(parent, &blkg->iostat.cur, &blkg->iostat.last); - percpu_ref_put(&blkg->refcnt); } - + raw_spin_unlock(&blkg_stat_lock); out: rcu_read_unlock(); } +static void blkcg_rstat_flush(struct cgroup_subsys_state *css, int cpu) +{ + /* Root-level stats are sourced from system-wide IO stats */ + if (cgroup_parent(css->cgroup)) + __blkcg_rstat_flush(css_to_blkcg(css), cpu); +} + /* * We source root cgroup stats from the system-wide stats to avoid * tracking the same information twice and incurring overhead when no @@ -2075,7 +2098,6 @@ void blk_cgroup_bio_start(struct bio *bio) llist_add(&bis->lnode, lhead); WRITE_ONCE(bis->lqueued, true); - percpu_ref_get(&bis->blkg->refcnt); } u64_stats_update_end_irqrestore(&bis->sync, flags); -- 2.40.1

1 year

4
9
0 0

[PATCH] tpm: factor out the user space mm from tpm_vtpm_set_locality()

by Jarkko Sakkinen

From: Jarkko Sakkinen <jarkko.sakkinen(a)tuni.fi> vtpm_proxy_fops_set_locality() causes kernel buffers to be passed to copy_from_user() and copy_to_user(). Factor out the crippled code away with help of an internal API for managing struct proxy_dev instances. Link: https://lore.kernel.org/all/20230530020133.235765-1-jarkko@kernel.org/ Cc: stable(a)vger.kernel.org # v4.14+ Fixes: be4c9acfe297 ("tpm: vtpm_proxy: Implement request_locality function.") Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen(a)tuni.fi> --- I've tested this on RISC-V QEMU and have not noticed issues so far, and thus dropped the RFC tag. I've been looking into the code a lot lately as I'm building a boot time support for it, which will allow to e.g. test IMA without a physical TPM. drivers/char/tpm/tpm_vtpm_proxy.c | 168 ++++++++++++++++-------------- 1 file changed, 87 insertions(+), 81 deletions(-) diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c index 30e953988cab..83496742cc19 100644 --- a/drivers/char/tpm/tpm_vtpm_proxy.c +++ b/drivers/char/tpm/tpm_vtpm_proxy.c @@ -38,7 +38,6 @@ struct proxy_dev { #define STATE_OPENED_FLAG BIT(0) #define STATE_WAIT_RESPONSE_FLAG BIT(1) /* waiting for emulator response */ #define STATE_REGISTERED_FLAG BIT(2) -#define STATE_DRIVER_COMMAND BIT(3) /* sending a driver specific command */ size_t req_len; /* length of queued TPM request */ size_t resp_len; /* length of queued TPM response */ @@ -58,6 +57,53 @@ static void vtpm_proxy_delete_device(struct proxy_dev *proxy_dev); * Functions related to 'server side' */ +static ssize_t __vtpm_proxy_copy_from(struct proxy_dev *proxy_dev, u8 *buf, size_t count) +{ + size_t len = proxy_dev->req_len; + + if (!(proxy_dev->state & STATE_OPENED_FLAG)) + return -EPIPE; + + if (count < len || len > sizeof(proxy_dev->buffer)) { + pr_debug("Invalid size in recv: count=%zd, req_len=%zd\n", count, len); + return -EIO; + } + + memcpy(buf, proxy_dev->buffer, len); + memset(proxy_dev->buffer, 0, len); + proxy_dev->req_len = 0; + proxy_dev->state |= STATE_WAIT_RESPONSE_FLAG; + + return len; +} + +static ssize_t __vtpm_proxy_copy_to(struct proxy_dev *proxy_dev, const u8 *buf, size_t count) +{ + if (!(proxy_dev->state & STATE_OPENED_FLAG)) + return -EPIPE; + + if (count > sizeof(proxy_dev->buffer) || !(proxy_dev->state & STATE_WAIT_RESPONSE_FLAG)) + return -EIO; + + proxy_dev->state &= ~STATE_WAIT_RESPONSE_FLAG; + proxy_dev->req_len = 0; + proxy_dev->resp_len = count; + memcpy(proxy_dev->buffer, buf, count); + + return count; +} + +static int vtpm_proxy_wait_for(struct proxy_dev *proxy_dev) +{ + if (wait_event_interruptible( + proxy_dev->wq, + proxy_dev->req_len != 0 || !(proxy_dev->state & STATE_OPENED_FLAG))) + return -EINTR; + + return 0; +} + + /** * vtpm_proxy_fops_read - Read TPM commands on 'server side' * @@ -73,44 +119,26 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf, size_t count, loff_t *off) { struct proxy_dev *proxy_dev = filp->private_data; - size_t len; - int sig, rc; + u8 *kernel_buf; + ssize_t rc; - sig = wait_event_interruptible(proxy_dev->wq, - proxy_dev->req_len != 0 || - !(proxy_dev->state & STATE_OPENED_FLAG)); - if (sig) - return -EINTR; - - mutex_lock(&proxy_dev->buf_lock); - - if (!(proxy_dev->state & STATE_OPENED_FLAG)) { - mutex_unlock(&proxy_dev->buf_lock); - return -EPIPE; - } - - len = proxy_dev->req_len; - - if (count < len || len > sizeof(proxy_dev->buffer)) { - mutex_unlock(&proxy_dev->buf_lock); - pr_debug("Invalid size in recv: count=%zd, req_len=%zd\n", - count, len); - return -EIO; - } - - rc = copy_to_user(buf, proxy_dev->buffer, len); - memset(proxy_dev->buffer, 0, len); - proxy_dev->req_len = 0; + rc = vtpm_proxy_wait_for(proxy_dev); + if (rc) + return rc; - if (!rc) - proxy_dev->state |= STATE_WAIT_RESPONSE_FLAG; + kernel_buf = kzalloc(sizeof(proxy_dev->buffer), GFP_KERNEL); + if (!kernel_buf) + return -ENOMEM; + mutex_lock(&proxy_dev->buf_lock); + rc = __vtpm_proxy_copy_from(proxy_dev, buf, count); mutex_unlock(&proxy_dev->buf_lock); - if (rc) - return -EFAULT; + if (!rc && copy_to_user(buf, kernel_buf, count)) + rc = -EFAULT; - return len; + kfree(kernel_buf); + return rc; } /** @@ -128,36 +156,26 @@ static ssize_t vtpm_proxy_fops_write(struct file *filp, const char __user *buf, size_t count, loff_t *off) { struct proxy_dev *proxy_dev = filp->private_data; + u8 *kernel_buf; + int rc; - mutex_lock(&proxy_dev->buf_lock); - - if (!(proxy_dev->state & STATE_OPENED_FLAG)) { - mutex_unlock(&proxy_dev->buf_lock); - return -EPIPE; - } - - if (count > sizeof(proxy_dev->buffer) || - !(proxy_dev->state & STATE_WAIT_RESPONSE_FLAG)) { - mutex_unlock(&proxy_dev->buf_lock); - return -EIO; - } - - proxy_dev->state &= ~STATE_WAIT_RESPONSE_FLAG; - - proxy_dev->req_len = 0; + kernel_buf = kzalloc(sizeof(proxy_dev->buffer), GFP_KERNEL); + if (!kernel_buf) + return -ENOMEM; - if (copy_from_user(proxy_dev->buffer, buf, count)) { - mutex_unlock(&proxy_dev->buf_lock); + if (copy_from_user(kernel_buf, buf, count)) { + kfree(kernel_buf); return -EFAULT; } - proxy_dev->resp_len = count; - + mutex_lock(&proxy_dev->buf_lock); + rc = __vtpm_proxy_copy_to(proxy_dev, kernel_buf, count); mutex_unlock(&proxy_dev->buf_lock); wake_up_interruptible(&proxy_dev->wq); + kfree(kernel_buf); - return count; + return rc; } /* @@ -295,28 +313,6 @@ static int vtpm_proxy_tpm_op_recv(struct tpm_chip *chip, u8 *buf, size_t count) return len; } -static int vtpm_proxy_is_driver_command(struct tpm_chip *chip, - u8 *buf, size_t count) -{ - struct tpm_header *hdr = (struct tpm_header *)buf; - - if (count < sizeof(struct tpm_header)) - return 0; - - if (chip->flags & TPM_CHIP_FLAG_TPM2) { - switch (be32_to_cpu(hdr->ordinal)) { - case TPM2_CC_SET_LOCALITY: - return 1; - } - } else { - switch (be32_to_cpu(hdr->ordinal)) { - case TPM_ORD_SET_LOCALITY: - return 1; - } - } - return 0; -} - /* * Called when core TPM driver forwards TPM requests to 'server side'. * @@ -330,6 +326,7 @@ static int vtpm_proxy_is_driver_command(struct tpm_chip *chip, static int vtpm_proxy_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t count) { struct proxy_dev *proxy_dev = dev_get_drvdata(&chip->dev); + unsigned int ord = ((struct tpm_header *)buf)->ordinal; if (count > sizeof(proxy_dev->buffer)) { dev_err(&chip->dev, @@ -338,8 +335,10 @@ static int vtpm_proxy_tpm_op_send(struct tpm_chip *chip, u8 *buf, size_t count) return -EIO; } - if (!(proxy_dev->state & STATE_DRIVER_COMMAND) && - vtpm_proxy_is_driver_command(chip, buf, count)) + if ((chip->flags & TPM_CHIP_FLAG_TPM2) && ord == TPM2_CC_SET_LOCALITY) + return -EFAULT; + + if (ord == TPM_ORD_SET_LOCALITY) return -EFAULT; mutex_lock(&proxy_dev->buf_lock); @@ -407,13 +406,20 @@ static int vtpm_proxy_request_locality(struct tpm_chip *chip, int locality) TPM_ORD_SET_LOCALITY); if (rc) return rc; + tpm_buf_append_u8(&buf, locality); - proxy_dev->state |= STATE_DRIVER_COMMAND; + mutex_lock(&proxy_dev->buf_lock); + rc = __vtpm_proxy_copy_to(proxy_dev, buf.data, tpm_buf_length(&buf)); + mutex_unlock(&proxy_dev->buf_lock); - rc = tpm_transmit_cmd(chip, &buf, 0, "attempting to set locality"); + rc = vtpm_proxy_wait_for(proxy_dev); + if (rc) + return rc; - proxy_dev->state &= ~STATE_DRIVER_COMMAND; + mutex_lock(&proxy_dev->buf_lock); + rc = __vtpm_proxy_copy_from(proxy_dev, buf.data, tpm_buf_length(&buf)); + mutex_unlock(&proxy_dev->buf_lock); if (rc < 0) { locality = rc; -- 2.39.2

1 year

3
9
0 0

[PATCH 5.15 00/93] 5.15.107-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.107 release. There are 93 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 Fri, 14 Apr 2023 08:28:02 +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.15.107-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.15.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.15.107-rc1 Alistair Popple <apopple(a)nvidia.com> mm: take a page reference when removing device exclusive entries Robert Foss <robert.foss(a)linaro.org> drm/bridge: lt9611: Fix PLL being unable to lock Rongwei Wang <rongwei.wang(a)linux.alibaba.com> mm/swap: fix swap_info_struct race between swapoff and get_swap_pages() Zheng Yejian <zhengyejian1(a)huawei.com> ring-buffer: Fix race while reader and writer are on the same page Karol Herbst <kherbst(a)redhat.com> drm/nouveau/disp: Support more modes by checking with lower bpc Boris Brezillon <boris.brezillon(a)collabora.com> drm/panfrost: Fix the panfrost_mmu_map_fault_addr() error path Yafang Shao <laoar.shao(a)gmail.com> mm: vmalloc: avoid warn_alloc noise caused by fatal signal Jason Montleon <jmontleo(a)redhat.com> ASoC: hdac_hdmi: use set_stream() instead of set_tdm_slots() Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Free error logs of tracing instances Michal Sojka <michal.sojka(a)cvut.cz> can: isotp: isotp_ops: fix poll() to not report false EPOLLOUT events Oleksij Rempel <linux(a)rempel-privat.de> can: j1939: j1939_tp_tx_dat_new(): fix out-of-bounds memory access Christian Brauner <brauner(a)kernel.org> fs: drop peer group ids under namespace lock Zheng Yejian <zhengyejian1(a)huawei.com> ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct() John Keeping <john(a)metanate.com> ftrace: Mark get_lock_parent_ip() __always_inline Kan Liang <kan.liang(a)linux.intel.com> perf/core: Fix the same task check in perf_event_set_output Thiago Rafael Becker <tbecker(a)redhat.com> cifs: sanitize paths in cifs_update_super_prepath. Steve French <stfrench(a)microsoft.com> smb3: lower default deferred close timeout to address perf regression Steve French <stfrench(a)microsoft.com> smb3: allow deferred close timeout to be configurable Zhong Jinghua <zhongjinghua(a)huawei.com> scsi: iscsi_tcp: Check that sock is valid before iscsi_set_param() Li Zetao <lizetao1(a)huawei.com> scsi: qla2xxx: Fix memory leak in qla2x00_probe_one() Nuno Sá <nuno.sa(a)analog.com> iio: adc: ad7791: fix IRQ flags Steve Clevenger <scclevenger(a)os.amperecomputing.com> coresight-etm4: Fix for() loop drvdata->nr_addr_cmp range bug Suzuki K Poulose <suzuki.poulose(a)arm.com> coresight: etm4x: Do not access TRCIDR1 for identification Jeremy Soller <jeremy(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo X370SNW Marios Makassikis <mmakassikis(a)freebox.fr> ksmbd: do not call kvmalloc() with __GFP_NORETRY | __GFP_NO_WARN Geert Uytterhoeven <geert+renesas(a)glider.be> dt-bindings: serial: renesas,scif: Fix 4th IRQ for 4-IRQ SCIFs Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix sysfs interface lifetime Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix potential UAF of struct nilfs_sc_info in nilfs_segctor_thread() Sherry Sun <sherry.sun(a)nxp.com> tty: serial: fsl_lpuart: avoid checking for transfer complete when UARTCTRL_SBK is asserted in lpuart32_tx_empty Biju Das <biju.das.jz(a)bp.renesas.com> tty: serial: sh-sci: Fix Rx on RZ/G2L SCI Biju Das <biju.das.jz(a)bp.renesas.com> tty: serial: sh-sci: Fix transmit end interrupt handler Kai-Heng Feng <kai.heng.feng(a)canonical.com> iio: light: cm32181: Unregister second I2C client if present William Breathitt Gray <william.gray(a)linaro.org> iio: dac: cio-dac: Fix max DAC write value check for 12-bit Lars-Peter Clausen <lars(a)metafoo.de> iio: adc: ti-ads7950: Set `can_sleep` flag for GPIO chip Arnd Bergmann <arnd(a)arndb.de> iio: adis16480: select CONFIG_CRC32 Bjørn Mork <bjorn(a)mork.no> USB: serial: option: add Quectel RM500U-CN modem Enrico Sau <enrico.sau(a)gmail.com> USB: serial: option: add Telit FE990 compositions RD Babiera <rdbabiera(a)google.com> usb: typec: altmodes/displayport: Fix configure initial pin assignment Kees Jan Koster <kjkoster(a)kjkoster.org> USB: serial: cp210x: add Silicon Labs IFS-USB-DATACABLE IDs Heikki Krogerus <heikki.krogerus(a)linux.intel.com> usb: dwc3: pci: add support for the Intel Meteor Lake-S Pawel Laszczak <pawell(a)cadence.com> usb: cdnsp: Fixes error: uninitialized symbol 'len' D Scott Phillips <scott(a)os.amperecomputing.com> xhci: also avoid the XHCI_ZERO_64B_REGS quirk with a passthrough iommu Wayne Chang <waynec(a)nvidia.com> usb: xhci: tegra: fix sleep in atomic call Masahiro Yamada <masahiroy(a)kernel.org> kbuild: refactor single builds of *.ko Shailend Chand <shailend(a)google.com> gve: Secure enough bytes in the first TX desc for all TCP pkts Andy Roulin <aroulin(a)nvidia.com> ethtool: reset #lanes when lanes is omitted Lingyu Liu <lingyu.liu(a)intel.com> ice: Reset FDIR counter in FDIR init stage Simei Su <simei.su(a)intel.com> ice: fix wrong fallback logic for FDIR Dai Ngo <dai.ngo(a)oracle.com> NFSD: callback request does not use correct credential for AUTH_SYS Jeff Layton <jlayton(a)kernel.org> sunrpc: only free unix grouplist after RCU settles Corinna Vinschen <vinschen(a)redhat.com> net: stmmac: fix up RX flow hash indirection table when setting channels Siddharth Vadapalli <s-vadapalli(a)ti.com> net: ethernet: ti: am65-cpsw: Fix mdio cleanup in probe Dhruva Gole <d-gole(a)ti.com> gpio: davinci: Add irq chip flag to skip set wake Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: Clean up display of current_value on Thinkstation Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: Fix memory leaks when parsing ThinkStation WMI strings Armin Wolf <W_Armin(a)gmx.de> platform/x86: think-lmi: Fix memory leak when showing current settings Ziyang Xuan <william.xuanziyang(a)huawei.com> ipv6: Fix an uninit variable access bug in __ip6_make_skb() Sricharan Ramabadhran <quic_srichara(a)quicinc.com> net: qrtr: Do not do DEL_SERVER broadcast after DEL_CLIENT Xin Long <lucien.xin(a)gmail.com> sctp: check send stream number after wait_for_sndbuf Gustav Ekelund <gustaek(a)axis.com> net: dsa: mv88e6xxx: Reset mv88e6393x force WD event bit Jakub Kicinski <kuba(a)kernel.org> net: don't let netpoll invoke NAPI if in xmit context Eric Dumazet <edumazet(a)google.com> icmp: guard against too small mtu Chuck Lever <chuck.lever(a)oracle.com> NFSD: Avoid calling OPDESC() with ops->opnum == OP_ILLEGAL Ziyang Xuan <william.xuanziyang(a)huawei.com> net: qrtr: Fix a refcount bug in qrtr_recvmsg() Luca Weiss <luca(a)z3ntu.xyz> net: qrtr: combine nameservice into main module Felix Fietkau <nbd(a)nbd.name> wifi: mac80211: fix invalid drv_sta_pre_rcu_remove calls for non-uploaded sta Nico Boehr <nrb(a)linux.ibm.com> KVM: s390: pv: fix external interruption loop not always detected Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: sprd: Explicitly set .polarity in .get_state() Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> pwm: cros-ec: Explicitly set .polarity in .get_state() Mohammed Gamal <mgamal(a)redhat.com> Drivers: vmbus: Check for channel allocation before looking up relids Randy Dunlap <rdunlap(a)infradead.org> gpio: GPIO_REGMAP: select REGMAP instead of depending on it Tonghao Zhang <tong(a)infragraf.org> bpf: hash map, avoid deadlock with suitable hash mask Christian König <christian.koenig(a)amd.com> drm/amdgpu: fix amdgpu_job_free_resources v2 Andrey Grodzovsky <andrey.grodzovsky(a)amd.com> drm/amdgpu: Prevent race between late signaled fences and GPU reset. Matthew Howell <matthew.howell(a)sealevel.com> serial: exar: Add support for Sealevel 7xxxC serial cards Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> serial: 8250_exar: derive nr_ports from PCI ID for Acces I/O cards Daniil Tatianin <d-tatianin(a)yandex-team.ru> iavf/iavf_main: actually log ->src mask when talking about it Jacob Keller <jacob.e.keller(a)intel.com> iavf: return errno code instead of status code Hans de Goede <hdegoede(a)redhat.com> platform/x86: int3472/discrete: Ensure the clk/power enable pins are in output mode Hans de Goede <hdegoede(a)redhat.com> platform/x86: int3472: Split into 2 drivers Mustafa Ismail <mustafa.ismail(a)intel.com> RDMA/irdma: Do not request 2-level PBLEs for CQ alloc Brian Foster <bfoster(a)redhat.com> NFSD: pass range end to vfs_fsync_range() instead of count Chuck Lever <chuck.lever(a)oracle.com> NFSD: Fix sparse warning Li Zetao <ocfs2-devel(a)oss.oracle.com> ocfs2: fix memory leak in ocfs2_mount_volume() Heming Zhao via Ocfs2-devel <ocfs2-devel(a)oss.oracle.com> ocfs2: rewrite error handling of ocfs2_fill_super Heming Zhao via Ocfs2-devel <ocfs2-devel(a)oss.oracle.com> ocfs2: ocfs2_mount_volume does cleanup job before return error Yang Yingliang <yangyingliang(a)huawei.com> soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init() Yang Yingliang <yangyingliang(a)huawei.com> soc: sifive: ccache: fix missing free_irq() in error path in sifive_ccache_init() Yang Yingliang <yangyingliang(a)huawei.com> soc: sifive: ccache: fix missing iounmap() in error path in sifive_ccache_init() Ben Dooks <ben.dooks(a)sifive.com> soc: sifive: ccache: use pr_fmt() to remove CCACHE: prefixes Ben Dooks <ben.dooks(a)sifive.com> soc: sifive: ccache: reduce printing on init Zong Li <zong.li(a)sifive.com> soc: sifive: ccache: determine the cache level from dts Greentime Hu <greentime.hu(a)sifive.com> soc: sifive: ccache: Rename SiFive L2 cache to Composable cache. ------------- Diffstat: .../devicetree/bindings/serial/renesas,scif.yaml | 4 +- Makefile | 20 +- arch/s390/kvm/intercept.c | 32 ++- drivers/edac/Kconfig | 2 +- drivers/edac/sifive_edac.c | 12 +- drivers/gpio/Kconfig | 2 +- drivers/gpio/gpio-davinci.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 18 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 10 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 1 + drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + drivers/gpu/drm/nouveau/dispnv50/disp.c | 32 +++ drivers/gpu/drm/nouveau/nouveau_dp.c | 8 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + drivers/hv/connection.c | 4 + drivers/hwtracing/coresight/coresight-etm4x-core.c | 24 +- drivers/hwtracing/coresight/coresight-etm4x.h | 20 +- drivers/iio/adc/ad7791.c | 2 +- drivers/iio/adc/ti-ads7950.c | 1 + drivers/iio/dac/cio-dac.c | 4 +- drivers/iio/imu/Kconfig | 1 + drivers/iio/light/cm32181.c | 12 + drivers/infiniband/hw/irdma/verbs.c | 15 +- drivers/net/dsa/mv88e6xxx/chip.c | 2 +- drivers/net/dsa/mv88e6xxx/global2.c | 20 ++ drivers/net/dsa/mv88e6xxx/global2.h | 1 + drivers/net/ethernet/google/gve/gve.h | 2 + drivers/net/ethernet/google/gve/gve_tx.c | 12 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 22 +- drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 23 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +- drivers/net/ethernet/ti/am65-cpsw-nuss.c | 6 +- drivers/platform/x86/intel/int3472/Makefile | 9 +- ...472_clk_and_regulator.c => clk_and_regulator.c} | 5 +- drivers/platform/x86/intel/int3472/common.c | 54 +++++ .../{intel_skl_int3472_common.h => common.h} | 3 - .../{intel_skl_int3472_discrete.c => discrete.c} | 32 ++- .../x86/intel/int3472/intel_skl_int3472_common.c | 106 -------- .../{intel_skl_int3472_tps68470.c => tps68470.c} | 23 +- drivers/platform/x86/think-lmi.c | 20 +- drivers/pwm/pwm-cros-ec.c | 1 + drivers/pwm/pwm-sprd.c | 1 + drivers/scsi/iscsi_tcp.c | 3 +- drivers/scsi/qla2xxx/qla_os.c | 1 + drivers/soc/sifive/Kconfig | 6 +- drivers/soc/sifive/Makefile | 2 +- drivers/soc/sifive/sifive_ccache.c | 266 +++++++++++++++++++++ drivers/soc/sifive/sifive_l2_cache.c | 237 ------------------ drivers/tty/serial/8250/8250_exar.c | 51 ++-- drivers/tty/serial/fsl_lpuart.c | 8 +- drivers/tty/serial/sh-sci.c | 10 +- drivers/usb/cdns3/cdnsp-ep0.c | 3 +- drivers/usb/dwc3/dwc3-pci.c | 4 + drivers/usb/host/xhci-tegra.c | 6 +- drivers/usb/host/xhci.c | 6 +- drivers/usb/serial/cp210x.c | 1 + drivers/usb/serial/option.c | 10 + drivers/usb/typec/altmodes/displayport.c | 6 +- fs/cifs/cifsfs.c | 1 + fs/cifs/connect.c | 2 + fs/cifs/file.c | 4 +- fs/cifs/fs_context.c | 22 +- fs/cifs/fs_context.h | 11 + fs/cifs/misc.c | 2 +- fs/ksmbd/connection.c | 5 +- fs/namespace.c | 2 +- fs/nfsd/nfs4callback.c | 4 +- fs/nfsd/nfs4proc.c | 7 +- fs/nfsd/nfs4xdr.c | 4 +- fs/nilfs2/segment.c | 3 +- fs/nilfs2/super.c | 2 + fs/nilfs2/the_nilfs.c | 12 +- fs/ocfs2/journal.c | 2 +- fs/ocfs2/journal.h | 1 + fs/ocfs2/super.c | 105 ++++---- include/linux/ftrace.h | 2 +- include/soc/sifive/sifive_ccache.h | 16 ++ include/soc/sifive/sifive_l2_cache.h | 16 -- kernel/bpf/hashtab.c | 4 +- kernel/events/core.c | 2 +- kernel/trace/ftrace.c | 15 +- kernel/trace/ring_buffer.c | 13 +- kernel/trace/trace.c | 1 + mm/memory.c | 16 +- mm/swapfile.c | 3 +- mm/vmalloc.c | 8 +- net/can/isotp.c | 17 +- net/can/j1939/transport.c | 5 +- net/core/netpoll.c | 19 +- net/ethtool/linkmodes.c | 7 +- net/ipv4/icmp.c | 5 + net/ipv6/ip6_output.c | 7 +- net/mac80211/sta_info.c | 3 +- net/qrtr/Makefile | 3 +- net/qrtr/{qrtr.c => af_qrtr.c} | 2 + net/qrtr/ns.c | 15 +- net/sctp/socket.c | 4 + net/sunrpc/svcauth_unix.c | 17 +- sound/pci/hda/patch_realtek.c | 1 + sound/soc/codecs/hdac_hdmi.c | 17 +- 101 files changed, 968 insertions(+), 639 deletions(-)

1 year

10
105
0 0

[PATCH 6.3 000/364] 6.3.4-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.3.4 release. There are 364 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, 24 May 2023 19:03:25 +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/v6.x/stable-review/patch-6.3.4-rc1.… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.3.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.3.4-rc1 Wenchao Hao <haowenchao2(a)huawei.com> scsi: Revert "scsi: core: Do not increase scsi_device's iorequest_cnt if dispatch failed" Li Ma <li.ma(a)amd.com> drm/amdgpu: reserve the old gc_11_0_*_mes.bin Jack Xiao <Jack.Xiao(a)amd.com> drm/amd/amdgpu: introduce gc_*_mes_2.bin v2 Ard Biesheuvel <ardb(a)kernel.org> ARM: 9297/1: vfp: avoid unbalanced stack on 'success' return path Ard Biesheuvel <ardb(a)kernel.org> ARM: 9294/2: vfp: Fix broken softirq handling with instrumentation enabled Mathieu Poirier <mathieu.poirier(a)linaro.org> remoteproc: imx_dsp_rproc: Fix kernel test robot sparse warning Ze Gao <zegao2021(a)gmail.com> rethook, fprobe: do not trace rethook related functions Ze Gao <zegao2021(a)gmail.com> rethook: use preempt_{disable, enable}_notrace in rethook_trampoline_handler Peter Collingbourne <pcc(a)google.com> arm64: mte: Do not set PG_mte_tagged if tags were not initialized Peter Collingbourne <pcc(a)google.com> arm64: Also reset KASAN tag if page is not PG_mte_tagged Heiko Carstens <hca(a)linux.ibm.com> s390/qdio: fix do_sqbs() inline assembly constraint Heiko Carstens <hca(a)linux.ibm.com> s390/crypto: use vector instructions only if available for ChaCha20 Stefan Haberland <sth(a)linux.ibm.com> s390/dasd: fix command reject error on ESE devices Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix use-after-free bug of nilfs_root in nilfs_evict_inode() Huayu Chen <huayu.chen(a)corigine.com> nfp: fix NFP_NET_MAX_DSCP definition error Hari Bathini <hbathini(a)linux.ibm.com> powerpc/bpf: populate extable entries only during the last pass Michael Ellerman <mpe(a)ellerman.id.au> powerpc/64s/radix: Fix soft dirty tracking Jerry Snitselaar <jsnitsel(a)redhat.com> tpm/tpm_tis: Disable interrupts for more Lenovo devices Gaurav Batra <gbatra(a)linux.vnet.ibm.com> powerpc/iommu: Incorrect DDW Table is referenced for SR-IOV device Gaurav Batra <gbatra(a)linux.vnet.ibm.com> powerpc/iommu: DMA address offset is incorrectly calculated with 2MB TCEs Michal Simek <michal.simek(a)amd.com> dt-bindings: ata: ahci-ceva: Cover all 4 iommus entries Rob Clark <robdclark(a)chromium.org> iommu/arm-smmu-qcom: Fix missing adreno_smmu's Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/gfx11: update gpu_clock_counter logic Tong Liu01 <Tong.Liu01(a)amd.com> drm/amdgpu: refine get gpu clock counter method Guilherme G. Piccoli <gpiccoli(a)igalia.com> drm/amdgpu/gfx11: Adjust gfxoff before powergating on gfx11 as well Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> drm/amdgpu/gfx10: Disable gfxoff before disabling powergating. Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/gmc11: implement get_vbios_fb_size() Evan Quan <evan.quan(a)amd.com> drm/amd/pm: fix possible power mode mismatch between driver and PMFW Xiubo Li <xiubli(a)redhat.com> ceph: force updating the msg pointer in non-split case George Kennedy <george.kennedy(a)oracle.com> vc_screen: reload load of struct vc_data pointer in vcs_write() to avoid UAF Mario Limonciello <mario.limonciello(a)amd.com> thunderbolt: Clear registers properly when auto clear isn't in use Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> serial: qcom-geni: fix enabling deactivated interrupt Andrew Davis <afd(a)ti.com> serial: 8250_exar: Add support for USR298x PCI Modems Vitaliy Tomin <tomin(a)iszf.irk.ru> serial: Add support for Advantech PCI-1611U card Sandipan Das <sandipan.das(a)amd.com> perf script: Skip aggregation for stat events Domenico Cerasuolo <cerasuolodomenico(a)gmail.com> mm: fix zswap writeback race condition Peng Zhang <zhangpeng.00(a)bytedance.com> maple_tree: make maple state reusable after mas_empty_area() Ilya Leoshkevich <iii(a)linux.ibm.com> statfs: enforce statfs[64] structure initialization Michal Luczaj <mhal(a)rbox.co> KVM: Fix vcpu_array[0] races Oliver Upton <oliver.upton(a)linux.dev> KVM: arm64: Infer the PA offset from IPA in stage-2 map walker Chih-Yen Chang <cc85nod(a)gmail.com> ksmbd: fix global-out-of-bounds in smb2_find_context_vals Chih-Yen Chang <cc85nod(a)gmail.com> ksmbd: fix wrong UserName check in session_user Chih-Yen Chang <cc85nod(a)gmail.com> ksmbd: allocate one more byte for implied bcc[0] Gustav Johansson <gustajo(a)axis.com> ksmbd: smb2: Allow messages padded to 8byte boundary Bharath SM <bharathsm(a)microsoft.com> SMB3: drop reference to cfile before sending oplock break Bharath SM <bharathsm(a)microsoft.com> SMB3: Close all deferred handles of inode in case of handle lease break Ping-Ke Shih <pkshih(a)realtek.com> wifi: rtw88: correct qsel_to_ep[] type as int Ping-Ke Shih <pkshih(a)realtek.com> wifi: rtw88: use work to update rate to avoid RCU warning Hans de Goede <hdegoede(a)redhat.com> wifi: brcmfmac: Check for probe() id argument being NULL Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Disable interrupts in probe error path Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Do not send EFLUSH command on TFD interrupt Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Clear listen-only bit if not explicitly requested Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Empty SRB buffer in probe Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Call request_irq() before enabling interrupts Jimmy Assarsson <extja(a)kvaser.com> can: kvaser_pciefd: Set CAN_STATE_STOPPED in kvaser_pciefd_stop() Oliver Hartkopp <socketcan(a)hartkopp.net> can: isotp: recvmsg(): allow MSG_CMSG_COMPAT flag Oliver Hartkopp <socketcan(a)hartkopp.net> can: j1939: recvmsg(): allow MSG_CMSG_COMPAT flag Kai-Heng Feng <kai.heng.feng(a)canonical.com> ALSA: hda/realtek: Fix mute and micmute LEDs for yet another HP laptop Vitaly Rodionov <vitalyr(a)opensource.cirrus.com> ALSA: hda/realtek: Add quirk for HP EliteBook G10 laptops Luke D. Jones <luke(a)ljones.dev> ALSA: hda/realtek: Add quirk for 2nd ASUS GU603 Ai Chao <aichao(a)kylinos.cn> ALSA: hda/realtek: Add a quirk for HP EliteDesk 805 Jeremy Soller <jeremy(a)system76.com> ALSA: hda/realtek: Add quirk for Clevo L140AU Nikhil Mahale <nmahale(a)nvidia.com> ALSA: hda: Add NVIDIA codec IDs a3 through a7 to patch table Takashi Iwai <tiwai(a)suse.de> ALSA: hda: Fix Oops by 9.1 surround channel names Mathias Nyman <mathias.nyman(a)linux.intel.com> xhci: Fix incorrect tracking of free space on transfer rings Mario Limonciello <mario.limonciello(a)amd.com> xhci-pci: Only run d3cold avoidance quirk for s2idle Francesco Dolcini <francesco.dolcini(a)toradex.com> Revert "usb: gadget: udc: core: Invoke usb_gadget_connect only when started" Francesco Dolcini <francesco.dolcini(a)toradex.com> Revert "usb: gadget: udc: core: Prevent redundant calls to pullup" Badhri Jagan Sridharan <badhri(a)google.com> usb: typec: altmodes/displayport: fix pin_assignment_show Konrad Gräfe <k.graefe(a)gateware.de> usb: gadget: u_ether: Fix host MAC address case Udipto Goswami <quic_ugoswami(a)quicinc.com> usb: dwc3: debugfs: Resume dwc3 before accessing registers Roger Quadros <rogerq(a)kernel.org> usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume() Weitao Wang <WeitaoWang-oc(a)zhaoxin.com> USB: UHCI: adjust zhaoxin UHCI controllers OverCurrent bit value Maxime Bizon <mbizon(a)freebox.fr> usb-storage: fix deadlock when a scsi command timeouts more than once Alan Stern <stern(a)rowland.harvard.edu> USB: usbtmc: Fix direction for 0-length ioctl control messages Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Add a sample rate workaround for Line6 Pod Go Arnd Bergmann <arnd(a)arndb.de> bridge: always declare tunnel functions Florian Westphal <fw(a)strlen.de> netfilter: nft_set_rbtree: fix null deref on element insertion Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: fix nft_trans type confusion Benjamin Poirier <bpoirier(a)nvidia.com> net: selftests: Fix optstring Vladimir Oltean <vladimir.oltean(a)nxp.com> net: pcs: xpcs: fix C73 AN not getting enabled M Chetan Kumar <m.chetan.kumar(a)linux.intel.com> net: wwan: iosm: fix NULL pointer dereference when removing device Eric Dumazet <edumazet(a)google.com> vlan: fix a potential uninit-value in vlan_dev_hard_start_xmit() Aleksandr Loktionov <aleksandr.loktionov(a)intel.com> igb: fix bit_shift to be in [1..8] range Marco Migliore <m.migliore(a)tiesse.com> net: dsa: mv88e6xxx: Fix mv88e6393x EPC write command offset Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> cassini: Fix a memory leak in the error handling path of cas_init_one() Kuniyuki Iwashima <kuniyu(a)amazon.com> tun: Fix memory leak for detached NAPI queue. Ido Schimmel <idosch(a)nvidia.com> devlink: Fix crash with CONFIG_NET_NS=n Michael Kelley <mikelley(a)microsoft.com> scsi: storvsc: Don't pass unused PFNs to Hyper-V host Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: mvm: don't trust firmware n_channels Alon Giladi <alon.giladi(a)intel.com> wifi: iwlwifi: mvm: fix OEM's name in the tas approved list Alon Giladi <alon.giladi(a)intel.com> wifi: iwlwifi: fix OEM's name in the ppag approved list Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: fw: fix DBGI dump Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: mvm: fix cancel_delayed_work_sync() deadlock Michael Lee <michael-cy.lee(a)mediatek.com> wifi: mac80211: Abort running color change when stopping the AP Johannes Berg <johannes.berg(a)intel.com> wifi: mac80211: fix min center freq offset tracing Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> wifi: mac80211: Fix puncturing bitmap handling in __ieee80211_csa_finalize() Mirsad Goran Todorovac <mirsad.todorovac(a)alu.unizg.hr> wifi: mac80211: fortify the spinlock against deadlock by interrupt Ilan Peer <ilan.peer(a)intel.com> wifi: cfg80211: Drop entries with invalid BSSIDs in RNR Ahmed Zaki <ahmed.zaki(a)intel.com> iavf: send VLAN offloading caps once after VFR Dawid Wesierski <dawidx.wesierski(a)intel.com> ice: Fix ice VF reset during iavf initialization Ahmed Zaki <ahmed.zaki(a)intel.com> ice: Fix stats after PF reset Florian Fainelli <f.fainelli(a)gmail.com> net: bcmgenet: Restore phy_stop() depending upon suspend/close Florian Fainelli <f.fainelli(a)gmail.com> net: bcmgenet: Remove phy_stop() from bcmgenet_netif_stop() Oliver Hartkopp <socketcan(a)hartkopp.net> can: dev: fix missing CAN XL support in can_put_echo_skb() Vineeth Vijayan <vneethv(a)linux.ibm.com> s390/cio: include subchannels without devices also for evaluation Xin Long <lucien.xin(a)gmail.com> tipc: check the bearer min mtu properly when setting it by netlink Xin Long <lucien.xin(a)gmail.com> tipc: do not update mtu if msg_max is too small in mtu negotiation Xin Long <lucien.xin(a)gmail.com> tipc: add tipc_bearer_min_mtu to calculate min mtu Feng Liu <feliu(a)nvidia.com> virtio_net: Fix error unwinding of XDP initialization Shenwei Wang <shenwei.wang(a)nxp.com> net: fec: remove the xdp_return_frame when lack of tx BDs Dong Chenchen <dongchenchen2(a)huawei.com> net: nsh: Use correct mac_offset to unwind gso skb in nsh_gso_segment() Arnd Bergmann <arnd(a)arndb.de> drm/exynos: fix g2d_open/close helper function definitions Ranjani Sridharan <ranjani.sridharan(a)linux.intel.com> ASoC: SOF: topology: Fix logic for copying tuples Douglas Anderson <dianders(a)chromium.org> ASoC: mediatek: mt8186: Fix use-after-free in driver remove path Peter Ujfalusi <peter.ujfalusi(a)linux.intel.com> ASoC: SOF: ipc3-topology: Make sure that only one cmd is sent in dai_config Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Fix trace_svc_register() call site NeilBrown <neilb(a)suse.de> SUNRPC: always free ctxt when freeing deferred request NeilBrown <neilb(a)suse.de> SUNRPC: double free xprt_ctxt while still in use Duoming Zhou <duoming(a)zju.edu.cn> media: netup_unidvb: fix use-after-free at del_timer() Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix reset timeout when enable full VF Jie Wang <wangjie125(a)huawei.com> net: hns3: fix reset delay time to avoid configuration timeout Jijie Shao <shaojijie(a)huawei.com> net: hns3: fix sending pfc frames after reset issue Jie Wang <wangjie125(a)huawei.com> net: hns3: fix output information incomplete for dumping tx queue info with debugfs Clément Léger <clement.leger(a)bootlin.com> net: dsa: rzn1-a5psw: disable learning for standalone ports Alexis Lothoré <alexis.lothore(a)bootlin.com> net: dsa: rzn1-a5psw: fix STP states handling Clément Léger <clement.leger(a)bootlin.com> net: dsa: rzn1-a5psw: enable management frames for CPU port Xin Long <lucien.xin(a)gmail.com> erspan: get the proto with the md version for collect_md Doug Berger <opendmb(a)gmail.com> serial: 8250_bcm7271: fix leak in `brcmuart_probe` Doug Berger <opendmb(a)gmail.com> serial: 8250_bcm7271: balance clk_enable calls Ke Zhang <m202171830(a)hust.edu.cn> serial: arc_uart: fix of_iomap leak in `arc_serial_probe` Arnd Bergmann <arnd(a)arndb.de> media: pvrusb2: fix DVB_CORE dependency Eric Dumazet <edumazet(a)google.com> tcp: fix possible sk_priority leak in tcp_v4_send_reset() Zhuang Shengen <zhuangshengen(a)huawei.com> vsock: avoid to close connected socket after the timeout Pieter Jansen van Vuuren <pieter.jansen-van-vuuren(a)amd.com> sfc: disable RXFCS and RXALL features by default Jan Sokolowski <jan.sokolowski(a)intel.com> ice: Fix undersized tx_flags variable Ryan C. Underwood <nemesis(a)icequake.net> ALSA: hda/realtek: Apply HP B&O top speaker profile to Pavilion 15 Ryder Lee <ryder.lee(a)mediatek.com> wifi: mt76: connac: fix stats->tx_bytes calculation Dan Carpenter <dan.carpenter(a)linaro.org> ALSA: firewire-digi00x: prevent potential use after free Grygorii Strashko <grygorii.strashko(a)ti.com> net: phy: dp83867: add w/a for packet errors seen with short cables Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> net: fec: Better handle pm_runtime_get() failing in .remove() Jiri Pirko <jiri(a)resnulli.us> devlink: change per-devlink netdev notifier to static one Andrea Mayer <andrea.mayer(a)uniroma2.it> selftets: seg6: disable rp_filter by default in srv6_end_dt4_l3vpn_test Andrea Mayer <andrea.mayer(a)uniroma2.it> selftests: seg6: disable DAD on IPv6 router cfg for srv6_end_dt4_l3vpn_test Rob Clark <robdclark(a)chromium.org> drm/msm: Fix submit error-path leaks Tobias Brunner <tobias(a)strongswan.org> af_key: Reject optional tunnel/BEET mode templates in outbound policies Tobias Brunner <tobias(a)strongswan.org> xfrm: Reject optional tunnel/BEET mode templates in outbound policies Wyes Karny <wyes.karny(a)amd.com> cpupower: Make TSC read per CPU for Mperf monitor Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: fsl_micfil: Fix error handler with pm_runtime_enable Chuck Lever <chuck.lever(a)oracle.com> SUNRPC: Fix encoding of accepted but unsuccessful RPC replies Jianhua Lu <lujianhua000(a)gmail.com> dt-bindings: display/msm: dsi-controller-main: Document qcom, master-dsi and qcom, sync-dual-dsi Marijn Suijten <marijn.suijten(a)somainline.org> drm/msm/dpu: Remove duplicate register defines from INTF Marijn Suijten <marijn.suijten(a)somainline.org> drm/msm/dpu: Fix PP_BLK_DIPHER -> DITHER typo Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: split SM8550 catalog entry to the separate file Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: move UBWC/memory configuration to separate struct Konrad Dybcio <konrad.dybcio(a)linaro.org> drm/msm/dpu: Allow variable INTF_BLK size Konrad Dybcio <konrad.dybcio(a)linaro.org> drm/msm/dpu: Allow variable SSPP_BLK size Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: drop smart_dma_rev from dpu_caps Dmitry Baryshkov <dmitry.baryshkov(a)linaro.org> drm/msm/dpu: populate SmartDMA features in hw catalog Marijn Suijten <marijn.suijten(a)somainline.org> drm/msm/dpu: Reindent REV_7xxx interrupt masks with tabs Marijn Suijten <marijn.suijten(a)somainline.org> drm/msm/dpu: Move non-MDP_TOP INTF_INTR offsets out of hwio header Marijn Suijten <marijn.suijten(a)somainline.org> drm/msm/dpu: Assign missing writeback log_mask Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> drm/msm/dp: unregister audio driver during unbind Martin Willi <martin(a)strongswan.org> Revert "Fix XFRM-I support for nested ESP tunnels" Leon Romanovsky <leon(a)kernel.org> xfrm: Fix leak of dev tracker Leon Romanovsky <leon(a)kernel.org> xfrm: release all offloaded policy memory Sabrina Dubroca <sd(a)queasysnail.net> xfrm: don't check the default policy if the policy allows the packet Guilherme G. Piccoli <gpiccoli(a)igalia.com> parisc: Replace regular spinlock with spin_trylock on panic path Jarkko Nikula <jarkko.nikula(a)linux.intel.com> mfd: intel-lpss: Add Intel Meteor Lake PCH-S LPSS PCI IDs Qiang Ning <qning0106(a)126.com> mfd: dln2: Fix memory leak in dln2_probe() Hans de Goede <hdegoede(a)redhat.com> mfd: intel_soc_pmic_chtwc: Add Lenovo Yoga Book X90F to intel_cht_wc_models Richard Fitzgerald <rf(a)opensource.cirrus.com> soundwire: bus: Fix unbalanced pm_runtime_put() causing usage count underflow Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> soundwire: qcom: gracefully handle too many ports in DT Alain Volmat <avolmat(a)me.com> phy: st: miphy28lp: use _poll_timeout functions for waits Eugene Huang <eugene.huang99(a)gmail.com> soundwire: dmi-quirks: add remapping for Intel 'Rooks County' NUC M15 Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> pinctrl: at91: use devm_kasprintf() to avoid potential leaks (part 2) Steve French <stfrench(a)microsoft.com> cifs: missing lock when updating session status Sebastian Reichel <sebastian.reichel(a)collabora.com> clk: rockchip: rk3588: make gate linked clocks critical Avihai Horon <avihaih(a)nvidia.com> RDMA/mlx5: Remove pcie_relaxed_ordering_enabled() check for RO write Vicki Pfau <vi(a)endrift.com> Input: xpad - add constants for GIP interface numbers Hans de Goede <hdegoede(a)redhat.com> power: supply: axp288_charger: Use alt usb-id extcon on some x86 android tablets Chunyan Zhang <chunyan.zhang(a)unisoc.com> iommu/sprd: Release dma buffer to avoid memory leak Tomas Krcka <krckatom(a)amazon.de> iommu/arm-smmu-v3: Acknowledge pri/event queue overflow if any Arnd Bergmann <arnd(a)arndb.de> clk: tegra20: fix gcc-7 constant overflow warning Jia-Ju Bai <baijiaju1990(a)gmail.com> fs/ntfs3: Fix a possible null-pointer dereference in ni_clear() Edward Lo <edward.lo(a)ambergroup.io> fs/ntfs3: Add length check in indx_get_root Edward Lo <edward.lo(a)ambergroup.io> fs/ntfs3: Validate MFT flags before replaying logs Abdun Nihaal <abdun.nihaal(a)gmail.com> fs/ntfs3: Fix NULL dereference in ni_write_inode Edward Lo <edward.lo(a)ambergroup.io> fs/ntfs3: Enhance the attribute size check Ye Bin <yebin10(a)huawei.com> fs/ntfs3: Fix NULL pointer dereference in 'ni_write_inode' Manivannan Sadhasivam <mani(a)kernel.org> iommu/arm-smmu-qcom: Limit the SMR groups to 128 Ivan Orlov <ivan.orlov0322(a)gmail.com> KVM: selftests: Add 'malloc' failure check in vcpu_save_state Gustavo A. R. Silva <gustavoars(a)kernel.org> RDMA/core: Fix multiple -Warray-bounds warnings Hao Zeng <zenghao(a)kylinos.cn> recordmcount: Fix memory leaks in the uwrite function Alexandre Ghiti <alexghiti(a)rivosinc.com> riscv: Fix EFI stub usage of KASAN instrumented strcmp function Josh Poimboeuf <jpoimboe(a)kernel.org> lkdtm/stackleak: Fix noinstr violation Josh Poimboeuf <jpoimboe(a)kernel.org> sched: Fix KCSAN noinstr violation Rob Herring <robh(a)kernel.org> powerpc: Use of_property_present() for testing DT property presence Rodríguez Barbarin, José Javier <JoseJavier.Rodriguez(a)duagon.com> mcb-pci: Reallocate memory region to avoid memory overlapping Tony Lindgren <tony(a)atomide.com> serial: 8250: Reinit port->pm on port specific driver unbind Frank Wang <frank.wang(a)rock-chips.com> usb: typec: tcpm: fix multiple times discover svids error Jason Gerecke <killertofu(a)gmail.com> HID: wacom: generic: Set battery quirk only when we see battery data weiliang1503 <weiliang1503(a)gmail.com> HID: Ignore battery for ELAN touchscreen on ROG Flow X13 GV301RA Alex Henrie <alexhenrie24(a)gmail.com> HID: apple: Set the tilde quirk flag on the Geyser 3 Syed Saba Kareem <Syed.SabaKareem(a)amd.com> ASoC: amd: Add check for acp config flags Baishan Jiang <bjiang400(a)outlook.com> ASoC: amd: yc: Add ThinkBook 14 G5+ ARP to quirks list for acp6x Cem Kaya <cemkaya.boun(a)gmail.com> ASoC: amd: Add Dell G15 5525 to quirks list Fred Oh <fred.oh(a)linux.intel.com> ALSA: hda: LNL: add HD Audio PCI ID Samuel Čavoj <samuel(a)cavoj.net> usb: typec: ucsi: acpi: add quirk for ASUS Zenbook UM325 Kevin Groeneveld <kgroeneveld(a)lenbrook.com> spi: spi-imx: fix MX51_ECSPI_* macros when cs > 3 Bastien Nocera <hadess(a)hadess.net> HID: logitech-hidpp: Reconcile USB and Unifying serials Bastien Nocera <hadess(a)hadess.net> HID: logitech-hidpp: Don't use the USB serial for USB devices Prajna Sariputra <putr4.s(a)gmail.com> ASoC: amd: yc: Add DMI entries to support HP OMEN 16-n0xxx (8A42) Mika Westerberg <mika.westerberg(a)linux.intel.com> spi: intel-pci: Add support for Meteor Lake-S SPI serial flash Josue David Hernandez Gutierrez <josue.d.hernandez.gutierrez(a)intel.com> xhci: Avoid PCI MSI/MSIX interrupt reinitialization at resume Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> xhci: mem: Carefully calculate size for memory allocations Khadija Kamran <kamrankhadijadj(a)gmail.com> staging: axis-fifo: initialize timeouts in init only Lorenzo Bianconi <lorenzo(a)kernel.org> iio: imu: st_lsm6dsx: discard samples during filters settling time Alex Henrie <alexhenrie24(a)gmail.com> HID: apple: Set the tilde quirk flag on the Geyser 4 and later Philipp Hortmann <philipp.g.hortmann(a)gmail.com> staging: rtl8192e: Replace macro RTL_PCI_DEVICE with PCI_DEVICE Max Chou <max.chou(a)realtek.com> Bluetooth: btrtl: Add the support for RTL8851B Min Li <lm0963hack(a)gmail.com> Bluetooth: L2CAP: fix "bad unlock balance" in l2cap_disconnect_rsp Raul Cheleguini <raul.cheleguini(a)gmail.com> Bluetooth: Add new quirk for broken set random RPA timeout for ATS2851 Hans de Goede <hdegoede(a)redhat.com> Bluetooth: hci_bcm: Fall back to getting bdaddr from EFI if not set Chethan T N <chethan.tumkur.narayan(a)intel.com> Bluetooth: btintel: Add LE States quirk support Max Chou <max.chou(a)realtek.com> Bluetooth: btrtl: check for NULL in btrtl_set_quirks() Raul Cheleguini <rcheleguini(a)google.com> Bluetooth: Improve support for Actions Semi ATS2851 based devices Vasily Khoruzhick <anarsoul(a)gmail.com> Bluetooth: btrtl: add support for the RTL8723CS Vasily Khoruzhick <anarsoul(a)gmail.com> Bluetooth: Add new quirk for broken local ext features page 2 Meng Tang <tangmeng(a)uniontech.com> Bluetooth: btusb: Add new PID/VID 04ca:3801 for MT7663 Simon Horman <horms(a)kernel.org> ipvs: Update width of source for ip_vs_sync_conn_options Zhong Jinghua <zhongjinghua(a)huawei.com> nbd: fix incomplete validation of ioctl arg Larry Finger <Larry.Finger(a)lwfinger.net> wifi: rtw88: Fix memory leak in rtw88_usb Nagarajan Maran <quic_nmaran(a)quicinc.com> wifi: ath11k: Fix SKB corruption in REO destination ring Hans de Goede <hdegoede(a)redhat.com> wifi: iwlwifi: dvm: Fix memcpy: detected field-spanning write backtrace Chaitanya Kulkarni <kch(a)nvidia.com> null_blk: Always check queue mode setting from configfs Jaegeuk Kim <jaegeuk(a)kernel.org> f2fs: relax sanity check if checkpoint is corrupted Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: fix iwl_mvm_max_amsdu_size() for MLO Reese Russell <git(a)qrsnap.io> wifi: mt76: mt7921: add Netgear AXE3000 (A8000) support Harshitha Prem <quic_hprem(a)quicinc.com> wifi: ath11k: Ignore frags from uninitialized peer in dp. Colin Ian King <colin.i.king(a)gmail.com> block, bfq: Fix division by zero error on zero wsum Johannes Berg <johannes.berg(a)intel.com> wifi: iwlwifi: mvm: fix ptk_pn memory leak Hyunwoo Kim <imv4bel(a)gmail.com> wifi: iwlwifi: pcie: Fix integer overflow in iwl_write_to_user_buf Mukesh Sisodiya <mukesh.sisodiya(a)intel.com> wifi: iwlwifi: add a new PCI device ID for BZ device Daniel Gabay <daniel.gabay(a)intel.com> wifi: iwlwifi: pcie: fix possible NULL pointer dereference Vladimir Oltean <vladimir.oltean(a)nxp.com> net/sched: pass netlink extack to mqprio and taprio offload Yu Kuai <yukuai3(a)huawei.com> md: fix soft lockup in status_resync Yafang <laoar.shao(a)gmail.com> bpf: Add preempt_count_{sub,add} into btf id deny list Hao Zeng <zenghao(a)kylinos.cn> samples/bpf: Fix fout leak in hbm's run_bpf_prog Chao Yu <chao(a)kernel.org> f2fs: fix to check readonly condition correctly Chao Yu <chao(a)kernel.org> f2fs: fix to drop all dirty pages during umount() if cp_error is set Yonggil Song <yonggil.song(a)samsung.com> f2fs: Fix system crash due to lack of free space in LFS Stephan Müller <smueller(a)chronox.de> crypto: jitter - permanent and intermittent health errors Ojaswin Mujoo <ojaswin(a)linux.ibm.com> ext4: Fix best extent lstart adjustment logic in ext4_mb_new_inode_pa() Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: set goal start correctly in ext4_mb_normalize_request Xingui Yang <yangxingui(a)huawei.com> scsi: hisi_sas: Grab sas_dev lock when traversing the members of sas_dev.list Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs: ufs-pci: Add support for Intel Lunar Lake Andreas Gruenbacher <agruenba(a)redhat.com> gfs2: Fix inode height consistency check Zheng Wang <zyytlz.wz(a)163.com> scsi: message: mptlan: Fix use after free bug in mptlan_remove() due to race condition Eli Cohen <elic(a)nvidia.com> lib: cpu_rmap: Avoid use after free on rmap->obj array entries Dmitry Bogdanov <d.bogdanov(a)yadro.com> scsi: target: iscsit: Free cmds before session free Nick Child <nnac123(a)linux.ibm.com> netdev: Enforce index cap in netdev_get_tx_queue Nick Child <nnac123(a)linux.ibm.com> net: Catch invalid index in XPS mapping Rajat Soni <quic_rajson(a)quicinc.com> wifi: ath12k: fix memory leak in ath12k_qmi_driver_event_work() Nathan Chancellor <nathan(a)kernel.org> net: pasemi: Fix return type of pasemi_mac_start_tx() Maxim Korotkov <korotkov.maxim.s(a)gmail.com> bnxt: avoid overflow in bnxt_get_nvram_directory() Dongliang Mu <dzm91(a)hust.edu.cn> wifi: rtw88: fix memory leak in rtw_usb_probe() Justin Tee <justin.tee(a)broadcom.com> scsi: lpfc: Correct used_rpi count when devloss tmo fires with no recovery Justin Tee <justin.tee(a)broadcom.com> scsi: lpfc: Prevent lpfc_debugfs_lockstat_write() buffer overflow Jan Kara <jack(a)suse.cz> ext2: Check block size validity during mount Hector Martin <marcan(a)marcan.st> wifi: brcmfmac: pcie: Add IDs/properties for BCM4387 Hector Martin <marcan(a)marcan.st> wifi: brcmfmac: cfg80211: Pass the PMK in binary instead of hex Hector Martin <marcan(a)marcan.st> wifi: brcmfmac: pcie: Provide a buffer of random bytes to the device Kumar Kartikeya Dwivedi <memxor(a)gmail.com> bpf: Annotate data races in bpf_local_storage Ramya Gnanasekar <quic_rgnanase(a)quicinc.com> wifi: ath12k: PCI ops for wakeup/release MHI Ramya Gnanasekar <quic_rgnanase(a)quicinc.com> wifi: ath12k: Handle lock during peer_id find Kees Cook <keescook(a)chromium.org> wifi: ath: Silence memcpy run-time false positive warning Aleksandr Mezin <mezin.alexander(a)gmail.com> hwmon: (nzxt-smart2) add another USB ID Feng Jiang <jiangfeng(a)kylinos.cn> platform/x86/amd: pmc: Fix memory leak in amd_pmc_stb_debugfs_open_v2() Wei Chen <harperchen1110(a)gmail.com> media: mediatek: vcodec: Fix potential array out-of-bounds in decoder queue_setup Mukul Joshi <mukul.joshi(a)amd.com> drm/amdgpu: Enable IH retry CAM on GFX9 Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> media: Prefer designated initializers over memset for subdev pad ops lyndonli <Lyndon.Li(a)amd.com> drm/amdgpu: Fix sdma v4 sw fini error Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Fix an out of bounds error in BIOS parser Paul Hsieh <Paul.Hsieh(a)amd.com> drm/amd/display: Correct DML calculation to follow HW SPEC Hans de Goede <hdegoede(a)redhat.com> ACPI: video: Remove desktops without backlight DMI quirks Bingbu Cao <bingbu.cao(a)intel.com> media: ipu3-cio2: support multiple sensors and VCMs with same HID Shanker Donthineni <sdonthineni(a)nvidia.com> irqchip/gicv3: Workaround for NVIDIA erratum T241-FABRIC-4 Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sm6115-j606f: Add ramoops node Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: sdm845-polaris: Drop inexistent properties void0red <30990023+void0red(a)users.noreply.github.com> ACPICA: ACPICA: check null return of ACPI_ALLOCATE_ZEROED in acpi_db_display_objects Tamir Duberstein <tamird(a)google.com> ACPICA: Avoid undefined behavior: applying zero offset to null pointer Douglas Anderson <dianders(a)chromium.org> drm/msm/dp: Clean up handling of DP AUX interrupts Nur Hussein <hussein(a)unixcat.org> drm/tegra: Avoid potential 32-bit integer overflow Karol Wachowski <karol.wachowski(a)linux.intel.com> accel/ivpu: Remove D3hot delay for Meteorlake Arnaud Pouliquen <arnaud.pouliquen(a)foss.st.com> remoteproc: stm32_rproc: Add mutex protection for workqueue Ayush Gupta <ayugupta(a)amd.com> drm/amd/display: fixed dcn30+ underflow issue Armin Wolf <W_Armin(a)gmx.de> ACPI: EC: Fix oops when removing custom query handlers Pierre Gondois <pierre.gondois(a)arm.com> firmware: arm_sdei: Fix sleep from invalid context BUG Sebastian Krzyszkowiak <sebastian.krzyszkowiak(a)puri.sm> arm64: dts: imx8mq-librem5: Remove dis_u3_susphy_quirk from usb_dwc3_0 Zheng Wang <zyytlz.wz(a)163.com> memstick: r592: Fix UAF bug in r592_remove due to race condition Toby Chen <tobyc(a)nvidia.com> drm/rockchip: dw_hdmi: cleanup drm encoder during unbind Kang Chen <void0red(a)gmail.com> ACPI: processor: Check for null return of devm_kzalloc() in fch_misc_setup() David E. Box <david.e.box(a)linux.intel.com> platform/x86/intel: vsec: Explicitly enable capabilities Tom Rix <trix(a)redhat.com> media: pvrusb2: VIDEO_PVRUSB2 depends on DVB_CORE to use dvb_* symbols harperchen <harperchen1110(a)gmail.com> media: pci: tw68: Fix null-ptr-deref bug in buf prepare and finish harperchen <harperchen1110(a)gmail.com> media: cx23885: Fix a null-ptr-deref bug in buffer_prepare() and buffer_finish() Kees Cook <keescook(a)chromium.org> media: imx-jpeg: Bounds check sizeimage access Samson Tam <Samson.Tam(a)amd.com> drm/amd/display: reallocate DET for dual displays with high pixel rate ratio Tomer Tayar <ttayar(a)habana.ai> accel/habanalabs: postpone mem_mgr IDR destruction to hpriv_release() Konrad Dybcio <konrad.dybcio(a)linaro.org> arm64: dts: qcom: msm8996: Add missing DWC3 quirks Iuliana Prodan <iuliana.prodan(a)nxp.com> remoteproc: imx_dsp_rproc: Add custom memory copy implementation for i.MX DSP Cores Alexander Stein <alexander.stein(a)ew.tq-group.com> regmap: cache: Return error in cache sync operations for REGCACHE_NONE Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Use DC_LOG_DC in the trasform pixel function Gabe Teeger <gabe.teeger(a)amd.com> drm/amd/display: Enable HostVM based on rIOMMU active Hans de Goede <hdegoede(a)redhat.com> platform/x86: x86-android-tablets: Add Acer Iconia One 7 B1-750 data Samson Tam <samson.tam(a)amd.com> drm/amd/display: enable DPG when disabling plane for phantom pipe Paul Hsieh <Paul.Hsieh(a)amd.com> drm/amd/display: Correct DML calculation to align HW formula Ayush Gupta <ayush.gupta(a)amd.com> drm/amd/display: populate subvp cmd info only for the top pipe Jani Nikula <jani.nikula(a)intel.com> drm/displayid: add displayid_get_header() and check bounds better Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> fs: hfsplus: remove WARN_ON() from hfsplus_cat_{read,write}_inode() Christian Brauner <brauner(a)kernel.org> open: return EINVAL for O_DIRECTORY | O_CREAT Zqiang <qiang1.zhang(a)intel.com> rcu: Protect rcu_print_task_exp_stall() ->exp_tasks access Ivan Orlov <ivan.orlov0322(a)gmail.com> selftests: cgroup: Add 'malloc' failures checks in test_memcontrol Paul E. McKenney <paulmck(a)kernel.org> refscale: Move shutdown from wait_event() to wait_event_idle() Theodore Ts'o <tytso(a)mit.edu> ext4: allow ext4_get_group_info() to fail Kemeng Shi <shikemeng(a)huaweicloud.com> ext4: allow to find by goal if EXT4_MB_HINT_GOAL_ONLY is set Theodore Ts'o <tytso(a)mit.edu> ext4: don't clear SB_RDONLY when remounting r/w until quota is re-enabled Theodore Ts'o <tytso(a)mit.edu> ext4: reflect error codes from ext4_multi_mount_protect() to its callers Zongjie Li <u202112089(a)hust.edu.cn> fbdev: arcfb: Fix error handling in arcfb_probe() Jani Nikula <jani.nikula(a)intel.com> drm/i915: taint kernel when force probing unsupported devices Nikita Zhandarovich <n.zhandarovich(a)fintech.ru> drm/i915/dp: prevent potential div-by-zero Stanislav Lisovskiy <stanislav.lisovskiy(a)intel.com> drm/i915: Fix NULL ptr deref by checking new_crtc_state John Harrison <John.C.Harrison(a)Intel.com> drm/i915/guc: Don't capture Gen8 regs on Xe devices Kuniyuki Iwashima <kuniyu(a)amazon.com> af_unix: Fix data races around sk->sk_shutdown. Kuniyuki Iwashima <kuniyu(a)amazon.com> af_unix: Fix a data race of sk->sk_receive_queue->qlen. Eric Dumazet <edumazet(a)google.com> net: datagram: fix data-races in datagram_poll() Vitaly Prosyak <vitaly.prosyak(a)amd.com> drm/sched: Check scheduler work queue before calling timeout handling Colin Foster <colin.foster(a)in-advantage.com> net: mscc: ocelot: fix stat counter register values t.feng <fengtao40(a)huawei.com> ipvlan:Fix out-of-bounds caused by unclear skb->cb Ziwei Xiao <ziweixiao(a)google.com> gve: Remove the code of clearing PBA bit Eric Dumazet <edumazet(a)google.com> tcp: add annotations around sk->sk_shutdown accesses Eric Dumazet <edumazet(a)google.com> net: add vlan_get_protocol_and_depth() helper Eric Dumazet <edumazet(a)google.com> net: deal with most data-races in sk_wait_event() Eric Dumazet <edumazet(a)google.com> net: annotate sk->sk_err write from do_recvmmsg() Eric Dumazet <edumazet(a)google.com> netlink: annotate accesses to nlk->cb_running Hangbin Liu <liuhangbin(a)gmail.com> bonding: fix send_peer_notif overflow Florian Westphal <fw(a)strlen.de> netfilter: conntrack: fix possible bug_on with enable_hooks=1 Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: always release netdev hooks from notifier Florian Fainelli <f.fainelli(a)gmail.com> net: phy: bcm7xx: Correct read from expansion register Kuniyuki Iwashima <kuniyu(a)amazon.com> net: Fix load-tearing on sk->sk_stamp in sock_recv_cmsgs(). Marek Vasut <marex(a)denx.de> net: stmmac: Initialize MAC_ONEUS_TIC_COUNTER register Roy Novich <royno(a)nvidia.com> linux/dim: Do nothing if no time delta between samples Thomas Gleixner <tglx(a)linutronix.de> tick/broadcast: Make broadcast device replacement work correctly Keoseong Park <keosung.park(a)samsung.com> scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend Yang Jihong <yangjihong1(a)huawei.com> perf/core: Fix perf_sample_data not properly initialized for different swevents in perf_tp_event() Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: mdio: mvusb: Fix an error handling path in mvusb_mdio_probe() Eric Dumazet <edumazet(a)google.com> net: skb_partial_csum_set() fix against transport header magic value Randy Dunlap <rdunlap(a)infradead.org> ARM: 9296/1: HP Jornada 7XX: fix kernel-doc warnings Saravana Kannan <saravanak(a)google.com> drm/mipi-dsi: Set the fwnode for mipi_dsi_device Kees Cook <keescook(a)chromium.org> drm/nouveau/disp: More DP_RECEIVER_CAP_SIZE array fixes Jani Nikula <jani.nikula(a)intel.com> drm/dsc: fix DP_DSC_MAX_BPP_DELTA_* macro values Pierre Asselin <pa(a)panix.com> firmware/sysfb: Fix VESA format selection Sui Jingfeng <suijingfeng(a)loongson.cn> drm/fbdev-generic: prohibit potential out-of-bounds access ------------- Diffstat: Documentation/arm64/silicon-errata.rst | 2 + .../devicetree/bindings/ata/ceva,ahci-1v84.yaml | 2 +- .../bindings/display/msm/dsi-controller-main.yaml | 12 + Makefile | 4 +- arch/arm/include/asm/assembler.h | 13 - arch/arm/mach-sa1100/jornada720_ssp.c | 5 +- arch/arm/vfp/entry.S | 16 +- arch/arm/vfp/vfphw.S | 16 +- arch/arm/vfp/vfpmodule.c | 27 +- arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 1 - arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 - arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 11 + arch/arm64/include/asm/kvm_pgtable.h | 1 + arch/arm64/kernel/mte.c | 7 +- arch/arm64/kvm/hyp/pgtable.c | 32 +- arch/arm64/mm/copypage.c | 5 +- arch/parisc/include/asm/pdc.h | 1 + arch/parisc/kernel/firmware.c | 27 +- arch/powerpc/kernel/dma-iommu.c | 4 +- arch/powerpc/kernel/iommu.c | 11 +- arch/powerpc/kernel/legacy_serial.c | 8 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 4 +- arch/powerpc/net/bpf_jit_comp.c | 2 + arch/powerpc/platforms/44x/iss4xx.c | 2 +- arch/powerpc/platforms/44x/ppc476.c | 2 +- arch/powerpc/platforms/cell/spu_manage.c | 2 +- arch/powerpc/platforms/powermac/pic.c | 3 +- arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- arch/powerpc/platforms/pseries/iommu.c | 13 +- arch/powerpc/platforms/pseries/vio.c | 2 +- arch/powerpc/sysdev/mpic_msgr.c | 2 +- arch/riscv/kernel/image-vars.h | 2 - arch/riscv/kernel/probes/Makefile | 2 + arch/s390/crypto/chacha-glue.c | 2 +- arch/s390/kernel/Makefile | 1 + arch/x86/kernel/Makefile | 1 + block/bfq-iosched.c | 2 + crypto/jitterentropy-kcapi.c | 51 +- crypto/jitterentropy.c | 144 ++--- crypto/jitterentropy.h | 1 - drivers/accel/habanalabs/common/device.c | 9 + drivers/accel/habanalabs/common/habanalabs.h | 1 + drivers/accel/habanalabs/common/habanalabs_drv.c | 1 + drivers/accel/habanalabs/common/memory_mgr.c | 13 +- drivers/accel/ivpu/ivpu_drv.c | 4 + drivers/acpi/acpi_apd.c | 2 + drivers/acpi/acpica/dbnames.c | 3 + drivers/acpi/acpica/dswstate.c | 11 +- drivers/acpi/ec.c | 1 + drivers/acpi/video_detect.c | 35 -- drivers/base/regmap/regcache.c | 6 + drivers/block/nbd.c | 6 + drivers/block/null_blk/main.c | 5 + drivers/bluetooth/btbcm.c | 47 +- drivers/bluetooth/btintel.c | 5 +- drivers/bluetooth/btrtl.c | 138 ++++- drivers/bluetooth/btrtl.h | 5 + drivers/bluetooth/btusb.c | 6 + drivers/bluetooth/hci_h5.c | 4 + drivers/char/tpm/tpm_tis.c | 16 + drivers/clk/rockchip/clk-rk3588.c | 42 +- drivers/clk/tegra/clk-tegra20.c | 28 +- drivers/firmware/arm_sdei.c | 37 +- drivers/firmware/smccc/smccc.c | 26 + drivers/firmware/smccc/soc_id.c | 28 +- drivers/firmware/sysfb_simplefb.c | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 26 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 36 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 21 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 51 +- drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 2 +- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 55 +- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 10 +- drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 7 +- drivers/gpu/drm/amd/display/dc/core/dc.c | 47 +- drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 3 +- drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 +- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 2 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 2 +- .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 43 +- .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 300 +++++---- .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 + .../display/dc/dml/dcn314/display_mode_vba_314.c | 300 +++++---- .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 2 +- .../amd/include/asic_reg/oss/osssys_4_2_0_offset.h | 6 + .../include/asic_reg/oss/osssys_4_2_0_sh_mask.h | 11 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 18 + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 20 +- .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 + drivers/gpu/drm/drm_displayid.c | 17 +- drivers/gpu/drm/drm_fb_helper.c | 16 +- drivers/gpu/drm/drm_mipi_dsi.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_g2d.h | 4 +- drivers/gpu/drm/i915/Kconfig | 12 +- drivers/gpu/drm/i915/display/intel_atomic_plane.c | 4 +- drivers/gpu/drm/i915/display/intel_dp.c | 5 + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 7 +- drivers/gpu/drm/i915/i915_pci.c | 6 + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 202 +++++++ .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 177 ++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 671 ++++++--------------- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 21 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 23 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 5 - drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 18 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 4 +- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 1 + drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h | 3 - drivers/gpu/drm/msm/dp/dp_audio.c | 12 + drivers/gpu/drm/msm/dp/dp_audio.h | 2 + drivers/gpu/drm/msm/dp/dp_aux.c | 80 ++- drivers/gpu/drm/msm/dp/dp_catalog.c | 2 +- drivers/gpu/drm/msm/dp/dp_catalog.h | 2 +- drivers/gpu/drm/msm/dp/dp_display.c | 1 + drivers/gpu/drm/msm/msm_gem_submit.c | 25 +- drivers/gpu/drm/nouveau/include/nvif/if0012.h | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 3 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 2 +- drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 + drivers/gpu/drm/scheduler/sched_main.c | 2 +- drivers/gpu/drm/tegra/sor.c | 2 +- drivers/hid/hid-apple.c | 19 +- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-input.c | 2 + drivers/hid/hid-logitech-hidpp.c | 53 +- drivers/hid/wacom_wac.c | 33 +- drivers/hwmon/nzxt-smart2.c | 3 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 11 + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 57 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 18 + drivers/infiniband/core/user_mad.c | 23 +- drivers/infiniband/hw/mlx5/mr.c | 6 +- drivers/input/joystick/xpad.c | 5 +- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 19 +- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 26 +- drivers/iommu/sprd-iommu.c | 29 +- drivers/irqchip/Kconfig | 1 + drivers/irqchip/irq-gic-v3.c | 115 +++- drivers/mcb/mcb-pci.c | 27 +- drivers/md/md.c | 18 +- drivers/media/pci/cx23885/cx23885-core.c | 4 +- drivers/media/pci/cx23885/cx23885-video.c | 13 +- drivers/media/pci/intel/ipu3/cio2-bridge.c | 15 +- drivers/media/pci/intel/ipu3/cio2-bridge.h | 3 +- drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- drivers/media/pci/tw68/tw68-video.c | 16 +- .../platform/mediatek/vcodec/mtk_vcodec_dec.c | 7 + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 5 + drivers/media/platform/renesas/vsp1/vsp1_drm.c | 18 +- drivers/media/platform/renesas/vsp1/vsp1_entity.c | 11 +- .../platform/samsung/exynos4-is/fimc-capture.c | 7 +- drivers/media/platform/ti/am437x/am437x-vpfe.c | 15 +- drivers/media/platform/ti/cal/cal-video.c | 8 +- drivers/media/usb/dvb-usb/cxusb-analog.c | 14 +- drivers/media/usb/pvrusb2/Kconfig | 3 +- drivers/memstick/host/r592.c | 2 +- drivers/message/fusion/mptlan.c | 2 + drivers/mfd/dln2.c | 1 + drivers/mfd/intel-lpss-pci.c | 15 + drivers/mfd/intel_soc_pmic_chtwc.c | 14 +- drivers/misc/lkdtm/stackleak.c | 6 + drivers/net/bonding/bond_netlink.c | 7 +- drivers/net/bonding/bond_options.c | 8 +- drivers/net/can/dev/skb.c | 3 +- drivers/net/can/kvaser_pciefd.c | 51 +- drivers/net/dsa/mv88e6xxx/port.h | 2 +- drivers/net/dsa/rzn1_a5psw.c | 83 ++- drivers/net/dsa/rzn1_a5psw.h | 3 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 9 +- drivers/net/ethernet/freescale/fec_main.c | 16 +- drivers/net/ethernet/google/gve/gve_main.c | 13 - .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 25 +- .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 8 +- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 2 +- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.h | 1 + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 15 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 4 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +- drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 5 - drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 5 +- drivers/net/ethernet/intel/ice/ice_lib.c | 5 + drivers/net/ethernet/intel/ice/ice_sriov.c | 8 +- drivers/net/ethernet/intel/ice/ice_txrx.c | 8 +- drivers/net/ethernet/intel/ice/ice_txrx.h | 9 +- drivers/net/ethernet/intel/ice/ice_vf_lib.c | 19 + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 1 + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 1 + drivers/net/ethernet/intel/igb/e1000_mac.c | 4 +- .../net/ethernet/mellanox/mlx5/core/en/params.c | 3 +- .../net/ethernet/mellanox/mlx5/core/en_common.c | 2 +- drivers/net/ethernet/mscc/vsc7514_regs.c | 18 +- drivers/net/ethernet/netronome/nfp/nic/main.h | 2 +- drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- drivers/net/ethernet/sfc/ef100_netdev.c | 4 +- drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 5 + drivers/net/ethernet/sun/cassini.c | 2 + drivers/net/ipvlan/ipvlan_core.c | 6 + drivers/net/mdio/mdio-mvusb.c | 11 +- drivers/net/pcs/pcs-xpcs.c | 2 +- drivers/net/phy/bcm-phy-lib.h | 5 + drivers/net/phy/bcm7xxx.c | 2 +- drivers/net/phy/dp83867.c | 22 +- drivers/net/tap.c | 4 +- drivers/net/tun.c | 15 + drivers/net/virtio_net.c | 61 +- drivers/net/wireless/ath/ath.h | 12 +- drivers/net/wireless/ath/ath11k/dp.c | 4 +- drivers/net/wireless/ath/ath11k/dp_rx.c | 17 +- drivers/net/wireless/ath/ath11k/peer.h | 1 + drivers/net/wireless/ath/ath12k/dp_rx.c | 3 + drivers/net/wireless/ath/ath12k/pci.c | 47 +- drivers/net/wireless/ath/ath12k/pci.h | 6 + drivers/net/wireless/ath/ath12k/qmi.c | 4 +- drivers/net/wireless/ath/key.c | 2 +- .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 5 + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 13 +- .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 51 ++ .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 11 + .../broadcom/brcm80211/include/brcm_hw_ids.h | 2 + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 5 +- drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 2 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 19 +- drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 10 + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 37 +- drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 2 +- .../net/wireless/mediatek/mt76/mt76_connac2_mac.h | 2 +- .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 3 +- drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 3 + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +- drivers/net/wireless/realtek/rtw88/main.c | 15 + drivers/net/wireless/realtek/rtw88/main.h | 3 + drivers/net/wireless/realtek/rtw88/usb.c | 3 +- drivers/net/wireless/realtek/rtw88/usb.h | 2 +- drivers/net/wwan/iosm/iosm_ipc_imem.c | 27 +- drivers/net/wwan/iosm/iosm_ipc_imem_ops.c | 12 +- drivers/net/wwan/iosm/iosm_ipc_imem_ops.h | 6 +- drivers/parisc/power.c | 16 +- drivers/phy/st/phy-miphy28lp.c | 42 +- drivers/pinctrl/pinctrl-at91.c | 23 +- drivers/platform/x86/amd/pmc.c | 1 + drivers/platform/x86/intel/vsec.c | 69 +-- drivers/platform/x86/intel/vsec.h | 9 +- drivers/platform/x86/x86-android-tablets.c | 101 +++- drivers/power/supply/axp288_charger.c | 15 +- drivers/remoteproc/imx_dsp_rproc.c | 187 +++++- drivers/remoteproc/stm32_rproc.c | 8 + drivers/s390/block/dasd_eckd.c | 33 +- drivers/s390/cio/device.c | 2 + drivers/s390/cio/qdio.h | 2 +- drivers/scsi/hisi_sas/hisi_sas.h | 3 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 25 +- drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 2 +- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 4 +- drivers/scsi/lpfc/lpfc_debugfs.c | 7 +- drivers/scsi/lpfc/lpfc_els.c | 24 +- drivers/scsi/scsi_lib.c | 3 +- drivers/scsi/storvsc_drv.c | 8 +- drivers/soundwire/bus.c | 15 +- drivers/soundwire/dmi-quirks.c | 25 + drivers/soundwire/qcom.c | 3 + drivers/spi/spi-imx.c | 24 +- drivers/spi/spi-intel-pci.c | 1 + drivers/staging/axis-fifo/axis-fifo.c | 28 +- drivers/staging/media/imx/imx-media-capture.c | 12 +- drivers/staging/media/imx/imx-media-utils.c | 8 +- drivers/staging/media/omap4iss/iss_video.c | 6 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 5 - drivers/target/iscsi/iscsi_target.c | 6 +- drivers/thunderbolt/nhi.c | 29 +- drivers/thunderbolt/nhi_regs.h | 2 + drivers/tty/serial/8250/8250_bcm7271.c | 7 +- drivers/tty/serial/8250/8250_core.c | 1 + drivers/tty/serial/8250/8250_exar.c | 17 + drivers/tty/serial/8250/8250_pci.c | 5 + drivers/tty/serial/arc_uart.c | 7 +- drivers/tty/serial/qcom_geni_serial.c | 9 +- drivers/tty/vt/vc_screen.c | 11 +- drivers/ufs/core/ufshcd.c | 10 +- drivers/ufs/host/ufshcd-pci.c | 1 + drivers/usb/class/usbtmc.c | 2 + drivers/usb/dwc3/debugfs.c | 109 ++++ drivers/usb/dwc3/gadget.c | 67 +- drivers/usb/gadget/function/u_ether.c | 3 + drivers/usb/gadget/udc/core.c | 151 ++--- drivers/usb/host/uhci-pci.c | 10 +- drivers/usb/host/xhci-mem.c | 9 +- drivers/usb/host/xhci-pci.c | 27 +- drivers/usb/host/xhci-ring.c | 29 +- drivers/usb/host/xhci.c | 8 +- drivers/usb/host/xhci.h | 3 +- drivers/usb/storage/scsiglue.c | 28 +- drivers/usb/typec/altmodes/displayport.c | 4 + drivers/usb/typec/tcpm/tcpm.c | 16 +- drivers/usb/typec/ucsi/ucsi_acpi.c | 44 +- drivers/video/fbdev/arcfb.c | 15 +- fs/ceph/snap.c | 13 + fs/cifs/cifsglob.h | 4 +- fs/cifs/connect.c | 8 +- fs/cifs/file.c | 26 +- fs/cifs/smb1ops.c | 9 +- fs/cifs/smb2ops.c | 7 +- fs/ext2/ext2.h | 1 + fs/ext2/super.c | 7 + fs/ext4/balloc.c | 18 +- fs/ext4/ext4.h | 15 +- fs/ext4/ialloc.c | 12 +- fs/ext4/mballoc.c | 131 ++-- fs/ext4/mmp.c | 9 +- fs/ext4/super.c | 24 +- fs/f2fs/checkpoint.c | 22 +- fs/f2fs/data.c | 7 +- fs/f2fs/extent_cache.c | 22 +- fs/f2fs/f2fs.h | 5 + fs/f2fs/gc.c | 10 +- fs/f2fs/gc.h | 2 + fs/f2fs/segment.h | 39 +- fs/f2fs/super.c | 2 +- fs/gfs2/glops.c | 3 +- fs/hfsplus/inode.c | 28 +- fs/ksmbd/connection.c | 3 +- fs/ksmbd/oplock.c | 5 +- fs/ksmbd/oplock.h | 2 +- fs/ksmbd/smb2misc.c | 5 +- fs/ksmbd/smb2pdu.c | 19 +- fs/nilfs2/inode.c | 18 + fs/ntfs3/frecord.c | 5 +- fs/ntfs3/fsntfs.c | 1 + fs/ntfs3/index.c | 11 +- fs/ntfs3/inode.c | 6 + fs/ntfs3/record.c | 9 +- fs/open.c | 18 +- fs/statfs.c | 4 +- include/drm/display/drm_dp.h | 4 +- include/linux/arm-smccc.h | 18 + include/linux/cpuhotplug.h | 1 - include/linux/dim.h | 3 +- include/linux/if_vlan.h | 17 + include/linux/netdevice.h | 1 + include/linux/sched/task_stack.h | 2 +- include/linux/sunrpc/svc_rdma.h | 2 +- include/linux/sunrpc/svc_xprt.h | 2 +- include/net/bluetooth/hci.h | 15 + include/net/bonding.h | 2 +- include/net/ip_vs.h | 6 +- include/net/pkt_sched.h | 2 + include/net/sock.h | 2 +- include/uapi/asm-generic/fcntl.h | 1 - kernel/bpf/bpf_local_storage.c | 16 +- kernel/bpf/verifier.c | 4 + kernel/events/core.c | 14 +- kernel/rcu/refscale.c | 2 +- kernel/rcu/tree_exp.h | 6 +- kernel/time/tick-broadcast.c | 120 +++- kernel/trace/rethook.c | 4 +- lib/cpu_rmap.c | 5 +- lib/dim/dim.c | 5 +- lib/dim/net_dim.c | 3 +- lib/dim/rdma_dim.c | 3 +- lib/maple_tree.c | 12 +- mm/zswap.c | 16 + net/8021q/vlan_dev.c | 4 +- net/bluetooth/hci_event.c | 9 +- net/bluetooth/hci_sync.c | 6 +- net/bluetooth/l2cap_core.c | 1 - net/bridge/br_forward.c | 2 +- net/bridge/br_private_tunnel.h | 8 +- net/can/isotp.c | 2 +- net/can/j1939/socket.c | 2 +- net/core/datagram.c | 15 +- net/core/dev.c | 4 +- net/core/skbuff.c | 4 +- net/core/stream.c | 12 +- net/devlink/core.c | 16 +- net/devlink/devl_internal.h | 1 - net/devlink/leftover.c | 5 +- net/ipv4/af_inet.c | 2 +- net/ipv4/tcp.c | 14 +- net/ipv4/tcp_bpf.c | 2 +- net/ipv4/tcp_input.c | 4 +- net/ipv4/tcp_ipv4.c | 5 +- net/ipv6/ip6_gre.c | 13 +- net/key/af_key.c | 12 +- net/llc/af_llc.c | 8 +- net/mac80211/cfg.c | 7 +- net/mac80211/trace.h | 2 +- net/mac80211/tx.c | 5 +- net/netfilter/core.c | 6 +- net/netfilter/ipvs/ip_vs_sync.c | 2 +- net/netfilter/nf_conntrack_standalone.c | 3 +- net/netfilter/nf_tables_api.c | 4 +- net/netfilter/nft_chain_filter.c | 9 +- net/netfilter/nft_set_rbtree.c | 20 +- net/netlink/af_netlink.c | 8 +- net/nsh/nsh.c | 8 +- net/packet/af_packet.c | 6 +- net/sched/sch_mqprio.c | 5 +- net/sched/sch_taprio.c | 12 +- net/smc/smc_close.c | 4 +- net/smc/smc_rx.c | 4 +- net/smc/smc_tx.c | 4 +- net/socket.c | 2 +- net/sunrpc/svc.c | 19 +- net/sunrpc/svc_xprt.c | 24 +- net/sunrpc/svcsock.c | 30 +- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 11 +- net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- net/tipc/bearer.c | 17 +- net/tipc/bearer.h | 3 + net/tipc/link.c | 9 +- net/tipc/socket.c | 4 +- net/tipc/udp_media.c | 5 +- net/tls/tls_main.c | 3 +- net/unix/af_unix.c | 22 +- net/vmw_vsock/af_vsock.c | 2 +- net/wireless/scan.c | 6 +- net/xfrm/xfrm_device.c | 2 +- net/xfrm/xfrm_interface_core.c | 54 +- net/xfrm/xfrm_policy.c | 9 - net/xfrm/xfrm_user.c | 15 +- samples/bpf/hbm.c | 1 + scripts/recordmcount.c | 6 +- sound/firewire/digi00x/digi00x-stream.c | 4 +- sound/pci/hda/hda_generic.c | 7 +- sound/pci/hda/hda_intel.c | 3 + sound/pci/hda/patch_hdmi.c | 5 + sound/pci/hda/patch_realtek.c | 14 +- sound/soc/amd/Kconfig | 2 + sound/soc/amd/ps/acp63.h | 2 + sound/soc/amd/ps/pci-ps.c | 8 +- sound/soc/amd/yc/acp6x-mach.c | 21 + sound/soc/amd/yc/acp6x.h | 3 + sound/soc/amd/yc/pci-acp6x.c | 8 +- sound/soc/fsl/fsl_micfil.c | 14 +- sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 6 - sound/soc/mediatek/mt8186/mt8186-afe-clk.h | 1 - sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 4 - sound/soc/mediatek/mt8186/mt8186-audsys-clk.c | 46 +- sound/soc/mediatek/mt8186/mt8186-audsys-clk.h | 1 - sound/soc/sof/ipc3-topology.c | 7 +- sound/soc/sof/topology.c | 4 + sound/usb/format.c | 1 + tools/include/uapi/asm-generic/fcntl.h | 1 - tools/perf/builtin-script.c | 7 + .../cpupower/utils/idle_monitor/mperf_monitor.c | 31 +- tools/testing/selftests/cgroup/test_memcontrol.c | 15 + tools/testing/selftests/kvm/lib/x86_64/processor.c | 1 + tools/testing/selftests/net/fib_nexthops.sh | 2 +- .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 17 +- virt/kvm/kvm_main.c | 16 +- 467 files changed, 5192 insertions(+), 2485 deletions(-)

1 year

15
381
0 0

dpt_i2o fixes for stable

by Ben Hutchings

I'm proposing to address the most obvious issues with dpt_i2o on stable branches. At this stage it may be better to remove it as has been done upstream, but I'd rather limit the regression for anyone still using the hardware. The changes are: - "scsi: dpt_i2o: Remove broken pass-through ioctl (I2OUSERCMD)", which closes security flaws including CVE-2023-2007. - "scsi: dpt_i2o: Do not process completions with invalid addresses", which removes the remaining bus_to_virt() call and may slightly improve handling of misbehaving hardware. These changes have been compiled on all the relevant stable branches, but I don't have hardware to test on. Ben. -- Ben Hutchings - Debian developer, member of kernel, installer and LTS teams

1 year

3
8
0 0

randconfig fixes for 5.10.y

by Dan Carpenter

I did some randconfig testing on 5.10.y and the following patches are required. d7a7d721064c5 ("media: ti-vpe: cal: avoid FIELD_GET assertion") 42d95d1b3a9c6 ("drm/rcar: stop using 'imply' for dependencies") The first patch is only required on 5.10.y. The second "drm/rcar" commit is required in 5.15.y as well. I'm going to be doing regular randconfig testing on stable so let me know if you have any advice. regards, dan carpenter

1 year

4
7
0 0

[PATCH] drm/dp_mst: Clear MSG_RDY flag before sending new message

by Wayne Lin

[Why] The sequence for collecting down_reply from source perspective should be: Request_n->repeat (get partial reply of Request_n->clear message ready flag to ack DPRX that the message is received) till all partial replies for Request_n are received->new Request_n+1. Now there is chance that drm_dp_mst_hpd_irq() will fire new down request in the tx queue when the down reply is incomplete. Source is restricted to generate interveleaved message transactions so we should avoid it. Also, while assembling partial reply packets, reading out DPCD DOWN_REP Sideband MSG buffer + clearing DOWN_REP_MSG_RDY flag should be wrapped up as a complete operation for reading out a reply packet. Kicking off a new request before clearing DOWN_REP_MSG_RDY flag might be risky. e.g. If the reply of the new request has overwritten the DPRX DOWN_REP Sideband MSG buffer before source writing one to clear DOWN_REP_MSG_RDY flag, source then unintentionally flushes the reply for the new request. Should handle the up request in the same way. [How] Separete drm_dp_mst_hpd_irq() into 2 steps. After acking the MST IRQ event, driver calls drm_dp_mst_hpd_irq_send_new_request() and might trigger drm_dp_mst_kick_tx() only when there is no on going message transaction. Changes since v1: * Reworked on review comments received -> Adjust the fix to let driver explicitly kick off new down request when mst irq event is handled and acked -> Adjust the commit message Changes since v2: * Adjust the commit message * Adjust the naming of the divided 2 functions and add a new input parameter "ack". * Adjust code flow as per review comments. Signed-off-by: Wayne Lin <Wayne.Lin(a)amd.com> Cc: stable(a)vger.kernel.org --- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 33 +++++++++------- drivers/gpu/drm/display/drm_dp_mst_topology.c | 39 +++++++++++++++++-- drivers/gpu/drm/i915/display/intel_dp.c | 7 ++-- drivers/gpu/drm/nouveau/dispnv50/disp.c | 12 ++++-- include/drm/display/drm_dp_mst_helper.h | 7 +++- 5 files changed, 70 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index d5cec03eaa8d..597c3368bcfb 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -3236,6 +3236,7 @@ static void dm_handle_mst_sideband_msg(struct amdgpu_dm_connector *aconnector) { u8 esi[DP_PSR_ERROR_STATUS - DP_SINK_COUNT_ESI] = { 0 }; u8 dret; + u8 ack; bool new_irq_handled = false; int dpcd_addr; int dpcd_bytes_to_read; @@ -3265,34 +3266,36 @@ static void dm_handle_mst_sideband_msg(struct amdgpu_dm_connector *aconnector) process_count < max_process_count) { u8 retry; dret = 0; + ack = 0; process_count++; DRM_DEBUG_DRIVER("ESI %02x %02x %02x\n", esi[0], esi[1], esi[2]); /* handle HPD short pulse irq */ if (aconnector->mst_mgr.mst_state) - drm_dp_mst_hpd_irq( - &aconnector->mst_mgr, - esi, - &new_irq_handled); + drm_dp_mst_hpd_irq_handle_event(&aconnector->mst_mgr, + esi, + &ack, + &new_irq_handled); if (new_irq_handled) { /* ACK at DPCD to notify down stream */ - const int ack_dpcd_bytes_to_write = - dpcd_bytes_to_read - 1; - for (retry = 0; retry < 3; retry++) { - u8 wret; - - wret = drm_dp_dpcd_write( - &aconnector->dm_dp_aux.aux, - dpcd_addr + 1, - &esi[1], - ack_dpcd_bytes_to_write); - if (wret == ack_dpcd_bytes_to_write) + ssize_t wret; + + wret = drm_dp_dpcd_writeb(&aconnector->dm_dp_aux.aux, + dpcd_addr + 1, + ack); + if (wret == 1) break; } + if (retry == 3) { + DRM_ERROR("Failed to ack MST event.\n"); + return; + } + + drm_dp_mst_hpd_irq_send_new_request(&aconnector->mst_mgr); /* check if there is new irq to be handled */ dret = drm_dp_dpcd_read( &aconnector->dm_dp_aux.aux, diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c index 38dab76ae69e..13165e764709 100644 --- a/drivers/gpu/drm/display/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c @@ -4053,9 +4053,10 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) } /** - * drm_dp_mst_hpd_irq() - MST hotplug IRQ notify + * drm_dp_mst_hpd_irq_handle_event() - MST hotplug IRQ handle MST event * @mgr: manager to notify irq for. * @esi: 4 bytes from SINK_COUNT_ESI + * @ack: flags of events to ack * @handled: whether the hpd interrupt was consumed or not * * This should be called from the driver when it detects a short IRQ, @@ -4063,7 +4064,8 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr) * topology manager will process the sideband messages received as a result * of this. */ -int drm_dp_mst_hpd_irq(struct drm_dp_mst_topology_mgr *mgr, u8 *esi, bool *handled) +int drm_dp_mst_hpd_irq_handle_event(struct drm_dp_mst_topology_mgr *mgr, const u8 *esi, + u8 *ack, bool *handled) { int ret = 0; int sc; @@ -4078,18 +4080,47 @@ int drm_dp_mst_hpd_irq(struct drm_dp_mst_topology_mgr *mgr, u8 *esi, bool *handl if (esi[1] & DP_DOWN_REP_MSG_RDY) { ret = drm_dp_mst_handle_down_rep(mgr); *handled = true; + *ack |= DP_DOWN_REP_MSG_RDY; } if (esi[1] & DP_UP_REQ_MSG_RDY) { ret |= drm_dp_mst_handle_up_req(mgr); *handled = true; + *ack |= DP_UP_REQ_MSG_RDY; } - drm_dp_mst_kick_tx(mgr); return ret; } -EXPORT_SYMBOL(drm_dp_mst_hpd_irq); +EXPORT_SYMBOL(drm_dp_mst_hpd_irq_handle_event); + +/** + * drm_dp_mst_hpd_irq_send_new_request() - MST hotplug IRQ kick off new request + * @mgr: manager to notify irq for. + * + * This should be called from the driver when mst irq event is handled + * and acked. Note that new down request should only be sent when + * previous message transaction is completed. Source is not supposed to generate + * interleaved message transactions. + */ +void drm_dp_mst_hpd_irq_send_new_request(struct drm_dp_mst_topology_mgr *mgr) +{ + struct drm_dp_sideband_msg_tx *txmsg; + bool kick = true; + mutex_lock(&mgr->qlock); + txmsg = list_first_entry_or_null(&mgr->tx_msg_downq, + struct drm_dp_sideband_msg_tx, next); + /* If last transaction is not completed yet*/ + if (!txmsg || + txmsg->state == DRM_DP_SIDEBAND_TX_START_SEND || + txmsg->state == DRM_DP_SIDEBAND_TX_SENT) + kick = false; + mutex_unlock(&mgr->qlock); + + if (kick) + drm_dp_mst_kick_tx(mgr); +} +EXPORT_SYMBOL(drm_dp_mst_hpd_irq_send_new_request); /** * drm_dp_mst_detect_port() - get connection status for an MST port * @connector: DRM connector for this port diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 4bec8cd7979f..f24602887015 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4062,9 +4062,7 @@ intel_dp_mst_hpd_irq(struct intel_dp *intel_dp, u8 *esi, u8 *ack) { bool handled = false; - drm_dp_mst_hpd_irq(&intel_dp->mst_mgr, esi, &handled); - if (handled) - ack[1] |= esi[1] & (DP_DOWN_REP_MSG_RDY | DP_UP_REQ_MSG_RDY); + drm_dp_mst_hpd_irq_handle_event(&intel_dp->mst_mgr, esi, &ack[1], &handled); if (esi[1] & DP_CP_IRQ) { intel_hdcp_handle_cp_irq(intel_dp->attached_connector); @@ -4139,6 +4137,9 @@ intel_dp_check_mst_status(struct intel_dp *intel_dp) if (!intel_dp_ack_sink_irq_esi(intel_dp, ack)) drm_dbg_kms(&i915->drm, "Failed to ack ESI\n"); + + if (ack[1] & (DP_DOWN_REP_MSG_RDY | DP_UP_REQ_MSG_RDY)) + drm_dp_mst_hpd_irq_send_new_request(&intel_dp->mst_mgr); } return link_ok; diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c index 9b6824f6b9e4..b2d9978e88a8 100644 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@ -1357,6 +1357,7 @@ nv50_mstm_service(struct nouveau_drm *drm, bool handled = true, ret = true; int rc; u8 esi[8] = {}; + u8 ack; while (handled) { rc = drm_dp_dpcd_read(aux, DP_SINK_COUNT_ESI, esi, 8); @@ -1365,16 +1366,19 @@ nv50_mstm_service(struct nouveau_drm *drm, break; } - drm_dp_mst_hpd_irq(&mstm->mgr, esi, &handled); + ack = 0; + drm_dp_mst_hpd_irq_handle_event(&mstm->mgr, esi, &ack, &handled); if (!handled) break; - rc = drm_dp_dpcd_write(aux, DP_SINK_COUNT_ESI + 1, &esi[1], - 3); - if (rc != 3) { + rc = drm_dp_dpcd_writeb(aux, DP_SINK_COUNT_ESI + 1, ack); + + if (rc != 1) { ret = false; break; } + + drm_dp_mst_hpd_irq_send_new_request(&mstm->mgr); } if (!ret) diff --git a/include/drm/display/drm_dp_mst_helper.h b/include/drm/display/drm_dp_mst_helper.h index 32c764fb9cb5..40e855c8407c 100644 --- a/include/drm/display/drm_dp_mst_helper.h +++ b/include/drm/display/drm_dp_mst_helper.h @@ -815,8 +815,11 @@ void drm_dp_mst_topology_mgr_destroy(struct drm_dp_mst_topology_mgr *mgr); bool drm_dp_read_mst_cap(struct drm_dp_aux *aux, const u8 dpcd[DP_RECEIVER_CAP_SIZE]); int drm_dp_mst_topology_mgr_set_mst(struct drm_dp_mst_topology_mgr *mgr, bool mst_state); -int drm_dp_mst_hpd_irq(struct drm_dp_mst_topology_mgr *mgr, u8 *esi, bool *handled); - +int drm_dp_mst_hpd_irq_handle_event(struct drm_dp_mst_topology_mgr *mgr, + const u8 *esi, + u8 *ack, + bool *handled); +void drm_dp_mst_hpd_irq_send_new_request(struct drm_dp_mst_topology_mgr *mgr); int drm_dp_mst_detect_port(struct drm_connector *connector, -- 2.37.3

1 year

4
3
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror May 2023