April 2023 - Linux-stable-mirror

[PATCH net 4/4] can: isotp: fix race between isotp_sendsmg() and isotp_release()

by Marc Kleine-Budde

From: Oliver Hartkopp <socketcan(a)hartkopp.net> As discussed with Dae R. Jeong and Hillf Danton here [1] the sendmsg() function in isotp.c might get into a race condition when restoring the former tx.state from the old_state. Remove the old_state concept and implement proper locking for the ISOTP_IDLE transitions in isotp_sendmsg(), inspired by a simplification idea from Hillf Danton. Introduce a new tx.state ISOTP_SHUTDOWN and use the same locking mechanism from isotp_release() which resolves a potential race between isotp_sendsmg() and isotp_release(). [1] https://lore.kernel.org/linux-can/ZB%2F93xJxq%2FBUqAgG@dragonet v1: https://lore.kernel.org/all/20230331102114.15164-1-socketcan@hartkopp.net v2: https://lore.kernel.org/all/20230331123600.3550-1-socketcan@hartkopp.net take care of signal interrupts for wait_event_interruptible() in isotp_release() v3: https://lore.kernel.org/all/20230331130654.9886-1-socketcan@hartkopp.net take care of signal interrupts for wait_event_interruptible() in isotp_sendmsg() in the wait_tx_done case v4: https://lore.kernel.org/all/20230331131935.21465-1-socketcan@hartkopp.net take care of signal interrupts for wait_event_interruptible() in isotp_sendmsg() in ALL cases Cc: Dae R. Jeong <threeearcat(a)gmail.com> Cc: Hillf Danton <hdanton(a)sina.com> Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net> Fixes: 4f027cba8216 ("can: isotp: split tx timer into transmission and timeout") Link: https://lore.kernel.org/all/20230331131935.21465-1-socketcan@hartkopp.net Cc: stable(a)vger.kernel.org [mkl: rephrase commit message] Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- net/can/isotp.c | 55 ++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 24 deletions(-) diff --git a/net/can/isotp.c b/net/can/isotp.c index 281b7766c54e..5761d4ab839d 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -119,7 +119,8 @@ enum { ISOTP_WAIT_FIRST_FC, ISOTP_WAIT_FC, ISOTP_WAIT_DATA, - ISOTP_SENDING + ISOTP_SENDING, + ISOTP_SHUTDOWN, }; struct tpcon { @@ -880,8 +881,8 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer) txtimer); struct sock *sk = &so->sk; - /* don't handle timeouts in IDLE state */ - if (so->tx.state == ISOTP_IDLE) + /* don't handle timeouts in IDLE or SHUTDOWN state */ + if (so->tx.state == ISOTP_IDLE || so->tx.state == ISOTP_SHUTDOWN) return HRTIMER_NORESTART; /* we did not get any flow control or echo frame in time */ @@ -918,7 +919,6 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) { struct sock *sk = sock->sk; struct isotp_sock *so = isotp_sk(sk); - u32 old_state = so->tx.state; struct sk_buff *skb; struct net_device *dev; struct canfd_frame *cf; @@ -928,23 +928,24 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) int off; int err; - if (!so->bound) + if (!so->bound || so->tx.state == ISOTP_SHUTDOWN) return -EADDRNOTAVAIL; +wait_free_buffer: /* we do not support multiple buffers - for now */ - if (cmpxchg(&so->tx.state, ISOTP_IDLE, ISOTP_SENDING) != ISOTP_IDLE || - wq_has_sleeper(&so->wait)) { - if (msg->msg_flags & MSG_DONTWAIT) { - err = -EAGAIN; - goto err_out; - } + if (wq_has_sleeper(&so->wait) && (msg->msg_flags & MSG_DONTWAIT)) + return -EAGAIN; - /* wait for complete transmission of current pdu */ - err = wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); - if (err) - goto err_out; + /* wait for complete transmission of current pdu */ + err = wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); + if (err) + goto err_event_drop; - so->tx.state = ISOTP_SENDING; + if (cmpxchg(&so->tx.state, ISOTP_IDLE, ISOTP_SENDING) != ISOTP_IDLE) { + if (so->tx.state == ISOTP_SHUTDOWN) + return -EADDRNOTAVAIL; + + goto wait_free_buffer; } if (!size || size > MAX_MSG_LENGTH) { @@ -1074,7 +1075,9 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) if (wait_tx_done) { /* wait for complete transmission of current pdu */ - wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); + err = wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); + if (err) + goto err_event_drop; if (sk->sk_err) return -sk->sk_err; @@ -1082,13 +1085,15 @@ static int isotp_sendmsg(struct socket *sock, struct msghdr *msg, size_t size) return size; +err_event_drop: + /* got signal: force tx state machine to be idle */ + so->tx.state = ISOTP_IDLE; + hrtimer_cancel(&so->txfrtimer); + hrtimer_cancel(&so->txtimer); err_out_drop: /* drop this PDU and unlock a potential wait queue */ - old_state = ISOTP_IDLE; -err_out: - so->tx.state = old_state; - if (so->tx.state == ISOTP_IDLE) - wake_up_interruptible(&so->wait); + so->tx.state = ISOTP_IDLE; + wake_up_interruptible(&so->wait); return err; } @@ -1150,10 +1155,12 @@ static int isotp_release(struct socket *sock) net = sock_net(sk); /* wait for complete transmission of current pdu */ - wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE); + while (wait_event_interruptible(so->wait, so->tx.state == ISOTP_IDLE) == 0 && + cmpxchg(&so->tx.state, ISOTP_IDLE, ISOTP_SHUTDOWN) != ISOTP_IDLE) + ; /* force state machines to be idle also when a signal occurred */ - so->tx.state = ISOTP_IDLE; + so->tx.state = ISOTP_SHUTDOWN; so->rx.state = ISOTP_IDLE; spin_lock(&isotp_notifier_lock); -- 2.39.2

1 year, 8 months

1
0
0 0

[PATCH net 3/4] can: isotp: isotp_ops: fix poll() to not report false EPOLLOUT events

by Marc Kleine-Budde

