April 2021 - Linux-stable-mirror

[PATCH] ext4: fix memory leak in ext4_fill_super

by Alexey Makhalov

I've recently discovered that doing infinite loop of systemctl start <ext4_on_lvm>.mount, and systemctl stop <ext4_on_lvm>.mount linearly increases percpu allocator memory consumption. In several hours, it might lead to system instability by consuming most of the memory. Bug is not reproducible when the ext4 filesystem is on physical partition, but it is persistent when ext4 is on logical volume. During debugging it was found that most of active percpu allocations are from /system.slice/<ext4_on_lvm>.mount memory cgroups (created by systemd for each mount). All of these cgroups are in dying state with refcount equal to 2. And most interesting that each mount/umount itera- tion creates exactly one dying memory cgroup. Tracking down the remaining refcounts showed that it was charged from ext4_fill_super(). And the page is always 0 index in the page cache mapping. The issue was hidden behind initial super block read using logical blocksize from bdev and adjusting blocksize later after reading actual block size from superblock. If blocksizes differ, sb_set_blocksize() will kill current buffers and page cache by using kill_bdev(). And then super block will be reread again but using correct blocksize this time. sb_set_blocksize() didn't fully free superblock page and buffers as buffer pointed by bh variable remained busy. So buffer and its page remains in the memory (leak). Super block reread logic does not happen when ext4 filesystem is on physical partition as blocksize is correct for initial superblock read. brelse(bh), where bh is a buffer head of superblock page, must be called and bh references must be released before kill_bdev(). kill_bdev() subfunctions (see callstack below) won't be able to free not released buffer (even if it's clean) and superblock page won't be freed as well. callstack: kill_bdev() ->truncate_inode_pages() ->truncate_inode_pages_range() ->truncate_cleanup_page() ->do_invalidatepage ->block_invalidatepage() ->try_to_release_page() == fail to release ->try_to_free_buffers() == fail to free ->drop_buffers() ->buffer_busy() == yes Incorrect order of brelse() and kill_bdev() in ext4_fill_super() was introduced by commit ce40733ce93d ("ext4: Check for return value from sb_set_blocksize") 13 years ago! Thanks to memory hungry percpu, it was easy to detect this issue now. Fix this by moving the brelse() before sb_set_blocksize() and add a comment about the dependency. In addition, fix similar issue under failed_mount: label (in the same function) about incorrect order of ext4_blkdev_remove() vs brelse() introduced by commit ac27a0ec112a ("ext4: initial copy of files from ext3") Signed-off-by: Alexey Makhalov <amakhalov(a)vmware.com> Cc: stable(a)vger.kernel.org Fixes: ce40733ce93d ("ext4: Check for return value from sb_set_blocksize") Fixes: ac27a0ec112a ("ext4: initial copy of files from ext3") Cc: "Theodore Ts'o" <tytso(a)mit.edu> Cc: Andreas Dilger <adilger.kernel(a)dilger.ca> --- fs/ext4/super.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index b9693680463a..6c8f68309834 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -4451,14 +4451,20 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) } if (sb->s_blocksize != blocksize) { + /* + * bh must be released before kill_bdev(), otherwise + * it won't be freed and its page also. kill_bdev() + * is called by sb_set_blocksize(). + */ + brelse(bh); /* Validate the filesystem blocksize */ if (!sb_set_blocksize(sb, blocksize)) { ext4_msg(sb, KERN_ERR, "bad block size %d", blocksize); + bh = NULL; goto failed_mount; } - brelse(bh); logical_sb_block = sb_block * EXT4_MIN_BLOCK_SIZE; offset = do_div(logical_sb_block, blocksize); bh = ext4_sb_bread_unmovable(sb, logical_sb_block); @@ -5178,8 +5184,9 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) kfree(get_qf_name(sb, sbi, i)); #endif fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy); - ext4_blkdev_remove(sbi); + /* ext4_blkdev_remove() calls kill_bdev(), release bh before it. */ brelse(bh); + ext4_blkdev_remove(sbi); out_fail: sb->s_fs_info = NULL; kfree(sbi->s_blockgroup_lock); -- 2.14.2

3 years, 4 months

2
5
0 0

