- Linux-stable-mirror - lists.linaro.org

[PATCH] drm/i915: Limit MST to <= 8bpc once again

by Ville Syrjala

From: Ville Syrjälä <ville.syrjala(a)linux.intel.com> My attempt at allowing MST to use the higher color depths has regressed some configurations. Apparently people have setups where all MST streams will fit into the DP link with 8bpc but won't fit with higher color depths. What we really should be doing is reducing the bpc for all the streams on the same link until they start to fit. But that requires a bit more work, so in the meantime let's revert back closer to the old behavior and limit MST to at most 8bpc. Cc: stable(a)vger.kernel.org Cc: Lyude Paul <lyude(a)redhat.com> Cc: Geoffrey Bennett <gmux22(a)gmail.com> Fixes: f1477219869c ("drm/i915: Remove the 8bpc shackles from DP MST") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=111505 Signed-off-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> --- drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index 2c5ac3dd647f..6df240a01b8c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -128,7 +128,15 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, limits.max_lane_count = intel_dp_max_lane_count(intel_dp); limits.min_bpp = intel_dp_min_bpp(pipe_config); - limits.max_bpp = pipe_config->pipe_bpp; + /* + * FIXME: If all the streams can't fit into the link with + * their current pipe_bpp we should reduce pipe_bpp across + * the board until things start to fit. Until then we + * limit to <= 8bpc since that's what was hardcoded for all + * MST streams previously. This hack should be removed once + * we have the proper retry logic in place. + */ + limits.max_bpp = min(pipe_config->pipe_bpp, 24); intel_dp_adjust_compliance_config(intel_dp, pipe_config, &limits); -- 2.21.0

5 years, 8 months

2
1
0 0

