June 2023 - Linux-stable-mirror

[PATCH] rust: allocator: Prevents mis-aligned allocation

by Boqun Feng

Currently the KernelAllocator simply passes the size of the type Layout to krealloc(), and in theory the alignment requirement from the type Layout may be larger than the guarantee provided by SLAB, which means the allocated object is mis-aligned. Fixes this by adjusting the allocation size to the nearest power of two, which SLAB always guarantees a size-aligned allocation. And because Rust guarantees that original size must be a multiple of alignment and the alignment must be a power of two, then the alignment requirement is satisfied. Suggested-by: Vlastimil Babka <vbabka(a)suse.cz> Co-developed-by: Andreas Hindborg (Samsung) <nmi(a)metaspace.dk> Signed-off-by: Andreas Hindborg (Samsung) <nmi(a)metaspace.dk> Signed-off-by: Boqun Feng <boqun.feng(a)gmail.com> Cc: stable(a)vger.kernel.org # v6.1+ --- Some more explanation: * Layout is a data structure describing a particular memory layout, conceptionally it has two fields: align and size. * align is guaranteed to be a power of two. * size can be smaller than align (only when the Layout is created via Layout::from_align_size()) * After pad_to_align(), the size is guaranteed to be a multiple of align For more information, please see: https://doc.rust-lang.org/stable/std/alloc/struct.Layout.html rust/bindings/bindings_helper.h | 1 + rust/kernel/allocator.rs | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h index 3e601ce2548d..6619ce95dd37 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -15,3 +15,4 @@ /* `bindgen` gets confused at certain things. */ const gfp_t BINDINGS_GFP_KERNEL = GFP_KERNEL; const gfp_t BINDINGS___GFP_ZERO = __GFP_ZERO; +const size_t BINDINGS_ARCH_SLAB_MINALIGN = ARCH_SLAB_MINALIGN; diff --git a/rust/kernel/allocator.rs b/rust/kernel/allocator.rs index 397a3dd57a9b..66575cf87ce2 100644 --- a/rust/kernel/allocator.rs +++ b/rust/kernel/allocator.rs @@ -11,9 +11,24 @@ unsafe impl GlobalAlloc for KernelAllocator { unsafe fn alloc(&self, layout: Layout) -> *mut u8 { + // Customized layouts from `Layout::from_size_align()` can have size < align, so pads first. + let layout = layout.pad_to_align(); + + let mut size = layout.size(); + + if layout.align() > bindings::BINDINGS_ARCH_SLAB_MINALIGN { + // The alignment requirement exceeds the slab guarantee, then tries to enlarges the size + // to use the "power-of-two" size/alignment guarantee (see comments in kmalloc() for + // more information). + // + // Note that `layout.size()` (after padding) is guaranteed to be muliples of + // `layout.align()`, so `next_power_of_two` gives enough alignment guarantee. + size = size.next_power_of_two(); + } + // `krealloc()` is used instead of `kmalloc()` because the latter is // an inline function and cannot be bound to as a result. - unsafe { bindings::krealloc(ptr::null(), layout.size(), bindings::GFP_KERNEL) as *mut u8 } + unsafe { bindings::krealloc(ptr::null(), size, bindings::GFP_KERNEL) as *mut u8 } } unsafe fn dealloc(&self, ptr: *mut u8, _layout: Layout) { -- 2.39.2

9 months, 1 week

6
6
0 0

[PATCH v3] xen: speed up grant-table reclaim

by Demi Marie Obenour

When a grant entry is still in use by the remote domain, Linux must put it on a deferred list. Normally, this list is very short, because the PV network and block protocols expect the backend to unmap the grant first. However, Qubes OS's GUI protocol is subject to the constraints of the X Window System, and as such winds up with the frontend unmapping the window first. As a result, the list can grow very large, resulting in a massive memory leak and eventual VM freeze. To partially solve this problem, make the number of entries that the VM will attempt to free at each iteration tunable. The default is still 10, but it can be overridden at compile-time (via Kconfig), boot-time (via a kernel command-line option), or runtime (via sysfs). This is Cc: stable because (when combined with appropriate userspace changes) it fixes a severe performance and stability problem for Qubes OS users. Cc: stable(a)vger.kernel.org Signed-off-by: Demi Marie Obenour <demi(a)invisiblethingslab.com> --- drivers/xen/grant-table.c | 40 ++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) Changes since v2: - use atomic_inc_return(x) and atomic_dec_return(x) instead of atomic_add_return(1, x) and atomic_sub_return(1, x) respectively. - move module_param macro closer to the definition of free_per_iteration. - add blank line between declarations and statements. Changes since v1: - drop setting default via Kconfig diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index e1ec725c2819d4d5dede063eb00d86a6d52944c0..f13c3b76ad1eb7110e2a2981e9fa4e504174e431 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -498,14 +498,21 @@ static LIST_HEAD(deferred_list); static void gnttab_handle_deferred(struct timer_list *); static DEFINE_TIMER(deferred_timer, gnttab_handle_deferred); +static atomic64_t deferred_count; +static atomic64_t leaked_count; +static unsigned int free_per_iteration = 10; +module_param(free_per_iteration, uint, 0600); + static void gnttab_handle_deferred(struct timer_list *unused) { - unsigned int nr = 10; + unsigned int nr = READ_ONCE(free_per_iteration); + const bool ignore_limit = nr == 0; struct deferred_entry *first = NULL; unsigned long flags; + size_t freed = 0; spin_lock_irqsave(&gnttab_list_lock, flags); - while (nr--) { + while ((ignore_limit || nr--) && !list_empty(&deferred_list)) { struct deferred_entry *entry = list_first_entry(&deferred_list, struct deferred_entry, list); @@ -515,10 +522,14 @@ static void gnttab_handle_deferred(struct timer_list *unused) list_del(&entry->list); spin_unlock_irqrestore(&gnttab_list_lock, flags); if (_gnttab_end_foreign_access_ref(entry->ref)) { + uint64_t ret = atomic64_dec_return(&deferred_count); + put_free_entry(entry->ref); - pr_debug("freeing g.e. %#x (pfn %#lx)\n", - entry->ref, page_to_pfn(entry->page)); + pr_debug("freeing g.e. %#x (pfn %#lx), %llu remaining\n", + entry->ref, page_to_pfn(entry->page), + (unsigned long long)ret); put_page(entry->page); + freed++; kfree(entry); entry = NULL; } else { @@ -530,21 +541,22 @@ static void gnttab_handle_deferred(struct timer_list *unused) spin_lock_irqsave(&gnttab_list_lock, flags); if (entry) list_add_tail(&entry->list, &deferred_list); - else if (list_empty(&deferred_list)) - break; } - if (!list_empty(&deferred_list) && !timer_pending(&deferred_timer)) { + if (list_empty(&deferred_list)) + WARN_ON(atomic64_read(&deferred_count)); + else if (!timer_pending(&deferred_timer)) { deferred_timer.expires = jiffies + HZ; add_timer(&deferred_timer); } spin_unlock_irqrestore(&gnttab_list_lock, flags); + pr_debug("Freed %zu references", freed); } static void gnttab_add_deferred(grant_ref_t ref, struct page *page) { struct deferred_entry *entry; gfp_t gfp = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL; - const char *what = KERN_WARNING "leaking"; + uint64_t leaked, deferred; entry = kmalloc(sizeof(*entry), gfp); if (!page) { @@ -567,10 +579,16 @@ static void gnttab_add_deferred(grant_ref_t ref, struct page *page) add_timer(&deferred_timer); } spin_unlock_irqrestore(&gnttab_list_lock, flags); - what = KERN_DEBUG "deferring"; + deferred = atomic64_inc_return(&deferred_count); + leaked = atomic64_read(&leaked_count); + pr_debug("deferring g.e. %#x (pfn %#lx) (total deferred %llu, total leaked %llu)\n", + ref, page ? page_to_pfn(page) : -1, deferred, leaked); + } else { + deferred = atomic64_read(&deferred_count); + leaked = atomic64_inc_return(&leaked_count); + pr_warn("leaking g.e. %#x (pfn %#lx) (total deferred %llu, total leaked %llu)\n", + ref, page ? page_to_pfn(page) : -1, deferred, leaked); } - printk("%s g.e. %#x (pfn %#lx)\n", - what, ref, page ? page_to_pfn(page) : -1); } int gnttab_try_end_foreign_access(grant_ref_t ref) -- Sincerely, Demi Marie Obenour (she/her/hers) Invisible Things Lab