[PATCH 5.4 000/111] 5.4.112-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.4.112 release. There are 111 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, 14 Apr 2021 08:39: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.4.112-rc… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.4.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.4.112-rc1 Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath." Alexander Aring <aahringo(a)redhat.com> net: ieee802154: stop dump llsec params for monitors Alexander Aring <aahringo(a)redhat.com> net: ieee802154: forbid monitor for del llsec seclevel Alexander Aring <aahringo(a)redhat.com> net: ieee802154: forbid monitor for set llsec params Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec devkey Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 add llsec key Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec dev Alexander Aring <aahringo(a)redhat.com> net: ieee802154: fix nl802154 del llsec key Alexander Aring <aahringo(a)redhat.com> net: ieee802154: nl-mac: fix check on panid Pavel Skripkin <paskripkin(a)gmail.com> net: mac802154: Fix general protection fault Pavel Skripkin <paskripkin(a)gmail.com> drivers: net: fix memory leak in peak_usb_create_dev Pavel Skripkin <paskripkin(a)gmail.com> drivers: net: fix memory leak in atusb_probe Phillip Potter <phil(a)philpotter.co.uk> net: tun: set tun->dev->addr_len during TUNSETLINK processing Du Cheng <ducheng2(a)gmail.com> cfg80211: remove WARN_ON() in cfg80211_sme_connect Kumar Kartikeya Dwivedi <memxor(a)gmail.com> net: sched: bump refcount for new action in ACT replace mode Rafał Miłecki <rafal(a)milecki.pl> dt-bindings: net: ethernet-controller: fix typo in NVMEM Krzysztof Kozlowski <krzysztof.kozlowski(a)canonical.com> clk: socfpga: fix iomem pointer cast on 64-bit William Roche <william.roche(a)oracle.com> RAS/CEC: Correct ce_add_elem()'s returned values Leon Romanovsky <leonro(a)nvidia.com> RDMA/addr: Be strict with gid size Potnuri Bharat Teja <bharat(a)chelsio.com> RDMA/cxgb4: check for ipv6 address properly while destroying listener Aya Levin <ayal(a)nvidia.com> net/mlx5: Fix PBMC register mapping Raed Salem <raeds(a)nvidia.com> net/mlx5: Fix placement of log_max_flow_counter Guangbin Huang <huangguangbin2(a)huawei.com> net: hns3: clear VF down state bit before request link status Ilya Maximets <i.maximets(a)ovn.org> openvswitch: fix send of uninitialized stack memory in ct limit reply Zheng Yongjun <zhengyongjun3(a)huawei.com> net: openvswitch: conntrack: simplify the return expression of ovs_ct_limit_get_default_limit() Adrian Hunter <adrian.hunter(a)intel.com> perf inject: Fix repipe usage Alexander Gordeev <agordeev(a)linux.ibm.com> s390/cpcmd: fix inline assembly register clobbering Zqiang <qiang.zhang(a)windriver.com> workqueue: Move the position of debug_work_activate() in __queue_work() Lukasz Bartosik <lb(a)semihalf.com> clk: fix invalid usage of list cursor in unregister Lukasz Bartosik <lb(a)semihalf.com> clk: fix invalid usage of list cursor in register Claudiu Beznea <claudiu.beznea(a)microchip.com> net: macb: restore cmp registers on resume path Can Guo <cang(a)codeaurora.org> scsi: ufs: core: Fix wrong Task Tag used in task management request UPIUs Can Guo <cang(a)codeaurora.org> scsi: ufs: core: Fix task management request completion timeout Bart Van Assche <bvanassche(a)acm.org> scsi: ufs: Use blk_{get,put}_request() to allocate and free TMFs Bart Van Assche <bvanassche(a)acm.org> scsi: ufs: Avoid busy-waiting by eliminating tag conflicts Venkat Gopalakrishnan <venkatg(a)codeaurora.org> scsi: ufs: Fix irq return code Norman Maurer <norman_maurer(a)apple.com> net: udp: Add support for getsockopt(..., ..., UDP_GRO, ..., ...); Stephen Boyd <swboyd(a)chromium.org> drm/msm: Set drvdata to NULL when msm_drm_init() fails Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix display statistics for veb_tc Arnd Bergmann <arnd(a)arndb.de> soc/fsl: qbman: fix conflicting alignment attributes Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> net/rds: Fix a use after free in rds_message_map_pages Daniel Jurgens <danielj(a)mellanox.com> net/mlx5: Don't request more than supported EQs Aya Levin <ayal(a)nvidia.com> net/mlx5e: Fix ethtool indication of connector type Bastian Germann <bage(a)linutronix.de> ASoC: sunxi: sun4i-codec: fill ASoC card owner Florian Fainelli <f.fainelli(a)gmail.com> net: phy: broadcom: Only advertise EEE for supported modes Yinjun Zhang <yinjun.zhang(a)corigine.com> nfp: flower: ignore duplicate merge hints from FW Milton Miller <miltonm(a)us.ibm.com> net/ncsi: Avoid channel_monitor hrtimer deadlock Stefan Riedmueller <s.riedmueller(a)phytec.de> ARM: dts: imx6: pbab01: Set vmmc supply for both SD interfaces Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> net:tipc: Fix a double free in tipc_sk_mcast_rcv Rahul Lakkireddy <rahul.lakkireddy(a)chelsio.com> cxgb4: avoid collecting SGE_QBASE regs during traffic Claudiu Manoil <claudiu.manoil(a)nxp.com> gianfar: Handle error code at MAC address change Oliver Hartkopp <socketcan(a)hartkopp.net> can: bcm/raw: fix msg_namelen values depending on CAN_REQUIRED_SIZE Oliver Stäbler <oliver.staebler(a)bytesatwork.ch> arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0 Eric Dumazet <edumazet(a)google.com> sch_red: fix off-by-one checks in red_check_params() Shyam Sundar S K <Shyam-sundar.S-k(a)amd.com> amd-xgbe: Update DMA coherency values Al Viro <viro(a)zeniv.linux.org.uk> hostfs: fix memory handling in follow_link() Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> hostfs: Use kasprintf() instead of fixed buffer formatting Eryk Rybak <eryk.roch.rybak(a)intel.com> i40e: Fix kernel oops when i40e driver removes VF's Mateusz Palczewski <mateusz.palczewski(a)intel.com> i40e: Added Asym_Pause to supported link modes Steffen Klassert <steffen.klassert(a)secunet.com> xfrm: Fix NULL pointer dereference on policy lookup Shengjiu Wang <shengjiu.wang(a)nxp.com> ASoC: wm8960: Fix wrong bclk and lrclk with pll enabled for some chips Guennadi Liakhovetski <guennadi.liakhovetski(a)linux.intel.com> ASoC: SOF: Intel: HDA: fix core status verification Payal Kshirsagar <payalskshirsagar1234(a)gmail.com> ASoC: SOF: Intel: hda: remove unnecessary parentheses Xin Long <lucien.xin(a)gmail.com> esp: delete NETIF_F_SCTP_CRC bit from features for esp offload Ahmed S. Darwish <a.darwish(a)linutronix.de> net: xfrm: Localize sequence counter per network namespace Geert Uytterhoeven <geert+renesas(a)glider.be> regulator: bd9571mwv: Fix AVS and DVFS voltage range Eyal Birger <eyal.birger(a)gmail.com> xfrm: interface: fix ipv4 pmtu check to honor ip header df Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Configure all remaining GSWIP_MII_CFG bits Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Don't use PHY auto polling Eric Dumazet <edumazet(a)google.com> virtio_net: Do not pull payload in skb->head Yuya Kusakabe <yuya.kusakabe(a)gmail.com> virtio_net: Add XDP meta data support Wolfram Sang <wsa+renesas(a)sang-engineering.com> i2c: turn recovery error on init to debug Shuah Khan <skhan(a)linuxfoundation.org> usbip: synchronize event handler with sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: vudc synchronize sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: stub-dev synchronize sysfs code paths Shuah Khan <skhan(a)linuxfoundation.org> usbip: add sysfs_lock to synchronize sysfs code paths Paolo Abeni <pabeni(a)redhat.com> net: let skb_orphan_partial wake-up waiters. Maciej Żenczykowski <maze(a)google.com> net-ipv6: bugfix - raw & sctp - switch to ipv6_can_nonlocal_bind() Kurt Kanzenbach <kurt(a)linutronix.de> net: hsr: Reset MAC header for Tx path Johannes Berg <johannes.berg(a)intel.com> mac80211: fix TXQ AC confusion Pavel Tikhomirov <ptikhomirov(a)virtuozzo.com> net: sched: sch_teql: fix null-pointer dereference Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse error: 'vsi->netdev' could be null Arkadiusz Kubalewski <arkadiusz.kubalewski(a)intel.com> i40e: Fix sparse warning: missing error code 'err' Eric Dumazet <edumazet(a)google.com> net: ensure mac header is set in virtio_net_hdr_to_skb() John Fastabend <john.fastabend(a)gmail.com> bpf, sockmap: Fix sk->prot unhash op reset Lv Yunlong <lyl2019(a)mail.ustc.edu.cn> ethernet/netronome/nfp: Fix a use after free in nfp_bpf_ctrl_msg_rx Anirudh Rayabharam <mail(a)anirudhrb.com> net: hso: fix null-ptr-deref during tty device unregistration Robert Malz <robertx.malz(a)intel.com> ice: Cleanup fltr list in case of allocation issues Jacek Bułatek <jacekx.bulatek(a)intel.com> ice: Fix for dereference of NULL pointer Fabio Pricoco <fabio.pricoco(a)intel.com> ice: Increase control queue timeout Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field Marek Behún <kabel(a)kernel.org> ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin Gao Xiang <hsiangkao(a)redhat.com> parisc: avoid a warning on u8 cast for cmpxchg on u8 pointers Helge Deller <deller(a)gmx.de> parisc: parisc-agp requires SBA IOMMU driver Jack Qiu <jack.qiu(a)huawei.com> fs: direct-io: fix missing sdio->boundary Wengang Wang <wen.gang.wang(a)oracle.com> ocfs2: fix deadlock between setattr and dio_end_io_write Mike Rapoport <rppt(a)linux.ibm.com> nds32: flush_dcache_page: use page_mapping_file to avoid races with swapoff Sergei Trofimovich <slyfox(a)gentoo.org> ia64: fix user_stack_pointer() for ptrace() Nick Desaulniers <ndesaulniers(a)google.com> gcov: re-fix clang-11+ support Takashi Iwai <tiwai(a)suse.de> drm/i915: Fix invalid access to ACPI _DSM objects Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: dsa: lantiq_gswip: Let GSWIP automatically set the xMII clock Muhammad Usama Anjum <musamaanjum(a)gmail.com> net: ipv6: check for validity before dereferencing cfg->fc_nlinfo.nlh Luca Fancellu <luca.fancellu(a)arm.com> xen/evtchn: Change irq_info lock to raw_spinlock_t Xiaoming Ni <nixiaoming(a)huawei.com> nfc: Avoid endless loops caused by repeated llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix memory leak in llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix refcount leak in llcp_sock_connect() Xiaoming Ni <nixiaoming(a)huawei.com> nfc: fix refcount leak in llcp_sock_bind() Hans de Goede <hdegoede(a)redhat.com> ASoC: intel: atom: Stop advertising non working S24LE support Takashi Iwai <tiwai(a)suse.de> ALSA: hda/realtek: Fix speaker amp setup on Acer Aspire E1 Jonas Holmberg <jonashg(a)axis.com> ALSA: aloop: Fix initialization of controls Fabrice Gasnier <fabrice.gasnier(a)foss.st.com> counter: stm32-timer-cnt: fix ceiling miss-alignment with reload register ------------- Diffstat: .../bindings/net/ethernet-controller.yaml | 2 +- Makefile | 4 +- arch/arm/boot/dts/armada-385-turris-omnia.dts | 1 + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 2 +- arch/arm64/boot/dts/freescale/imx8mq-pinfunc.h | 2 +- arch/ia64/include/asm/ptrace.h | 8 +- arch/nds32/mm/cacheflush.c | 2 +- arch/parisc/include/asm/cmpxchg.h | 2 +- arch/s390/kernel/cpcmd.c | 6 +- drivers/char/agp/Kconfig | 2 +- drivers/clk/clk.c | 47 ++- drivers/clk/socfpga/clk-gate.c | 2 +- drivers/counter/stm32-timer-cnt.c | 12 +- drivers/gpu/drm/i915/display/intel_acpi.c | 22 +- drivers/gpu/drm/msm/msm_drv.c | 1 + drivers/i2c/i2c-core-base.c | 7 +- drivers/infiniband/core/addr.c | 4 +- drivers/infiniband/hw/cxgb4/cm.c | 3 +- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 6 +- drivers/net/dsa/lantiq_gswip.c | 196 ++++++++-- drivers/net/ethernet/amd/xgbe/xgbe.h | 6 +- drivers/net/ethernet/cadence/macb_main.c | 7 + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 23 +- drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 3 +- drivers/net/ethernet/freescale/gianfar.c | 6 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 4 +- drivers/net/ethernet/intel/i40e/i40e.h | 1 + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 53 ++- drivers/net/ethernet/intel/i40e/i40e_main.c | 11 +- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 9 + drivers/net/ethernet/intel/ice/ice_controlq.h | 4 +- drivers/net/ethernet/intel/ice/ice_switch.c | 15 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 22 +- drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 +- drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 1 + drivers/net/ethernet/netronome/nfp/flower/main.h | 8 + .../net/ethernet/netronome/nfp/flower/metadata.c | 16 +- .../net/ethernet/netronome/nfp/flower/offload.c | 48 ++- drivers/net/ieee802154/atusb.c | 1 + drivers/net/phy/bcm-phy-lib.c | 13 +- drivers/net/tun.c | 48 +++ drivers/net/usb/hso.c | 33 +- drivers/net/virtio_net.c | 62 ++-- drivers/ras/cec.c | 15 +- drivers/regulator/bd9571mwv-regulator.c | 4 +- drivers/scsi/ufs/ufshcd.c | 398 ++++++++++++--------- drivers/scsi/ufs/ufshcd.h | 18 +- drivers/scsi/ufs/ufshci.h | 2 +- drivers/soc/fsl/qbman/qman.c | 2 +- drivers/usb/usbip/stub_dev.c | 11 +- drivers/usb/usbip/usbip_common.h | 3 + drivers/usb/usbip/usbip_event.c | 2 + drivers/usb/usbip/vhci_hcd.c | 1 + drivers/usb/usbip/vhci_sysfs.c | 30 +- drivers/usb/usbip/vudc_dev.c | 1 + drivers/usb/usbip/vudc_sysfs.c | 5 + drivers/xen/events/events_base.c | 10 +- drivers/xen/events/events_internal.h | 2 +- fs/cifs/connect.c | 1 - fs/direct-io.c | 5 +- fs/hostfs/hostfs_kern.c | 19 +- fs/ocfs2/aops.c | 11 +- fs/ocfs2/file.c | 8 +- include/linux/mlx5/mlx5_ifc.h | 8 +- include/linux/skmsg.h | 8 +- include/linux/virtio_net.h | 16 +- include/net/netns/xfrm.h | 4 +- include/net/red.h | 4 +- include/net/sock.h | 9 + include/net/xfrm.h | 2 +- kernel/gcov/clang.c | 29 +- kernel/workqueue.c | 2 +- net/batman-adv/translation-table.c | 2 + net/can/bcm.c | 10 +- net/can/raw.c | 14 +- net/core/sock.c | 12 +- net/hsr/hsr_device.c | 1 + net/hsr/hsr_forward.c | 6 - net/ieee802154/nl-mac.c | 7 +- net/ieee802154/nl802154.c | 23 +- net/ipv4/esp4_offload.c | 6 +- net/ipv4/udp.c | 4 + net/ipv6/esp6_offload.c | 6 +- net/ipv6/raw.c | 2 +- net/ipv6/route.c | 8 +- net/mac80211/tx.c | 2 +- net/mac802154/llsec.c | 2 +- net/ncsi/ncsi-manage.c | 20 +- net/nfc/llcp_sock.c | 10 + net/openvswitch/conntrack.c | 14 +- net/rds/message.c | 3 +- net/sched/act_api.c | 3 + net/sched/sch_teql.c | 3 + net/sctp/ipv6.c | 7 +- net/tipc/socket.c | 2 +- net/wireless/sme.c | 2 +- net/xfrm/xfrm_interface.c | 3 + net/xfrm/xfrm_state.c | 10 +- sound/drivers/aloop.c | 11 +- sound/pci/hda/patch_realtek.c | 16 + sound/soc/codecs/wm8960.c | 8 +- sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 +- sound/soc/sof/intel/hda-dsp.c | 15 +- sound/soc/sunxi/sun4i-codec.c | 5 + tools/perf/builtin-inject.c | 2 +- 106 files changed, 1104 insertions(+), 511 deletions(-)