[PATCH 5.2 000/162] 5.2.11-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 5.2.11 release. There are 162 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu 29 Aug 2019 07:25:02 AM UTC. 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.2.11-rc1… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.2.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.2.11-rc1 David Howells <dhowells(a)redhat.com> rxrpc: Fix read-after-free in rxrpc_queue_local() David Howells <dhowells(a)redhat.com> rxrpc: Fix local endpoint refcounting Alastair D'Silva <alastair(a)d-silva.org> powerpc: Allow flush_(inval_)dcache_range to work across ranges >4GB Jens Axboe <axboe(a)kernel.dk> io_uring: add need_resched() check in inner poll loop Jens Axboe <axboe(a)kernel.dk> io_uring: don't enter poll loop if we have CQEs pending Jens Axboe <axboe(a)kernel.dk> io_uring: fix potential hang with polled IO Dan Carpenter <dan.carpenter(a)oracle.com> dm zoned: fix potential NULL dereference in dmz_do_reclaim() Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Drop stale TID RDMA packets Darrick J. Wong <darrick.wong(a)oracle.com> xfs: fix missing ILOCK unlock when xfs_setattr_nonsize fails due to EDQUOT Andrey Ryabinin <aryabinin(a)virtuozzo.com> mm/kasan: fix false positive invalid-free reports with CONFIG_KASAN_SW_TAGS=y Henry Burns <henryburns(a)google.com> mm/zsmalloc.c: fix race condition in zs_destroy_pool Henry Burns <henryburns(a)google.com> mm/zsmalloc.c: migration can leave pages in ZS_EMPTY indefinitely Vlastimil Babka <vbabka(a)suse.cz> mm, page_owner: handle THP splits correctly Roman Gushchin <guro(a)fb.com> mm: memcontrol: flush percpu vmevents before releasing memcg Roman Gushchin <guro(a)fb.com> mm: memcontrol: flush percpu vmstats before releasing memcg David Rientjes <rientjes(a)google.com> mm, page_alloc: move_freepages should not examine struct page of reserved memory Henry Burns <henryburns(a)google.com> mm/z3fold.c: fix race between migration and destruction Michael Kelley <mikelley(a)microsoft.com> genirq: Properly pair kobject_del() with kobject_add() Dmitry Fomichev <dmitry.fomichev(a)wdc.com> dm zoned: properly handle backing device failure Dmitry Fomichev <dmitry.fomichev(a)wdc.com> dm zoned: improve error handling in i/o map code Dmitry Fomichev <dmitry.fomichev(a)wdc.com> dm zoned: improve error handling in reclaim Mikulas Patocka <mpatocka(a)redhat.com> dm table: fix invalid memory accesses with too high sector number ZhangXiaoxu <zhangxiaoxu5(a)huawei.com> dm space map metadata: fix missing store of apply_bops() return value Wenwen Wang <wenwen(a)cs.uga.edu> dm raid: add missing cleanup in raid_ctr() Mikulas Patocka <mpatocka(a)redhat.com> dm integrity: fix a crash due to BUG_ON in __journal_read_write() ZhangXiaoxu <zhangxiaoxu5(a)huawei.com> dm btree: fix order of block initialization in btree_split_beneath Bryan Gurney <bgurney(a)redhat.com> dm dust: use dust block size for badblocklist index Dmitry Fomichev <dmitry.fomichev(a)wdc.com> dm kcopyd: always complete failed jobs Jason Xing <kerneljasonxing(a)linux.alibaba.com> psi: get poll_work to run when calling poll syscall next time Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Drop stale TID RDMA packets that cause TIDErr Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Add additional checks when handling TID RDMA WRITE DATA packet Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Add additional checks when handling TID RDMA READ RESP packet Kaike Wan <kaike.wan(a)intel.com> IB/hfi1: Unsafe PSN checking for TID RDMA READ Resp packet John Hubbard <jhubbard(a)nvidia.com> x86/boot: Fix boot regression caused by bootparam sanitizing John Hubbard <jhubbard(a)nvidia.com> x86/boot: Save fields explicitly, zero out everything else Tom Lendacky <thomas.lendacky(a)amd.com> x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h Thomas Gleixner <tglx(a)linutronix.de> x86/apic: Handle missing global clockevent gracefully Sean Christopherson <sean.j.christopherson(a)intel.com> x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386 Oleg Nesterov <oleg(a)redhat.com> userfaultfd_release: always remove uffd flags and clear vm_userfaultfd_ctx Dexuan Cui <decui(a)microsoft.com> Drivers: hv: vmbus: Fix virt_to_hvpfn() for X86_PAE Bartosz Golaszewski <bgolaszewski(a)baylibre.com> gpiolib: never report open-drain/source lines as 'input' to user-space Adrian Hunter <adrian.hunter(a)intel.com> scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm() Lyude Paul <lyude(a)redhat.com> drm/nouveau: Don't retry infinitely when receiving no data on i2c over AUX Alex Deucher <alexander.deucher(a)amd.com> drm/amdgpu/gfx9: update pg_flags after determining if gfx off is possible Ilya Dryomov <idryomov(a)gmail.com> libceph: fix PG split vs OSD (re)connect race Jeff Layton <jlayton(a)kernel.org> ceph: don't try fill file_lock on unsuccessful GETFILELOCK reply Erqi Chen <chenerqi(a)gmail.com> ceph: clear page dirty before invalidate page Dinh Nguyen <dinguyen(a)kernel.org> clk: socfpga: stratix10: fix rate caclulationg for cnt_clks Mikulas Patocka <mpatocka(a)redhat.com> Revert "dm bufio: fix deadlock with loop device" Paolo Bonzini <pbonzini(a)redhat.com> Revert "KVM: x86/mmu: Zap only the relevant pages when removing a memslot" Jason Gerecke <jason.gerecke(a)wacom.com> HID: wacom: Correct distance scale for 2nd-gen Intuos devices Aaron Armstrong Skomra <skomra(a)gmail.com> HID: wacom: correct misreported EKR ring values Johannes Berg <johannes.berg(a)intel.com> iwlwifi: mvm: disable TX-AMSDU on older NICs Naresh Kamboju <naresh.kamboju () linaro ! org> selftests: kvm: Adding config fragments Marc Zyngier <maz(a)kernel.org> KVM: arm: Don't write junk to CP15 registers on reset Marc Zyngier <maz(a)kernel.org> KVM: arm64: Don't write junk to sysregs on reset Paul Walmsley <paul.walmsley(a)sifive.com> dt-bindings: riscv: fix the schema compatible string for the HiFive Unleashed board Jin Yao <yao.jin(a)linux.intel.com> perf pmu-events: Fix missing "cpu_clk_unhalted.core" event He Zhe <zhe.he(a)windriver.com> perf cpumap: Fix writing to illegal memory in handling cpumap mask He Zhe <zhe.he(a)windriver.com> perf ftrace: Fix failure to set cpumask when only one cpu is present Paolo Valente <paolo.valente(a)linaro.org> block, bfq: handle NULL return value by bfq_init_rq() He Zhe <zhe.he(a)windriver.com> block: aoe: Fix kernel crash due to atomic sleep when exiting Colin Ian King <colin.king(a)canonical.com> drm/vmwgfx: fix memory leak when too many retries have occurred Valdis Kletnieks <valdis.kletnieks(a)vt.edu> x86/lib/cpu: Address missing prototypes warning Jens Axboe <axboe(a)kernel.dk> libata: add SG safety checks in SFF pio transfers Jens Axboe <axboe(a)kernel.dk> libata: have ata_scsi_rw_xlat() fail invalid passthrough requests Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Ensure state recovery handles ETIMEDOUT correctly Jiangfeng Xiao <xiaojiangfeng(a)huawei.com> net: hisilicon: Fix dma_map_single failed on arm64 Jiangfeng Xiao <xiaojiangfeng(a)huawei.com> net: hisilicon: fix hip04-xmit never return TX_BUSY Jiangfeng Xiao <xiaojiangfeng(a)huawei.com> net: hisilicon: make hip04_tx_reclaim non-reentrant Likun Gao <Likun.Gao(a)amd.com> drm/amdgpu: pin the csb buffer on hw init for gfx v8 Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: tc: Do not return a fragment entry Jose Abreu <Jose.Abreu(a)synopsys.com> net: stmmac: Fix issues when number of Queues >= 4 Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> net: cxgb3_main: Fix a resource leak in a error path in 'init_one()' Gustavo A. R. Silva <gustavo(a)embeddedor.com> ata: rb532_cf: Fix unused variable warning in rb532_pata_driver_probe Vasily Gorbik <gor(a)linux.ibm.com> s390: put _stext and _etext into .text section Vasily Gorbik <gor(a)linux.ibm.com> s390/mm: fix dump_pagetables top level page table walking Vasily Gorbik <gor(a)linux.ibm.com> s390/protvirt: avoid memory sharing for diag 308 set/store Suren Baghdasaryan <surenb(a)google.com> sched/psi: Do not require setsched permission from the trigger creator Peter Zijlstra <peterz(a)infradead.org> sched/psi: Reduce psimon FIFO priority Dietmar Eggemann <dietmar.eggemann(a)arm.com> sched/deadline: Fix double accounting of rq/running bw in push & pull Sebastien Tisserant <stisserant(a)wallix.com> SMB3: Kernel oops mounting a encryptData share with CONFIG_DEBUG_VIRTUAL Pavel Shilovsky <pshilov(a)microsoft.com> SMB3: Fix potential memory leak when processing compound chain Douglas Anderson <dianders(a)chromium.org> drm/rockchip: Suspend DP late Nicolas Saenz Julienne <nsaenzjulienne(a)suse.de> HID: input: fix a4tech horizontal wheel custom usage István Váradi <ivaradi(a)varadiistvan.hu> HID: quirks: Set the INCREMENT_USAGE_ON_DUPLICATE quirk on Saitek X52 Trond Myklebust <trond.myklebust(a)hammerspace.com> NFS: Fix regression whereby fscache errors are appearing on 'nofsc' mounts Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a potential sleep while atomic in nfs4_do_reclaim() Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.1: Only reap expired delegations Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4.1: Fix open stateid recovery Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: When recovering state fails with EAGAIN, retry the same recovery Trond Myklebust <trond.myklebust(a)hammerspace.com> NFSv4: Fix a credential refcount leak in nfs41_check_delegation_stateid YueHaibing <yuehaibing(a)huawei.com> enetc: Select PHYLIB while CONFIG_FSL_ENETC_VF is set Wang Xiayang <xywang.sjtu(a)sjtu.edu.cn> net/ethernet/qlogic/qed: force the string buffer NULL-terminated Vijendar Mukunda <Vijendar.Mukunda(a)amd.com> ASoC: amd: acp3x: use dma_ops of parent device for acp3x dma driver Wang Xiayang <xywang.sjtu(a)sjtu.edu.cn> can: peak_usb: force the string buffer NULL-terminated Wang Xiayang <xywang.sjtu(a)sjtu.edu.cn> can: sja1000: force the string buffer NULL-terminated Jarkko Nikula <jarkko.nikula(a)linux.intel.com> spi: pxa2xx: Add support for Intel Tiger Lake Jiri Olsa <jolsa(a)kernel.org> perf bench numa: Fix cpu0 binding Jia-Ju Bai <baijiaju1990(a)gmail.com> net: phy: phy_led_triggers: Fix a possible null-pointer dereference in phy_led_trigger_change_speed() Juliana Rodrigueiro <juliana.rodrigueiro(a)intra2net.com> isdn: hfcsusb: Fix mISDN driver crash caused by transfer buffer on the stack YueHaibing <yuehaibing(a)huawei.com> enetc: Fix build error without PHYLIB Gregory Greenman <gregory.greenman(a)intel.com> iwlwifi: mvm: send LQ command always ASYNC Johannes Berg <johannes.berg(a)intel.com> iwlwifi: fix locking in delayed GTK setting Shahar S Matityahu <shahar.s.matityahu(a)intel.com> iwlwifi: dbg_ini: move iwl_dbg_tlv_free outside of debugfs ifdef Shahar S Matityahu <shahar.s.matityahu(a)intel.com> iwlwifi: dbg_ini: move iwl_dbg_tlv_load_bin out of debug override ifdef Mordechay Goodstein <mordechay.goodstein(a)intel.com> iwlwifi: mvm: avoid races in rate init and rate perform Jean Delvare <jdelvare(a)suse.de> nvmem: Use the same permissions for eeprom as for nvmem David Howells <dhowells(a)redhat.com> rxrpc: Fix the lack of notification when sendmsg() fails on a DATA packet David Howells <dhowells(a)redhat.com> rxrpc: Fix potential deadlock Jozsef Kadlecsik <kadlec(a)netfilter.org> netfilter: ipset: Fix rename concurrency with listing Stefano Brivio <sbrivio(a)redhat.com> netfilter: ipset: Copy the right MAC address in bitmap:ip,mac and hash:ip,mac sets Stefano Brivio <sbrivio(a)redhat.com> netfilter: ipset: Actually allow destination MAC address for hash:ip,mac sets too Martin Blumenstingl <martin.blumenstingl(a)googlemail.com> net: stmmac: manage errors returned by of_get_mac_address() Jia-Ju Bai <baijiaju1990(a)gmail.com> mac80211_hwsim: Fix possible null-pointer dereferences in hwsim_dump_radio_nl() Ben Segal <bpsegal20(a)gmail.com> habanalabs: fix F/W download in BE architecture Jia-Ju Bai <baijiaju1990(a)gmail.com> isdn: mISDN: hfcsusb: Fix possible null-pointer dereferences in start_isoc_chain() Michal Kalderon <michal.kalderon(a)marvell.com> qed: RDMA - Fix the hw_ver returned in device attributes Bob Ham <bob.ham(a)puri.sm> net: usb: qmi_wwan: Add the BroadMobi BM818 card Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: ti: davinci-mcasp: Correct slot_width posed constraint Cheng-Yi Chiang <cychiang(a)chromium.org> ASoC: rockchip: Fix mono capture Peter Ujfalusi <peter.ujfalusi(a)ti.com> ASoC: ti: davinci-mcasp: Fix clk PDIR handling for i2s master mode Manikanta Pubbisetty <mpubbise(a)codeaurora.org> {nl,mac}80211: fix interface combinations on crypto controlled devices Navid Emamdoost <navid.emamdoost(a)gmail.com> st_nci_hci_connectivity_event_received: null check the allocation Navid Emamdoost <navid.emamdoost(a)gmail.com> st21nfca_connectivity_event_received: null check the allocation Andrii Nakryiko <andriin(a)fb.com> libbpf: silence GCC8 warning about string truncation Jan Sebastian Götte <linux(a)jaseg.net> Staging: fbtft: Fix GPIO handling Ricard Wanderlof <ricard.wanderlof(a)axis.com> ASoC: Fail card instantiation if DAI format setup fails YueHaibing <yuehaibing(a)huawei.com> can: gw: Fix error path of cgw_module_init Weitao Hou <houweitaoo(a)gmail.com> can: mcp251x: add error check when wq alloc failed Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> can: dev: call netif_carrier_off() in register_candev() Ilya Maximets <i.maximets(a)samsung.com> libbpf: fix using uninitialized ioctl results Eric Dumazet <edumazet(a)google.com> selftests/bpf: add another gso_segs access Ido Schimmel <idosch(a)mellanox.com> selftests: forwarding: gre_multipath: Fix flower filters Ido Schimmel <idosch(a)mellanox.com> selftests: forwarding: gre_multipath: Enable IPv4 forwarding Maxime Chevallier <maxime.chevallier(a)bootlin.com> net: mvpp2: Don't check for 3 consecutive Idle frames for 10G links Thomas Falcon <tlfalcon(a)linux.ibm.com> bonding: Force slave speed check after link state recovery for 802.3ad Wenwen Wang <wenwen(a)cs.uga.edu> ASoC: dapm: fix a memory leak bug Ilya Leoshkevich <iii(a)linux.ibm.com> selftests/bpf: fix sendmsg6_prog on s390 John Fastabend <john.fastabend(a)gmail.com> bpf: sockmap, only create entry if ulp is not already enabled John Fastabend <john.fastabend(a)gmail.com> bpf: sockmap, synchronize_rcu before free'ing map John Fastabend <john.fastabend(a)gmail.com> bpf: sockmap, sock_map_delete needs to use xchg Lubomir Rintel <lkundrak(a)v3.sk> spi: pxa2xx: Balance runtime PM enable/disable on error Masahiro Yamada <yamada.masahiro(a)socionext.com> ASoC: SOF: use __u32 instead of uint32_t in uapi headers Charles Keepax <ckeepax(a)opensource.cirrus.com> ASoC: dapm: Fix handling of custom_stop_condition on DAPM graph walks Wenwen Wang <wenwen(a)cs.uga.edu> netfilter: ebtables: fix a memory leak bug in compat Andrii Nakryiko <andriin(a)fb.com> libbpf: sanitize VAR to conservative 1-byte INT Vladimir Kondratiev <vladimir.kondratiev(a)linux.intel.com> mips: fix cacheinfo Thomas Bogendoerfer <tbogendoerfer(a)suse.de> MIPS: kernel: only use i8253 clocksource with periodic clockevent Ilya Trukhanov <lahvuun(a)gmail.com> HID: Add 044f:b320 ThrustMaster, Inc. 2 in 1 DT Filipe Laíns <lains(a)archlinux.org> HID: logitech-hidpp: add USB PID for a few more supported mice Hans de Goede <hdegoede(a)redhat.com> ASoC: Intel: bytcht_es8316: Add quirk for Irbis NB41 netbook Wen Yang <wen.yang99(a)zte.com.cn> ASoC: samsung: odroid: fix a double-free issue for cpu_dai Wen Yang <wen.yang99(a)zte.com.cn> ASoC: samsung: odroid: fix an use-after-free issue for codec Jernej Skrabec <jernej.skrabec(a)siol.net> regulator: axp20x: fix DCDC5 and DCDC6 for AXP803 Jernej Skrabec <jernej.skrabec(a)siol.net> regulator: axp20x: fix DCDCA and DCDCD for AXP806 Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: audio-graph-card: add missing const at graph_get_dai_id() Wen Yang <wen.yang99(a)zte.com.cn> ASoC: audio-graph-card: fix an use-after-free in graph_get_dai_id() Wen Yang <wen.yang99(a)zte.com.cn> ASoC: audio-graph-card: fix use-after-free in graph_dai_link_of_dpcm() Wen Yang <wen.yang99(a)zte.com.cn> ASoC: simple-card: fix an use-after-free in simple_for_each_link() Wen Yang <wen.yang99(a)zte.com.cn> ASoC: simple-card: fix an use-after-free in simple_dai_link_of_dpcm() Kuninori Morimoto <kuninori.morimoto.gx(a)renesas.com> ASoC: simple_card_utils.h: care NULL dai at asoc_simple_debug_dai() ------------- Diffstat: Documentation/admin-guide/kernel-parameters.txt | 7 ++ .../devicetree/bindings/riscv/sifive.yaml | 2 +- Makefile | 4 +- arch/arm/kvm/coproc.c | 23 +++-- arch/arm64/kvm/sys_regs.c | 32 ++++--- arch/mips/kernel/cacheinfo.c | 2 + arch/mips/kernel/i8253.c | 3 +- arch/powerpc/kernel/misc_64.S | 4 +- arch/s390/boot/ipl_parm.c | 2 - arch/s390/kernel/ipl.c | 9 -- arch/s390/kernel/vmlinux.lds.S | 10 +- arch/s390/mm/dump_pagetables.c | 12 +-- arch/x86/include/asm/bootparam_utils.h | 63 ++++++++++--- arch/x86/include/asm/msr-index.h | 1 + arch/x86/include/asm/nospec-branch.h | 2 +- arch/x86/kernel/apic/apic.c | 68 +++++++++++--- arch/x86/kernel/cpu/amd.c | 66 ++++++++++++++ arch/x86/kvm/mmu.c | 33 +------ arch/x86/lib/cpu.c | 1 + arch/x86/power/cpu.c | 86 +++++++++++++++--- block/bfq-iosched.c | 14 ++- drivers/ata/libata-scsi.c | 21 +++++ drivers/ata/libata-sff.c | 6 ++ drivers/ata/pata_rb532_cf.c | 1 - drivers/block/aoe/aoedev.c | 13 ++- drivers/clk/socfpga/clk-periph-s10.c | 2 +- drivers/gpio/gpiolib.c | 6 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 40 ++++++++ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 + drivers/gpu/drm/amd/amdgpu/soc15.c | 5 - drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 24 +++-- drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 4 +- drivers/hid/hid-a4tech.c | 30 +++++- drivers/hid/hid-ids.h | 1 + drivers/hid/hid-logitech-hidpp.c | 32 ++++++- drivers/hid/hid-quirks.c | 1 + drivers/hid/hid-tmff.c | 12 +++ drivers/hid/wacom_wac.c | 4 +- drivers/hv/channel.c | 2 +- drivers/infiniband/hw/hfi1/tid_rdma.c | 77 ++++++---------- drivers/isdn/hardware/mISDN/hfcsusb.c | 13 ++- drivers/md/dm-bufio.c | 4 +- drivers/md/dm-dust.c | 11 ++- drivers/md/dm-integrity.c | 15 +++ drivers/md/dm-kcopyd.c | 5 +- drivers/md/dm-raid.c | 2 +- drivers/md/dm-table.c | 5 +- drivers/md/dm-zoned-metadata.c | 59 +++++++++--- drivers/md/dm-zoned-reclaim.c | 44 +++++++-- drivers/md/dm-zoned-target.c | 67 ++++++++++++-- drivers/md/dm-zoned.h | 10 ++ drivers/md/persistent-data/dm-btree.c | 31 ++++--- drivers/md/persistent-data/dm-space-map-metadata.c | 2 +- drivers/misc/habanalabs/firmware_if.c | 19 +--- drivers/net/bonding/bond_main.c | 9 ++ drivers/net/can/dev.c | 2 + drivers/net/can/sja1000/peak_pcmcia.c | 2 +- drivers/net/can/spi/mcp251x.c | 49 +++++----- drivers/net/can/usb/peak_usb/pcan_usb_core.c | 2 +- drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 5 +- drivers/net/ethernet/freescale/enetc/Kconfig | 2 + drivers/net/ethernet/hisilicon/hip04_eth.c | 28 +++--- drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 +- drivers/net/ethernet/qlogic/qed/qed_int.c | 2 +- drivers/net/ethernet/qlogic/qed/qed_rdma.c | 2 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 4 + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 4 + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 ++ drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 2 +- drivers/net/phy/phy_led_triggers.c | 3 +- drivers/net/usb/qmi_wwan.c | 1 + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 53 ++++++++--- drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 65 ++++++++++--- drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 7 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 1 + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 4 +- drivers/net/wireless/mac80211_hwsim.c | 8 +- drivers/nfc/st-nci/se.c | 2 + drivers/nfc/st21nfca/se.c | 2 + drivers/nvmem/nvmem-sysfs.c | 15 ++- drivers/regulator/axp20x-regulator.c | 10 +- drivers/scsi/ufs/ufshcd.c | 3 + drivers/spi/spi-pxa2xx.c | 14 ++- drivers/staging/fbtft/fb_bd663474.c | 2 +- drivers/staging/fbtft/fb_ili9163.c | 2 +- drivers/staging/fbtft/fb_ili9325.c | 2 +- drivers/staging/fbtft/fb_s6d1121.c | 2 +- drivers/staging/fbtft/fb_ssd1289.c | 2 +- drivers/staging/fbtft/fb_ssd1331.c | 4 +- drivers/staging/fbtft/fb_upd161704.c | 2 +- drivers/staging/fbtft/fbtft-bus.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 4 +- fs/ceph/addr.c | 5 +- fs/ceph/locks.c | 3 +- fs/cifs/smb2ops.c | 39 +++++--- fs/io_uring.c | 66 ++++++++++---- fs/nfs/delegation.c | 23 +++-- fs/nfs/fscache.c | 7 +- fs/nfs/fscache.h | 2 +- fs/nfs/nfs4_fs.h | 3 +- fs/nfs/nfs4client.c | 5 +- fs/nfs/nfs4proc.c | 70 ++++++++------ fs/nfs/nfs4state.c | 43 +++++++-- fs/nfs/super.c | 1 + fs/userfaultfd.c | 25 ++--- fs/xfs/xfs_iops.c | 1 + include/net/cfg80211.h | 15 +++ include/sound/simple_card_utils.h | 4 + include/trace/events/rxrpc.h | 6 +- include/uapi/sound/sof/fw.h | 16 ++-- include/uapi/sound/sof/header.h | 14 +-- kernel/irq/irqdesc.c | 15 ++- kernel/sched/deadline.c | 8 -- kernel/sched/psi.c | 12 ++- mm/huge_memory.c | 4 + mm/kasan/common.c | 10 +- mm/memcontrol.c | 60 ++++++++++++ mm/page_alloc.c | 19 +--- mm/z3fold.c | 89 ++++++++++++++++++ mm/zsmalloc.c | 78 +++++++++++++++- net/bridge/netfilter/ebtables.c | 4 +- net/can/gw.c | 48 +++++++--- net/ceph/osd_client.c | 9 +- net/core/sock_map.c | 19 +++- net/mac80211/util.c | 7 +- net/netfilter/ipset/ip_set_bitmap_ipmac.c | 2 +- net/netfilter/ipset/ip_set_core.c | 2 +- net/netfilter/ipset/ip_set_hash_ipmac.c | 6 +- net/rxrpc/af_rxrpc.c | 4 +- net/rxrpc/ar-internal.h | 6 +- net/rxrpc/input.c | 16 +++- net/rxrpc/local_object.c | 101 +++++++++++++-------- net/rxrpc/peer_event.c | 2 +- net/rxrpc/peer_object.c | 18 ++++ net/rxrpc/sendmsg.c | 1 + net/wireless/core.c | 6 +- net/wireless/nl80211.c | 4 +- net/wireless/util.c | 27 +++++- sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- sound/soc/generic/audio-graph-card.c | 30 +++--- sound/soc/generic/simple-card.c | 26 +++--- sound/soc/intel/boards/bytcht_es8316.c | 8 ++ sound/soc/rockchip/rockchip_i2s.c | 5 +- sound/soc/samsung/odroid.c | 8 +- sound/soc/soc-core.c | 7 +- sound/soc/soc-dapm.c | 10 +- sound/soc/ti/davinci-mcasp.c | 46 ++++++++-- tools/lib/bpf/libbpf.c | 9 +- tools/lib/bpf/xsk.c | 11 +-- tools/perf/bench/numa.c | 6 +- tools/perf/builtin-ftrace.c | 2 +- tools/perf/pmu-events/jevents.c | 1 + tools/perf/util/cpumap.c | 5 +- tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 +- tools/testing/selftests/bpf/verifier/ctx_skb.c | 11 +++ tools/testing/selftests/kvm/config | 3 + .../selftests/net/forwarding/gre_multipath.sh | 28 +++--- 161 files changed, 1815 insertions(+), 703 deletions(-)