From: Michal Sojka <michal.sojka(a)cvut.cz> When using select()/poll()/epoll() with a non-blocking ISOTP socket to wait for when non-blocking write is possible, a false EPOLLOUT event is sometimes returned. This can happen at least after sending a message which must be split to multiple CAN frames. The reason is that isotp_sendmsg() returns -EAGAIN when tx.state is not equal to ISOTP_IDLE and this behavior is not reflected in datagram_poll(), which is used in isotp_ops. This is fixed by introducing ISOTP-specific poll function, which suppresses the EPOLLOUT events in that case. v2: https://lore.kernel.org/all/20230302092812.320643-1-michal.sojka@cvut.cz v1: https://lore.kernel.org/all/20230224010659.48420-1-michal.sojka@cvut.cz https://lore.kernel.org/all/b53a04a2-ba1f-3858-84c1-d3eb3301ae15@hartkopp.n… Signed-off-by: Michal Sojka <michal.sojka(a)cvut.cz> Reported-by: Jakub Jira <jirajak2(a)fel.cvut.cz> Tested-by: Oliver Hartkopp <socketcan(a)hartkopp.net> Acked-by: Oliver Hartkopp <socketcan(a)hartkopp.net> Fixes: e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol") Link: https://lore.kernel.org/all/20230331125511.372783-1-michal.sojka@cvut.cz Cc: stable(a)vger.kernel.org Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- net/can/isotp.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/net/can/isotp.c b/net/can/isotp.c index 47c2ebad10ed..281b7766c54e 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1608,6 +1608,21 @@ static int isotp_init(struct sock *sk) return 0; } +static __poll_t isotp_poll(struct file *file, struct socket *sock, poll_table *wait) +{ + struct sock *sk = sock->sk; + struct isotp_sock *so = isotp_sk(sk); + + __poll_t mask = datagram_poll(file, sock, wait); + poll_wait(file, &so->wait, wait); + + /* Check for false positives due to TX state */ + if ((mask & EPOLLWRNORM) && (so->tx.state != ISOTP_IDLE)) + mask &= ~(EPOLLOUT | EPOLLWRNORM); + + return mask; +} + static int isotp_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd, unsigned long arg) { @@ -1623,7 +1638,7 @@ static const struct proto_ops isotp_ops = { .socketpair = sock_no_socketpair, .accept = sock_no_accept, .getname = isotp_getname, - .poll = datagram_poll, + .poll = isotp_poll, .ioctl = isotp_sock_no_ioctlcmd, .gettstamp = sock_gettstamp, .listen = sock_no_listen, -- 2.39.2

1 year, 8 months

1
0
0 0

[PATCH net 2/4] can: isotp: isotp_recvmsg(): use sock_recv_cmsgs() to get SOCK_RXQ_OVFL infos

by Marc Kleine-Budde

From: Oliver Hartkopp <socketcan(a)hartkopp.net> isotp.c was still using sock_recv_timestamp() which does not provide control messages to detect dropped PDUs in the receive path. Fixes: e057dd3fc20f ("can: add ISO 15765-2:2016 transport protocol") Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net> Link: https://lore.kernel.org/all/20230330170248.62342-1-socketcan@hartkopp.net Cc: stable(a)vger.kernel.org Signed-off-by: Marc Kleine-Budde <mkl(a)pengutronix.de> --- net/can/isotp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/can/isotp.c b/net/can/isotp.c index 9bc344851704..47c2ebad10ed 100644 --- a/net/can/isotp.c +++ b/net/can/isotp.c @@ -1120,7 +1120,7 @@ static int isotp_recvmsg(struct socket *sock, struct msghdr *msg, size_t size, if (ret < 0) goto out_err; - sock_recv_timestamp(msg, sk, skb); + sock_recv_cmsgs(msg, sk, skb); if (msg->msg_name) { __sockaddr_check_size(ISOTP_MIN_NAMELEN); -- 2.39.2

1 year, 8 months

1
0
0 0

[PATCH] xhci: fix debugfs register accesses while suspended

by Johan Hovold

Wire up the debugfs regset device pointer so that the controller is resumed before accessing registers to avoid crashing or locking up if it happens to be runtime suspended. Fixes: 02b6fdc2a153 ("usb: xhci: Add debugfs interface for xHCI driver") Cc: stable(a)vger.kernel.org # 4.15: 30332eeefec8: debugfs: regset32: Add Runtime PM support Cc: stable(a)vger.kernel.org # 4.15 Signed-off-by: Johan Hovold <johan+linaro(a)kernel.org> --- drivers/usb/host/xhci-debugfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/host/xhci-debugfs.c b/drivers/usb/host/xhci-debugfs.c index 0bc7fe11f749..99baa60ef50f 100644 --- a/drivers/usb/host/xhci-debugfs.c +++ b/drivers/usb/host/xhci-debugfs.c @@ -133,6 +133,7 @@ static void xhci_debugfs_regset(struct xhci_hcd *xhci, u32 base, regset->regs = regs; regset->nregs = nregs; regset->base = hcd->regs + base; + regset->dev = hcd->self.controller; debugfs_create_regset32((const char *)rgs->name, 0444, parent, regset); } -- 2.39.2

1 year, 8 months

1
0
0 0