3 years, 4 months

11
124
0 0

[PATCH] drm/ingenic: Fix pixclock rate for 24-bit serial panels

by Paul Cercueil

When using a 24-bit panel on a 8-bit serial bus, the pixel clock requested by the panel has to be multiplied by 3, since the subpixels are shifted sequentially. The code (in ingenic_drm_encoder_atomic_check) already computed crtc_state->adjusted_mode->crtc_clock accordingly, but clk_set_rate() used crtc_state->adjusted_mode->clock instead. Fixes: 28ab7d35b6e0 ("drm/ingenic: Properly compute timings when using a 3x8-bit panel") Cc: stable(a)vger.kernel.org # v5.10 Signed-off-by: Paul Cercueil <paul(a)crapouillou.net> --- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index d60e1eefc9d1..cba68bf52ec5 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -342,7 +342,7 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc, if (priv->update_clk_rate) { mutex_lock(&priv->clk_mutex); clk_set_rate(priv->pix_clk, - crtc_state->adjusted_mode.clock * 1000); + crtc_state->adjusted_mode.crtc_clock * 1000); priv->update_clk_rate = false; mutex_unlock(&priv->clk_mutex); } -- 2.30.2

3 years, 4 months

4
7
0 0

[PATCH v4] crypto: ccp: Annotate SEV Firmware file names

by Joerg Roedel

From: Joerg Roedel <jroedel(a)suse.de> Annotate the firmware files CCP might need using MODULE_FIRMWARE(). This will get them included into an initrd when CCP is also included there. Otherwise the CCP module will not find its firmware when loaded before the root-fs is mounted. This can cause problems when the pre-loaded SEV firmware is too old to support current SEV and SEV-ES virtualization features. Fixes: e93720606efd ("crypto: ccp - Allow SEV firmware to be chosen based on Family and Model") Cc: stable(a)vger.kernel.org # v4.20+ Acked-by: Tom Lendacky <thomas.lendacky(a)amd.com> Signed-off-by: Joerg Roedel <jroedel(a)suse.de> --- drivers/crypto/ccp/sev-dev.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index cb9b4c4e371e..675ff925a59d 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -42,6 +42,10 @@ static int psp_probe_timeout = 5; module_param(psp_probe_timeout, int, 0644); MODULE_PARM_DESC(psp_probe_timeout, " default timeout value, in seconds, during PSP device probe"); +MODULE_FIRMWARE("amd/amd_sev_fam17h_model0xh.sbin"); /* 1st gen EPYC */ +MODULE_FIRMWARE("amd/amd_sev_fam17h_model3xh.sbin"); /* 2nd gen EPYC */ +MODULE_FIRMWARE("amd/amd_sev_fam19h_model0xh.sbin"); /* 3rd gen EPYC */ + static bool psp_dead; static int psp_timeout; -- 2.31.1

3 years, 5 months

2
1
0 0

[PATCH v4] x86, sched: Fix the AMD CPPC maximum perf on some specific generations

by Huang Rui

Some AMD Ryzen generations has different calculation method on maximum perf. 255 is not for all asics, some specific generations should use 166 as the maximum perf. Otherwise, it will report incorrect frequency value like below: ~ → lscpu | grep MHz CPU MHz: 3400.000 CPU max MHz: 7228.3198 CPU min MHz: 2200.0000 Fixes: 41ea667227ba ("x86, sched: Calculate frequency invariance for AMD systems") Fixes: 3c55e94c0ade ("cpufreq: ACPI: Extend frequency tables to cover boost frequencies") Reported-by: Jason Bagavatsingham <jason.bagavatsingham(a)gmail.com> Tested-by: Jason Bagavatsingham <jason.bagavatsingham(a)gmail.com> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=211791 Signed-off-by: Huang Rui <ray.huang(a)amd.com> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: Nathan Fontenot <nathan.fontenot(a)amd.com> Cc: Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> Cc: Borislav Petkov <bp(a)suse.de> Cc: x86(a)kernel.org Cc: stable(a)vger.kernel.org --- Changes from V1 -> V2: - Enhance the commit message. - Move amd_get_highest_perf() into amd.c. - Refine the implementation of switch-case. - Cc stable mail list. Changes from V2 -> V3: - Move the update into cppc_get_perf_caps() to correct the highest perf value in the API. Changes from V3 -> V4: - Rollback to V2 implementation because acpi_cppc.c will be used by ARM as well. It's not good to add x86-specific calling there. - Simplify the implementation of the functions. --- arch/x86/include/asm/processor.h | 2 ++ arch/x86/kernel/cpu/amd.c | 16 ++++++++++++++++ arch/x86/kernel/smpboot.c | 2 +- drivers/cpufreq/acpi-cpufreq.c | 6 +++++- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index f1b9ed5efaa9..908bcaea1361 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -804,8 +804,10 @@ DECLARE_PER_CPU(u64, msr_misc_features_shadow); #ifdef CONFIG_CPU_SUP_AMD extern u32 amd_get_nodes_per_socket(void); +extern u32 amd_get_highest_perf(void); #else static inline u32 amd_get_nodes_per_socket(void) { return 0; } +static inline u32 amd_get_highest_perf(void) { return 0; } #endif static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 347a956f71ca..bc3496669def 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -1170,3 +1170,19 @@ void set_dr_addr_mask(unsigned long mask, int dr) break; } } + +u32 amd_get_highest_perf(void) +{ + struct cpuinfo_x86 *c = &boot_cpu_data; + + if (c->x86 == 0x17 && ((c->x86_model >= 0x30 && c->x86_model < 0x40) || + (c->x86_model >= 0x70 && c->x86_model < 0x80))) + return 166; + + if (c->x86 == 0x19 && ((c->x86_model >= 0x20 && c->x86_model < 0x30) || + (c->x86_model >= 0x40 && c->x86_model < 0x70))) + return 166; + + return 225; +} +EXPORT_SYMBOL_GPL(amd_get_highest_perf); diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 02813a7f3a7c..7bec57d04a87 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -2046,7 +2046,7 @@ static bool amd_set_max_freq_ratio(void) return false; } - highest_perf = perf_caps.highest_perf; + highest_perf = amd_get_highest_perf(); nominal_perf = perf_caps.nominal_perf; if (!highest_perf || !nominal_perf) { diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index d1bbc16fba4b..7e7450453714 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c @@ -646,7 +646,11 @@ static u64 get_max_boost_ratio(unsigned int cpu) return 0; } - highest_perf = perf_caps.highest_perf; + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) + highest_perf = amd_get_highest_perf(); + else + highest_perf = perf_caps.highest_perf; + nominal_perf = perf_caps.nominal_perf; if (!highest_perf || !nominal_perf) { -- 2.25.1

3 years, 5 months

5
11
0 0

[PATCH V3] ARM: dts: imx6q-dhcom: Add PU,VDD1P1,VDD2P5 regulators

by Marek Vasut

Per schematic, both PU and SOC regulator are supplied from LTC3676 SW1 via VDDSOC_IN rail, add the PU input. Both VDD1P1, VDD2P5 are supplied from LTC3676 SW2 via VDDHIGH_IN rail, add both inputs. While no instability or problems are currently observed, the regulators should be fully described in DT and that description should fully match the hardware, else this might lead to unforseen issues later. Fix this. Fixes: 52c7a088badd ("ARM: dts: imx6q: Add support for the DHCOM iMX6 SoM and PDK2") Reviewed-by: Fabio Estevam <festevam(a)gmail.com> Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> Cc: Fabio Estevam <festevam(a)gmail.com> Cc: Ludwig Zenz <lzenz(a)dh-electronics.com> Cc: NXP Linux Team <linux-imx(a)nxp.com> Cc: Shawn Guo <shawnguo(a)kernel.org> Cc: stable(a)vger.kernel.org --- V2: Amend commit message V3: Reinstate the missing SoB line, add RB --- arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi index 236fc205c389..d0768ae429fa 100644 --- a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi +++ b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi @@ -406,6 +406,18 @@ &reg_soc { vin-supply = <&sw1_reg>; }; +&reg_pu { + vin-supply = <&sw1_reg>; +}; + +&reg_vdd1p1 { + vin-supply = <&sw2_reg>; +}; + +&reg_vdd2p5 { + vin-supply = <&sw2_reg>; +}; + &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; -- 2.30.2

3 years, 5 months

3
2
0 0

[PATCH] ARM: dts: imx6dl-yapp4: Fix RGMII connection to QCA8334 switch

by Michal Vokáč