5 years, 8 months

6
172
0 0

[PATCH v4.4 V2 00/43] V4.4 backport of arm64 Spectre patches

by Viresh Kumar

Hello, This series backports arm64 spectre patches to v4.4 stable kernel. I have started this backport with Mark Rutland's backport of Spectre to 4.9 [1] and tried applying the upstream version of them over 4.4 and resolved conflicts by checking how they have been resolved in 4.9. The KVM changes are mostly dropped as the KVM code in v4.4 is quite different and it makes backport more complex. This was suggested by the ARM team. I had to pick few extra upstream patches to avoid conflicts and to make things work: mm/kasan: add API to check memory regions arm64: kasan: instrument user memory access API arm64: cpufeature: Add scope for capability check arm64: cputype info for Broadcom Vulcan arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs ARM: 8478/2: arm/arm64: add arm-smccc arm64: cpufeature: Test 'matches' pointer to find the end of the list arm64: Introduce cpu_die_early arm64: Move cpu_die_early to smp.c arm64: Verify CPU errata work arounds on hotplugged CPU arm64: errata: Calling enable functions for CPU errata too arm64: Rearrange CPU errata workaround checks I also had to drop few patches as they weren't getting applied properly due to missing files/features or they were KVM related: arm64: cpufeature: __this_cpu_has_cap() shouldn't stop early arm64: KVM: Use per-CPU vector when BP hardening is enabled arm64: KVM: Make PSCI_VERSION a fast path mm: Introduce lm_alias arm64: KVM: Increment PC after handling an SMC trap arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Turn kvm_psci_version into a static inline arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling I have dropped arch/arm64/crypto/sha256-core.S and sha512-core.S files as they weren't part of the upstream commit. Not sure why it was included by Mark as the commit log doesn't provide any reasoning for it. The patches in this series are pushed here [2]. This is tested on Hikey board (octa A53) and I verified that BP hardening code is getting hit for CPUs (had to hack a bit and enable BP hardening support for A53 for this). Changes V1->V2: - Rebased over 4.4.184 (was 4.4.180 earlier). - Fixed an build issue with CONFIG_KASAN (Julien). - Dropped few patches, mostly KVM stuff (Julien): arm64: remove duplicate macro __KERNEL__ check mm: Introduce lm_alias arm64: KVM: Increment PC after handling an SMC trap arm/arm64: KVM: Consolidate the PSCI include files arm/arm64: KVM: Add PSCI_VERSION helper arm/arm64: KVM: Add smccc accessors to PSCI code arm/arm64: KVM: Implement PSCI 1.0 support arm/arm64: KVM: Turn kvm_psci_version into a static inline arm64: KVM: Add SMCCC_ARCH_WORKAROUND_1 fast handling - Added few patches to fix issues reported by Julien: arm64: cpufeature: Test 'matches' pointer to find the end of the list arm64: Introduce cpu_die_early arm64: Move cpu_die_early to smp.c arm64: Verify CPU errata work arounds on hotplugged CPU arm64: errata: Calling enable functions for CPU errata too arm64: Rearrange CPU errata workaround checks -- viresh [1] https://patches.linaro.org/cover/133195/ with top commit in 4.9 stable tree: a3b292fe0560 arm64: futex: Mask __user pointers prior to dereference [2] https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git stable/v4.4.y/spectre -------------------------8<------------------------- Andre Przywara (1): arm64: errata: Calling enable functions for CPU errata too Andrey Ryabinin (1): mm/kasan: add API to check memory regions Catalin Marinas (1): arm64: Factor out TTBR0_EL1 post-update workaround into a specific asm macro James Morse (1): arm64: cpufeature: Test 'matches' pointer to find the end of the list Jayachandran C (3): arm64: cputype info for Broadcom Vulcan arm64: cputype: Add MIDR values for Cavium ThunderX2 CPUs arm64: Branch predictor hardening for Cavium ThunderX2 Jens Wiklander (1): ARM: 8478/2: arm/arm64: add arm-smccc Marc Zyngier (11): arm64: Move post_ttbr_update_workaround to C code arm64: Move BP hardening to check_and_switch_context arm64: cpu_errata: Allow an erratum to be match for all revisions of a core arm/arm64: KVM: Advertise SMCCC v1.1 arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support firmware/psci: Expose PSCI conduit firmware/psci: Expose SMCCC version through psci_ops arm/arm64: smccc: Make function identifiers an unsigned quantity arm/arm64: smccc: Implement SMCCC v1.1 inline primitive arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support arm64: Kill PSCI_GET_VERSION as a variant-2 workaround Robin Murphy (3): arm64: Implement array_index_mask_nospec() arm64: Make USER_DS an inclusive limit arm64: Use pointer masking to limit uaccess speculation Suzuki K Poulose (6): arm64: cpufeature: Add scope for capability check arm64: Introduce cpu_die_early arm64: Move cpu_die_early to smp.c arm64: Verify CPU errata work arounds on hotplugged CPU arm64: Rearrange CPU errata workaround checks arm64: Run enable method for errata work arounds on late CPUs Will Deacon (13): arm64: barrier: Add CSDB macros to control data-value prediction arm64: entry: Ensure branch through syscall table is bounded under speculation arm64: uaccess: Prevent speculative use of the current addr_limit arm64: uaccess: Don't bother eliding access_ok checks in __{get, put}_user arm64: uaccess: Mask __user pointers for __arch_{clear, copy_*}_user arm64: cpufeature: Pass capability structure to ->enable callback drivers/firmware: Expose psci_get_version through psci_ops structure arm64: Add skeleton to harden the branch predictor against aliasing attacks arm64: entry: Apply BP hardening for high-priority synchronous exceptions arm64: entry: Apply BP hardening for suspicious interrupts from EL0 arm64: cputype: Add missing MIDR values for Cortex-A72 and Cortex-A75 arm64: Implement branch predictor hardening for affected Cortex-A CPUs arm64: futex: Mask __user pointers prior to dereference Yang Shi (1): arm64: kasan: instrument user memory access API Yury Norov (1): arm64: move TASK_* definitions to <asm/processor.h> MAINTAINERS | 14 ++ arch/arm64/Kconfig | 17 ++ arch/arm64/include/asm/assembler.h | 18 ++ arch/arm64/include/asm/barrier.h | 23 +++ arch/arm64/include/asm/cpufeature.h | 24 ++- arch/arm64/include/asm/cputype.h | 12 ++ arch/arm64/include/asm/futex.h | 9 +- arch/arm64/include/asm/memory.h | 15 -- arch/arm64/include/asm/mmu.h | 39 ++++ arch/arm64/include/asm/processor.h | 24 +++ arch/arm64/include/asm/smp.h | 1 + arch/arm64/include/asm/sysreg.h | 2 + arch/arm64/include/asm/uaccess.h | 175 ++++++++++++------ arch/arm64/kernel/Makefile | 5 + arch/arm64/kernel/arm64ksyms.c | 8 +- arch/arm64/kernel/bpi.S | 75 ++++++++ arch/arm64/kernel/cpu_errata.c | 213 +++++++++++++++++++++- arch/arm64/kernel/cpufeature.c | 186 +++++++++---------- arch/arm64/kernel/cpuinfo.c | 2 - arch/arm64/kernel/entry.S | 26 ++- arch/arm64/kernel/smp.c | 33 +++- arch/arm64/lib/clear_user.S | 6 +- arch/arm64/lib/copy_from_user.S | 4 +- arch/arm64/lib/copy_in_user.S | 4 +- arch/arm64/lib/copy_to_user.S | 4 +- arch/arm64/mm/context.c | 12 ++ arch/arm64/mm/fault.c | 31 ++++ arch/arm64/mm/proc.S | 12 +- drivers/firmware/Kconfig | 3 + drivers/firmware/psci.c | 58 +++++- include/linux/arm-smccc.h | 267 ++++++++++++++++++++++++++++ include/linux/kasan-checks.h | 12 ++ include/linux/psci.h | 14 ++ mm/kasan/kasan.c | 12 ++ 34 files changed, 1147 insertions(+), 213 deletions(-) create mode 100644 arch/arm64/kernel/bpi.S create mode 100644 include/linux/arm-smccc.h create mode 100644 include/linux/kasan-checks.h -- 2.21.0.rc0.269.g1a574e7a288b