[PATCH 5.15 00/99] 5.15.106-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.106 release. There are 99 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, 05 Apr 2023 14:03:18 +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.106-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.106-rc1 Jan Beulich <jbeulich(a)suse.com> x86/PVH: avoid 32-bit build warning when obtaining VGA console info Matthieu Baerts <matthieu.baerts(a)tessares.net> hsr: ratelimit only when errors are printed Andrii Nakryiko <andrii(a)kernel.org> libbpf: Fix btf_dump's packed struct determination Andrii Nakryiko <andrii(a)kernel.org> selftests/bpf: Add few corner cases to test padding handling of btf_dump Andrii Nakryiko <andrii(a)kernel.org> libbpf: Fix BTF-to-C converter's padding logic Eduard Zingerman <eddyz87(a)gmail.com> selftests/bpf: Test btf dump for struct with padding only fields Damien Le Moal <damien.lemoal(a)opensource.wdc.com> zonefs: Fix error message in zonefs_file_dio_append() Sean Christopherson <seanjc(a)google.com> KVM: x86: Purge "highest ISR" cache when updating APICv state Sean Christopherson <seanjc(a)google.com> KVM: x86: Inject #GP on x2APIC WRMSR that sets reserved bits 63:32 Sean Christopherson <seanjc(a)google.com> KVM: VMX: Move preemption timer <=> hrtimer dance to common x86 Heiko Carstens <hca(a)linux.ibm.com> s390/uaccess: add missing earlyclobber annotations to __clear_user() Marc Zyngier <maz(a)kernel.org> KVM: arm64: Disable interrupts while walking userspace PTs Fangzhi Zuo <Jerry.Zuo(a)amd.com> drm/amd/display: Add DSC Support for Synaptics Cascaded MST Hub Lucas Stach <l.stach(a)pengutronix.de> drm/etnaviv: fix reference leak when mmaping imported buffer Douglas Raillard <douglas.raillard(a)arm.com> rcu: Fix rcu_torture_read ftrace event Max Filippov <jcmvbkbc(a)gmail.com> xtensa: fix KASAN report for show_stack huangwenhui <huangwenhuia(a)uniontech.com> ALSA: hda/realtek: Add quirk for Lenovo ZhaoYang CF4620Z Tim Crawford <tcrawford(a)system76.com> ALSA: hda/realtek: Add quirks for some Clevo laptops Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix regression on detection of Roland VS-100 Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant: Partial revert of a quirk for Lenovo Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix hangs when recovering open state after a server reboot Jens Axboe <axboe(a)kernel.dk> powerpc: Don't try to copy PPR for task with NULL pt_regs Johan Hovold <johan+linaro(a)kernel.org> pinctrl: at91-pio4: fix domain name assignment Kornel Dulęba <korneld(a)chromium.org> pinctrl: amd: Disable and mask interrupts on resume Josua Mayer <josua(a)solid-run.com> net: phy: dp83869: fix default value for tx-/rx-internal-delay Juergen Gross <jgross(a)suse.com> xen/netback: don't do grant copy across page boundary Oleksij Rempel <linux(a)rempel-privat.de> can: j1939: prevent deadlock by moving j1939_sk_errqueue() Damien Le Moal <damien.lemoal(a)opensource.wdc.com> zonefs: Always invalidate last cached page on append write Anand Jain <anand.jain(a)oracle.com> btrfs: scan device in non-exclusive mode Filipe Manana <fdmanana(a)suse.com> btrfs: fix race between quota disable and quota assign ioctls Hans de Goede <hdegoede(a)redhat.com> Input: goodix - add Lenovo Yoga Book X90F to nine_bytes_report DMI table David Disseldorp <ddiss(a)suse.de> cifs: fix DFS traversal oops without CONFIG_CIFS_DFS_UPCALL Paulo Alcantara <pc(a)manguebit.com> cifs: prevent infinite recursion in CIFSGetDFSRefer() Jason A. Donenfeld <Jason(a)zx2c4.com> Input: focaltech - use explicitly signed char type msizanoen <msizanoen(a)qtmlabs.xyz> Input: alps - fix compatibility with -funsigned-char Lu Baolu <baolu.lu(a)linux.intel.com> iommu/vt-d: Allow zero SAGAW if second-stage not supported Horatiu Vultur <horatiu.vultur(a)microchip.com> pinctrl: ocelot: Fix alt mode for ocelot Felix Fietkau <nbd(a)nbd.name> net: ethernet: mtk_eth_soc: fix flow block refcounting logic Steffen Bätz <steffen(a)innosonix.de> net: dsa: mv88e6xxx: Enable IGMP snooping on user ports only Michael Chan <michael.chan(a)broadcom.com> bnxt_en: Add missing 200G link speed reporting Kalesh AP <kalesh-anakkur.purayil(a)broadcom.com> bnxt_en: Fix typo in PCI id to device description string mapping Kalesh AP <kalesh-anakkur.purayil(a)broadcom.com> bnxt_en: Fix reporting of test result in ethtool selftest Radoslaw Tyl <radoslawx.tyl(a)intel.com> i40e: fix registers dump after run ethtool adapter self test Alex Elder <elder(a)linaro.org> net: ipa: compute DMA pool size properly Tasos Sahanidis <tasos(a)tasossah.com> ALSA: ymfpci: Fix BUG_ON in probe function Tasos Sahanidis <tasos(a)tasossah.com> ALSA: ymfpci: Create card with device-managed snd_devm_card_new() Jakob Koschel <jkl820.git(a)gmail.com> ice: fix invalid check for empty list in ice_sched_assoc_vsi_to_agg() Junfeng Guo <junfeng.guo(a)intel.com> ice: add profile conflict check for AVF FDIR Wolfram Sang <wsa+renesas(a)sang-engineering.com> smsc911x: avoid PHY being resumed when interface is not up Sven Auhagen <sven.auhagen(a)voleatech.de> net: mvpp2: parser fix PPPoE Sven Auhagen <sven.auhagen(a)voleatech.de> net: mvpp2: parser fix QinQ Sven Auhagen <sven.auhagen(a)voleatech.de> net: mvpp2: classifier flow fix fragmentation flags Alyssa Ross <hi(a)alyssa.is> loop: LOOP_CONFIGURE: send uevents for partitions Christoph Hellwig <hch(a)lst.de> loop: suppress uevents while reconfiguring the device Tony Krowiak <akrowiak(a)linux.ibm.com> s390/vfio-ap: fix memory leak in vfio_ap device driver Ivan Orlov <ivan.orlov0322(a)gmail.com> can: bcm: bcm_tx_setup(): fix KMSAN uninit-value in vfs_write Rajvi Jingar <rajvi.jingar(a)linux.intel.com> platform/x86/intel/pmc: Alder Lake PCH slp_s0_residency fix Imre Deak <imre.deak(a)intel.com> drm/i915/tc: Fix the ICL PHY ownership check in TC-cold state Vladimir Oltean <vladimir.oltean(a)nxp.com> net: stmmac: don't reject VLANs when IFF_PROMISC is set Faicker Mo <faicker.mo(a)ucloud.cn> net/net_failover: fix txq exceeding warning Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> regulator: Handle deferred clk ChunHao Lin <hau(a)realtek.com> r8169: fix RTL8168H and RTL8107E rx crc error Oleksij Rempel <linux(a)rempel-privat.de> net: dsa: microchip: ksz8863_smi: fix bulk access SongJingyi <u201912584(a)hust.edu.cn> ptp_qoriq: fix memory leak in probe() Jerry Snitselaar <jsnitsel(a)redhat.com> scsi: mpt3sas: Don't print sense pool info twice Tomas Henzl <thenzl(a)redhat.com> scsi: megaraid_sas: Fix crash after a double completion Íñigo Huguet <ihuguet(a)redhat.com> sfc: ef10: don't overwrite offload features at NIC reset Siddharth Kawar <Siddharth.Kawar(a)microsoft.com> SUNRPC: fix shutdown of NFS TCP client socket Arseniy Krasnov <avkrasnov(a)sberdevices.ru> mtd: rawnand: meson: invalidate cache on polling ECC bit Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: Add possible_values for ThinkStation Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: only display possible_values if available Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: use correct possible_values delimiters Mark Pearson <mpearson-lenovo(a)squebb.ca> platform/x86: think-lmi: add missing type attribute Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix recursive locking at XRUN during syncing Álvaro Fernández Rojas <noltari(a)gmail.com> mips: bmips: BCM6358: disable RAC flush for TP1 Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> ca8210: Fix unsigned mac_len comparison with zero in ca8210_skb_tx() Anton Gusev <aagusev(a)ispras.ru> tracing: Fix wrong return in kprobe_event_gen_test.c Antti Laakso <antti.laakso(a)intel.com> tools/power turbostat: fix decoding of HWP_STATUS Prarit Bhargava <prarit(a)redhat.com> tools/power turbostat: Fix /dev/cpu_dma_latency warnings Wei Chen <harperchen1110(a)gmail.com> fbdev: au1200fb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: lxfb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: intelfb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: nvidia: Fix potential divide by zero Linus Torvalds <torvalds(a)linux-foundation.org> sched_getaffinity: don't assume 'cpumask_size()' is fully initialized Wei Chen <harperchen1110(a)gmail.com> fbdev: tgafb: Fix potential divide by zero Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ALSA: hda/ca0132: fixup buffer overrun at tuning_ctl_set() Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ALSA: asihpi: check pao in control_message() Kristian Overskeid <koverskeid(a)gmail.com> net: hsr: Don't log netdev_err message on unknown prp dst node Jan Beulich <jbeulich(a)suse.com> x86/PVH: obtain VGA console info in Dom0 NeilBrown <neilb(a)suse.de> md: avoid signed overflow in slot_store() Ravulapati Vishnu Vardhan Rao <quic_visr(a)quicinc.com> ASoC: codecs: tx-macro: Fix for KASAN: slab-out-of-bounds Herbert Xu <herbert(a)gondor.apana.org.au> xfrm: Zero padding when dumping algos and encap Ivan Bornyakov <i.bornyakov(a)metrotek.ru> bus: imx-weim: fix branch condition evaluates to a garbage value Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: don't terminate inactive sessions after a few seconds Marco Elver <elver(a)google.com> kcsan: avoid passing -g for test Anders Roxell <anders.roxell(a)linaro.org> kernel: kcsan: kcsan_test: build without structleak plugin Wesley Cheng <quic_wcheng(a)quicinc.com> usb: dwc3: gadget: Add 1ms delay after end transfer command without IOC Michael Grzeschik <m.grzeschik(a)pengutronix.de> usb: dwc3: gadget: move cmd_endtransfer to extra function Eric Biggers <ebiggers(a)google.com> fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY ------------- Diffstat: Makefile | 4 +- arch/arm64/kvm/mmu.c | 45 +++++- arch/mips/bmips/dma.c | 5 + arch/mips/bmips/setup.c | 8 + arch/powerpc/kernel/ptrace/ptrace-view.c | 6 + arch/s390/lib/uaccess.c | 2 +- arch/x86/kvm/lapic.c | 11 +- arch/x86/kvm/vmx/vmx.c | 6 - arch/x86/kvm/x86.c | 21 +++ arch/x86/xen/Makefile | 2 +- arch/x86/xen/enlighten_pv.c | 3 +- arch/x86/xen/enlighten_pvh.c | 13 ++ arch/x86/xen/vga.c | 5 +- arch/x86/xen/xen-ops.h | 7 +- arch/xtensa/kernel/traps.c | 16 +- drivers/block/loop.c | 21 ++- drivers/bus/imx-weim.c | 2 +- .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 19 +++ .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 12 ++ drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 10 +- drivers/gpu/drm/i915/display/intel_tc.c | 4 +- drivers/input/mouse/alps.c | 16 +- drivers/input/mouse/focaltech.c | 8 +- drivers/input/touchscreen/goodix.c | 14 +- drivers/iommu/intel/dmar.c | 3 +- drivers/md/md.c | 3 + drivers/mtd/nand/raw/meson_nand.c | 8 +- drivers/net/dsa/microchip/ksz8863_smi.c | 9 -- drivers/net/dsa/mv88e6xxx/chip.c | 9 +- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 +- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 + drivers/net/ethernet/intel/i40e/i40e_diag.c | 11 +- drivers/net/ethernet/intel/i40e/i40e_diag.h | 2 +- drivers/net/ethernet/intel/ice/ice_sched.c | 8 +- drivers/net/ethernet/intel/ice/ice_virtchnl_fdir.c | 73 +++++++++ drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 30 ++-- drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 86 +++++------ drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 3 +- drivers/net/ethernet/realtek/r8169_phy_config.c | 3 + drivers/net/ethernet/sfc/ef10.c | 38 +++-- drivers/net/ethernet/sfc/efx.c | 17 +- drivers/net/ethernet/smsc/smsc911x.c | 7 +- drivers/net/ethernet/stmicro/stmmac/common.h | 1 - drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 61 +------- drivers/net/ieee802154/ca8210.c | 3 +- drivers/net/ipa/gsi_trans.c | 2 +- drivers/net/net_failover.c | 8 +- drivers/net/phy/dp83869.c | 6 +- drivers/net/xen-netback/common.h | 2 +- drivers/net/xen-netback/netback.c | 25 ++- drivers/pinctrl/pinctrl-amd.c | 36 +++-- drivers/pinctrl/pinctrl-at91-pio4.c | 1 - drivers/pinctrl/pinctrl-ocelot.c | 2 +- drivers/platform/x86/intel/pmc/core.c | 13 +- drivers/platform/x86/think-lmi.c | 60 +++++++- drivers/ptp/ptp_qoriq.c | 2 +- drivers/regulator/fixed.c | 2 +- drivers/s390/crypto/vfio_ap_drv.c | 3 +- drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +- drivers/scsi/mpt3sas/mpt3sas_base.c | 5 - drivers/usb/dwc3/gadget.c | 79 ++++++---- drivers/video/fbdev/au1200fb.c | 3 + drivers/video/fbdev/geode/lxfb_core.c | 3 + drivers/video/fbdev/intelfb/intelfbdrv.c | 3 + drivers/video/fbdev/nvidia/nvidia.c | 2 + drivers/video/fbdev/tgafb.c | 3 + fs/btrfs/ioctl.c | 2 + fs/btrfs/qgroup.c | 11 +- fs/btrfs/volumes.c | 11 +- fs/cifs/cifsfs.h | 5 +- fs/cifs/cifssmb.c | 9 +- fs/ksmbd/connection.c | 4 +- fs/ksmbd/connection.h | 3 +- fs/ksmbd/transport_rdma.c | 2 +- fs/ksmbd/transport_tcp.c | 35 +++-- fs/nfs/nfs4proc.c | 5 +- fs/verity/enable.c | 24 +-- fs/zonefs/super.c | 16 +- include/trace/events/rcu.h | 2 +- include/xen/interface/platform.h | 3 + kernel/compat.c | 2 +- kernel/kcsan/Makefile | 3 +- kernel/sched/core.c | 4 +- kernel/trace/kprobe_event_gen_test.c | 4 +- net/can/bcm.c | 16 +- net/can/j1939/transport.c | 8 +- net/hsr/hsr_framereg.c | 2 +- net/sunrpc/xprtsock.c | 1 + net/xfrm/xfrm_user.c | 45 +++++- sound/core/pcm_lib.c | 2 + sound/pci/asihpi/hpi6205.c | 2 +- sound/pci/hda/patch_ca0132.c | 4 +- sound/pci/hda/patch_conexant.c | 6 +- sound/pci/hda/patch_realtek.c | 5 + sound/pci/ymfpci/ymfpci.c | 2 +- sound/pci/ymfpci/ymfpci_main.c | 2 +- sound/soc/codecs/lpass-tx-macro.c | 11 +- sound/usb/endpoint.c | 22 ++- sound/usb/endpoint.h | 4 +- sound/usb/format.c | 8 +- sound/usb/pcm.c | 2 +- tools/lib/bpf/btf_dump.c | 154 +++++++++++++------ tools/power/x86/turbostat/turbostat.8 | 2 + tools/power/x86/turbostat/turbostat.c | 4 +- .../bpf/progs/btf_dump_test_case_bitfields.c | 2 +- .../bpf/progs/btf_dump_test_case_packing.c | 80 +++++++++- .../bpf/progs/btf_dump_test_case_padding.c | 171 ++++++++++++++++++--- 108 files changed, 1157 insertions(+), 454 deletions(-)