The FEC does not have a PHY so it should not have a phy-handle. It is connected to the switch at RGMII level so we need a fixed-link sub-node on both ends. This was not a problem until the qca8k.c driver was converted to PHYLINK by commit b3591c2a3661 ("net: dsa: qca8k: Switch to PHYLINK instead of PHYLIB"). That commit revealed the FEC configuration was not correct. Fixes: 87489ec3a77f ("ARM: dts: imx: Add Y Soft IOTA Draco, Hydra and Ursa boards") Cc: stable(a)vger.kernel.org Signed-off-by: Michal Vokáč <michal.vokac(a)ysoft.com> --- arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi index 111d4d331f98..686dab57a1e4 100644 --- a/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi +++ b/arch/arm/boot/dts/imx6dl-yapp4-common.dtsi @@ -121,9 +121,13 @@ phy-reset-gpios = <&gpio1 25 GPIO_ACTIVE_LOW>; phy-reset-duration = <20>; phy-supply = <&sw2_reg>; - phy-handle = <&ethphy0>; status = "okay"; + fixed-link { + speed = <1000>; + full-duplex; + }; + mdio { #address-cells = <1>; #size-cells = <0>; -- 2.1.4

3 years, 5 months

3
2
0 0

[PATCH 00/30 for 5.4] Backport unencrypted non-blocking DMA allocations

by Peter Gonda

Currently SEV enabled guests hit might_sleep() warnings when a driver (nvme in this case) allocates through the DMA API in a non-blockable context. Making these unencrypted non-blocking DMA allocations come from the coherent pools prevents this BUG. BUG: sleeping function called from invalid context at mm/vmalloc.c:1710 in_atomic(): 1, irqs_disabled(): 0, non_block: 0, pid: 3383, name: fio 2 locks held by fio/3383: #0: ffff93b6a8568348 (&sb->s_type->i_mutex_key#16){+.+.}, at: ext4_file_write_iter+0xa2/0x5d0 #1: ffffffffa52a61a0 (rcu_read_lock){....}, at: hctx_lock+0x1a/0xe0 CPU: 0 PID: 3383 Comm: fio Tainted: G W 5.5.10 #14 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: dump_stack+0x98/0xd5 ___might_sleep+0x175/0x260 __might_sleep+0x4a/0x80 _vm_unmap_aliases+0x45/0x250 vm_unmap_aliases+0x19/0x20 __set_memory_enc_dec+0xa4/0x130 set_memory_decrypted+0x10/0x20 dma_direct_alloc_pages+0x148/0x150 dma_direct_alloc+0xe/0x10 dma_alloc_attrs+0x86/0xc0 dma_pool_alloc+0x16f/0x2b0 nvme_queue_rq+0x878/0xc30 [nvme] __blk_mq_try_issue_directly+0x135/0x200 blk_mq_request_issue_directly+0x4f/0x80 blk_mq_try_issue_list_directly+0x46/0xb0 blk_mq_sched_insert_requests+0x19b/0x2b0 blk_mq_flush_plug_list+0x22f/0x3b0 blk_flush_plug_list+0xd1/0x100 blk_finish_plug+0x2c/0x40 iomap_dio_rw+0x427/0x490 ext4_file_write_iter+0x181/0x5d0 aio_write+0x109/0x1b0 io_submit_one+0x7d0/0xfa0 __x64_sys_io_submit+0xa2/0x280 do_syscall_64+0x5f/0x250 entry_SYSCALL_64_after_hwframe+0x49/0xbe Christoph Hellwig (9): dma-direct: remove __dma_direct_free_pages dma-direct: remove the dma_handle argument to __dma_direct_alloc_pages dma-direct: provide mmap and get_sgtable method overrides dma-mapping: merge the generic remapping helpers into dma-direct dma-direct: consolidate the error handling in dma_direct_alloc_pages xtensa: use the generic uncached segment support dma-direct: make uncached_kernel_address more general dma-mapping: DMA_COHERENT_POOL should select GENERIC_ALLOCATOR dma-pool: fix coherent pool allocations for IOMMU mappings David Rientjes (13): dma-remap: separate DMA atomic pools from direct remap code dma-pool: add additional coherent pools to map to gfp mask dma-pool: dynamically expanding atomic pools dma-direct: atomic allocations must come from atomic coherent pools dma-pool: add pool sizes to debugfs x86/mm: unencrypted non-blocking DMA allocations use coherent pools dma-pool: scale the default DMA coherent pool size with memory capacity dma-pool: decouple DMA_REMAP from DMA_COHERENT_POOL dma-direct: always align allocation size in dma_direct_alloc_pages() dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails dma-direct: check return value when encrypting or decrypting memory dma-direct: add missing set_memory_decrypted() for coherent mapping dma-mapping: warn when coherent pool is depleted Geert Uytterhoeven (1): dma-pool: fix too large DMA pools on medium memory size systems Huang Shijie (1): lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr Nicolas Saenz Julienne (6): dma-direct: provide function to check physical memory area validity dma-pool: get rid of dma_in_atomic_pool() dma-pool: introduce dma_guess_pool() dma-pool: make sure atomic pool suits device dma-pool: do not allocate pool memory from CMA dma/direct: turn ARCH_ZONE_DMA_BITS into a variable Documentation/core-api/genalloc.rst | 2 +- arch/Kconfig | 8 +- arch/arc/Kconfig | 1 - arch/arm/Kconfig | 1 - arch/arm/mm/dma-mapping.c | 8 +- arch/arm64/Kconfig | 1 - arch/arm64/mm/init.c | 9 +- arch/ia64/Kconfig | 2 +- arch/ia64/kernel/dma-mapping.c | 6 - arch/microblaze/Kconfig | 3 +- arch/microblaze/mm/consistent.c | 2 +- arch/mips/Kconfig | 7 +- arch/mips/mm/dma-noncoherent.c | 8 +- arch/nios2/Kconfig | 3 +- arch/nios2/mm/dma-mapping.c | 2 +- arch/powerpc/include/asm/page.h | 9 - arch/powerpc/mm/mem.c | 20 +- arch/powerpc/platforms/Kconfig.cputype | 1 - arch/s390/include/asm/page.h | 2 - arch/s390/mm/init.c | 1 + arch/x86/Kconfig | 1 + arch/xtensa/Kconfig | 6 +- arch/xtensa/include/asm/platform.h | 27 --- arch/xtensa/kernel/Makefile | 3 +- arch/xtensa/kernel/pci-dma.c | 121 ++--------- drivers/iommu/dma-iommu.c | 5 +- drivers/misc/sram-exec.c | 2 +- include/linux/dma-direct.h | 12 +- include/linux/dma-mapping.h | 7 +- include/linux/dma-noncoherent.h | 4 +- include/linux/genalloc.h | 2 +- kernel/dma/Kconfig | 20 +- kernel/dma/Makefile | 1 + kernel/dma/direct.c | 224 ++++++++++++++++---- kernel/dma/mapping.c | 45 +---- kernel/dma/pool.c | 270 +++++++++++++++++++++++++ kernel/dma/remap.c | 176 +--------------- lib/genalloc.c | 5 +- 38 files changed, 564 insertions(+), 463 deletions(-) create mode 100644 kernel/dma/pool.c -- 2.28.0.618.gf4bc123cb7-goog

3 years, 5 months

3
38
0 0

[PATCH] thermal: intel: Initialize RW trip to THERMAL_TEMP_INVALID

by Srinivas Pandruvada

After commit 81ad4276b505 ("Thermal: Ignore invalid trip points") all user_space governor notifications via RW trip point is broken in intel thermal drivers. This commits marks trip_points with value of 0 during call to thermal_zone_device_register() as invalid. RW trip points can be 0 as user space will set the correct trip temperature later. During driver init, x86_package_temp and all int340x drivers sets RW trip temperature as 0. This results in all these trips marked as invalid by the thermal core. To fix this initialize RW trips to THERMAL_TEMP_INVALID instead of 0. Cc: <stable(a)vger.kernel.org> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> --- drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 4 ++++ drivers/thermal/intel/x86_pkg_temp_thermal.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index d1248ba943a4..62c0aa5d0783 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c @@ -237,6 +237,8 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, if (ACPI_FAILURE(status)) trip_cnt = 0; else { + int i; + int34x_thermal_zone->aux_trips = kcalloc(trip_cnt, sizeof(*int34x_thermal_zone->aux_trips), @@ -247,6 +249,8 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, } trip_mask = BIT(trip_cnt) - 1; int34x_thermal_zone->aux_trip_nr = trip_cnt; + for (i = 0; i < trip_cnt; ++i) + int34x_thermal_zone->aux_trips[i] = THERMAL_TEMP_INVALID; } trip_cnt = int340x_thermal_read_trips(int34x_thermal_zone); diff --git a/drivers/thermal/intel/x86_pkg_temp_thermal.c b/drivers/thermal/intel/x86_pkg_temp_thermal.c index 295742e83960..4d8edc61a78b 100644 --- a/drivers/thermal/intel/x86_pkg_temp_thermal.c +++ b/drivers/thermal/intel/x86_pkg_temp_thermal.c @@ -166,7 +166,7 @@ static int sys_get_trip_temp(struct thermal_zone_device *tzd, if (thres_reg_value) *temp = zonedev->tj_max - thres_reg_value * 1000; else - *temp = 0; + *temp = THERMAL_TEMP_INVALID; pr_debug("sys_get_trip_temp %d\n", *temp); return 0; -- 2.25.1

3 years, 5 months

2
3
0 0

[v5.4 stable] arm: stm32: Regression observed on "no-map" reserved memory region

by Alexandre TORGUE

Hi, Since v5.4.102 I observe a regression on stm32mp1 platform: "no-map" reserved-memory regions are no more "reserved" and make part of the kernel System RAM. This causes allocation failure for devices which try to take a reserved-memory region. It has been introduced by the following path: "fdt: Properly handle "no-map" field in the memory region [ Upstream commit 86588296acbfb1591e92ba60221e95677ecadb43 ]" which replace memblock_remove by memblock_mark_nomap in no-map case. Reverting this patch it's fine. I add part of my DT (something is maybe wrong inside): memory@c0000000 { reg = <0xc0000000 0x20000000>; }; reserved-memory { #address-cells = <1>; #size-cells = <1>; ranges; gpu_reserved: gpu@d4000000 { reg = <0xd4000000 0x4000000>; no-map; }; }; Sorry if this issue has already been raised and discussed. Thanks alex

3 years, 5 months

5
17
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror April 2021