5 years, 8 months

5
67
0 0

Re: [PATCH] block: mq-deadline: Fix queue restart handling

by Sasha Levin

Hi, [This is an automated email] This commit has been processed because it contains a "Fixes:" tag, fixing commit: 7211aef86f79 block: mq-deadline: Fix write completion handling. The bot has tested the following trees: v5.2.10, v4.19.68. v5.2.10: Build OK! v4.19.68: Build failed! Errors: block/mq-deadline.c:571:39: error: ‘struct request’ has no member named ‘mq_hctx’; did you mean ‘mq_ctx’? NOTE: The patch will not be queued to stable trees until it is upstream. How should we proceed with this patch? -- Thanks, Sasha

5 years, 8 months

1
0
0 0

[PATCH] mmc: core: Fix init of SD cards reporting an invalid VDD range

by Ulf Hansson

The OCR register defines the supported range of VDD voltages for SD cards. However, it has turned out that some SD cards reports an invalid voltage range, for example having bit7 set. When a host supports MMC_CAP2_FULL_PWR_CYCLE and some of the voltages from the invalid VDD range, this triggers the core to run a power cycle of the card to try to initialize it at the lowest common supported voltage. Obviously this fails, since the card can't support it. Let's fix this problem, by clearing invalid bits from the read OCR register for SD cards, before proceeding with the VDD voltage negotiation. Cc: stable(a)vger.kernel.org Reported-by: Philip Langdale <philipl(a)overt.org> Signed-off-by: Ulf Hansson <ulf.hansson(a)linaro.org> --- drivers/mmc/core/sd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index d681e8aaca83..fe914ff5f5d6 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -1292,6 +1292,12 @@ int mmc_attach_sd(struct mmc_host *host) goto err; } + /* + * Some SD cards claims an out of spec VDD voltage range. Let's treat + * these bits as being in-valid and especially also bit7. + */ + ocr &= ~0x7FFF; + rocr = mmc_select_voltage(host, ocr); /* -- 2.17.1

5 years, 8 months

2
2
0 0

[PATCH 4.4 01/13] GFS2: don't set rgrp gl_object until it's inserted into rgrp tree

by Ben Hutchings

From: Bob Peterson <rpeterso(a)redhat.com> commit 36e4ad0316c017d5b271378ed9a1c9a4b77fab5f upstream. Before this patch, function read_rindex_entry would set a rgrp glock's gl_object pointer to itself before inserting the rgrp into the rgrp rbtree. The problem is: if another process was also reading the rgrp in, and had already inserted its newly created rgrp, then the second call to read_rindex_entry would overwrite that value, then return a bad return code to the caller. Later, other functions would reference the now-freed rgrp memory by way of gl_object. In some cases, that could result in gfs2_rgrp_brelse being called twice for the same rgrp: once for the failed attempt and once for the "real" rgrp release. Eventually the kernel would panic. There are also a number of other things that could go wrong when a kernel module is accessing freed storage. For example, this could result in rgrp corruption because the fake rgrp would point to a fake bitmap in memory too, causing gfs2_inplace_reserve to search some random memory for free blocks, and find some, since we were never setting rgd->rd_bits to NULL before freeing it. This patch fixes the problem by not setting gl_object until we have successfully inserted the rgrp into the rbtree. Also, it sets rd_bits to NULL as it frees them, which will ensure any accidental access to the wrong rgrp will result in a kernel panic rather than file system corruption, which is preferred. Signed-off-by: Bob Peterson <rpeterso(a)redhat.com> [bwh: Backported to 4.4: adjust context] Signed-off-by: Ben Hutchings <ben.hutchings(a)codethink.co.uk> --- fs/gfs2/rgrp.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c index ef24894edecc..9c159e6ad116 100644 --- a/fs/gfs2/rgrp.c +++ b/fs/gfs2/rgrp.c @@ -739,6 +739,7 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp) gfs2_free_clones(rgd); kfree(rgd->rd_bits); + rgd->rd_bits = NULL; return_all_reservations(rgd); kmem_cache_free(gfs2_rgrpd_cachep, rgd); } @@ -933,10 +934,6 @@ static int read_rindex_entry(struct gfs2_inode *ip) if (error) goto fail; - rgd->rd_gl->gl_object = rgd; - rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_CACHE_MASK; - rgd->rd_gl->gl_vm.end = PAGE_CACHE_ALIGN((rgd->rd_addr + - rgd->rd_length) * bsize) - 1; rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr; rgd->rd_flags &= ~(GFS2_RDF_UPTODATE | GFS2_RDF_PREFERRED); if (rgd->rd_data > sdp->sd_max_rg_data) @@ -944,14 +941,20 @@ static int read_rindex_entry(struct gfs2_inode *ip) spin_lock(&sdp->sd_rindex_spin); error = rgd_insert(rgd); spin_unlock(&sdp->sd_rindex_spin); - if (!error) + if (!error) { + rgd->rd_gl->gl_object = rgd; + rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_MASK; + rgd->rd_gl->gl_vm.end = PAGE_ALIGN((rgd->rd_addr + + rgd->rd_length) * bsize) - 1; return 0; + } error = 0; /* someone else read in the rgrp; free it and ignore it */ gfs2_glock_put(rgd->rd_gl); fail: kfree(rgd->rd_bits); + rgd->rd_bits = NULL; kmem_cache_free(gfs2_rgrpd_cachep, rgd); return error; } -- Ben Hutchings, Software Developer Codethink Ltd https://www.codethink.co.uk/ Dale House, 35 Dale Street Manchester, M1 2HF, United Kingdom