1 year, 8 months

9
107
0 0

[PATCH 4.14 00/66] 4.14.312-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.312 release. There are 66 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, 05 Apr 2023 14:03:18 +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/v4.x/stable-review/patch-4.14.312-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.312-rc1 Harshit Mogalapalli <harshit.m.mogalapalli(a)oracle.com> ca8210: Fix unsigned mac_len comparison with zero in ca8210_skb_tx() Jamal Hadi Salim <jhs(a)mojatatu.com> net: sched: cbq: dont intepret cls results when asked to drop Ye Bin <yebin10(a)huawei.com> ext4: fix kernel BUG in 'ext4_write_inline_data_end()' Dan Carpenter <dan.carpenter(a)oracle.com> usb: host: ohci-pxa27x: Fix and & vs | typo Heiko Carstens <hca(a)linux.ibm.com> s390/uaccess: add missing earlyclobber annotations to __clear_user() Lucas Stach <l.stach(a)pengutronix.de> drm/etnaviv: fix reference leak when mmaping imported buffer Takashi Iwai <tiwai(a)suse.de> ALSA: usb-audio: Fix regression on detection of Roland VS-100 Takashi Iwai <tiwai(a)suse.de> ALSA: hda/conexant: Partial revert of a quirk for Lenovo Johan Hovold <johan+linaro(a)kernel.org> pinctrl: at91-pio4: fix domain name assignment Juergen Gross <jgross(a)suse.com> xen/netback: don't do grant copy across page boundary David Disseldorp <ddiss(a)suse.de> cifs: fix DFS traversal oops without CONFIG_CIFS_DFS_UPCALL Jason A. Donenfeld <Jason(a)zx2c4.com> Input: focaltech - use explicitly signed char type Radoslaw Tyl <radoslawx.tyl(a)intel.com> i40e: fix registers dump after run ethtool adapter self test Ivan Orlov <ivan.orlov0322(a)gmail.com> can: bcm: bcm_tx_setup(): fix KMSAN uninit-value in vfs_write Tomas Henzl <thenzl(a)redhat.com> scsi: megaraid_sas: Fix crash after a double completion Wei Chen <harperchen1110(a)gmail.com> fbdev: au1200fb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: lxfb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: intelfb: Fix potential divide by zero Wei Chen <harperchen1110(a)gmail.com> fbdev: nvidia: Fix potential divide by zero Linus Torvalds <torvalds(a)linux-foundation.org> sched_getaffinity: don't assume 'cpumask_size()' is fully initialized Wei Chen <harperchen1110(a)gmail.com> fbdev: tgafb: Fix potential divide by zero Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ALSA: hda/ca0132: fixup buffer overrun at tuning_ctl_set() Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ALSA: asihpi: check pao in control_message() NeilBrown <neilb(a)suse.de> md: avoid signed overflow in slot_store() Jan Kara via Ocfs2-devel <ocfs2-devel(a)oss.oracle.com> ocfs2: fix data corruption after failed write Vincent Guittot <vincent.guittot(a)linaro.org> sched/fair: Sanitize vruntime of entity being migrated Zhang Qiao <zhangqiao22(a)huawei.com> sched/fair: sanitize vruntime of entity being placed Mikulas Patocka <mpatocka(a)redhat.com> dm crypt: add cond_resched() to dmcrypt_write() Jiasheng Jiang <jiasheng(a)iscas.ac.cn> dm stats: check for and propagate alloc_percpu failure Wei Chen <harperchen1110(a)gmail.com> i2c: xgene-slimpro: Fix out-of-bounds bug in xgene_slimpro_i2c_xfer() Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix kernel-infoleak in nilfs_ioctl_wrap_copy() Xu Yang <xu.yang_2(a)nxp.com> usb: chipidea: core: fix possible concurrent when switch role Xu Yang <xu.yang_2(a)nxp.com> usb: chipdea: core: fix return -EINVAL if request role is the same with current role Lin Ma <linma(a)zju.edu.cn> igb: revert rtnl_lock() that causes deadlock Alvin Šipraga <alsi(a)bang-olufsen.dk> usb: gadget: u_audio: don't let userspace block driver unbind Joel Selvaraj <joelselvaraj.oss(a)gmail.com> scsi: core: Add BLIST_SKIP_VPD_PAGES for SKhynix H28U74301AMR Al Viro <viro(a)zeniv.linux.org.uk> sh: sanitize the flags on sigreturn Enrico Sau <enrico.sau(a)gmail.com> net: usb: qmi_wwan: add Telit 0x1080 composition Enrico Sau <enrico.sau(a)gmail.com> net: usb: cdc_mbim: avoid altsetting toggling for Telit FE990 Adrien Thierry <athierry(a)redhat.com> scsi: ufs: core: Add soft dependency on governor_simpleondemand Maurizio Lombardi <mlombard(a)redhat.com> scsi: target: iscsi: Fix an error message in iscsi_check_key() Michael Schmitz <schmitzmic(a)gmail.com> m68k: Only force 030 bus error if PC not in exception table Alexander Aring <aahringo(a)redhat.com> ca8210: fix mac_len negative array access Alexandre Ghiti <alex(a)ghiti.fr> riscv: Bump COMMAND_LINE_SIZE value to 1024 Mario Limonciello <mario.limonciello(a)amd.com> thunderbolt: Use const qualifier for `ring_interrupt_index` Yaroslav Furman <yaro330(a)gmail.com> uas: Add US_FL_NO_REPORT_OPCODES for JMicron JMS583Gen 2 Frank Crawford <frank(a)crawford.emu.id.au> hwmon (it87): Fix voltage scaling for chips with 10.9mV ADCs Zheng Wang <zyytlz.wz(a)163.com> Bluetooth: btsdio: fix use after free bug in btsdio_remove due to unfinished work Stephan Gerhold <stephan.gerhold(a)kernkonzept.com> Bluetooth: btqcomsmd: Fix command timeout after setting BD address Liang He <windhl(a)126.com> net: mdio: thunder: Add missing fwnode_handle_put() Roger Pau Monne <roger.pau(a)citrix.com> hvc/xen: prevent concurrent accesses to the shared ring Li Zetao <lizetao1(a)huawei.com> atm: idt77252: fix kmemleak when rmmod idt77252 Maher Sanalla <msanalla(a)nvidia.com> net/mlx5: Read the TC mapping of all priorities on ETS query Daniel Borkmann <daniel(a)iogearbox.net> bpf: Adjust insufficient default bpf_jit_limit Geoff Levand <geoff(a)infradead.org> net/ps3_gelic_net: Use dma_mapping_error Geoff Levand <geoff(a)infradead.org> net/ps3_gelic_net: Fix RX sk_buff length Zheng Wang <zyytlz.wz(a)163.com> net: qcom/emac: Fix use after free bug in emac_remove due to race condition Zheng Wang <zyytlz.wz(a)163.com> xirc2ps_cs: Fix use after free bug in xirc2ps_detach Daniil Tatianin <d-tatianin(a)yandex-team.ru> qed/qed_sriov: guard against NULL derefs from qed_iov_get_vf_info Szymon Heidrich <szymon.heidrich(a)gmail.com> net: usb: smsc95xx: Limit packet length to skb->len Yu Kuai <yukuai3(a)huawei.com> scsi: scsi_dh_alua: Fix memleak for 'qdata' in alua_activate() Alexander Stein <alexander.stein(a)ew.tq-group.com> i2c: imx-lpi2c: check only for enabled interrupt flags Akihiko Odaki <akihiko.odaki(a)daynix.com> igbvf: Regard vf reset nack as success Gaosheng Cui <cuigaosheng1(a)huawei.com> intel/igbvf: free irq on the error path in igbvf_request_msix() Alexander Lobakin <aleksander.lobakin(a)intel.com> iavf: fix inverted Rx hash condition leading to disabled hash Zheng Wang <zyytlz.wz(a)163.com> power: supply: da9150: Fix use after free bug in da9150_charger_remove due to race condition ------------- Diffstat: Makefile | 4 +- arch/m68k/kernel/traps.c | 4 +- arch/riscv/include/uapi/asm/setup.h | 8 ++++ arch/s390/lib/uaccess.c | 2 +- arch/sh/include/asm/processor_32.h | 1 + arch/sh/kernel/signal_32.c | 3 ++ drivers/atm/idt77252.c | 11 +++++ drivers/bluetooth/btqcomsmd.c | 17 ++++++- drivers/bluetooth/btsdio.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 10 +++- drivers/hwmon/it87.c | 4 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 4 ++ drivers/i2c/busses/i2c-xgene-slimpro.c | 3 ++ drivers/input/mouse/focaltech.c | 8 ++-- drivers/md/dm-crypt.c | 1 + drivers/md/dm-stats.c | 7 ++- drivers/md/dm-stats.h | 2 +- drivers/md/dm.c | 4 +- drivers/md/md.c | 3 ++ drivers/net/ethernet/intel/i40e/i40e_diag.c | 11 +++-- drivers/net/ethernet/intel/i40e/i40e_diag.h | 2 +- drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 +- drivers/net/ethernet/intel/igb/igb_main.c | 2 - drivers/net/ethernet/intel/igbvf/netdev.c | 8 +++- drivers/net/ethernet/intel/igbvf/vf.c | 13 ++++-- drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 6 ++- drivers/net/ethernet/qlogic/qed/qed_sriov.c | 5 +- drivers/net/ethernet/qualcomm/emac/emac.c | 6 +++ drivers/net/ethernet/toshiba/ps3_gelic_net.c | 41 ++++++++-------- drivers/net/ethernet/toshiba/ps3_gelic_net.h | 5 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 5 ++ drivers/net/ieee802154/ca8210.c | 5 +- drivers/net/phy/mdio-thunder.c | 1 + drivers/net/usb/cdc_mbim.c | 5 ++ drivers/net/usb/qmi_wwan.c | 1 + drivers/net/usb/smsc95xx.c | 6 +++ drivers/net/xen-netback/common.h | 2 +- drivers/net/xen-netback/netback.c | 25 +++++++++- drivers/pinctrl/pinctrl-at91-pio4.c | 1 - drivers/power/supply/da9150-charger.c | 1 + drivers/scsi/device_handler/scsi_dh_alua.c | 6 ++- drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +- drivers/scsi/scsi_devinfo.c | 1 + drivers/scsi/ufs/ufshcd.c | 1 + drivers/target/iscsi/iscsi_target_parameters.c | 12 +++-- drivers/thunderbolt/nhi.c | 2 +- drivers/tty/hvc/hvc_xen.c | 19 +++++++- drivers/usb/chipidea/ci.h | 2 + drivers/usb/chipidea/core.c | 11 ++++- drivers/usb/chipidea/otg.c | 5 +- drivers/usb/gadget/function/u_audio.c | 2 +- drivers/usb/host/ohci-pxa27x.c | 2 +- drivers/usb/storage/unusual_uas.h | 7 +++ drivers/video/fbdev/au1200fb.c | 3 ++ drivers/video/fbdev/geode/lxfb_core.c | 3 ++ drivers/video/fbdev/intelfb/intelfbdrv.c | 3 ++ drivers/video/fbdev/nvidia/nvidia.c | 2 + drivers/video/fbdev/tgafb.c | 3 ++ fs/cifs/cifsfs.h | 5 +- fs/ext4/inode.c | 3 +- fs/nilfs2/ioctl.c | 2 +- fs/ocfs2/aops.c | 18 +++++++- kernel/bpf/core.c | 2 +- kernel/compat.c | 2 +- kernel/sched/core.c | 7 ++- kernel/sched/fair.c | 54 ++++++++++++++++++++-- net/can/bcm.c | 16 ++++--- net/sched/sch_cbq.c | 4 +- sound/pci/asihpi/hpi6205.c | 2 +- sound/pci/hda/patch_ca0132.c | 4 +- sound/pci/hda/patch_conexant.c | 6 ++- sound/usb/format.c | 8 +++- 72 files changed, 370 insertions(+), 101 deletions(-)