9 months, 1 week

3
5
0 0

[PATCH] mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC)

by Paul Fertser

On DBDC devices the first (internal) phy is only capable of using 2.4 GHz band, and the 5 GHz band is exposed via a separate phy object, so avoid the false advertising. Reported-by: Rani Hod <rani.hod(a)gmail.com> Closes: https://github.com/openwrt/openwrt/pull/12361 Fixes: 7660a1bd0c22 ("mt76: mt7615: register ext_phy if DBDC is detected") Cc: stable(a)vger.kernel.org Signed-off-by: Paul Fertser <fercerpav(a)gmail.com> --- drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c index 68e88224b8b1..ccedea7e8a50 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/eeprom.c @@ -128,12 +128,12 @@ mt7615_eeprom_parse_hw_band_cap(struct mt7615_dev *dev) case MT_EE_5GHZ: dev->mphy.cap.has_5ghz = true; break; - case MT_EE_2GHZ: - dev->mphy.cap.has_2ghz = true; - break; case MT_EE_DBDC: dev->dbdc_support = true; fallthrough; + case MT_EE_2GHZ: + dev->mphy.cap.has_2ghz = true; + break; default: dev->mphy.cap.has_2ghz = true; dev->mphy.cap.has_5ghz = true; -- 2.34.1

9 months, 1 week

5
7
0 0

[PATCH 5.15 00/96] 5.15.119-rc1 review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.15.119 release. There are 96 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, 28 Jun 2023 18:07:23 +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.119-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.119-rc1 Clark Wang <xiaoning.wang(a)nxp.com> i2c: imx-lpi2c: fix type char overflow issue when calculating the clock cycle Dheeraj Kumar Srivastava <dheerajkumar.srivastava(a)amd.com> x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys Andrey Smetanin <asmetanin(a)yandex-team.ru> vhost_net: revert upend_idx only on retriable error Min Li <lm0963hack(a)gmail.com> drm/radeon: fix race condition UAF in radeon_gem_set_domain_ioctl Min Li <lm0963hack(a)gmail.com> drm/exynos: fix race condition UAF in exynos_g2d_exec_ioctl Inki Dae <inki.dae(a)samsung.com> drm/exynos: vidi: fix a wrong error return Linus Walleij <linus.walleij(a)linaro.org> ARM: dts: Fix erroneous ADS touchscreen polarities Alexander Gordeev <agordeev(a)linux.ibm.com> s390/purgatory: disable branch profiling Edson Juliano Drosdeck <edson.drosdeck(a)gmail.com> ASoC: nau8824: Add quirk to active-high jack-detect Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> soundwire: dmi-quirks: add new mapping for HP Spectre x360 Herve Codina <herve.codina(a)bootlin.com> ASoC: simple-card: Add missing of_node_put() in case of error Clark Wang <xiaoning.wang(a)nxp.com> spi: lpspi: disable lpspi module irq in DMA mode Vineeth Vijayan <vneethv(a)linux.ibm.com> s390/cio: unregister device when the only path is gone Hans de Goede <hdegoede(a)redhat.com> Input: soc_button_array - add invalid acpi_index DMI quirk handling Uday Shankar <ushankar(a)purestorage.com> nvme: double KA polling frequency to avoid KATO with TBKAS on Dan Carpenter <dan.carpenter(a)linaro.org> usb: gadget: udc: fix NULL dereference in remove() Osama Muhammad <osmtendev(a)gmail.com> nfcsim.c: Fix error checking for debugfs_create_dir Hans Verkuil <hverkuil-cisco(a)xs4all.nl> media: cec: core: don't set last_initiator if tx in progress Marc Zyngier <maz(a)kernel.org> arm64: Add missing Set/Way CMO encodings Denis Arefev <arefev(a)swemel.ru> HID: wacom: Add error check to wacom_parse_and_register() Maurizio Lombardi <mlombard(a)redhat.com> scsi: target: iscsi: Prevent login threads from racing between each other Jiasheng Jiang <jiasheng(a)iscas.ac.cn> gpio: sifive: add missing check for platform_get_irq Jiawen Wu <jiawenwu(a)trustnetic.com> gpiolib: Fix GPIO chip IRQ initialization restriction Marc Zyngier <maz(a)kernel.org> gpio: Allow per-parent interrupt data Eric Dumazet <edumazet(a)google.com> sch_netem: acquire qdisc lock in netem_change() Danielle Ratson <danieller(a)nvidia.com> selftests: forwarding: Fix race condition in mirror installation Florent Revest <revest(a)chromium.org> bpf/btf: Accept function names that contain dots Francesco Dolcini <francesco.dolcini(a)toradex.com> Revert "net: phy: dp83867: perform soft reset and retain established link" Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nfnetlink_osf: fix module autoload Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow updates of anonymous sets Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: reject unbound chain set before commit phase Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: reject unbound anonymous set before commit phase Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: disallow element updates of bound anonymous sets Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nft_set_pipapo: .walk does not deal with generations Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: add NFT_TRANS_PREPARE_ERROR to deal with bound set/chain Pablo Neira Ayuso <pablo(a)netfilter.org> netfilter: nf_tables: fix chain binding transaction logic Ross Lagerwall <ross.lagerwall(a)citrix.com> be2net: Extend xmit workaround to BE3 chip Arınç ÜNAL <arinc.unal(a)arinc9.com> net: dsa: mt7530: fix handling of BPDUs on MT7530 switch Arınç ÜNAL <arinc.unal(a)arinc9.com> net: dsa: mt7530: fix trapping frames on non-MT7621 SoC MT7530 switch Terin Stock <terin(a)cloudflare.com> ipvs: align inner_mac_header for encapsulation Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: usdhi60rol0: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: sh_mmcif: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: sdhci-acpi: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: owl: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: omap_hsmmc: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: omap: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: mvsdio: fix deferred probing Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: mtk-sd: fix deferred probing Stefan Wahren <stefan.wahren(a)i2se.com> net: qca_spi: Avoid high load if QCA7000 is not available Sebastian Andrzej Siewior <bigeasy(a)linutronix.de> xfrm: Linearize the skb after offloading if needed. Magali Lemes <magali.lemes(a)canonical.com> selftests: net: fcnal-test: check if FIPS mode is enabled Maciej Żenczykowski <maze(a)google.com> xfrm: fix inbound ipv4/udp/esp packets to UDPv6 dualstack sockets Maxim Mikityanskiy <maxim(a)isovalent.com> bpf: Fix verifier id tracking of scalars on spill Eduard Zingerman <eddyz87(a)gmail.com> bpf: track immediate values written to stack by BPF_ST instruction Benedict Wong <benedictwong(a)google.com> xfrm: Ensure policies always checked on XFRM-I input path Eyal Birger <eyal.birger(a)gmail.com> xfrm: interface: rename xfrm_interface.c to xfrm_interface_core.c Benedict Wong <benedictwong(a)google.com> xfrm: Treat already-verified secpath entries as optional Chen Aotian <chenaotian2(a)163.com> ieee802154: hwsim: Fix possible memory leaks Sergey Shtylyov <s.shtylyov(a)omp.ru> mmc: meson-gx: fix deferred probing Roberto Sassu <roberto.sassu(a)huawei.com> memfd: check for non-NULL file_seals in memfd_create() syscall Lee Jones <lee(a)kernel.org> x86/mm: Avoid using set_pgd() outside of real PGD pages Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: prevent general protection fault in nilfs_clear_dirty_page() Jens Axboe <axboe(a)kernel.dk> io_uring/net: disable partial retries for recvmsg with cmsg Jens Axboe <axboe(a)kernel.dk> io_uring/net: clear msg_controllen on partial sendmsg retry Jens Axboe <axboe(a)kernel.dk> io_uring/net: save msghdr->msg_control for retries Rafael Aquini <aquini(a)redhat.com> writeback: fix dereferencing NULL mapping->host on writeback_page_template Russ Weight <russell.h.weight(a)intel.com> regmap: spi-avmm: Fix regmap_bus max_raw_write Teresa Remmet <t.remmet(a)phytec.de> regulator: pca9450: Fix LDO3OUT and LDO4OUT MASK Matthias May <matthias.may(a)westermo.com> ip_tunnels: allow VXLAN/GENEVE to inherit TOS/TTL from VLAN Christophe Kerello <christophe.kerello(a)foss.st.com> mmc: mmci: stm32: fix max busy timeout calculation Martin Hundebøll <martin(a)geanix.com> mmc: meson-gx: remove redundant mmc_request_done() call from irq context Stephan Gerhold <stephan(a)gerhold.net> mmc: sdhci-msm: Disable broken 64-bit DMA on MSM8916 Xiu Jianfeng <xiujianfeng(a)huawei.com> cgroup: Do not corrupt task iteration when rebinding subsystem Dexuan Cui <decui(a)microsoft.com> PCI: hv: Add a per-bus mutex state_lock Dexuan Cui <decui(a)microsoft.com> PCI: hv: Fix a race condition in hv_irq_unmask() that can cause panic Dexuan Cui <decui(a)microsoft.com> PCI: hv: Remove the useless hv_pcichild_state from struct hv_pci_dev Dexuan Cui <decui(a)microsoft.com> Revert "PCI: hv: Fix a timing issue which causes kdump to fail occasionally" Dexuan Cui <decui(a)microsoft.com> PCI: hv: Fix a race condition bug in hv_pci_query_relations() Michael Kelley <mikelley(a)microsoft.com> Drivers: hv: vmbus: Fix vmbus_wait_for_unload() to scan present CPUs Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: Call hv_synic_free() if hv_synic_alloc() fails Gavin Shan <gshan(a)redhat.com> KVM: Avoid illegal stage2 mapping on invalid memory slot Rafael J. Wysocki <rafael.j.wysocki(a)intel.com> ACPI: sleep: Avoid breaking S3 wakeup due to might_sleep() Ryusuke Konishi <konishi.ryusuke(a)gmail.com> nilfs2: fix buffer corruption due to concurrent device reads Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: join: skip check if MIB counter not supported Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: join: use 'iptables-legacy' if available Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: pm nl: remove hardcoded default limits Shuah Khan <skhan(a)linuxfoundation.org> selftests/mount_setattr: fix redefine struct mount_attr build error Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: lib: skip if not below kernel version Matthieu Baerts <matthieu.baerts(a)tessares.net> selftests: mptcp: lib: skip if missing symbol Thomas Gleixner <tglx(a)linutronix.de> tick/common: Align tick period during sched_timer setup Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Add wrapper to call planes and stream update Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Use dc_update_planes_and_stream Rodrigo Siqueira <Rodrigo.Siqueira(a)amd.com> drm/amd/display: Add minimal pipe split transition state Lino Sanfilippo <l.sanfilippo(a)kunbus.com> tpm, tpm_tis: Claim locality in interrupt handler Steven Rostedt (Google) <rostedt(a)goodmis.org> tracing: Add tracing_reset_all_online_cpus_unlocked() function Tom Chung <chiahsuan.chung(a)amd.com> drm/amd/display: fix the system hang while disable PSR ------------- Diffstat: Makefile | 4 +- arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- arch/arm/boot/dts/at91sam9261ek.dts | 2 +- arch/arm/boot/dts/imx7d-pico-hobbit.dts | 2 +- arch/arm/boot/dts/imx7d-sdb.dts | 2 +- arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +- arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- arch/arm/boot/dts/omap3-pandora-common.dtsi | 2 +- arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- arch/arm64/include/asm/sysreg.h | 6 + arch/s390/purgatory/Makefile | 1 + arch/x86/kernel/apic/x2apic_phys.c | 5 +- arch/x86/mm/kaslr.c | 8 +- drivers/acpi/acpica/achware.h | 2 - drivers/acpi/sleep.c | 16 +- drivers/base/regmap/regmap-spi-avmm.c | 2 +- drivers/char/tpm/tpm_tis_core.c | 2 + drivers/gpio/gpio-sifive.c | 8 +- drivers/gpio/gpiolib.c | 17 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 72 ++++-- drivers/gpu/drm/amd/display/dc/core/dc.c | 277 +++++++++++++++++++++ drivers/gpu/drm/amd/display/dc/dc_stream.h | 20 +- drivers/gpu/drm/exynos/exynos_drm_g2d.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 - drivers/gpu/drm/radeon/radeon_gem.c | 4 +- drivers/hid/wacom_sys.c | 7 +- drivers/hv/channel_mgmt.c | 18 +- drivers/hv/vmbus_drv.c | 5 +- drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +- drivers/input/misc/soc_button_array.c | 30 +++ drivers/media/cec/core/cec-adap.c | 3 +- drivers/mmc/host/meson-gx-mmc.c | 14 +- drivers/mmc/host/mmci.c | 3 +- drivers/mmc/host/mtk-sd.c | 2 +- drivers/mmc/host/mvsdio.c | 2 +- drivers/mmc/host/omap.c | 2 +- drivers/mmc/host/omap_hsmmc.c | 6 +- drivers/mmc/host/owl-mmc.c | 2 +- drivers/mmc/host/sdhci-acpi.c | 2 +- drivers/mmc/host/sdhci-msm.c | 3 + drivers/mmc/host/sh_mmcif.c | 2 +- drivers/mmc/host/usdhi6rol0.c | 6 +- drivers/net/dsa/mt7530.c | 16 +- drivers/net/ethernet/emulex/benet/be_main.c | 4 +- drivers/net/ethernet/qualcomm/qca_spi.c | 3 +- drivers/net/ieee802154/mac802154_hwsim.c | 6 +- drivers/net/phy/dp83867.c | 2 +- drivers/nfc/nfcsim.c | 4 - drivers/nvme/host/core.c | 18 +- drivers/pci/controller/pci-hyperv.c | 139 ++++++----- drivers/s390/cio/device.c | 5 +- drivers/soundwire/dmi-quirks.c | 7 + drivers/spi/spi-fsl-lpspi.c | 7 +- drivers/target/iscsi/iscsi_target_nego.c | 4 +- drivers/usb/gadget/udc/amd5536udc_pci.c | 3 + drivers/vhost/net.c | 11 +- fs/nilfs2/page.c | 10 +- fs/nilfs2/segbuf.c | 6 + fs/nilfs2/segment.c | 7 + fs/nilfs2/super.c | 25 +- include/acpi/acpixf.h | 1 + include/linux/gpio/driver.h | 19 +- include/linux/regulator/pca9450.h | 4 +- include/net/ip_tunnels.h | 12 +- include/net/netfilter/nf_tables.h | 26 +- include/net/xfrm.h | 1 + include/trace/events/writeback.h | 2 +- io_uring/io_uring.c | 15 +- kernel/bpf/btf.c | 20 +- kernel/bpf/verifier.c | 21 +- kernel/cgroup/cgroup.c | 20 +- kernel/time/tick-common.c | 13 +- kernel/time/tick-sched.c | 13 +- kernel/trace/trace.c | 11 +- kernel/trace/trace.h | 1 + kernel/trace/trace_events.c | 2 +- kernel/trace/trace_events_synth.c | 2 - mm/memfd.c | 3 +- net/ipv4/esp4_offload.c | 3 + net/ipv4/xfrm4_input.c | 1 + net/ipv6/esp6_offload.c | 3 + net/ipv6/xfrm6_input.c | 3 + net/netfilter/ipvs/ip_vs_xmit.c | 2 + net/netfilter/nf_tables_api.c | 183 +++++++++++--- net/netfilter/nfnetlink_osf.c | 1 + net/netfilter/nft_immediate.c | 90 ++++++- net/netfilter/nft_set_pipapo.c | 6 +- net/netfilter/xt_osf.c | 1 - net/sched/sch_netem.c | 8 +- net/xfrm/Makefile | 2 + net/xfrm/xfrm_input.c | 1 + .../{xfrm_interface.c => xfrm_interface_core.c} | 54 +++- net/xfrm/xfrm_policy.c | 12 + sound/soc/codecs/nau8824.c | 24 ++ sound/soc/generic/simple-card.c | 1 + .../bpf/verifier/bounds_mix_sign_unsign.c | 110 ++++---- .../selftests/mount_setattr/mount_setattr_test.c | 7 - tools/testing/selftests/net/fcnal-test.sh | 27 +- .../net/forwarding/mirror_gre_bridge_1d.sh | 4 + .../net/forwarding/mirror_gre_bridge_1q.sh | 4 + tools/testing/selftests/net/mptcp/config | 1 + tools/testing/selftests/net/mptcp/mptcp_join.sh | 181 ++++++++------ tools/testing/selftests/net/mptcp/mptcp_lib.sh | 64 +++++ tools/testing/selftests/net/mptcp/pm_netlink.sh | 12 +- virt/kvm/kvm_main.c | 20 +- 108 files changed, 1458 insertions(+), 411 deletions(-)

9 months, 2 weeks

7
103
0 0

[PATCH v7 5/9] serial: sc16is7xx: fix regression with GPIO configuration

by Hugo Villeneuve

From: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> Commit 679875d1d880 ("sc16is7xx: Separate GPIOs from modem control lines") and commit 21144bab4f11 ("sc16is7xx: Handle modem status lines") changed the function of the GPIOs pins to act as modem control lines without any possibility of selecting GPIO function. As a consequence, applications that depends on GPIO lines configured by default as GPIO pins no longer work as expected. Also, the change to select modem control lines function was done only for channel A of dual UART variants (752/762). This was not documented in the log message. Allow to specify GPIO or modem control line function in the device tree, and for each of the ports (A or B). Do so by using the new device-tree property named "modem-control-line-ports" (property added in separate patch). When registering GPIO chip controller, mask-out GPIO pins declared as modem control lines according to this new "modem-control-line-ports" DT property. Boards that need to have GPIOS configured as modem control lines should add that property to their device tree. Here is a list of boards using the sc16is7xx driver in their device tree and that may need to be modified: arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts mips/boot/dts/ingenic/cu1830-neo.dts mips/boot/dts/ingenic/cu1000-neo.dts Fixes: 679875d1d880 ("sc16is7xx: Separate GPIOs from modem control lines") Fixes: 21144bab4f11 ("sc16is7xx: Handle modem status lines") Cc: <stable(a)vger.kernel.org> # 6.1.x: 35210b22 dt-bindings: sc16is7xx: Add property to change GPIO function Cc: <stable(a)vger.kernel.org> # 6.1.x: 7d61ca47 serial: sc16is7xx: refactor GPIO controller registration Cc: <stable(a)vger.kernel.org> # 6.1.x: 322470ed serial: sc16is7xx: mark IOCONTROL register as volatile Cc: <stable(a)vger.kernel.org> # 6.1.x: a0077362 serial: sc16is7xx: fix broken port 0 uart init Cc: <stable(a)vger.kernel.org> # 6.1.x Signed-off-by: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> Reviewed-by: Andy Shevchenko <andy.shevchenko(a)gmail.com> --- drivers/tty/serial/sc16is7xx.c | 103 ++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 21 deletions(-) diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c index 7d50674d2d0e..edc83f5f6340 100644 --- a/drivers/tty/serial/sc16is7xx.c +++ b/drivers/tty/serial/sc16is7xx.c @@ -236,7 +236,8 @@ /* IOControl register bits (Only 750/760) */ #define SC16IS7XX_IOCONTROL_LATCH_BIT (1 << 0) /* Enable input latching */ -#define SC16IS7XX_IOCONTROL_MODEM_BIT (1 << 1) /* Enable GPIO[7:4] as modem pins */ +#define SC16IS7XX_IOCONTROL_MODEM_A_BIT (1 << 1) /* Enable GPIO[7:4] as modem A pins */ +#define SC16IS7XX_IOCONTROL_MODEM_B_BIT (1 << 2) /* Enable GPIO[3:0] as modem B pins */ #define SC16IS7XX_IOCONTROL_SRESET_BIT (1 << 3) /* Software Reset */ /* EFCR register bits */ @@ -301,12 +302,12 @@ /* Misc definitions */ #define SC16IS7XX_FIFO_SIZE (64) #define SC16IS7XX_REG_SHIFT 2 +#define SC16IS7XX_GPIOS_PER_BANK 4 struct sc16is7xx_devtype { char name[10]; int nr_gpio; int nr_uart; - int has_mctrl; }; #define SC16IS7XX_RECONF_MD (1 << 0) @@ -336,6 +337,7 @@ struct sc16is7xx_port { struct clk *clk; #ifdef CONFIG_GPIOLIB struct gpio_chip gpio; + unsigned long gpio_valid_mask; #endif unsigned char buf[SC16IS7XX_FIFO_SIZE]; struct kthread_worker kworker; @@ -447,35 +449,30 @@ static const struct sc16is7xx_devtype sc16is74x_devtype = { .name = "SC16IS74X", .nr_gpio = 0, .nr_uart = 1, - .has_mctrl = 0, }; static const struct sc16is7xx_devtype sc16is750_devtype = { .name = "SC16IS750", - .nr_gpio = 4, + .nr_gpio = 8, .nr_uart = 1, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is752_devtype = { .name = "SC16IS752", - .nr_gpio = 0, + .nr_gpio = 8, .nr_uart = 2, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is760_devtype = { .name = "SC16IS760", - .nr_gpio = 4, + .nr_gpio = 8, .nr_uart = 1, - .has_mctrl = 1, }; static const struct sc16is7xx_devtype sc16is762_devtype = { .name = "SC16IS762", - .nr_gpio = 0, + .nr_gpio = 8, .nr_uart = 2, - .has_mctrl = 1, }; static bool sc16is7xx_regmap_volatile(struct device *dev, unsigned int reg) @@ -1350,16 +1347,45 @@ static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip, return 0; } -static int sc16is7xx_setup_gpio_chip(struct device *dev) +static int sc16is7xx_gpio_init_valid_mask(struct gpio_chip *chip, + unsigned long *valid_mask, + unsigned int ngpios) +{ + struct sc16is7xx_port *s = gpiochip_get_data(chip); + + *valid_mask = s->gpio_valid_mask; + + return 0; +} + +static int sc16is7xx_setup_gpio_chip(struct device *dev, u8 mctrl_mask) { struct sc16is7xx_port *s = dev_get_drvdata(dev); if (!s->devtype->nr_gpio) return 0; + switch (mctrl_mask) { + case 0: + s->gpio_valid_mask = GENMASK(7, 0); + break; + case SC16IS7XX_IOCONTROL_MODEM_A_BIT: + s->gpio_valid_mask = GENMASK(3, 0); + break; + case SC16IS7XX_IOCONTROL_MODEM_B_BIT: + s->gpio_valid_mask = GENMASK(7, 4); + break; + default: + break; + } + + if (s->gpio_valid_mask == 0) + return 0; + s->gpio.owner = THIS_MODULE; s->gpio.parent = dev; s->gpio.label = dev_name(dev); + s->gpio.init_valid_mask = sc16is7xx_gpio_init_valid_mask; s->gpio.direction_input = sc16is7xx_gpio_direction_input; s->gpio.get = sc16is7xx_gpio_get; s->gpio.direction_output = sc16is7xx_gpio_direction_output; @@ -1371,6 +1397,44 @@ static int sc16is7xx_setup_gpio_chip(struct device *dev) } #endif +static u8 sc16is7xx_setup_mctrl_ports(struct device *dev) +{ + struct sc16is7xx_port *s = dev_get_drvdata(dev); + int i; + int ret; + int count; + u32 mctrl_port[2]; + u8 mctrl_mask; + + count = device_property_count_u32(dev, "nxp,modem-control-line-ports"); + if (count < 0 || count > ARRAY_SIZE(mctrl_port)) + return 0; + + ret = device_property_read_u32_array(dev, "nxp,modem-control-line-ports", + mctrl_port, count); + if (ret) + return 0; + + mctrl_mask = 0; + + for (i = 0; i < count; i++) { + /* Use GPIO lines as modem control lines */ + if (mctrl_port[i] == 0) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_A_BIT; + else if (mctrl_port[i] == 1) + mctrl_mask |= SC16IS7XX_IOCONTROL_MODEM_B_BIT; + } + + if (mctrl_mask) + regmap_update_bits( + s->regmap, + SC16IS7XX_IOCONTROL_REG << SC16IS7XX_REG_SHIFT, + SC16IS7XX_IOCONTROL_MODEM_A_BIT | + SC16IS7XX_IOCONTROL_MODEM_B_BIT, mctrl_mask); + + return mctrl_mask; +} + static const struct serial_rs485 sc16is7xx_rs485_supported = { .flags = SER_RS485_ENABLED | SER_RS485_RTS_AFTER_SEND, .delay_rts_before_send = 1, @@ -1383,6 +1447,7 @@ static int sc16is7xx_probe(struct device *dev, { unsigned long freq = 0, *pfreq = dev_get_platdata(dev); unsigned int val; + u8 mctrl_mask; u32 uartclk = 0; int i, ret; struct sc16is7xx_port *s; @@ -1478,12 +1543,6 @@ static int sc16is7xx_probe(struct device *dev, SC16IS7XX_EFCR_RXDISABLE_BIT | SC16IS7XX_EFCR_TXDISABLE_BIT); - /* Use GPIO lines as modem status registers */ - if (devtype->has_mctrl) - sc16is7xx_port_write(&s->p[i].port, - SC16IS7XX_IOCONTROL_REG, - SC16IS7XX_IOCONTROL_MODEM_BIT); - /* Initialize kthread work structs */ kthread_init_work(&s->p[i].tx_work, sc16is7xx_tx_proc); kthread_init_work(&s->p[i].reg_work, sc16is7xx_reg_proc); @@ -1521,8 +1580,10 @@ static int sc16is7xx_probe(struct device *dev, s->p[u].irda_mode = true; } + mctrl_mask = sc16is7xx_setup_mctrl_ports(dev); + #ifdef CONFIG_GPIOLIB - ret = sc16is7xx_setup_gpio_chip(dev); + ret = sc16is7xx_setup_gpio_chip(dev, mctrl_mask); if (ret) goto out_thread; #endif @@ -1547,7 +1608,7 @@ static int sc16is7xx_probe(struct device *dev, return 0; #ifdef CONFIG_GPIOLIB - if (devtype->nr_gpio) + if (s->gpio_valid_mask) gpiochip_remove(&s->gpio); out_thread: @@ -1573,7 +1634,7 @@ static void sc16is7xx_remove(struct device *dev) int i; #ifdef CONFIG_GPIOLIB - if (s->devtype->nr_gpio) + if (s->gpio_valid_mask) gpiochip_remove(&s->gpio); #endif -- 2.30.2

9 months, 2 weeks

4
24
0 0

[PATCH] ceph: defer stopping the mdsc delayed_work

by xiubli＠redhat.com

From: Xiubo Li <xiubli(a)redhat.com> Flushing the dirty buffer may take a long time if the Rados is overloaded or if there is network issue. So we should ping the MDSs perioudically to keep alive, else the MDS will blocklist the kclient. Cc: stable(a)vger.kernel.org Cc: Venky Shankar <vshankar(a)redhat.com> URL: https://tracker.ceph.com/issues/61843 Signed-off-by: Xiubo Li <xiubli(a)redhat.com> --- fs/ceph/mds_client.c | 2 +- fs/ceph/mds_client.h | 3 ++- fs/ceph/super.c | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 65230ebefd51..70987b3c198a 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -5192,7 +5192,7 @@ static void delayed_work(struct work_struct *work) doutc(mdsc->fsc->client, "mdsc delayed_work\n"); - if (mdsc->stopping) + if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) return; mutex_lock(&mdsc->mutex); diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index 5d02c8c582fd..befbd384428e 100644 --- a/fs/ceph/mds_client.h +++ b/fs/ceph/mds_client.h @@ -400,7 +400,8 @@ struct cap_wait { enum { CEPH_MDSC_STOPPING_BEGIN = 1, - CEPH_MDSC_STOPPING_FLUSHED = 2, + CEPH_MDSC_STOPPING_FLUSHING = 2, + CEPH_MDSC_STOPPING_FLUSHED = 3, }; /* diff --git a/fs/ceph/super.c b/fs/ceph/super.c index 8e1e517a45db..fb694ba72955 100644 --- a/fs/ceph/super.c +++ b/fs/ceph/super.c @@ -1488,7 +1488,7 @@ static int ceph_init_fs_context(struct fs_context *fc) static bool __inc_stopping_blocker(struct ceph_mds_client *mdsc) { spin_lock(&mdsc->stopping_lock); - if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) { + if (mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHING) { spin_unlock(&mdsc->stopping_lock); return false; } @@ -1501,7 +1501,7 @@ static void __dec_stopping_blocker(struct ceph_mds_client *mdsc) { spin_lock(&mdsc->stopping_lock); if (!atomic_dec_return(&mdsc->stopping_blockers) && - mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHED) + mdsc->stopping >= CEPH_MDSC_STOPPING_FLUSHING) complete_all(&mdsc->stopping_waiter); spin_unlock(&mdsc->stopping_lock); } @@ -1562,7 +1562,7 @@ static void ceph_kill_sb(struct super_block *s) sync_filesystem(s); spin_lock(&mdsc->stopping_lock); - mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHED; + mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHING; wait = !!atomic_read(&mdsc->stopping_blockers); spin_unlock(&mdsc->stopping_lock); @@ -1576,6 +1576,7 @@ static void ceph_kill_sb(struct super_block *s) pr_warn_client(cl, "umount was killed, %ld\n", timeleft); } + mdsc->stopping = CEPH_MDSC_STOPPING_FLUSHED; kill_anon_super(s); fsc->client->extra_mon_dispatch = NULL; -- 2.40.1

9 months, 2 weeks

3
2
0 0

[PATCH] power: supply: ab8500: Set typing and props

by Linus Walleij

I had the following weird phenomena on a mobile phone: while the capacity in /sys/class/power_supply/ab8500_fg/capacity would reflect the actual charge and capacity of the battery, only 1/3 of the value was shown on the battery status indicator and warnings for low battery appeared. It turns out that utemp, the Freedesktop temperature daemon, will average all the power supplies of type "battery" in /sys/class/power_supply/* if there is more than one battery. For the AB8500, there was "battery" ab8500_fg, ab8500_btemp and ab8500_chargalg. The latter two don't know anything about the battery, and should not be considered. They were however averaged and with the capacity of 0. Flag ab8500_btemp and ab8500_chargalg with type "unknown" so they are not averaged as batteries. Remove the technology prop from ab8500_btemp as well, all it does is snoop in on knowledge from another supply. After this the battery indicator shows the right value. Cc: Stefan Hansson <newbyte(a)disroot.org> Cc: stable(a)vger.kernel.org Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- drivers/power/supply/ab8500_btemp.c | 9 +-------- drivers/power/supply/ab8500_chargalg.c | 2 +- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/power/supply/ab8500_btemp.c b/drivers/power/supply/ab8500_btemp.c index 307ee6f71042..3662ca53941e 100644 --- a/drivers/power/supply/ab8500_btemp.c +++ b/drivers/power/supply/ab8500_btemp.c @@ -115,7 +115,6 @@ struct ab8500_btemp { static enum power_supply_property ab8500_btemp_props[] = { POWER_SUPPLY_PROP_PRESENT, POWER_SUPPLY_PROP_ONLINE, - POWER_SUPPLY_PROP_TECHNOLOGY, POWER_SUPPLY_PROP_TEMP, }; @@ -532,12 +531,6 @@ static int ab8500_btemp_get_property(struct power_supply *psy, else val->intval = 1; break; - case POWER_SUPPLY_PROP_TECHNOLOGY: - if (di->bm->bi) - val->intval = di->bm->bi->technology; - else - val->intval = POWER_SUPPLY_TECHNOLOGY_UNKNOWN; - break; case POWER_SUPPLY_PROP_TEMP: val->intval = ab8500_btemp_get_temp(di); break; @@ -664,7 +657,7 @@ static char *supply_interface[] = { static const struct power_supply_desc ab8500_btemp_desc = { .name = "ab8500_btemp", - .type = POWER_SUPPLY_TYPE_BATTERY, + .type = POWER_SUPPLY_TYPE_UNKNOWN, .properties = ab8500_btemp_props, .num_properties = ARRAY_SIZE(ab8500_btemp_props), .get_property = ab8500_btemp_get_property, diff --git a/drivers/power/supply/ab8500_chargalg.c b/drivers/power/supply/ab8500_chargalg.c index ea4ad61d4c7e..2205ea0834a6 100644 --- a/drivers/power/supply/ab8500_chargalg.c +++ b/drivers/power/supply/ab8500_chargalg.c @@ -1720,7 +1720,7 @@ static char *supply_interface[] = { static const struct power_supply_desc ab8500_chargalg_desc = { .name = "ab8500_chargalg", - .type = POWER_SUPPLY_TYPE_BATTERY, + .type = POWER_SUPPLY_TYPE_UNKNOWN, .properties = ab8500_chargalg_props, .num_properties = ARRAY_SIZE(ab8500_chargalg_props), .get_property = ab8500_chargalg_get_property, -- 2.40.1

9 months, 2 weeks

2
2
0 0

[PATCH V2] MIPS: Loongson: Fix build error when make modules_install

by Huacai Chen

After commit 0e96ea5c3eb5904e5dc2f ("MIPS: Loongson64: Clean up use of cc-ifversion") we get a build error when make modules_install: cc1: error: '-mloongson-mmi' must be used with '-mhard-float' The reason is when make modules_install, 'call cc-option' doesn't work in $(KBUILD_CFLAGS) of 'CHECKFLAGS'. Then there is no -mno-loongson-mmi applied and -march=loongson3a enable MMI instructions. To be detail, the error message comes from the CHECKFLAGS invocation of $(CC) but it has no impact on the final result of make modules_install, it is purely a cosmetic issue. The error occurs because cc-option is defined in scripts/Makefile.compiler, which is not included in Makefile when running 'make modules_install', as install targets are not supposed to require the compiler; see commit 805b2e1d427aab4b ("kbuild: include Makefile.compiler only when compiler is needed"). As a result, the call to check for '-mno-loongson-mmi' just never happens. Fix this by partially reverting to the old logic, use 'call cc-option' to conditionally apply -march=loongson3a and -march=mips64r2. By the way, Loongson-2E/2F is also broken in commit 13ceb48bc19c563e05f4 ("MIPS: Loongson2ef: Remove unnecessary {as,cc}-option calls") so fix it together. Fixes: 13ceb48bc19c563e05f4 ("MIPS: Loongson2ef: Remove unnecessary {as,cc}-option calls") Fixes: 0e96ea5c3eb5904e5dc2 ("MIPS: Loongson64: Clean up use of cc-ifversion") Cc: stable(a)vger.kernel.org Cc: Feiyang Chen <chenfeiyang(a)loongson.cn> Cc: Nathan Chancellor <nathan(a)kernel.org> Cc: Nick Desaulniers <ndesaulniers(a)google.com> Signed-off-by: Huacai Chen <chenhuacai(a)loongson.cn> --- V2: Update commit message and fix for LOONGSON2EF together. arch/mips/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/arch/mips/Makefile b/arch/mips/Makefile index a7a4ee66a9d3..35a1b9b34734 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -181,16 +181,12 @@ endif cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1 cflags-$(CONFIG_CPU_BMIPS) += -march=mips32 -Wa,-mips32 -Wa,--trap -cflags-$(CONFIG_CPU_LOONGSON2E) += -march=loongson2e -Wa,--trap -cflags-$(CONFIG_CPU_LOONGSON2F) += -march=loongson2f -Wa,--trap +cflags-$(CONFIG_CPU_LOONGSON2E) += $(call cc-option,-march=loongson2e) -Wa,--trap +cflags-$(CONFIG_CPU_LOONGSON2F) += $(call cc-option,-march=loongson2f) -Wa,--trap +cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-march=loongson3a,-march=mips64r2) -Wa,--trap # Some -march= flags enable MMI instructions, and GCC complains about that # support being enabled alongside -msoft-float. Thus explicitly disable MMI. cflags-$(CONFIG_CPU_LOONGSON2EF) += $(call cc-option,-mno-loongson-mmi) -ifdef CONFIG_CPU_LOONGSON64 -cflags-$(CONFIG_CPU_LOONGSON64) += -Wa,--trap -cflags-$(CONFIG_CC_IS_GCC) += -march=loongson3a -cflags-$(CONFIG_CC_IS_CLANG) += -march=mips64r2 -endif cflags-$(CONFIG_CPU_LOONGSON64) += $(call cc-option,-mno-loongson-mmi) cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,) -- 2.39.3

9 months, 2 weeks

4
3
0 0

[PATCH] MIPS: Loongson: Fix cpu_probe_loongson() again

by Huacai Chen

Commit 7db5e9e9e5e6c10d7d ("MIPS: loongson64: fix FTLB configuration") move decode_configs() from the beginning of cpu_probe_loongson() to the end in order to fix FTLB configuration. However, it breaks the CPUCFG decoding because decode_configs() use "c->options = xxxx" rather than "c->options |= xxxx", all information get from CPUCFG by decode_cpucfg() is lost. This causes error when creating a KVM guest on Loongson-3A4000: Exception Code: 4 not handled @ PC: 0000000087ad5981, inst: 0xcb7a1898 BadVaddr: 0x0 Status: 0x0 Fix this by moving the c->cputype setting to the beginning and moving decode_configs() after that. Fixes: 7db5e9e9e5e6c10d7d ("MIPS: loongson64: fix FTLB configuration") Cc: stable(a)vger.kernel.org Cc: Huang Pei <huangpei(a)loongson.cn> Signed-off-by: Huacai Chen <chenhuacai(a)loongson.cn> --- arch/mips/kernel/cpu-probe.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index e79adcb128e6..b406d8bfb15a 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -1677,7 +1677,10 @@ static inline void decode_cpucfg(struct cpuinfo_mips *c) static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) { + c->cputype = CPU_LOONGSON64; + /* All Loongson processors covered here define ExcCode 16 as GSExc. */ + decode_configs(c); c->options |= MIPS_CPU_GSEXCEX; switch (c->processor_id & PRID_IMP_MASK) { @@ -1687,7 +1690,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) case PRID_REV_LOONGSON2K_R1_1: case PRID_REV_LOONGSON2K_R1_2: case PRID_REV_LOONGSON2K_R1_3: - c->cputype = CPU_LOONGSON64; __cpu_name[cpu] = "Loongson-2K"; set_elf_platform(cpu, "gs264e"); set_isa(c, MIPS_CPU_ISA_M64R2); @@ -1700,14 +1702,12 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) switch (c->processor_id & PRID_REV_MASK) { case PRID_REV_LOONGSON3A_R2_0: case PRID_REV_LOONGSON3A_R2_1: - c->cputype = CPU_LOONGSON64; __cpu_name[cpu] = "ICT Loongson-3"; set_elf_platform(cpu, "loongson3a"); set_isa(c, MIPS_CPU_ISA_M64R2); break; case PRID_REV_LOONGSON3A_R3_0: case PRID_REV_LOONGSON3A_R3_1: - c->cputype = CPU_LOONGSON64; __cpu_name[cpu] = "ICT Loongson-3"; set_elf_platform(cpu, "loongson3a"); set_isa(c, MIPS_CPU_ISA_M64R2); @@ -1727,7 +1727,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) c->ases &= ~MIPS_ASE_VZ; /* VZ of Loongson-3A2000/3000 is incomplete */ break; case PRID_IMP_LOONGSON_64G: - c->cputype = CPU_LOONGSON64; __cpu_name[cpu] = "ICT Loongson-3"; set_elf_platform(cpu, "loongson3a"); set_isa(c, MIPS_CPU_ISA_M64R2); @@ -1737,8 +1736,6 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) panic("Unknown Loongson Processor ID!"); break; } - - decode_configs(c); } #else static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) { } -- 2.39.3

9 months, 2 weeks

3
2
0 0

[PATCH] f2fs: get out of a repeat loop when getting a locked data page

by Jaegeuk Kim

https://bugzilla.kernel.org/show_bug.cgi?id=216050 Somehow we're getting a page which has a different mapping. Let's avoid the infinite loop. Cc: <stable(a)vger.kernel.org> Signed-off-by: Jaegeuk Kim <jaegeuk(a)kernel.org> --- fs/f2fs/data.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index bf51e6e4eb64..80702c93e885 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -1329,18 +1329,14 @@ struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index, { struct address_space *mapping = inode->i_mapping; struct page *page; -repeat: + page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL); if (IS_ERR(page)) return page; /* wait for read completion */ lock_page(page); - if (unlikely(page->mapping != mapping)) { - f2fs_put_page(page, 1); - goto repeat; - } - if (unlikely(!PageUptodate(page))) { + if (unlikely(page->mapping != mapping || !PageUptodate(page))) { f2fs_put_page(page, 1); return ERR_PTR(-EIO); } -- 2.40.0.348.gf938b09366-goog

9 months, 2 weeks

4
12
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror June 2023