5 years, 8 months

3
14
0 0

[PATCH] perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops

by Kim Phillips

When counting dispatched micro-ops with cnt_ctl=1, in order to prevent sample bias, IBS hardware preloads the least significant 7 bits of current count (IbsOpCurCnt) with random values, such that, after the interrupt is handled and counting resumes, the next sample taken will be slightly perturbed. The current count bitfield is in the IBS execution control h/w register, alongside the maximum count field. Currently, the IBS driver writes that register with the maximum count, leaving zeroes to fill the current count field, thereby overwriting the random bits the hardware preloaded for itself. Fix the driver to actually retain and carry those random bits from the read of the IBS control register, through to its write, instead of overwriting the lower current count bits with zeroes. Tested with: perf record -c 100001 -e ibs_op/cnt_ctl=1/pp -a -C 0 taskset -c 0 <workload> 'perf annotate' output before: 15.70 65: addsd %xmm0,%xmm1 17.30 add $0x1,%rax 15.88 cmp %rdx,%rax je 82 17.32 72: test $0x1,%al jne 7c 7.52 movapd %xmm1,%xmm0 5.90 jmp 65 8.23 7c: sqrtsd %xmm1,%xmm0 12.15 jmp 65 'perf annotate' output after: 16.63 65: addsd %xmm0,%xmm1 16.82 add $0x1,%rax 16.81 cmp %rdx,%rax je 82 16.69 72: test $0x1,%al jne 7c 8.30 movapd %xmm1,%xmm0 8.13 jmp 65 8.24 7c: sqrtsd %xmm1,%xmm0 8.39 jmp 65 Tested on Family 15h and 17h machines. Machines prior to family 10h Rev. C don't have the RDWROPCNT capability, and have the IbsOpCurCnt bitfield reserved, so this patch shouldn't affect their operation. It is unknown why commit db98c5faf8cb ("perf/x86: Implement 64-bit counter support for IBS") ignored the lower 4 bits of the IbsOpCurCnt field; the number of preloaded random bits has always been 7, AFAICT. Signed-off-by: Kim Phillips <kim.phillips(a)amd.com> Cc: Stephane Eranian <eranian(a)google.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Arnaldo Carvalho de Melo <acme(a)kernel.org> Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Jiri Olsa <jolsa(a)redhat.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: Borislav Petkov <bp(a)alien8.de> Cc: "H. Peter Anvin" <hpa(a)zytor.com> Cc: x86(a)kernel.org Cc: stable(a)vger.kernel.org --- arch/x86/events/amd/ibs.c | 11 +++++++++-- arch/x86/include/asm/perf_event.h | 9 ++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/x86/events/amd/ibs.c b/arch/x86/events/amd/ibs.c index 62f317c9113a..f2625b4a5a8b 100644 --- a/arch/x86/events/amd/ibs.c +++ b/arch/x86/events/amd/ibs.c @@ -663,8 +663,15 @@ static int perf_ibs_handle_irq(struct perf_ibs *perf_ibs, struct pt_regs *iregs) out: if (throttle) perf_ibs_stop(event, 0); - else - perf_ibs_enable_event(perf_ibs, hwc, period >> 4); + else { + period >>= 4; + + if ((ibs_caps & IBS_CAPS_RDWROPCNT) && + (*config & IBS_OP_CNT_CTL)) + period |= *config & IBS_OP_CUR_CNT_RAND; + + perf_ibs_enable_event(perf_ibs, hwc, period); + } perf_event_update_userpage(event); diff --git a/arch/x86/include/asm/perf_event.h b/arch/x86/include/asm/perf_event.h index 1392d5e6e8d6..67d94696a1d6 100644 --- a/arch/x86/include/asm/perf_event.h +++ b/arch/x86/include/asm/perf_event.h @@ -259,9 +259,12 @@ struct pebs_lbr { #define IBS_FETCH_CNT 0xFFFF0000ULL #define IBS_FETCH_MAX_CNT 0x0000FFFFULL -/* ibs op bits/masks */ -/* lower 4 bits of the current count are ignored: */ -#define IBS_OP_CUR_CNT (0xFFFF0ULL<<32) +/* ibs op bits/masks + * The lower 7 bits of the current count are random bits + * preloaded by hardware and ignored in software + */ +#define IBS_OP_CUR_CNT (0xFFF80ULL<<32) +#define IBS_OP_CUR_CNT_RAND (0x0007FULL<<32) #define IBS_OP_CNT_CTL (1ULL<<19) #define IBS_OP_VAL (1ULL<<18) #define IBS_OP_ENABLE (1ULL<<17) -- 2.23.0

5 years, 8 months

2
1
0 0

stable/linux-4.14.y boot: 72 boots: 1 failed, 71 passed (v4.14.140)

by kernelci.org bot

stable/linux-4.14.y boot: 72 boots: 1 failed, 71 passed (v4.14.140) Full Boot Summary: https://kernelci.org/boot/all/job/stable/branch/linux-4.14.y/kernel/v4.14.1… Full Build Summary: https://kernelci.org/build/stable/branch/linux-4.14.y/kernel/v4.14.140/ Tree: stable Branch: linux-4.14.y Git Describe: v4.14.140 Git Commit: b5260801526c77496dd8be7d750c20939ec64189 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git Tested: 33 unique boards, 17 SoC families, 12 builds out of 201 Boot Failure Detected: arm: sama5_defconfig: gcc-8: at91-sama5d4_xplained: 1 failed lab --- For more info write to <info(a)kernelci.org>

5 years, 8 months

1
0
0 0

FAILED: patch "[PATCH] scsi: ufs: Fix NULL pointer dereference in" failed to apply to 4.4-stable tree

by gregkh＠linuxfoundation.org

The patch below does not apply to the 4.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>. thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 7c7cfdcf7f1777c7376fc9a239980de04b6b5ea1 Mon Sep 17 00:00:00 2001 From: Adrian Hunter <adrian.hunter(a)intel.com> Date: Wed, 14 Aug 2019 15:59:50 +0300 Subject: [PATCH] scsi: ufs: Fix NULL pointer dereference in ufshcd_config_vreg_hpm() Fix the following BUG: [ 187.065689] BUG: kernel NULL pointer dereference, address: 000000000000001c [ 187.065790] RIP: 0010:ufshcd_vreg_set_hpm+0x3c/0x110 [ufshcd_core] [ 187.065938] Call Trace: [ 187.065959] ufshcd_resume+0x72/0x290 [ufshcd_core] [ 187.065980] ufshcd_system_resume+0x54/0x140 [ufshcd_core] [ 187.065993] ? pci_pm_restore+0xb0/0xb0 [ 187.066005] ufshcd_pci_resume+0x15/0x20 [ufshcd_pci] [ 187.066017] pci_pm_thaw+0x4c/0x90 [ 187.066030] dpm_run_callback+0x5b/0x150 [ 187.066043] device_resume+0x11b/0x220 Voltage regulators are optional, so functions must check they exist before dereferencing. Note this issue is hidden if CONFIG_REGULATORS is not set, because the offending code is optimised away. Notes for stable: The issue first appears in commit 57d104c153d3 ("ufs: add UFS power management support") but is inadvertently fixed in commit 60f0187031c0 ("scsi: ufs: disable vccq if it's not needed by UFS device") which in turn was reverted by commit 730679817d83 ("Revert "scsi: ufs: disable vccq if it's not needed by UFS device""). So fix applies v3.18 to v4.5 and v5.1+ Fixes: 57d104c153d3 ("ufs: add UFS power management support") Fixes: 730679817d83 ("Revert "scsi: ufs: disable vccq if it's not needed by UFS device"") Cc: stable(a)vger.kernel.org Signed-off-by: Adrian Hunter <adrian.hunter(a)intel.com> Signed-off-by: Martin K. Petersen <martin.petersen(a)oracle.com> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e274053109d0..029da74bb2f5 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7062,6 +7062,9 @@ static inline int ufshcd_config_vreg_lpm(struct ufs_hba *hba, static inline int ufshcd_config_vreg_hpm(struct ufs_hba *hba, struct ufs_vreg *vreg) { + if (!vreg) + return 0; + return ufshcd_config_vreg_load(hba->dev, vreg, vreg->max_uA); }

5 years, 8 months

4
4
0 0

stable-rc/linux-4.9.y boot: 109 boots: 2 failed, 97 passed with 10 offline (v4.9.190-44-g7c5529b85097)

by kernelci.org bot

stable-rc/linux-4.9.y boot: 109 boots: 2 failed, 97 passed with 10 offline (v4.9.190-44-g7c5529b85097) Full Boot Summary: https://kernelci.org/boot/all/job/stable-rc/branch/linux-4.9.y/kernel/v4.9.… Full Build Summary: https://kernelci.org/build/stable-rc/branch/linux-4.9.y/kernel/v4.9.190-44-… Tree: stable-rc Branch: linux-4.9.y Git Describe: v4.9.190-44-g7c5529b85097 Git Commit: 7c5529b85097ab741ffb2c03b344c4925e489336 Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Tested: 52 unique boards, 22 SoC families, 15 builds out of 197 Boot Failures Detected: arm: sama5_defconfig: gcc-8: at91-sama5d4_xplained: 1 failed lab multi_v7_defconfig: gcc-8: exynos5250-snow: 1 failed lab Offline Platforms: arm64: defconfig: gcc-8 apq8016-sbc: 1 offline lab meson-gxbb-odroidc2: 1 offline lab arm: tegra_defconfig: gcc-8 tegra20-iris-512: 1 offline lab multi_v7_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sun5i-r8-chip: 1 offline lab tegra20-iris-512: 1 offline lab qcom_defconfig: gcc-8 qcom-apq8064-cm-qs600: 1 offline lab qcom-apq8064-ifc6410: 1 offline lab sunxi_defconfig: gcc-8 sun5i-r8-chip: 1 offline lab --- For more info write to <info(a)kernelci.org>

5 years, 8 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror