August 2023 - Linux-stable-mirror

stable/linux-6.1.y build: 20 builds: 0 failed, 20 passed, 1 warning (v6.1.49)

by kernelci.org bot

stable/linux-6.1.y build: 20 builds: 0 failed, 20 passed, 1 warning (v6.1.49) Full Build Summary: https://kernelci.org/build/stable/branch/linux-6.1.y/kernel/v6.1.49/ Tree: stable Branch: linux-6.1.y Git Describe: v6.1.49 Git Commit: 024f76bca9d0e29513fa99e1cd0f86bfa841743b Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Built: 7 unique architectures Warnings Detected: arc: arm64: arm: i386: mips: 32r2el_defconfig (gcc-10): 1 warning riscv: x86_64: Warnings summary: 1 arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" ================================================================================ Detailed per-defconfig build reports: -------------------------------------------------------------------------------- 32r2el_defconfig (mips, gcc-10) — PASS, 0 errors, 1 warning, 0 section mismatches Warnings: arch/mips/boot/dts/img/boston.dts:128.19-178.5: Warning (pci_device_reg): /pci@14000000/pci2_root@0,0,0: PCI unit address format error, expected "0,0" -------------------------------------------------------------------------------- allnoconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- allnoconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- defconfig+arm64-chromebook (arm64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- haps_hs_smp_defconfig (arc, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- i386_defconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- imx_v6_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v5_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- multi_v7_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nommu_k210_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- nommu_k210_sdcard_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- omap2plus_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- rv32_defconfig (riscv, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (i386, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- tinyconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- vexpress_defconfig (arm, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches -------------------------------------------------------------------------------- x86_64_defconfig+x86-chromebook (x86_64, gcc-10) — PASS, 0 errors, 0 warnings, 0 section mismatches --- For more info write to <info(a)kernelci.org>

1 year, 4 months

1
0
0 0

Linux 6.1.49

by Greg Kroah-Hartman

I'm announcing the release of the 6.1.49 kernel. This upgrade is only for all users of the 6.1 series that use the x86 platform OR the F2FS file system. If that's not you, feel free to ignore this release. The updated 6.1.y git tree can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-6.1.y and can be browsed at the normal kernel.org git web browser: https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary thanks, greg k-h ------------ Makefile | 2 - fs/f2fs/f2fs.h | 1 fs/f2fs/file.c | 5 ++++ fs/f2fs/node.c | 14 +---------- fs/f2fs/super.c | 43 +++++++++++------------------------ include/linux/f2fs_fs.h | 1 tools/objtool/arch/x86/decode.c | 11 +++++--- tools/objtool/check.c | 22 +++++++++++++++++ tools/objtool/include/objtool/arch.h | 1 tools/objtool/include/objtool/elf.h | 1 10 files changed, 53 insertions(+), 48 deletions(-) Greg Kroah-Hartman (4): Revert "f2fs: don't reset unchangable mount option in f2fs_remount()" Revert "f2fs: fix to set flush_merge opt and show noflush_merge" Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()" Linux 6.1.49 Peter Zijlstra (1): objtool/x86: Fix SRSO mess

1 year, 4 months

1
1
0 0

[PATCH] x86/sgx: Describe the parameters of sgx_calc_section_metric()

by Jarkko Sakkinen

Cc: stable(a)vger.kernel.org # v5.11+ Fixes: e7e0545299d8 ("x86/sgx: Initialize metadata for Enclave Page Cache (EPC) sections") Reported-by: kernel test robot <lkp(a)intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202308221542.11UpkVfp-lkp@intel.com/ Signed-off-by: Jarkko Sakkinen <jarkko(a)kernel.org> --- arch/x86/kernel/cpu/sgx/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/x86/kernel/cpu/sgx/main.c b/arch/x86/kernel/cpu/sgx/main.c index 166692f2d501..388350b8f5e3 100644 --- a/arch/x86/kernel/cpu/sgx/main.c +++ b/arch/x86/kernel/cpu/sgx/main.c @@ -732,6 +732,10 @@ int arch_memory_failure(unsigned long pfn, int flags) } /** + * sgx_calc_section_metric() - Calculate an EPC section metric + * @low: low 32-bit word from CPUID:0x12:{2, ...} + * @high: high 32-bit word from CPUID:0x12:{2, ...} + * * A section metric is concatenated in a way that @low bits 12-31 define the * bits 12-31 of the metric and @high bits 0-19 define the bits 32-51 of the * metric. -- 2.39.2

1 year, 4 months

2
2
0 0

[PATCH stable < v6.0] can: raw: add missing refcount for memory leak fix

by Oliver Hartkopp

Commit ee8b94c8510c ("can: raw: fix receiver memory leak") introduced a new reference to the CAN netdevice that has assigned CAN filters. But this new ro->dev reference did not maintain its own refcount which lead to another KASAN use-after-free splat found by Eric Dumazet. This patch ensures a proper refcount for the CAN nedevice. Fixes: ee8b94c8510c ("can: raw: fix receiver memory leak") Reported-by: Eric Dumazet <edumazet(a)google.com> Cc: Ziyang Xuan <william.xuanziyang(a)huawei.com> Signed-off-by: Oliver Hartkopp <socketcan(a)hartkopp.net> --- net/can/raw.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/net/can/raw.c b/net/can/raw.c index e10f59375659..26285a6c968e 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -283,12 +283,14 @@ static void raw_notify(struct raw_sock *ro, unsigned long msg, switch (msg) { case NETDEV_UNREGISTER: lock_sock(sk); /* remove current filters & unregister */ - if (ro->bound) + if (ro->bound) { raw_disable_allfilters(dev_net(dev), dev, sk); + dev_put(dev); + } if (ro->count > 1) kfree(ro->filter); ro->ifindex = 0; @@ -389,14 +391,16 @@ static int raw_release(struct socket *sock) rtnl_lock(); lock_sock(sk); /* remove current filters & unregister */ if (ro->bound) { - if (ro->dev) + if (ro->dev) { raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk); - else + dev_put(ro->dev); + } else { raw_disable_allfilters(sock_net(sk), NULL, sk); + } } if (ro->count > 1) kfree(ro->filter); @@ -443,44 +447,56 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len) if (!dev) { err = -ENODEV; goto out; } if (dev->type != ARPHRD_CAN) { - dev_put(dev); err = -ENODEV; - goto out; + goto out_put_dev; } + if (!(dev->flags & IFF_UP)) notify_enetdown = 1; ifindex = dev->ifindex; /* filters set by default/setsockopt */ err = raw_enable_allfilters(sock_net(sk), dev, sk); - dev_put(dev); + if (err) + goto out_put_dev; + } else { ifindex = 0; /* filters set by default/setsockopt */ err = raw_enable_allfilters(sock_net(sk), NULL, sk); } if (!err) { if (ro->bound) { /* unregister old filters */ - if (ro->dev) + if (ro->dev) { raw_disable_allfilters(dev_net(ro->dev), ro->dev, sk); - else + /* drop reference to old ro->dev */ + dev_put(ro->dev); + } else { raw_disable_allfilters(sock_net(sk), NULL, sk); + } } ro->ifindex = ifindex; ro->bound = 1; + /* bind() ok -> hold a reference for new ro->dev */ ro->dev = dev; + if (ro->dev) + dev_hold(ro->dev); } - out: +out_put_dev: + /* remove potential reference from dev_get_by_index() */ + if (dev) + dev_put(dev); +out: release_sock(sk); rtnl_unlock(); if (notify_enetdown) { sk->sk_err = ENETDOWN; -- 2.39.2

1 year, 4 months

2
1
0 0

[PATCH 6.4.12] madvise:madvise_cold_or_pageout_pte_range(): don't use mapcount() against large folio for sharing check

by Yin Fengwei

Patch series "don't use mapcount() to check large folio sharing", v2. In madvise_cold_or_pageout_pte_range() and madvise_free_pte_range(), folio_mapcount() is used to check whether the folio is shared. But it's not correct as folio_mapcount() returns total mapcount of large folio. Use folio_estimated_sharers() here as the estimated number is enough. This patchset will fix the cases: User space application call madvise() with MADV_FREE, MADV_COLD and MADV_PAGEOUT for specific address range. There are THP mapped to the range. Without the patchset, the THP is skipped. With the patch, the THP will be split and handled accordingly. David reported the cow self test skip some cases because of MADV_PAGEOUT skip THP: https://lore.kernel.org/linux-mm/9e92e42d-488f-47db-ac9d-75b24cd0d037@intel… and I confirmed this patchset make it work again. This patch (of 3): Commit 07e8c82b5eff ("madvise: convert madvise_cold_or_pageout_pte_range() to use folios") replaced the page_mapcount() with folio_mapcount() to check whether the folio is shared by other mapping. It's not correct for large folio. folio_mapcount() returns the total mapcount of large folio which is not suitable to detect whether the folio is shared. Use folio_estimated_sharers() which returns a estimated number of shares. That means it's not 100% correct. It should be OK for madvise case here. User-visible effects is that the THP is skipped when user call madvise. But the correct behavior is THP should be split and processed then. NOTE: this change is a temporary fix to reduce the user-visible effects before the long term fix from David is ready. Link: https://lkml.kernel.org/r/20230808020917.2230692-1-fengwei.yin@intel.com Link: https://lkml.kernel.org/r/20230808020917.2230692-2-fengwei.yin@intel.com Fixes: 07e8c82b5eff ("madvise: convert madvise_cold_or_pageout_pte_range() to use folios") Signed-off-by: Yin Fengwei <fengwei.yin(a)intel.com> Reviewed-by: Yu Zhao <yuzhao(a)google.com> Reviewed-by: Ryan Roberts <ryan.roberts(a)arm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Kefeng Wang <wangkefeng.wang(a)huawei.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Minchan Kim <minchan(a)kernel.org> Cc: Vishal Moola (Oracle) <vishal.moola(a)gmail.com> Cc: Yang Shi <shy828301(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> (cherry picked from commit 2f406263e3e954aa24c1248edcfa9be0c1bb30fa) --- mm/madvise.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index b5ffbaf616f5..6adee363a9fa 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -375,7 +375,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, folio = pfn_folio(pmd_pfn(orig_pmd)); /* Do not interfere with other mappings of this folio */ - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) goto huge_unlock; if (pageout_anon_only_filter && !folio_test_anon(folio)) @@ -447,7 +447,7 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, * are sure it's worth. Split it if we are only owner. */ if (folio_test_large(folio)) { - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (pageout_anon_only_filter && !folio_test_anon(folio)) break; -- 2.39.2

1 year, 4 months

2
1
0 0

[PATCH] dt-bindings: PCI: qcom: fix SDX65 compatible

by Krzysztof Kozlowski

Commit c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") adding SDX65 was not ever tested and is clearly bogus. The qcom,sdx65-pcie-ep compatible is followed by fallback in DTS and there is no driver matching by this compatible. Driver matches by its fallback qcom,sdx55-pcie-ep. This fixes also dtbs_check warnings like: qcom-sdx65-mtp.dtb: pcie-ep@1c00000: compatible: ['qcom,sdx65-pcie-ep', 'qcom,sdx55-pcie-ep'] is too long Fixes: c0aba9f32801 ("dt-bindings: PCI: qcom: Add SDX65 SoC") Cc: <stable(a)vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> --- .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml index 811112255d7d..c94b49498f69 100644 --- a/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml +++ b/Documentation/devicetree/bindings/pci/qcom,pcie-ep.yaml @@ -11,10 +11,13 @@ maintainers: properties: compatible: - enum: - - qcom,sdx55-pcie-ep - - qcom,sdx65-pcie-ep - - qcom,sm8450-pcie-ep + oneOf: + - enum: + - qcom,sdx55-pcie-ep + - qcom,sm8450-pcie-ep + - items: + - const: qcom,sdx65-pcie-ep + - const: qcom,sdx55-pcie-ep reg: items: @@ -110,7 +113,6 @@ allOf: contains: enum: - qcom,sdx55-pcie-ep - - qcom,sdx65-pcie-ep then: properties: clocks: -- 2.34.1

1 year, 4 months

3
2
0 0

[PATCH 6.1 000/149] 6.1.46-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 6.1.46 release. There are 149 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 Tue, 15 Aug 2023 21:16:53 +0000. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.1.46-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 6.1.46-rc1 Alex Deucher <alexander.deucher(a)amd.com> drm/amd/pm/smu7: move variables to where they are used Eric Dumazet <edumazet(a)google.com> sch_netem: fix issues in netem_change() vs get_dist_table() Masahiro Yamada <masahiroy(a)kernel.org> alpha: remove __init annotation from exported page_is_ram() Simon Trimmer <simont(a)opensource.cirrus.com> ACPI: scan: Create platform device for CS35L56 David Xu <xuwd1(a)hotmail.com> platform/x86: serial-multi-instantiate: Auto detect IRQ resource for CSC3551 Nilesh Javali <njavali(a)marvell.com> scsi: qedf: Fix firmware halt over suspend and resume Nilesh Javali <njavali(a)marvell.com> scsi: qedi: Fix firmware halt over suspend and resume Karan Tilak Kumar <kartilak(a)cisco.com> scsi: fnic: Replace return codes in fnic_clean_pending_aborts() Zhu Wang <wangzhu9(a)huawei.com> scsi: core: Fix possible memory leak if device_add() fails Zhu Wang <wangzhu9(a)huawei.com> scsi: snic: Fix possible memory leak if device_add() fails Alexandra Diupina <adiupina(a)astralinux.ru> scsi: 53c700: Check that command slot is not NULL Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> scsi: ufs: renesas: Fix private allocation Michael Kelley <mikelley(a)microsoft.com> scsi: storvsc: Fix handling of virtual Fibre Channel timeouts Tony Battersby <tonyb(a)cybernetics.com> scsi: core: Fix legacy /proc parsing buffer overflow Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: report use refcount overflow Ming Lei <ming.lei(a)redhat.com> nvme-rdma: fix potential unbalanced freeze & unfreeze Ming Lei <ming.lei(a)redhat.com> nvme-tcp: fix potential unbalanced freeze & unfreeze Josef Bacik <josef(a)toxicpanda.com> btrfs: set cache_block_group_error if we find an error Qu Wenruo <wqu(a)suse.com> btrfs: reject invalid reloc tree root keys with stack dump Qu Wenruo <wqu(a)suse.com> btrfs: exit gracefully if reloc roots don't match Christoph Hellwig <hch(a)lst.de> btrfs: properly clear end of the unreserved range in cow_file_range Christoph Hellwig <hch(a)lst.de> btrfs: don't stop integrity writeback too early Josef Bacik <josef(a)toxicpanda.com> btrfs: wait for actual caching progress during allocation Bartosz Golaszewski <bartosz.golaszewski(a)linaro.org> gpio: sim: mark the GPIO chip as a one that can sleep William Breathitt Gray <william.gray(a)linaro.org> gpio: ws16c48: Fix off-by-one error in WS16C48 resource region extent Nick Child <nnac123(a)linux.ibm.com> ibmvnic: Ensure login failure recovery is safe from other resets Nick Child <nnac123(a)linux.ibm.com> ibmvnic: Do partial reset on login failure Nick Child <nnac123(a)linux.ibm.com> ibmvnic: Handle DMA unmapping of login buffs in release functions Nick Child <nnac123(a)linux.ibm.com> ibmvnic: Unmap DMA login rsp buffer on send login fail Nick Child <nnac123(a)linux.ibm.com> ibmvnic: Enforce stronger sanity checks on login response Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Reload auxiliary devices in pci error handlers Moshe Shemesh <moshe(a)nvidia.com> net/mlx5: Skip clock update work when device is in error state Shay Drory <shayd(a)nvidia.com> net/mlx5: LAG, Check correct bucket when modifying LAG Daniel Jurgens <danielj(a)nvidia.com> net/mlx5: Allow 0 for total host VFs Zhang Jianhua <chris.zjh(a)huawei.com> dmaengine: owl-dma: Modify mismatched function name Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> dmaengine: mcf-edma: Fix a potential un-allocated memory access Hao Chen <chenhao418(a)huawei.com> net: hns3: fix strscpy causing content truncation issue Ido Schimmel <idosch(a)nvidia.com> nexthop: Fix infinite nexthop bucket dump when using maximum nexthop ID Ido Schimmel <idosch(a)nvidia.com> nexthop: Make nexthop bucket dump more efficient Ido Schimmel <idosch(a)nvidia.com> nexthop: Fix infinite nexthop dump when using maximum nexthop ID Yonglong Liu <liuyonglong(a)huawei.com> net: hns3: fix deadlock issue when externel_lb and reset are executed together Jie Wang <wangjie125(a)huawei.com> net: hns3: add wait until mac link down Jie Wang <wangjie125(a)huawei.com> net: hns3: refactor hclge_mac_link_status_wait for interface reuse Vladimir Oltean <vladimir.oltean(a)nxp.com> net: dsa: ocelot: call dsa_tag_8021q_unregister() under rtnl_lock() on driver remove Li Yang <leoyang.li(a)nxp.com> net: phy: at803x: remove set/get wol callbacks for AR8032 Jonas Gorski <jonas.gorski(a)bisdn.de> net: marvell: prestera: fix handling IPv4 routes with nhid Jakub Kicinski <kuba(a)kernel.org> net: tls: avoid discarding data on record close Michael Guralnik <michaelgur(a)nvidia.com> RDMA/umem: Set iova in ODP flow Felix Fietkau <nbd(a)nbd.name> wifi: cfg80211: fix sband iftype data lookup for AP_VLAN Daniel Stone <daniels(a)collabora.com> drm/rockchip: Don't spam logs in atomic check Douglas Miller <doug.miller(a)cornelisnetworks.com> IB/hfi1: Fix possible panic during hotplug remove Piotr Gardocki <piotrx.gardocki(a)intel.com> iavf: fix potential races for FDIR filters Fedor Pchelkin <pchelkin(a)ispras.ru> drivers: vxlan: vnifilter: free percpu vni stats on error path Andrew Kanner <andrew.kanner(a)gmail.com> drivers: net: prevent tun_build_skb() to exceed the packet size limit Eric Dumazet <edumazet(a)google.com> dccp: fix data-race around dp->dccps_mss_cache Ziyang Xuan <william.xuanziyang(a)huawei.com> bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves Magnus Karlsson <magnus.karlsson(a)intel.com> xsk: fix refcount underflow in error path Florian Westphal <fw(a)strlen.de> tunnels: fix kasan splat when generating ipv4 pmtu error Eric Dumazet <edumazet(a)google.com> tcp: add missing family to tcp_set_ca_state() tracepoint Gerd Bayer <gbayer(a)linux.ibm.com> net/smc: Use correct buffer sizes when switching between TCP and SMC Eric Dumazet <edumazet(a)google.com> net/packet: annotate data-races around tp->status Xiang Yang <xiangyang3(a)huawei.com> mptcp: fix the incorrect judgment for msk->cb_flags Eric Dumazet <edumazet(a)google.com> macsec: use DEV_STATS_INC() Nathan Chancellor <nathan(a)kernel.org> mISDN: Update parameter type of dsp_cmx_send() Xu Kuohai <xukuohai(a)huawei.com> bpf, sockmap: Fix bug that strp_done cannot be called Xu Kuohai <xukuohai(a)huawei.com> bpf, sockmap: Fix map type error in sock_map_del_link Andrew Kanner <andrew.kanner(a)gmail.com> net: core: remove unnecessary frame_sz check in bpf_xdp_adjust_tail() Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: tc_flower: Relax success criterion Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: Switch off timeout Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: Skip test when no interfaces are specified Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: hw_stats_l3_gre: Skip when using veth pairs Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: ethtool_extended_state: Skip when using veth pairs Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: ethtool: Skip when using veth pairs Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: Add a helper to skip test when using veth pairs Mark Brown <broonie(a)kernel.org> selftests/rseq: Fix build with undefined __weak Neil Armstrong <neil.armstrong(a)linaro.org> interconnect: qcom: sm8450: add enable_mask for bcm nodes Mike Tipton <mdtipton(a)codeaurora.org> interconnect: qcom: Add support for mask-based BCMs Milan Zamazal <mzamazal(a)redhat.com> iio: core: Prevent invalid memory access when there is no parent Florian Westphal <fw(a)strlen.de> netfilter: nf_tables: don't skip expired elements during walk Karol Herbst <kherbst(a)redhat.com> drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes Arnd Bergmann <arnd(a)arndb.de> x86: Move gds_ucode_mitigated() declaration to header Arnd Bergmann <arnd(a)arndb.de> x86/speculation: Add cpu_show_gds() prototype Borislav Petkov (AMD) <bp(a)alien8.de> x86/sev: Do not try to parse for the CC blob on non-AMD hardware Kirill A. Shutemov <kirill.shutemov(a)linux.intel.com> x86/mm: Fix VDSO and VVAR placement on 5-level paging machines Cristian Ciocaltea <cristian.ciocaltea(a)collabora.com> x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405 Nick Desaulniers <ndesaulniers(a)google.com> x86/srso: Fix build breakage with the LLVM linker RD Babiera <rdbabiera(a)google.com> usb: typec: altmodes/displayport: Signal hpd when configuring pin assignment Badhri Jagan Sridharan <badhri(a)google.com> usb: typec: tcpm: Fix response to vsafe0V event Prashanth K <quic_prashk(a)quicinc.com> usb: common: usb-conn-gpio: Prevent bailing out if initial role is none Alan Stern <stern(a)rowland.harvard.edu> USB: Gadget: core: Help prevent panic during UVC unconfigure Elson Roy Serrao <quic_eserrao(a)quicinc.com> usb: dwc3: Properly handle processing of pending events Alan Stern <stern(a)rowland.harvard.edu> usb-storage: alauda: Fix uninit-value in alauda_check_media() Ricky WU <ricky_wu(a)realtek.com> misc: rtsx: judge ASPM Mode to set PETXCFG Reg Qi Zheng <zhengqi.arch(a)bytedance.com> binder: fix memory leak in binder_init() Alvin Šipraga <alsi(a)bang-olufsen.dk> iio: adc: ina2xx: avoid NULL pointer dereference on OF device match Alisa Roman <alisa.roman(a)analog.com> iio: adc: ad7192: Fix ac excitation feature Dan Carpenter <dan.carpenter(a)linaro.org> iio: frequency: admv1013: propagate errors from regulator_get_voltage() Yiyuan Guo <yguoaz(a)gmail.com> iio: cros_ec: Fix the allocation size for cros_ec_command Aleksa Sarai <cyphar(a)cyphar.com> io_uring: correct check for O_TMPFILE Aurabindo Pillai <aurabindo.pillai(a)amd.com> drm/amd/display: trigger timing sync only if TG is running Alex Deucher <alexander.deucher(a)amd.com> drm/amd/display: fix the build when DRM_AMD_DC_DCN is not set Alvin Lee <Alvin.Lee2(a)amd.com> drm/amd/display: Retain phantom plane/stream if validation fails Alvin Lee <Alvin.Lee2(a)amd.com> drm/amd/display: Disable phantom OTG after enable for plane disable Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Use update plane and stream routine for DCN32x Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Avoid ABM when ODM combine is enabled for eDP Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Update OTG instance in the commit stream Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Handle seamless boot stream Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Add function for validate and update new stream Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Handle virtual hardware detect Evan Quan <evan.quan(a)amd.com> drm/amd/pm: avoid unintentional shutdown due to temperature momentary fluctuation Evan Quan <evan.quan(a)amd.com> drm/amd/pm: fulfill powerplay peak profiling mode shader/memory clock settings Evan Quan <evan.quan(a)amd.com> drm/amd/pm: expose swctf threshold setting for legacy powerplay Evan Quan <evan.quan(a)amd.com> drm/amd/pm: fulfill swsmu peak profiling mode shader/memory clock settings Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput Colin Ian King <colin.i.king(a)gmail.com> radix tree test suite: fix incorrect allocation size for pthreads Tao Ren <rentao.bupt(a)gmail.com> hwmon: (pmbus/bel-pfe) Enable PMBUS_SKIP_STATUS_CHECK for pfe1100 Maulik Shah <quic_mkshah(a)quicinc.com> cpuidle: dt_idle_genpd: Add helper function to remove genpd topology Peichen Huang <peichen.huang(a)amd.com> drm/amd/display: limit DPIA link rate to HBR3 Mario Limonciello <mario.limonciello(a)amd.com> drm/amd: Disable S/G for APUs when 64GB or more host memory Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: add S/G display parameter Melissa Wen <mwen(a)igalia.com> drm/amd/display: check attr flag before set cursor degamma on DCN3+ Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu: fix possible UAF in amdgpu_cs_pass1() Boris Brezillon <boris.brezillon(a)collabora.com> drm/shmem-helper: Reset vma->vm_ops before calling dma_buf_mmap() Lyude Paul <lyude(a)redhat.com> drm/nouveau/nvkm/dp: Add workaround to fix DP 1.3+ DPCD issues Karol Herbst <kherbst(a)redhat.com> drm/nouveau/gr: enable memory loads on helper invocation on all channels August Wikerfors <git(a)augustwikerfors.se> nvme-pci: add NVME_QUIRK_BOGUS_NID for Samsung PM9B1 256G and 512G Torsten Duwe <duwe(a)suse.de> riscv/kexec: handle R_RISCV_CALL_PLT relocation type Andrea Parri <parri.andrea(a)gmail.com> riscv,mmio: Fix readX()-to-delay() ordering Torsten Duwe <duwe(a)suse.de> riscv/kexec: load initrd high in available memory Souradeep Chakrabarti <schakrabarti(a)linux.microsoft.com> net: mana: Fix MANA VF unload when hardware is unresponsive Ilpo Järvinen <ilpo.jarvinen(a)linux.intel.com> dmaengine: pl330: Return DMA_PAUSED when transaction is paused Paolo Abeni <pabeni(a)redhat.com> mptcp: fix disconnect vs accept race Paolo Abeni <pabeni(a)redhat.com> mptcp: avoid bogus reset on fallback close Andrea Claudi <aclaudi(a)redhat.com> selftests: mptcp: join: fix 'implicit EP' test Andrea Claudi <aclaudi(a)redhat.com> selftests: mptcp: join: fix 'delete and re-add' test Maciej Żenczykowski <maze(a)google.com> ipv6: adjust ndisc_is_useropt() to also return true for PIO Sergei Antonov <saproj(a)gmail.com> mmc: moxart: read scr register without changing byte order Jason A. Donenfeld <Jason(a)zx2c4.com> wireguard: allowedips: expand maximum node depth Ido Schimmel <idosch(a)nvidia.com> selftests: forwarding: Set default IPv6 traceroute utility Ping-Ke Shih <pkshih(a)realtek.com> wifi: rtw89: fix 8852AE disconnection caused by RX full flags Keith Yeo <keithyjy(a)gmail.com> wifi: nl80211: fix integer overflow in nl80211_parse_mbssid_elems() Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV: only access GHCB fields once Paolo Bonzini <pbonzini(a)redhat.com> KVM: SEV: snapshot the GHCB before accessing it Namjae Jeon <linkinjeon(a)kernel.org> ksmbd: fix wrong next length validation of ea buffer in smb2_set_ea() Long Li <leo.lilong(a)huawei.com> ksmbd: validate command request size Mario Limonciello <mario.limonciello(a)amd.com> tpm: Add a helper for checking hwrng enabled Mario Limonciello <mario.limonciello(a)amd.com> tpm: Disable RNG for all AMD fTPMs Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Revert "loongarch/cpu: Switch to arch_cpu_finalize_init()" Kees Cook <keescook(a)chromium.org> gcc-plugins: Reorganize gimple includes for GCC 13 ------------- Diffstat: Makefile | 4 +- arch/alpha/kernel/setup.c | 3 +- arch/loongarch/Kconfig | 1 - arch/loongarch/kernel/setup.c | 6 - arch/riscv/include/asm/mmio.h | 16 +- arch/riscv/kernel/elf_kexec.c | 3 +- arch/x86/boot/compressed/idt_64.c | 9 +- arch/x86/boot/compressed/sev.c | 37 +++- arch/x86/entry/vdso/vma.c | 4 +- arch/x86/include/asm/processor.h | 2 + arch/x86/kernel/cpu/amd.c | 1 + arch/x86/kernel/vmlinux.lds.S | 12 +- arch/x86/kvm/svm/sev.c | 94 +++++---- arch/x86/kvm/svm/svm.h | 26 +++ arch/x86/kvm/x86.c | 2 - drivers/acpi/scan.c | 1 + drivers/android/binder.c | 1 + drivers/android/binder_alloc.c | 6 + drivers/android/binder_alloc.h | 1 + drivers/char/tpm/tpm-chip.c | 83 ++------ drivers/char/tpm/tpm_crb.c | 30 +++ drivers/cpuidle/dt_idle_genpd.c | 24 +++ drivers/cpuidle/dt_idle_genpd.h | 7 + drivers/dma/mcf-edma.c | 13 +- drivers/dma/owl-dma.c | 2 +- drivers/dma/pl330.c | 18 +- drivers/gpio/gpio-sim.c | 1 + drivers/gpio/gpio-ws16c48.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 26 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 + drivers/gpu/drm/amd/display/dc/core/dc.c | 74 ++++++- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 5 + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 234 ++++++++++++++++++++- drivers/gpu/drm/amd/display/dc/dc.h | 6 + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 6 + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 7 +- drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 8 + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 22 ++ .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 3 + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 2 + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 58 ++++- .../drm/amd/pm/powerplay/hwmgr/hardwaremanager.c | 4 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 80 +++++-- .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 16 +- .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 27 +-- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 41 +++- .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 26 +++ .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 24 +-- drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 4 + drivers/gpu/drm/amd/pm/powerplay/inc/power_state.h | 1 + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 42 ++++ drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 2 + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 9 +- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 9 +- drivers/gpu/drm/drm_gem_shmem_helper.c | 6 + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 48 ++++- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 1 + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 4 +- drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c | 10 + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c | 1 + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 17 +- drivers/hwmon/pmbus/bel-pfe.c | 16 +- drivers/iio/adc/ad7192.c | 16 +- drivers/iio/adc/ina2xx-adc.c | 9 +- .../common/cros_ec_sensors/cros_ec_sensors_core.c | 2 +- drivers/iio/frequency/admv1013.c | 5 +- drivers/iio/industrialio-core.c | 5 +- drivers/infiniband/core/umem.c | 3 +- drivers/infiniband/hw/hfi1/chip.c | 1 + drivers/interconnect/qcom/bcm-voter.c | 5 + drivers/interconnect/qcom/icc-rpmh.h | 2 + drivers/interconnect/qcom/sm8450.c | 9 + drivers/isdn/mISDN/dsp.h | 2 +- drivers/isdn/mISDN/dsp_cmx.c | 2 +- drivers/isdn/mISDN/dsp_core.c | 2 +- drivers/misc/cardreader/rts5227.c | 2 +- drivers/misc/cardreader/rts5228.c | 18 -- drivers/misc/cardreader/rts5249.c | 3 +- drivers/misc/cardreader/rts5260.c | 18 -- drivers/misc/cardreader/rts5261.c | 18 -- drivers/misc/cardreader/rtsx_pcr.c | 5 +- drivers/mmc/host/moxart-mmc.c | 8 +- drivers/net/bonding/bond_main.c | 4 +- drivers/net/dsa/ocelot/felix.c | 2 + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 14 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 4 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 24 ++- drivers/net/ethernet/ibm/ibmvnic.c | 112 ++++++++-- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 5 +- drivers/net/ethernet/intel/iavf/iavf_fdir.c | 11 +- .../ethernet/marvell/prestera/prestera_router.c | 14 +- .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 2 +- .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 5 + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 3 +- drivers/net/ethernet/microsoft/mana/mana_en.c | 37 +++- drivers/net/macsec.c | 28 +-- drivers/net/phy/at803x.c | 2 - drivers/net/tun.c | 2 +- drivers/net/vxlan/vxlan_vnifilter.c | 11 +- drivers/net/wireguard/allowedips.c | 8 +- drivers/net/wireguard/selftest/allowedips.c | 16 +- drivers/net/wireless/realtek/rtw89/mac.c | 2 +- drivers/nvme/host/pci.c | 3 +- drivers/nvme/host/rdma.c | 3 +- drivers/nvme/host/tcp.c | 3 +- drivers/platform/x86/serial-multi-instantiate.c | 35 ++- drivers/scsi/53c700.c | 2 +- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_scsi.c | 6 +- drivers/scsi/qedf/qedf_main.c | 18 ++ drivers/scsi/qedi/qedi_main.c | 18 ++ drivers/scsi/raid_class.c | 1 + drivers/scsi/scsi_proc.c | 30 +-- drivers/scsi/snic/snic_disc.c | 1 + drivers/scsi/storvsc_drv.c | 4 - drivers/ufs/host/ufs-renesas.c | 2 +- drivers/usb/common/usb-conn-gpio.c | 6 +- drivers/usb/dwc3/gadget.c | 9 +- drivers/usb/gadget/udc/core.c | 9 + drivers/usb/storage/alauda.c | 12 +- drivers/usb/typec/altmodes/displayport.c | 18 +- drivers/usb/typec/tcpm/tcpm.c | 7 + fs/btrfs/block-group.c | 17 +- fs/btrfs/block-group.h | 2 + fs/btrfs/disk-io.c | 3 +- fs/btrfs/extent-tree.c | 5 +- fs/btrfs/extent_io.c | 7 +- fs/btrfs/inode.c | 10 +- fs/btrfs/relocation.c | 45 +++- fs/btrfs/tree-checker.c | 14 ++ fs/nilfs2/inode.c | 8 + fs/nilfs2/segment.c | 2 + fs/nilfs2/the_nilfs.h | 2 + fs/smb/server/smb2misc.c | 10 +- fs/smb/server/smb2pdu.c | 9 +- include/linux/cpu.h | 2 + include/linux/skmsg.h | 1 + include/linux/tpm.h | 1 + include/net/cfg80211.h | 3 + include/net/netfilter/nf_tables.h | 31 ++- include/trace/events/tcp.h | 5 +- io_uring/openclose.c | 6 +- net/core/filter.c | 6 - net/core/skmsg.c | 10 +- net/core/sock_map.c | 10 +- net/dccp/output.c | 2 +- net/dccp/proto.c | 10 +- net/ipv4/ip_tunnel_core.c | 2 +- net/ipv4/nexthop.c | 28 +-- net/ipv6/ndisc.c | 3 +- net/mptcp/protocol.c | 4 +- net/mptcp/protocol.h | 1 - net/mptcp/subflow.c | 58 ++--- net/netfilter/nf_tables_api.c | 167 +++++++++------ net/netfilter/nft_flow_offload.c | 6 +- net/netfilter/nft_immediate.c | 8 +- net/netfilter/nft_objref.c | 8 +- net/netfilter/nft_set_hash.c | 2 - net/netfilter/nft_set_pipapo.c | 18 +- net/netfilter/nft_set_rbtree.c | 2 - net/packet/af_packet.c | 16 +- net/sched/sch_netem.c | 59 +++--- net/smc/af_smc.c | 73 +++++-- net/tls/tls_device.c | 64 +++--- net/wireless/nl80211.c | 5 +- net/xdp/xsk.c | 1 + scripts/gcc-plugins/gcc-common.h | 4 +- tools/testing/radix-tree/regression1.c | 2 +- tools/testing/selftests/net/fib_nexthops.sh | 10 + tools/testing/selftests/net/forwarding/ethtool.sh | 2 + .../net/forwarding/ethtool_extended_state.sh | 2 + .../selftests/net/forwarding/hw_stats_l3_gre.sh | 2 + .../net/forwarding/ip6_forward_instats_vrf.sh | 2 + tools/testing/selftests/net/forwarding/lib.sh | 17 ++ tools/testing/selftests/net/forwarding/settings | 1 + .../testing/selftests/net/forwarding/tc_flower.sh | 8 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +- tools/testing/selftests/rseq/Makefile | 4 +- tools/testing/selftests/rseq/rseq.c | 2 + 192 files changed, 1992 insertions(+), 745 deletions(-)

1 year, 4 months

13
166
0 0

FAILED: patch "[PATCH] madvise:madvise_free_pte_range(): don't use mapcount()" failed to apply to 6.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.4.y git checkout FETCH_HEAD git cherry-pick -x 0e0e9bd5f7b9d40fd03b70092367247d52da1db0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023082614-choice-mongoose-0731@gregkh' --subject-prefix 'PATCH 6.4.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 0e0e9bd5f7b9d40fd03b70092367247d52da1db0 Mon Sep 17 00:00:00 2001 From: Yin Fengwei <fengwei.yin(a)intel.com> Date: Tue, 8 Aug 2023 10:09:17 +0800 Subject: [PATCH] madvise:madvise_free_pte_range(): don't use mapcount() against large folio for sharing check Commit 98b211d6415f ("madvise: convert madvise_free_pte_range() to use a folio") replaced the page_mapcount() with folio_mapcount() to check whether the folio is shared by other mapping. It's not correct for large folios. folio_mapcount() returns the total mapcount of large folio which is not suitable to detect whether the folio is shared. Use folio_estimated_sharers() which returns a estimated number of shares. That means it's not 100% correct. It should be OK for madvise case here. User-visible effects is that the THP is skipped when user call madvise. But the correct behavior is THP should be split and processed then. NOTE: this change is a temporary fix to reduce the user-visible effects before the long term fix from David is ready. Link: https://lkml.kernel.org/r/20230808020917.2230692-4-fengwei.yin@intel.com Fixes: 98b211d6415f ("madvise: convert madvise_free_pte_range() to use a folio") Signed-off-by: Yin Fengwei <fengwei.yin(a)intel.com> Reviewed-by: Yu Zhao <yuzhao(a)google.com> Reviewed-by: Ryan Roberts <ryan.roberts(a)arm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Kefeng Wang <wangkefeng.wang(a)huawei.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Minchan Kim <minchan(a)kernel.org> Cc: Vishal Moola (Oracle) <vishal.moola(a)gmail.com> Cc: Yang Shi <shy828301(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> diff --git a/mm/madvise.c b/mm/madvise.c index 46802b4cf65a..ec30f48f8f2e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -680,7 +680,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, if (folio_test_large(folio)) { int err; - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (!folio_trylock(folio)) break;

1 year, 4 months

2
1
0 0

FAILED: patch "[PATCH] madvise:madvise_free_pte_range(): don't use mapcount()" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 0e0e9bd5f7b9d40fd03b70092367247d52da1db0 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023082616-velocity-mocha-97c0@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 0e0e9bd5f7b9 ("madvise:madvise_free_pte_range(): don't use mapcount() against large folio for sharing check") f3cd4ab0aabf ("mm/madvise: clean up pte_offset_map_lock() scans") 07e8c82b5eff ("madvise: convert madvise_cold_or_pageout_pte_range() to use folios") fd3b1bc3c86e ("mm/madvise: fix madvise_pageout for private file mappings") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 0e0e9bd5f7b9d40fd03b70092367247d52da1db0 Mon Sep 17 00:00:00 2001 From: Yin Fengwei <fengwei.yin(a)intel.com> Date: Tue, 8 Aug 2023 10:09:17 +0800 Subject: [PATCH] madvise:madvise_free_pte_range(): don't use mapcount() against large folio for sharing check Commit 98b211d6415f ("madvise: convert madvise_free_pte_range() to use a folio") replaced the page_mapcount() with folio_mapcount() to check whether the folio is shared by other mapping. It's not correct for large folios. folio_mapcount() returns the total mapcount of large folio which is not suitable to detect whether the folio is shared. Use folio_estimated_sharers() which returns a estimated number of shares. That means it's not 100% correct. It should be OK for madvise case here. User-visible effects is that the THP is skipped when user call madvise. But the correct behavior is THP should be split and processed then. NOTE: this change is a temporary fix to reduce the user-visible effects before the long term fix from David is ready. Link: https://lkml.kernel.org/r/20230808020917.2230692-4-fengwei.yin@intel.com Fixes: 98b211d6415f ("madvise: convert madvise_free_pte_range() to use a folio") Signed-off-by: Yin Fengwei <fengwei.yin(a)intel.com> Reviewed-by: Yu Zhao <yuzhao(a)google.com> Reviewed-by: Ryan Roberts <ryan.roberts(a)arm.com> Cc: David Hildenbrand <david(a)redhat.com> Cc: Kefeng Wang <wangkefeng.wang(a)huawei.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Minchan Kim <minchan(a)kernel.org> Cc: Vishal Moola (Oracle) <vishal.moola(a)gmail.com> Cc: Yang Shi <shy828301(a)gmail.com> Cc: <stable(a)vger.kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> diff --git a/mm/madvise.c b/mm/madvise.c index 46802b4cf65a..ec30f48f8f2e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -680,7 +680,7 @@ static int madvise_free_pte_range(pmd_t *pmd, unsigned long addr, if (folio_test_large(folio)) { int err; - if (folio_mapcount(folio) != 1) + if (folio_estimated_sharers(folio) != 1) break; if (!folio_trylock(folio)) break;

1 year, 4 months

2
1
0 0

FAILED: patch "[PATCH] hwmon: (aquacomputer_d5next) Add selective 200ms delay after" failed to apply to 6.1-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <stable(a)vger.kernel.org>. To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 56b930dcd88c2adc261410501c402c790980bdb5 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to '<stable(a)vger.kernel.org>' --in-reply-to '2023081222-chummy-aqueduct-85c2@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: 56b930dcd88c ("hwmon: (aquacomputer_d5next) Add selective 200ms delay after sending ctrl report") 19692f17cd13 ("hwmon: (aquacomputer_d5next) Add support for Aquacomputer Aquastream XT") 866e630a3b8b ("hwmon: (aquacomputer_d5next) Add temperature offset control for Aquaero") 6c83ccb10c49 ("hwmon: (aquacomputer_d5next) Add infrastructure for Aquaero control reports") b29090bac935 ("hwmon: (aquacomputer_d5next) Device dependent control report settings") 7505dab78f58 ("hwmon: (aquacomputer_d5next) Add support for Aquacomputer Aquastream Ultimate") e0f6c370f0ad ("hwmon: (aquacomputer_d5next) Add support for Aquacomputer Poweradjust 3") 3d2e9f582a8e ("hwmon: (aquacomputer_d5next) Add support for reading calculated Aquaero sensors") 2c55211104b4 ("hwmon: (aquacomputer_d5next) Support sensors for Aquacomputer Aquaero") ad2f0811fbeb ("hwmon: (aquacomputer_d5next) Device dependent serial number and firmware offsets") 249c752110a5 ("hwmon: (aquacomputer_d5next) Add structure for fan layout") 8bcb02bdc638 ("hwmon: (aquacomputer_d5next) Rename AQC_TEMP_SENSOR_SIZE to AQC_SENSOR_SIZE") 6ff838f2877d ("hwmon: (aquacomputer_d5next) Add support for Quadro flow sensor pulses") d5d896b83822 ("hwmon: (aquacomputer_d5next) Clear up macros and comments") 662d20b3a5af ("hwmon: (aquacomputer_d5next) Add support for temperature sensor offsets") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 56b930dcd88c2adc261410501c402c790980bdb5 Mon Sep 17 00:00:00 2001 From: Aleksa Savic <savicaleksa83(a)gmail.com> Date: Mon, 7 Aug 2023 19:20:03 +0200 Subject: [PATCH] hwmon: (aquacomputer_d5next) Add selective 200ms delay after sending ctrl report Add a 200ms delay after sending a ctrl report to Quadro, Octo, D5 Next and Aquaero to give them enough time to process the request and save the data to memory. Otherwise, under heavier userspace loads where multiple sysfs entries are usually set in quick succession, a new ctrl report could be requested from the device while it's still processing the previous one and fail with -EPIPE. The delay is only applied if two ctrl report operations are near each other in time. Reported by a user on Github [1] and tested by both of us. [1] https://github.com/aleksamagicka/aquacomputer_d5next-hwmon/issues/82 Fixes: 752b927951ea ("hwmon: (aquacomputer_d5next) Add support for Aquacomputer Octo") Signed-off-by: Aleksa Savic <savicaleksa83(a)gmail.com> Link: https://lore.kernel.org/r/20230807172004.456968-1-savicaleksa83@gmail.com Signed-off-by: Guenter Roeck <linux(a)roeck-us.net> diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomputer_d5next.c index a997dbcb563f..023807859be7 100644 --- a/drivers/hwmon/aquacomputer_d5next.c +++ b/drivers/hwmon/aquacomputer_d5next.c @@ -13,9 +13,11 @@ #include <linux/crc16.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/hid.h> #include <linux/hwmon.h> #include <linux/jiffies.h> +#include <linux/ktime.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/seq_file.h> @@ -63,6 +65,8 @@ static const char *const aqc_device_names[] = { #define CTRL_REPORT_ID 0x03 #define AQUAERO_CTRL_REPORT_ID 0x0b +#define CTRL_REPORT_DELAY 200 /* ms */ + /* The HID report that the official software always sends * after writing values, currently same for all devices */ @@ -527,6 +531,9 @@ struct aqc_data { int secondary_ctrl_report_size; u8 *secondary_ctrl_report; + ktime_t last_ctrl_report_op; + int ctrl_report_delay; /* Delay between two ctrl report operations, in ms */ + int buffer_size; u8 *buffer; int checksum_start; @@ -611,17 +618,35 @@ static int aqc_aquastreamxt_convert_fan_rpm(u16 val) return 0; } +static void aqc_delay_ctrl_report(struct aqc_data *priv) +{ + /* + * If previous read or write is too close to this one, delay the current operation + * to give the device enough time to process the previous one. + */ + if (priv->ctrl_report_delay) { + s64 delta = ktime_ms_delta(ktime_get(), priv->last_ctrl_report_op); + + if (delta < priv->ctrl_report_delay) + msleep(priv->ctrl_report_delay - delta); + } +} + /* Expects the mutex to be locked */ static int aqc_get_ctrl_data(struct aqc_data *priv) { int ret; + aqc_delay_ctrl_report(priv); + memset(priv->buffer, 0x00, priv->buffer_size); ret = hid_hw_raw_request(priv->hdev, priv->ctrl_report_id, priv->buffer, priv->buffer_size, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret < 0) ret = -ENODATA; + priv->last_ctrl_report_op = ktime_get(); + return ret; } @@ -631,6 +656,8 @@ static int aqc_send_ctrl_data(struct aqc_data *priv) int ret; u16 checksum; + aqc_delay_ctrl_report(priv); + /* Checksum is not needed for Aquaero */ if (priv->kind != aquaero) { /* Init and xorout value for CRC-16/USB is 0xffff */ @@ -646,12 +673,16 @@ static int aqc_send_ctrl_data(struct aqc_data *priv) ret = hid_hw_raw_request(priv->hdev, priv->ctrl_report_id, priv->buffer, priv->buffer_size, HID_FEATURE_REPORT, HID_REQ_SET_REPORT); if (ret < 0) - return ret; + goto record_access_and_ret; /* The official software sends this report after every change, so do it here as well */ ret = hid_hw_raw_request(priv->hdev, priv->secondary_ctrl_report_id, priv->secondary_ctrl_report, priv->secondary_ctrl_report_size, HID_FEATURE_REPORT, HID_REQ_SET_REPORT); + +record_access_and_ret: + priv->last_ctrl_report_op = ktime_get(); + return ret; } @@ -1524,6 +1555,7 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id) priv->buffer_size = AQUAERO_CTRL_REPORT_SIZE; priv->temp_ctrl_offset = AQUAERO_TEMP_CTRL_OFFSET; + priv->ctrl_report_delay = CTRL_REPORT_DELAY; priv->temp_label = label_temp_sensors; priv->virtual_temp_label = label_virtual_temp_sensors; @@ -1547,6 +1579,7 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id) priv->temp_ctrl_offset = D5NEXT_TEMP_CTRL_OFFSET; priv->buffer_size = D5NEXT_CTRL_REPORT_SIZE; + priv->ctrl_report_delay = CTRL_REPORT_DELAY; priv->power_cycle_count_offset = D5NEXT_POWER_CYCLES; @@ -1597,6 +1630,7 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id) priv->temp_ctrl_offset = OCTO_TEMP_CTRL_OFFSET; priv->buffer_size = OCTO_CTRL_REPORT_SIZE; + priv->ctrl_report_delay = CTRL_REPORT_DELAY; priv->power_cycle_count_offset = OCTO_POWER_CYCLES; @@ -1624,6 +1658,7 @@ static int aqc_probe(struct hid_device *hdev, const struct hid_device_id *id) priv->temp_ctrl_offset = QUADRO_TEMP_CTRL_OFFSET; priv->buffer_size = QUADRO_CTRL_REPORT_SIZE; + priv->ctrl_report_delay = CTRL_REPORT_DELAY; priv->flow_pulses_ctrl_offset = QUADRO_FLOW_PULSES_CTRL_OFFSET; priv->power_cycle_count_offset = QUADRO_POWER_CYCLES;

1 year, 4 months

4
5
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror August 2023