1 year, 8 months

5
70
0 0

[PATCH] memcg-v1: Enable setting memory min, low, high

by Shaun Tancheff

From: Shaun Tancheff <shaun.tancheff(a)hpe.com> For users that are unable to update to memcg-v2 this provides a method where memcg-v1 can more effectively apply enough memory pressure to effectively throttle filesystem I/O or otherwise minimize being memcg oom killed at the expense of reduced performance. This patch extends the memcg-v1 legacy sysfs entries with: limit_in_bytes.min, limit_in_bytes.low and limit_in_bytes.high Since old software will need to be updated to take advantage of the new files a secondary method of setting min, low and high based on a percentage of the limit is also provided. The percentages are determined by module parameters. The available module parameters can be set at kernel boot time, for example: memcontrol.memcg_min=10 memcontrol.memcg_low=30 memcontrol.memcg_high=80 Would set min to 10%, low to 30% and high to 80% of the value written to: /sys/fs/cgroup/memory/<grp>/memory.limit_in_bytes Signed-off-by: Shaun Tancheff <shaun.tancheff(a)hpe.com> --- mm/memcontrol.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 5abffe6f8389..eec6e6ed92f8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -73,6 +73,18 @@ #include <trace/events/vmscan.h> +static unsigned int memcg_v1_min_default_percent; +module_param_named(memcg_min, memcg_v1_min_default_percent, uint, 0600); +MODULE_PARM_DESC(memcg_min, "memcg v1 min default percent"); + +static unsigned int memcg_v1_low_default_percent; +module_param_named(memcg_low, memcg_v1_low_default_percent, uint, 0600); +MODULE_PARM_DESC(memcg_low, "memcg v1 low default percent"); + +static unsigned int memcg_v1_high_default_percent; +module_param_named(memcg_high, memcg_v1_high_default_percent, uint, 0600); +MODULE_PARM_DESC(memcg_high, "memcg v1 high default percent"); + struct cgroup_subsys memory_cgrp_subsys __read_mostly; EXPORT_SYMBOL(memory_cgrp_subsys); @@ -208,6 +220,7 @@ enum res_type { _MEMSWAP, _KMEM, _TCP, + _MEM_V1, }; #define MEMFILE_PRIVATE(x, val) ((x) << 16 | (val)) @@ -3689,6 +3702,9 @@ enum { RES_MAX_USAGE, RES_FAILCNT, RES_SOFT_LIMIT, + RES_LIMIT_MIN, + RES_LIMIT_LOW, + RES_LIMIT_HIGH, }; static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, @@ -3699,6 +3715,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, switch (MEMFILE_TYPE(cft->private)) { case _MEM: + case _MEM_V1: counter = &memcg->memory; break; case _MEMSWAP: @@ -3729,6 +3746,12 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css, return counter->failcnt; case RES_SOFT_LIMIT: return (u64)memcg->soft_limit * PAGE_SIZE; + case RES_LIMIT_MIN: + return (u64)READ_ONCE(memcg->memory.min); + case RES_LIMIT_LOW: + return (u64)READ_ONCE(memcg->memory.low); + case RES_LIMIT_HIGH: + return (u64)READ_ONCE(memcg->memory.high); default: BUG(); } @@ -3828,6 +3851,35 @@ static int memcg_update_tcp_max(struct mem_cgroup *memcg, unsigned long max) return ret; } +static inline void mem_cgroup_v1_set_defaults(struct mem_cgroup *memcg, + u64 nr_pages) +{ + u64 max = (u64)(PAGE_COUNTER_MAX * PAGE_SIZE) / PAGE_SIZE; + u64 min, low, high; + + if (mem_cgroup_is_root(memcg) || max == nr_pages) + return; + + min = READ_ONCE(memcg->memory.min); + low = READ_ONCE(memcg->memory.low); + if (min || low) + return; + + if (!min && memcg_v1_min_default_percent) { + min = (nr_pages * memcg_v1_min_default_percent) / 100; + page_counter_set_min(&memcg->memory, min); + } + if (!low && memcg_v1_low_default_percent) { + low = (nr_pages * memcg_v1_low_default_percent) / 100; + page_counter_set_low(&memcg->memory, low); + } + high = READ_ONCE(memcg->memory.high); + if (high == PAGE_COUNTER_MAX && memcg_v1_high_default_percent) { + high = (nr_pages * memcg_v1_high_default_percent) / 100; + page_counter_set_high(&memcg->memory, high); + } +} + /* * The user of this function is... * RES_LIMIT. @@ -3851,6 +3903,11 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of, break; } switch (MEMFILE_TYPE(of_cft(of)->private)) { + case _MEM_V1: + ret = mem_cgroup_resize_max(memcg, nr_pages, false); + if (!ret) + mem_cgroup_v1_set_defaults(memcg, nr_pages); + break; case _MEM: ret = mem_cgroup_resize_max(memcg, nr_pages, false); break; @@ -4999,6 +5056,13 @@ static int mem_cgroup_slab_show(struct seq_file *m, void *p) } #endif +static ssize_t memory_min_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off); +static ssize_t memory_low_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off); +static ssize_t memory_high_write(struct kernfs_open_file *of, + char *buf, size_t nbytes, loff_t off); + static struct cftype mem_cgroup_legacy_files[] = { { .name = "usage_in_bytes", @@ -5013,10 +5077,28 @@ static struct cftype mem_cgroup_legacy_files[] = { }, { .name = "limit_in_bytes", - .private = MEMFILE_PRIVATE(_MEM, RES_LIMIT), + .private = MEMFILE_PRIVATE(_MEM_V1, RES_LIMIT), .write = mem_cgroup_write, .read_u64 = mem_cgroup_read_u64, }, + { + .name = "limit_in_bytes.min", + .private = MEMFILE_PRIVATE(_MEM_V1, RES_LIMIT_MIN), + .write = memory_min_write, + .read_u64 = mem_cgroup_read_u64, + }, + { + .name = "limit_in_bytes.low", + .private = MEMFILE_PRIVATE(_MEM_V1, RES_LIMIT_LOW), + .write = memory_low_write, + .read_u64 = mem_cgroup_read_u64, + }, + { + .name = "limit_in_bytes.high", + .private = MEMFILE_PRIVATE(_MEM_V1, RES_LIMIT_HIGH), + .write = memory_high_write, + .read_u64 = mem_cgroup_read_u64, + }, { .name = "soft_limit_in_bytes", .private = MEMFILE_PRIVATE(_MEM, RES_SOFT_LIMIT), -- 2.34.1

1 year, 8 months

2
3
0 0

[PATCH 2/2] tracing: Fix ftrace_boot_snapshot command line logic

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> The kernel command line ftrace_boot_snapshot by itself is supposed to trigger a snapshot at the end of boot up of the main top level trace buffer. A ftrace_boot_snapshot=foo will do the same for an instance called foo that was created by trace_instance=foo,... The logic was broken where if ftrace_boot_snapshot was by itself, it would trigger a snapshot for all instances that had tracing enabled, regardless if it asked for a snapshot or not. When a snapshot is requested for a buffer, the buffer's tr->allocated_snapshot is set to true. Use that to know if a trace buffer wants a snapshot at boot up or not. Since the top level buffer is part of the ftrace_trace_arrays list, there's no reason to treat it differently than the other buffers. Just iterate the list if ftrace_boot_snapshot was specified. Cc: stable(a)vger.kernel.org Fixes: 9c1c251d670bc ("tracing: Allow boot instances to have snapshot buffers") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- kernel/trace/trace.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ed1d1093f5e9..8ae51f1dea8e 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10395,16 +10395,15 @@ void __init ftrace_boot_snapshot(void) { struct trace_array *tr; - if (snapshot_at_boot) { - tracing_snapshot(); - internal_trace_puts("** Boot snapshot taken **\n"); - } + if (!snapshot_at_boot) + return; list_for_each_entry(tr, &ftrace_trace_arrays, list) { - if (tr == &global_trace) + if (!tr->allocated_snapshot) continue; - trace_array_puts(tr, "** Boot snapshot taken **\n"); + tracing_snapshot_instance(tr); + trace_array_puts(tr, "** Boot snapshot taken **\n"); } } -- 2.39.2

1 year, 8 months

2
1
0 0

stable-rc/linux-6.1.y baseline: 135 runs, 7 regressions (v6.1.22-180-ge7511568ce95)

by kernelci.org bot

stable-rc/linux-6.1.y baseline: 135 runs, 7 regressions (v6.1.22-180-ge7511568ce95) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-C436FA-Flip-hatch | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 asus-CM1400CXA-dalboz | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 asus-cx9400-volteer | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-12b-c...4020-octopus | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-14-G1-sona | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 hp-x360-14a-cb0001xx-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 lenovo-TPad-C13-Yoga-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/job/stable-rc/branch/linux-6.1.y/kernel/v6.1.22-1… Test: baseline Tree: stable-rc Branch: linux-6.1.y Describe: v6.1.22-180-ge7511568ce95 URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git SHA: e7511568ce95fadd2a8f6727b0ace195f8149d94 Test Regressions ---------------- platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-C436FA-Flip-hatch | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca621d8e63a694a79e940 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca621d8e63a694a79e945 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:54.313436 <8>[ 10.618246] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870078_1.4.2.3.1> 2023-04-04T22:34:54.316522 + set +x 2023-04-04T22:34:54.424722 / # # 2023-04-04T22:34:54.527366 export SHELL=/bin/sh 2023-04-04T22:34:54.528033 # 2023-04-04T22:34:54.629810 / # export SHELL=/bin/sh. /lava-9870078/environment 2023-04-04T22:34:54.630433 2023-04-04T22:34:54.732244 / # . /lava-9870078/environment/lava-9870078/bin/lava-test-runner /lava-9870078/1 2023-04-04T22:34:54.733430 2023-04-04T22:34:54.738471 / # /lava-9870078/bin/lava-test-runner /lava-9870078/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-CM1400CXA-dalboz | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca62becb63fb5cf79e93b Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca62becb63fb5cf79e940 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:35:03.606315 + set +x<8>[ 11.917084] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870038_1.4.2.3.1> 2023-04-04T22:35:03.606483 2023-04-04T22:35:03.711131 / # # 2023-04-04T22:35:03.813899 export SHELL=/bin/sh 2023-04-04T22:35:03.814165 # 2023-04-04T22:35:03.915397 / # export SHELL=/bin/sh. /lava-9870038/environment 2023-04-04T22:35:03.916158 2023-04-04T22:35:04.018061 / # . /lava-9870038/environment/lava-9870038/bin/lava-test-runner /lava-9870038/1 2023-04-04T22:35:04.019267 2023-04-04T22:35:04.024129 / # /lava-9870038/bin/lava-test-runner /lava-9870038/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ asus-cx9400-volteer | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca62bfa392565a979e93d Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca62bfa392565a979e942 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:59.648030 <8>[ 10.994898] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870091_1.4.2.3.1> 2023-04-04T22:34:59.651188 + set +x 2023-04-04T22:34:59.756335 # 2023-04-04T22:34:59.859236 / # #export SHELL=/bin/sh 2023-04-04T22:34:59.859995 2023-04-04T22:34:59.961958 / # export SHELL=/bin/sh. /lava-9870091/environment 2023-04-04T22:34:59.962688 2023-04-04T22:35:00.064639 / # . /lava-9870091/environment/lava-9870091/bin/lava-test-runner /lava-9870091/1 2023-04-04T22:35:00.065766 2023-04-04T22:35:00.071666 / # /lava-9870091/bin/lava-test-runner /lava-9870091/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-12b-c...4020-octopus | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca6149acce79cca79e960 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca6149acce79cca79e965 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:50.348629 + set +x 2023-04-04T22:34:50.355290 <8>[ 10.625587] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870030_1.4.2.3.1> 2023-04-04T22:34:50.460129 / # # 2023-04-04T22:34:50.561266 export SHELL=/bin/sh 2023-04-04T22:34:50.561499 # 2023-04-04T22:34:50.662456 / # export SHELL=/bin/sh. /lava-9870030/environment 2023-04-04T22:34:50.662686 2023-04-04T22:34:50.763653 / # . /lava-9870030/environment/lava-9870030/bin/lava-test-runner /lava-9870030/1 2023-04-04T22:34:50.764010 2023-04-04T22:34:50.768076 / # /lava-9870030/bin/lava-test-runner /lava-9870030/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-14-G1-sona | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca6084ac9118c8579e946 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca6084ac9118c8579e94b failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:33.090007 <8>[ 10.148083] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870104_1.4.2.3.1> 2023-04-04T22:34:33.093301 + set +x 2023-04-04T22:34:33.199151 2023-04-04T22:34:33.301347 / # #export SHELL=/bin/sh 2023-04-04T22:34:33.302102 2023-04-04T22:34:33.403802 / # export SHELL=/bin/sh. /lava-9870104/environment 2023-04-04T22:34:33.404557 2023-04-04T22:34:33.506680 / # . /lava-9870104/environment/lava-9870104/bin/lava-test-runner /lava-9870104/1 2023-04-04T22:34:33.507967 2023-04-04T22:34:33.512715 / # /lava-9870104/bin/lava-test-runner /lava-9870104/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ hp-x360-14a-cb0001xx-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca61ffa392565a979e922 Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca61ffa392565a979e927 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:48.850182 + set<8>[ 11.176173] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870093_1.4.2.3.1> 2023-04-04T22:34:48.850277 +x 2023-04-04T22:34:48.955129 / # # 2023-04-04T22:34:49.056123 export SHELL=/bin/sh 2023-04-04T22:34:49.056372 # 2023-04-04T22:34:49.157351 / # export SHELL=/bin/sh. /lava-9870093/environment 2023-04-04T22:34:49.157573 2023-04-04T22:34:49.258598 / # . /lava-9870093/environment/lava-9870093/bin/lava-test-runner /lava-9870093/1 2023-04-04T22:34:49.259807 2023-04-04T22:34:49.265030 / # /lava-9870093/bin/lava-test-runner /lava-9870093/1 ... (12 line(s) more) platform | arch | lab | compiler | defconfig | regressions -----------------------------+--------+---------------+----------+------------------------------+------------ lenovo-TPad-C13-Yoga-zork | x86_64 | lab-collabora | gcc-10 | x86_64_defcon...6-chromebook | 1 Details: https://kernelci.org/test/plan/id/642ca6064ac9118c8579e93b Results: 6 PASS, 1 FAIL, 0 SKIP Full config: x86_64_defconfig+x86-chromebook Compiler: gcc-10 (gcc (Debian 10.2.1-6) 10.2.1 20210110) Plain log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… HTML log: https://storage.kernelci.org//stable-rc/linux-6.1.y/v6.1.22-180-ge7511568ce… Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/2023… * baseline.bootrr.deferred-probe-empty: https://kernelci.org/test/case/id/642ca6064ac9118c8579e940 failing since 5 days (last pass: v6.1.21, first fail: v6.1.22) 2023-04-04T22:34:30.955837 + set<8>[ 12.061837] <LAVA_SIGNAL_ENDRUN 0_dmesg 9870095_1.4.2.3.1> 2023-04-04T22:34:30.955931 +x 2023-04-04T22:34:31.060602 / # # 2023-04-04T22:34:31.161629 export SHELL=/bin/sh 2023-04-04T22:34:31.161829 # 2023-04-04T22:34:31.262702 / # export SHELL=/bin/sh. /lava-9870095/environment 2023-04-04T22:34:31.262891 2023-04-04T22:34:31.363867 / # . /lava-9870095/environment/lava-9870095/bin/lava-test-runner /lava-9870095/1 2023-04-04T22:34:31.364146 2023-04-04T22:34:31.368481 / # /lava-9870095/bin/lava-test-runner /lava-9870095/1 ... (12 line(s) more)

1 year, 8 months

1
0
0 0

[PATCH 2/2 v2] tracing: Fix ftrace_boot_snapshot command line logic

by Steven Rostedt

From: "Steven Rostedt (Google)" <rostedt(a)goodmis.org> The kernel command line ftrace_boot_snapshot by itself is supposed to trigger a snapshot at the end of boot up of the main top level trace buffer. A ftrace_boot_snapshot=foo will do the same for an instance called foo that was created by trace_instance=foo,... The logic was broken where if ftrace_boot_snapshot was by itself, it would trigger a snapshot for all instances that had tracing enabled, regardless if it asked for a snapshot or not. When a snapshot is requested for a buffer, the buffer's tr->allocated_snapshot is set to true. Use that to know if a trace buffer wants a snapshot at boot up or not. Since the top level buffer is part of the ftrace_trace_arrays list, there's no reason to treat it differently than the other buffers. Just iterate the list if ftrace_boot_snapshot was specified. Cc: stable(a)vger.kernel.org Fixes: 9c1c251d670bc ("tracing: Allow boot instances to have snapshot buffers") Signed-off-by: Steven Rostedt (Google) <rostedt(a)goodmis.org> --- Changes since v1: https://lkml.kernel.org/r/20230404230308.501833715@goodmis.org - Protect use of tr->allocated_snapshot around #ifdef TRACER_MAX_TRACE kernel/trace/trace.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 93740a9370c6..36a6037823cd 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -10394,19 +10394,20 @@ __init static int tracer_alloc_buffers(void) void __init ftrace_boot_snapshot(void) { +#ifdef CONFIG_TRACER_MAX_TRACE struct trace_array *tr; - if (snapshot_at_boot) { - tracing_snapshot(); - internal_trace_puts("** Boot snapshot taken **\n"); - } + if (!snapshot_at_boot) + return; list_for_each_entry(tr, &ftrace_trace_arrays, list) { - if (tr == &global_trace) + if (!tr->allocated_snapshot) continue; - trace_array_puts(tr, "** Boot snapshot taken **\n"); + tracing_snapshot_instance(tr); + trace_array_puts(tr, "** Boot snapshot taken **\n"); } +#endif } void __init early_trace_init(void) -- 2.39.2

1 year, 8 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2023