This regards upstream commit a90118c445cc ("x86/boot: Save fields
explicitly, zero out everything else") application to linux-stable.
Its corresponding commits to the stable 4.4 and 4.9 trees didn't apply
correctly, probably due to a field name change (e820_table had been named
e820_map before 4.10).
On my desktop I'm unable to boot a signed kernel due to these commits.
Add e820_map (to replace e820_table) to the preserved fields so that the
E820 memory regions in boot_params can be accessed by the kernel after
boot_params has been sanitized.
Signed-off-by: John S Gruber <JohnSGruber(a)gmail.com>
Fixes: 41664b97f46e ("x86/boot: Save fields explicitly, zero out everything else")
Fixes: 4e478cb2ccdd ("x86/boot: Save fields explicitly, zero out everything else")
Link: https://lore.kernel.org/lkml/20190731054627.5627-2-jhubbard@nvidia.com/
---
I tested stable 4.14.145, 4.19.74, and 5.2.16 successfully under the same
circumstances. Only 4.4 and 4.9 are affected by this dropped line.
arch/x86/include/asm/bootparam_utils.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/x86/include/asm/bootparam_utils.h b/arch/x86/include/asm/bootparam_utils.h
index 0232b5a..588d8fb 100644
--- a/arch/x86/include/asm/bootparam_utils.h
+++ b/arch/x86/include/asm/bootparam_utils.h
@@ -71,6 +71,7 @@ static void sanitize_boot_params(struct boot_params *boot_params)
BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),
BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),
BOOT_PARAM_PRESERVE(hdr),
+ BOOT_PARAM_PRESERVE(e820_map),
BOOT_PARAM_PRESERVE(eddbuf),
};
--
2.7.4
This is the start of the stable review cycle for the 4.4.194 release.
There are 56 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 Sat 21 Sep 2019 09:44:25 PM 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/v4.x/stable-review/patch-4.4.194-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.4.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.4.194-rc1
Vineet Gupta <Vineet.Gupta1(a)synopsys.com>
ARC: export "abort" for modules
Sean Young <sean(a)mess.org>
media: technisat-usb2: break out of loop at end of buffer
Jann Horn <jannh(a)google.com>
floppy: fix usercopy direction
Hillf Danton <hdanton(a)sina.com>
keys: Fix missing null pointer check in request_key_auth_describe()
Wenwen Wang <wenwen(a)cs.uga.edu>
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
net: seeq: Fix the function used to release some memory in an error handling path
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
tools/power turbostat: fix buffer overrun
Takashi Iwai <tiwai(a)suse.de>
sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
Dan Carpenter <dan.carpenter(a)oracle.com>
cifs: Use kzfree() to zero out the password
Ronnie Sahlberg <lsahlber(a)redhat.com>
cifs: set domainName when a domain-key is used in multiuser
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix write regression
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix eof handling
Thomas Jarosch <thomas.jarosch(a)intra2net.com>
netfilter: nf_conntrack_ftp: Fix debug output
Thomas Gleixner <tglx(a)linutronix.de>
x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
Prashant Malani <pmalani(a)chromium.org>
r8152: Set memory to all 0xFFs on failed reg reads
Doug Berger <opendmb(a)gmail.com>
ARM: 8874/1: mm: only adjust sections of valid mm structures
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv4: Fix return values for nfs4_file_open()
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: use 32-bit index for tail calls
Tony Lindgren <tony(a)atomide.com>
ARM: OMAP2+: Fix omap4 errata warning on other SoCs
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: fix lcgr instruction encoding
Wen Huang <huangwenabc(a)gmail.com>
mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
Razvan Stefanescu <razvan.stefanescu(a)microchip.com>
tty/serial: atmel: reschedule TX after RX was started
Chunyan Zhang <chunyan.zhang(a)unisoc.com>
serial: sprd: correct the wrong sequence of arguments
Matt Delco <delco(a)chromium.org>
KVM: coalesced_mmio: add bounds checking
Dongli Zhang <dongli.zhang(a)oracle.com>
xen-netfront: do not assume sk_buff_head list is empty in error handling
Corey Minyard <cminyard(a)mvista.com>
x86/boot: Add missing bootparam that breaks boot on some platforms
Sean Young <sean(a)mess.org>
media: tm6000: double free if usb disconnect while streaming
Alan Stern <stern(a)rowland.harvard.edu>
USB: usbcore: Fix slab-out-of-bounds bug during device reset
Alexey Brodkin <Alexey.Brodkin(a)synopsys.com>
ARC: configs: Remove CONFIG_INITRAMFS_SOURCE from defconfigs
Paul Burton <paul.burton(a)mips.com>
MIPS: netlogic: xlr: Remove erroneous check in nlm_fmn_send()
Linus Torvalds <torvalds(a)linux-foundation.org>
x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - check data blocksize in ablkcipher.
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - check AES key size
Muchun Song <smuchun(a)gmail.com>
driver core: Fix use-after-free and double free on glue directory
Douglas Anderson <dianders(a)chromium.org>
clk: rockchip: Don't yell about bad mmc phases when getting
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Use same -m%-float cflag as the kernel proper
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Prevent use of smp_processor_id()
Paolo Bonzini <pbonzini(a)redhat.com>
KVM: nVMX: handle page fault in vmread
Fuqian Huang <huangfq.daxian(a)gmail.com>
KVM: x86: work around leak of uninitialized stack contents
Thomas Huth <thuth(a)redhat.com>
KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl
Yunfeng Ye <yeyunfeng(a)huawei.com>
genirq: Prevent NULL pointer dereference in resend_irqs()
Filipe Manana <fdmanana(a)suse.com>
Btrfs: fix assertion failure during fsync and use of stale transaction
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur"
Yang Yingliang <yangyingliang(a)huawei.com>
tun: fix use-after-free when register netdev failed
Xin Long <lucien.xin(a)gmail.com>
tipc: add NULL pointer check before calling kfree_rcu
Neal Cardwell <ncardwell(a)google.com>
tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
Xin Long <lucien.xin(a)gmail.com>
sctp: use transport pf_retrans in sctp_do_8_2_transport_strike
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
Cong Wang <xiyou.wangcong(a)gmail.com>
sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero
Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org>
net: Fix null de-reference of device refcount
Eric Biggers <ebiggers(a)google.com>
isdn/capi: check message length in capi_write()
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
Bjørn Mork <bjorn(a)mork.no>
cdc_ether: fix rndis support for Mediatek based smartphones
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
bridge/mdb: remove wrong use of NLM_F_MULTI
-------------
Diffstat:
Makefile | 4 +--
arch/arc/configs/axs101_defconfig | 1 -
arch/arc/configs/axs103_defconfig | 1 -
arch/arc/configs/axs103_smp_defconfig | 1 -
arch/arc/configs/nsim_700_defconfig | 1 -
arch/arc/configs/nsim_hs_defconfig | 1 -
arch/arc/configs/nsim_hs_smp_defconfig | 1 -
arch/arc/configs/nsimosci_defconfig | 1 -
arch/arc/configs/nsimosci_hs_defconfig | 1 -
arch/arc/configs/nsimosci_hs_smp_defconfig | 1 -
arch/arc/kernel/traps.c | 1 +
arch/arm/mach-omap2/omap4-common.c | 3 ++
arch/arm/mm/init.c | 3 +-
arch/mips/Kconfig | 3 --
arch/mips/include/asm/netlogic/xlr/fmn.h | 2 --
arch/mips/include/asm/smp.h | 12 ++++++-
arch/mips/sibyte/common/Makefile | 1 -
arch/mips/sibyte/common/dma.c | 14 --------
arch/mips/vdso/Makefile | 4 ++-
arch/s390/kvm/interrupt.c | 10 ++++++
arch/s390/kvm/kvm-s390.c | 2 +-
arch/s390/net/bpf_jit_comp.c | 12 ++++---
arch/x86/Makefile | 1 +
arch/x86/include/asm/bootparam_utils.h | 1 +
arch/x86/kernel/apic/io_apic.c | 8 ++++-
arch/x86/kvm/vmx.c | 7 ++--
arch/x86/kvm/x86.c | 7 ++++
drivers/atm/Kconfig | 2 +-
drivers/base/core.c | 53 +++++++++++++++++++++++++++++-
drivers/block/floppy.c | 4 +--
drivers/clk/rockchip/clk-mmc-phase.c | 4 +--
drivers/crypto/talitos.c | 29 ++++++++++++++++
drivers/dma/omap-dma.c | 4 ++-
drivers/isdn/capi/capi.c | 10 +++++-
drivers/media/usb/dvb-usb/technisat-usb2.c | 21 ++++++------
drivers/media/usb/tm6000/tm6000-dvb.c | 3 ++
drivers/net/ethernet/marvell/sky2.c | 7 ++++
drivers/net/ethernet/seeq/sgiseeq.c | 7 ++--
drivers/net/tun.c | 16 ++++++---
drivers/net/usb/cdc_ether.c | 13 ++++++--
drivers/net/usb/r8152.c | 5 ++-
drivers/net/wireless/mwifiex/ie.c | 3 ++
drivers/net/wireless/mwifiex/uap_cmd.c | 9 ++++-
drivers/net/xen-netfront.c | 2 +-
drivers/tty/serial/atmel_serial.c | 1 -
drivers/tty/serial/sprd_serial.c | 2 +-
drivers/usb/core/config.c | 12 ++++---
fs/btrfs/tree-log.c | 6 ++--
fs/cifs/connect.c | 22 +++++++++++++
fs/nfs/nfs4file.c | 12 +++----
fs/nfs/pagelist.c | 2 +-
fs/nfs/proc.c | 7 ++--
include/uapi/linux/isdn/capicmd.h | 1 +
kernel/irq/resend.c | 2 ++
net/bridge/br_mdb.c | 2 +-
net/core/dev.c | 2 ++
net/ipv4/tcp_input.c | 2 +-
net/ipv6/ping.c | 2 +-
net/netfilter/nf_conntrack_ftp.c | 2 +-
net/sched/sch_hhf.c | 2 +-
net/sctp/protocol.c | 2 +-
net/sctp/sm_sideeffect.c | 2 +-
net/tipc/name_distr.c | 3 +-
security/keys/request_key_auth.c | 6 ++++
tools/power/x86/turbostat/turbostat.c | 2 +-
virt/kvm/coalesced_mmio.c | 17 ++++++----
66 files changed, 296 insertions(+), 111 deletions(-)
This is the start of the stable review cycle for the 4.9.194 release.
There are 74 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 Sat 21 Sep 2019 09:44:25 PM 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/v4.x/stable-review/patch-4.9.194-rc…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.9.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.9.194-rc1
Vineet Gupta <Vineet.Gupta1(a)synopsys.com>
ARC: export "abort" for modules
Sean Young <sean(a)mess.org>
media: technisat-usb2: break out of loop at end of buffer
Jann Horn <jannh(a)google.com>
floppy: fix usercopy direction
Joerg Roedel <jroedel(a)suse.de>
iommu/amd: Fix race in increase_address_space()
Hillf Danton <hdanton(a)sina.com>
keys: Fix missing null pointer check in request_key_auth_describe()
Peter Zijlstra <peterz(a)infradead.org>
x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation
Wenwen Wang <wenwen(a)cs.uga.edu>
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
Wenwen Wang <wenwen(a)cs.uga.edu>
dmaengine: ti: dma-crossbar: Fix a memory leak bug
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
net: seeq: Fix the function used to release some memory in an error handling path
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
tools/power turbostat: fix buffer overrun
Kim Phillips <kim.phillips(a)amd.com>
perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
Josh Hunt <johunt(a)akamai.com>
perf/x86/intel: Restrict period on Nehalem
Takashi Iwai <tiwai(a)suse.de>
sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
zhaoyang <huangzhaoyang(a)gmail.com>
ARM: 8901/1: add a criteria for pfn_valid of arm
Dan Carpenter <dan.carpenter(a)oracle.com>
cifs: Use kzfree() to zero out the password
Ronnie Sahlberg <lsahlber(a)redhat.com>
cifs: set domainName when a domain-key is used in multiuser
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix write regression
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix eof handling
Thomas Jarosch <thomas.jarosch(a)intra2net.com>
netfilter: nf_conntrack_ftp: Fix debug output
Thomas Gleixner <tglx(a)linutronix.de>
x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
Prashant Malani <pmalani(a)chromium.org>
r8152: Set memory to all 0xFFs on failed reg reads
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Only read OGM2 tvlv_len after buffer len check
Doug Berger <opendmb(a)gmail.com>
ARM: 8874/1: mm: only adjust sections of valid mm structures
Wenwen Wang <wenwen(a)cs.uga.edu>
qed: Add cleanup in qed_slowpath_start()
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv4: Fix return values for nfs4_file_open()
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: use 32-bit index for tail calls
Tony Lindgren <tony(a)atomide.com>
ARM: OMAP2+: Fix omap4 errata warning on other SoCs
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: fix lcgr instruction encoding
Tony Lindgren <tony(a)atomide.com>
ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
Wen Huang <huangwenabc(a)gmail.com>
mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
Razvan Stefanescu <razvan.stefanescu(a)microchip.com>
tty/serial: atmel: reschedule TX after RX was started
Chunyan Zhang <chunyan.zhang(a)unisoc.com>
serial: sprd: correct the wrong sequence of arguments
Matt Delco <delco(a)chromium.org>
KVM: coalesced_mmio: add bounds checking
Dongli Zhang <dongli.zhang(a)oracle.com>
xen-netfront: do not assume sk_buff_head list is empty in error handling
Corey Minyard <cminyard(a)mvista.com>
x86/boot: Add missing bootparam that breaks boot on some platforms
Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com>
powerpc/mm/radix: Use the right page size for vmemmap mapping
Sean Young <sean(a)mess.org>
media: tm6000: double free if usb disconnect while streaming
Alan Stern <stern(a)rowland.harvard.edu>
USB: usbcore: Fix slab-out-of-bounds bug during device reset
Linus Torvalds <torvalds(a)linux-foundation.org>
x86/build: Add -Wnoaddress-of-packed-member to REALMODE_CFLAGS, to silence GCC9 build warning
Jean Delvare <jdelvare(a)suse.de>
nvmem: Use the same permissions for eeprom as for nvmem
Nishka Dasgupta <nishkadg.linux(a)gmail.com>
drm/mediatek: mtk_drm_drv.c: Add of_node_put() before goto
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - HMAC SNOOP NO AFEU mode requires SW icv checking.
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - Do not modify req->cryptlen on decryption.
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - fix ECB algs ivsize
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - check data blocksize in ablkcipher.
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - fix CTR alg blocksize
Christophe Leroy <christophe.leroy(a)c-s.fr>
crypto: talitos - check AES key size
Muchun Song <smuchun(a)gmail.com>
driver core: Fix use-after-free and double free on glue directory
Xiaolei Li <xiaolei.li(a)mediatek.com>
mtd: rawnand: mtk: Fix wrongly assigned OOB buffer pointer issue
Douglas Anderson <dianders(a)chromium.org>
clk: rockchip: Don't yell about bad mmc phases when getting
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Use same -m%-float cflag as the kernel proper
Paul Burton <paul.burton(a)mips.com>
MIPS: VDSO: Prevent use of smp_processor_id()
Paolo Bonzini <pbonzini(a)redhat.com>
KVM: nVMX: handle page fault in vmread
Fuqian Huang <huangfq.daxian(a)gmail.com>
KVM: x86: work around leak of uninitialized stack contents
Thomas Huth <thuth(a)redhat.com>
KVM: s390: Do not leak kernel stack data in the KVM_S390_INTERRUPT ioctl
Yunfeng Ye <yeyunfeng(a)huawei.com>
genirq: Prevent NULL pointer dereference in resend_irqs()
Filipe Manana <fdmanana(a)suse.com>
Btrfs: fix assertion failure during fsync and use of stale transaction
Kent Gibson <warthog618(a)gmail.com>
gpio: fix line flag validation in lineevent_create
Kent Gibson <warthog618(a)gmail.com>
gpio: fix line flag validation in linehandle_create
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur"
Yang Yingliang <yangyingliang(a)huawei.com>
tun: fix use-after-free when register netdev failed
Xin Long <lucien.xin(a)gmail.com>
tipc: add NULL pointer check before calling kfree_rcu
Neal Cardwell <ncardwell(a)google.com>
tcp: fix tcp_ecn_withdraw_cwr() to clear TCP_ECN_QUEUE_CWR
Xin Long <lucien.xin(a)gmail.com>
sctp: use transport pf_retrans in sctp_do_8_2_transport_strike
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
sctp: Fix the link time qualifier of 'sctp_ctrlsock_exit()'
Cong Wang <xiyou.wangcong(a)gmail.com>
sch_hhf: ensure quantum and hhf_non_hh_weight are non-zero
Shmulik Ladkani <shmulik(a)metanetworks.com>
net: gso: Fix skb_segment splat when splitting gso_size mangled skb having linear-headed frag_list
Subash Abhinov Kasiviswanathan <subashab(a)codeaurora.org>
net: Fix null de-reference of device refcount
Eric Biggers <ebiggers(a)google.com>
isdn/capi: check message length in capi_write()
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
ipv6: Fix the link time qualifier of 'ping_v6_proc_exit_net()'
Bjørn Mork <bjorn(a)mork.no>
cdc_ether: fix rndis support for Mediatek based smartphones
Nicolas Dichtel <nicolas.dichtel(a)6wind.com>
bridge/mdb: remove wrong use of NLM_F_MULTI
-------------
Diffstat:
Makefile | 4 +-
arch/arc/kernel/traps.c | 1 +
arch/arm/mach-omap2/omap4-common.c | 3 ++
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 +-
arch/arm/mm/init.c | 8 ++-
arch/mips/Kconfig | 3 --
arch/mips/include/asm/smp.h | 12 ++++-
arch/mips/sibyte/common/Makefile | 1 -
arch/mips/sibyte/common/dma.c | 14 ------
arch/mips/vdso/Makefile | 4 +-
arch/powerpc/mm/pgtable-radix.c | 16 +++---
arch/s390/kvm/interrupt.c | 10 ++++
arch/s390/kvm/kvm-s390.c | 2 +-
arch/s390/net/bpf_jit_comp.c | 12 +++--
arch/x86/Makefile | 1 +
arch/x86/events/amd/ibs.c | 13 +++--
arch/x86/events/intel/core.c | 6 +++
arch/x86/include/asm/bootparam_utils.h | 1 +
arch/x86/include/asm/perf_event.h | 12 +++--
arch/x86/include/asm/uaccess.h | 4 +-
arch/x86/kernel/apic/io_apic.c | 8 ++-
arch/x86/kvm/vmx.c | 7 ++-
arch/x86/kvm/x86.c | 7 +++
drivers/atm/Kconfig | 2 +-
drivers/base/core.c | 53 +++++++++++++++++++-
drivers/block/floppy.c | 4 +-
drivers/clk/rockchip/clk-mmc-phase.c | 4 +-
drivers/crypto/talitos.c | 67 +++++++++++++++++++-------
drivers/dma/omap-dma.c | 4 +-
drivers/dma/ti-dma-crossbar.c | 4 +-
drivers/gpio/gpiolib.c | 20 +++++---
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +-
drivers/iommu/amd_iommu.c | 16 ++++--
drivers/isdn/capi/capi.c | 10 +++-
drivers/media/usb/dvb-usb/technisat-usb2.c | 22 ++++-----
drivers/media/usb/tm6000/tm6000-dvb.c | 3 ++
drivers/mtd/nand/mtk_nand.c | 21 ++++----
drivers/net/ethernet/marvell/sky2.c | 7 +++
drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +-
drivers/net/ethernet/seeq/sgiseeq.c | 7 +--
drivers/net/tun.c | 16 ++++--
drivers/net/usb/cdc_ether.c | 13 +++--
drivers/net/usb/r8152.c | 5 +-
drivers/net/wireless/marvell/mwifiex/ie.c | 3 ++
drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 +++-
drivers/net/xen-netfront.c | 2 +-
drivers/nvmem/core.c | 15 ++++--
drivers/tty/serial/atmel_serial.c | 1 -
drivers/tty/serial/sprd_serial.c | 2 +-
drivers/usb/core/config.c | 12 +++--
fs/btrfs/tree-log.c | 8 +--
fs/cifs/connect.c | 22 +++++++++
fs/nfs/nfs4file.c | 12 ++---
fs/nfs/pagelist.c | 2 +-
fs/nfs/proc.c | 7 ++-
include/uapi/linux/isdn/capicmd.h | 1 +
kernel/irq/resend.c | 2 +
net/batman-adv/bat_v_ogm.c | 18 ++++---
net/bridge/br_mdb.c | 2 +-
net/core/dev.c | 2 +
net/core/skbuff.c | 19 ++++++++
net/ipv4/tcp_input.c | 2 +-
net/ipv6/ping.c | 2 +-
net/netfilter/nf_conntrack_ftp.c | 2 +-
net/sched/sch_hhf.c | 2 +-
net/sctp/protocol.c | 2 +-
net/sctp/sm_sideeffect.c | 2 +-
net/tipc/name_distr.c | 3 +-
security/keys/request_key_auth.c | 6 +++
tools/power/x86/turbostat/turbostat.c | 2 +-
virt/kvm/coalesced_mmio.c | 17 ++++---
71 files changed, 446 insertions(+), 172 deletions(-)
This is the start of the stable review cycle for the 4.14.146 release.
There are 59 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 Sat 21 Sep 2019 09:44:25 PM 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/v4.x/stable-review/patch-4.14.146-r…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 4.14.146-rc1
Sean Young <sean(a)mess.org>
media: technisat-usb2: break out of loop at end of buffer
Christoph Paasch <cpaasch(a)apple.com>
tcp: Don't dequeue SYN/FIN-segments from write-queue
Christoph Paasch <cpaasch(a)apple.com>
tcp: Reset send_head when removing skb from write-queue
Kees Cook <keescook(a)chromium.org>
binfmt_elf: move brk out of mmap when doing direct loader exec
Jann Horn <jannh(a)google.com>
floppy: fix usercopy direction
Nathan Chancellor <natechancellor(a)gmail.com>
PCI: kirin: Fix section mismatch warning
Joerg Roedel <jroedel(a)suse.de>
iommu/amd: Fix race in increase_address_space()
Stuart Hayes <stuart.w.hayes(a)gmail.com>
iommu/amd: Flush old domains in kdump kernel
Hillf Danton <hdanton(a)sina.com>
keys: Fix missing null pointer check in request_key_auth_describe()
Tianyu Lan <Tianyu.Lan(a)microsoft.com>
x86/hyper-v: Fix overflow bug in fill_gva_list()
Peter Zijlstra <peterz(a)infradead.org>
x86/uaccess: Don't leak the AC flags into __get_user() argument evaluation
Wenwen Wang <wenwen(a)cs.uga.edu>
dmaengine: ti: omap-dma: Add cleanup in omap_dma_probe()
Wenwen Wang <wenwen(a)cs.uga.edu>
dmaengine: ti: dma-crossbar: Fix a memory leak bug
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
net: seeq: Fix the function used to release some memory in an error handling path
Naoya Horiguchi <n-horiguchi(a)ah.jp.nec.com>
tools/power turbostat: fix buffer overrun
Zephaniah E. Loss-Cutler-Hull <zephaniah(a)gmail.com>
tools/power x86_energy_perf_policy: Fix argument parsing
Ben Hutchings <ben(a)decadent.org.uk>
tools/power x86_energy_perf_policy: Fix "uninitialized variable" warnings at -O2
YueHaibing <yuehaibing(a)huawei.com>
amd-xgbe: Fix error path in xgbe_mod_init()
Kim Phillips <kim.phillips(a)amd.com>
perf/x86/amd/ibs: Fix sample bias for dispatched micro-ops
Josh Hunt <johunt(a)akamai.com>
perf/x86/intel: Restrict period on Nehalem
Jarkko Nikula <jarkko.nikula(a)linux.intel.com>
i2c: designware: Synchronize IRQs when unregistering slave client
Takashi Iwai <tiwai(a)suse.de>
sky2: Disable MSI on yet another ASUS boards (P6Xxxx)
zhaoyang <huangzhaoyang(a)gmail.com>
ARM: 8901/1: add a criteria for pfn_valid of arm
Dan Carpenter <dan.carpenter(a)oracle.com>
cifs: Use kzfree() to zero out the password
Ronnie Sahlberg <lsahlber(a)redhat.com>
cifs: set domainName when a domain-key is used in multiuser
Marc Zyngier <maz(a)kernel.org>
kallsyms: Don't let kallsyms_lookup_size_offset() fail on retrieving the first symbol
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix write regression
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv2: Fix eof handling
Thomas Jarosch <thomas.jarosch(a)intra2net.com>
netfilter: nf_conntrack_ftp: Fix debug output
Thomas Gleixner <tglx(a)linutronix.de>
x86/apic: Fix arch_dynirq_lower_bound() bug for DT enabled machines
Prashant Malani <pmalani(a)chromium.org>
r8152: Set memory to all 0xFFs on failed reg reads
Sven Eckelmann <sven(a)narfation.org>
batman-adv: Only read OGM2 tvlv_len after buffer len check
Doug Berger <opendmb(a)gmail.com>
ARM: 8874/1: mm: only adjust sections of valid mm structures
Wenwen Wang <wenwen(a)cs.uga.edu>
qed: Add cleanup in qed_slowpath_start()
Christophe JAILLET <christophe.jaillet(a)wanadoo.fr>
Kconfig: Fix the reference to the IDT77105 Phy driver in the description of ATM_NICSTAR_USE_IDT77105
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFS: Fix initialisation of I/O result struct in nfs_pgio_rpcsetup
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv4: Fix return value in nfs_finish_open()
Trond Myklebust <trond.myklebust(a)hammerspace.com>
NFSv4: Fix return values for nfs4_file_open()
Juliana Rodrigueiro <juliana.rodrigueiro(a)intra2net.com>
netfilter: xt_nfacct: Fix alignment mismatch in xt_nfacct_match_info
Phil Reid <preid(a)electromag.com.au>
fpga: altera-ps-spi: Fix getting of optional confd gpio
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: use 32-bit index for tail calls
Faiz Abbas <faiz_abbas(a)ti.com>
ARM: dts: dra74x: Fix iodelay configuration for mmc3
Tony Lindgren <tony(a)atomide.com>
ARM: OMAP2+: Fix omap4 errata warning on other SoCs
Ilya Leoshkevich <iii(a)linux.ibm.com>
s390/bpf: fix lcgr instruction encoding
Tony Lindgren <tony(a)atomide.com>
ARM: OMAP2+: Fix missing SYSC_HAS_RESET_STATUS for dra7 epwmss
Masashi Honma <masashi.honma(a)gmail.com>
nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds
Wen Huang <huangwenabc(a)gmail.com>
mwifiex: Fix three heap overflow at parsing element in cfg80211_ap_settings
Razvan Stefanescu <razvan.stefanescu(a)microchip.com>
tty/serial: atmel: reschedule TX after RX was started
Chunyan Zhang <chunyan.zhang(a)unisoc.com>
serial: sprd: correct the wrong sequence of arguments
Hung-Te Lin <hungte(a)chromium.org>
firmware: google: check if size is valid when decoding VPD data
Matt Delco <delco(a)chromium.org>
KVM: coalesced_mmio: add bounds checking
Cong Wang <xiyou.wangcong(a)gmail.com>
net_sched: let qdisc_put() accept NULL pointer
Dongli Zhang <dongli.zhang(a)oracle.com>
xen-netfront: do not assume sk_buff_head list is empty in error handling
Sean Young <sean(a)mess.org>
media: tm6000: double free if usb disconnect while streaming
Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com>
phy: renesas: rcar-gen3-usb2: Disable clearing VBUS in over-current
Alan Stern <stern(a)rowland.harvard.edu>
USB: usbcore: Fix slab-out-of-bounds bug during device reset
Aneesh Kumar K.V <aneesh.kumar(a)linux.ibm.com>
powerpc/mm/radix: Use the right page size for vmemmap mapping
Benjamin Tissoires <benjamin.tissoires(a)redhat.com>
Input: elan_i2c - remove Lenovo Legion Y7000 PnpID
Aaron Armstrong Skomra <skomra(a)gmail.com>
HID: wacom: generic: read HID_DG_CONTACTMAX from any feature report
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 50 ++++++++++----------
arch/arm/mach-omap2/omap4-common.c | 3 ++
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 3 +-
arch/arm/mm/init.c | 8 +++-
arch/powerpc/mm/pgtable-radix.c | 16 +++----
arch/s390/net/bpf_jit_comp.c | 12 +++--
arch/x86/events/amd/ibs.c | 13 +++--
arch/x86/events/intel/core.c | 6 +++
arch/x86/hyperv/mmu.c | 8 ++--
arch/x86/include/asm/perf_event.h | 12 +++--
arch/x86/include/asm/uaccess.h | 4 +-
arch/x86/kernel/apic/io_apic.c | 8 +++-
drivers/atm/Kconfig | 2 +-
drivers/block/floppy.c | 4 +-
drivers/dma/omap-dma.c | 4 +-
drivers/dma/ti-dma-crossbar.c | 4 +-
drivers/firmware/google/vpd.c | 4 +-
drivers/firmware/google/vpd_decode.c | 55 +++++++++++++---------
drivers/firmware/google/vpd_decode.h | 6 +--
drivers/fpga/altera-ps-spi.c | 11 +++--
drivers/hid/wacom_sys.c | 10 ++--
drivers/hid/wacom_wac.c | 4 ++
drivers/i2c/busses/i2c-designware-slave.c | 1 +
drivers/input/mouse/elan_i2c_core.c | 2 +-
drivers/iommu/amd_iommu.c | 40 ++++++++++++++--
drivers/media/usb/dvb-usb/technisat-usb2.c | 22 ++++-----
drivers/media/usb/tm6000/tm6000-dvb.c | 3 ++
drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 +++-
drivers/net/ethernet/marvell/sky2.c | 7 +++
drivers/net/ethernet/qlogic/qed/qed_main.c | 4 +-
drivers/net/ethernet/seeq/sgiseeq.c | 7 +--
drivers/net/usb/r8152.c | 5 +-
drivers/net/wireless/marvell/mwifiex/ie.c | 3 ++
drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 9 +++-
drivers/net/xen-netfront.c | 2 +-
drivers/pci/dwc/pcie-kirin.c | 4 +-
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 2 +
drivers/tty/serial/atmel_serial.c | 1 -
drivers/tty/serial/sprd_serial.c | 2 +-
drivers/usb/core/config.c | 12 +++--
fs/binfmt_elf.c | 11 +++++
fs/cifs/connect.c | 22 +++++++++
fs/nfs/dir.c | 2 +-
fs/nfs/nfs4file.c | 12 ++---
fs/nfs/pagelist.c | 2 +-
fs/nfs/proc.c | 7 ++-
include/uapi/linux/netfilter/xt_nfacct.h | 5 ++
kernel/kallsyms.c | 6 ++-
net/batman-adv/bat_v_ogm.c | 18 ++++---
net/ipv4/tcp.c | 6 +--
net/netfilter/nf_conntrack_ftp.c | 2 +-
net/netfilter/xt_nfacct.c | 36 +++++++++-----
net/sched/sch_generic.c | 3 ++
net/wireless/nl80211.c | 4 +-
security/keys/request_key_auth.c | 6 +++
tools/power/x86/turbostat/turbostat.c | 2 +-
.../x86_energy_perf_policy.c | 28 ++++++-----
virt/kvm/coalesced_mmio.c | 17 ++++---
59 files changed, 391 insertions(+), 185 deletions(-)
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: b63fd11cced17fcb8e133def29001b0f6aaa5e06
Gitweb: https://git.kernel.org/tip/b63fd11cced17fcb8e133def29001b0f6aaa5e06
Author: Srikar Dronamraju <srikar(a)linux.vnet.ibm.com>
AuthorDate: Wed, 04 Sep 2019 15:17:37 +05:30
Committer: Arnaldo Carvalho de Melo <acme(a)redhat.com>
CommitterDate: Fri, 20 Sep 2019 10:28:26 -03:00
perf stat: Reset previous counts on repeat with interval
When using 'perf stat' with repeat and interval option, it shows wrong
values for events.
The wrong values will be shown for the first interval on the second and
subsequent repetitions.
Without the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.000282489 53 faults
2.000282489 513 sched:sched_switch
4.005478208 3,721 faults
4.005478208 2,666 sched:sched_switch
5.025470933 395 faults
5.025470933 1,307 sched:sched_switch
2.009602825 1,84,46,74,40,73,70,95,47,520 faults <------
2.009602825 1,84,46,74,40,73,70,95,49,568 sched:sched_switch <------
4.019612206 4,730 faults
4.019612206 2,746 sched:sched_switch
5.039615484 3,953 faults
5.039615484 1,496 sched:sched_switch
2.000274620 1,84,46,74,40,73,70,95,47,520 faults <------
2.000274620 1,84,46,74,40,73,70,95,47,520 sched:sched_switch <------
4.000480342 4,282 faults
4.000480342 2,303 sched:sched_switch
5.000916811 1,322 faults
5.000916811 1,064 sched:sched_switch
#
prev_raw_counts is allocated when using intervals. This is used when
calculating the difference in the counts of events when using interval.
The current counts are stored in prev_raw_counts to calculate the
differences in the next iteration.
On the first interval of the second and subsequent repetitions,
prev_raw_counts would be the values stored in the last interval of the
previous repetitions, while the current counts will only be for the
first interval of the current repetition.
Hence there is a possibility of events showing up as big number.
Fix this by resetting prev_raw_counts whenever perf stat repeats the
command.
With the fix:
# perf stat -r 3 -I 2000 -e faults -e sched:sched_switch -a sleep 5
2.019349347 2,597 faults
2.019349347 2,753 sched:sched_switch
4.019577372 3,098 faults
4.019577372 2,532 sched:sched_switch
5.019415481 1,879 faults
5.019415481 1,356 sched:sched_switch
2.000178813 8,468 faults
2.000178813 2,254 sched:sched_switch
4.000404621 7,440 faults
4.000404621 1,266 sched:sched_switch
5.040196079 2,458 faults
5.040196079 556 sched:sched_switch
2.000191939 6,870 faults
2.000191939 1,170 sched:sched_switch
4.000414103 541 faults
4.000414103 902 sched:sched_switch
5.000809863 450 faults
5.000809863 364 sched:sched_switch
#
Committer notes:
This was broken since the cset introducing the --interval feature, i.e.
--repeat + --interval wasn't tested at that point, add the Fixes tag so
that automatic scripts can pick this up.
Fixes: 13370a9b5bb8 ("perf stat: Add interval printing")
Signed-off-by: Srikar Dronamraju <srikar(a)linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa(a)kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria(a)linux.ibm.com>
Cc: Namhyung Kim <namhyung(a)kernel.org>
Cc: Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com>
Cc: Stephane Eranian <eranian(a)google.com>
Cc: stable(a)vger.kernel.org # v3.9+
Link: http://lore.kernel.org/lkml/20190904094738.9558-2-srikar@linux.vnet.ibm.com
[ Fixed up conflicts with libperf, i.e. some perf_{evsel,evlist} lost the 'perf' prefix ]
Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
---
tools/perf/builtin-stat.c | 3 +++
tools/perf/util/stat.c | 17 +++++++++++++++++
tools/perf/util/stat.h | 1 +
3 files changed, 21 insertions(+)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index eece3d1..fa4b148 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1952,6 +1952,9 @@ int cmd_stat(int argc, const char **argv)
fprintf(output, "[ perf stat: executing run #%d ... ]\n",
run_idx + 1);
+ if (run_idx != 0)
+ perf_evlist__reset_prev_raw_counts(evsel_list);
+
status = run_perf_stat(argc, argv, run_idx);
if (forever && status != -1) {
print_counters(NULL, argc, argv);
diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c
index 0657120..fcd5434 100644
--- a/tools/perf/util/stat.c
+++ b/tools/perf/util/stat.c
@@ -162,6 +162,15 @@ static void perf_evsel__free_prev_raw_counts(struct evsel *evsel)
evsel->prev_raw_counts = NULL;
}
+static void perf_evsel__reset_prev_raw_counts(struct evsel *evsel)
+{
+ if (evsel->prev_raw_counts) {
+ evsel->prev_raw_counts->aggr.val = 0;
+ evsel->prev_raw_counts->aggr.ena = 0;
+ evsel->prev_raw_counts->aggr.run = 0;
+ }
+}
+
static int perf_evsel__alloc_stats(struct evsel *evsel, bool alloc_raw)
{
int ncpus = perf_evsel__nr_cpus(evsel);
@@ -212,6 +221,14 @@ void perf_evlist__reset_stats(struct evlist *evlist)
}
}
+void perf_evlist__reset_prev_raw_counts(struct evlist *evlist)
+{
+ struct evsel *evsel;
+
+ evlist__for_each_entry(evlist, evsel)
+ perf_evsel__reset_prev_raw_counts(evsel);
+}
+
static void zero_per_pkg(struct evsel *counter)
{
if (counter->per_pkg_mask)
diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h
index 0f9c9f6..edbeb2f 100644
--- a/tools/perf/util/stat.h
+++ b/tools/perf/util/stat.h
@@ -193,6 +193,7 @@ void perf_stat__collect_metric_expr(struct evlist *);
int perf_evlist__alloc_stats(struct evlist *evlist, bool alloc_raw);
void perf_evlist__free_stats(struct evlist *evlist);
void perf_evlist__reset_stats(struct evlist *evlist);
+void perf_evlist__reset_prev_raw_counts(struct evlist *evlist);
int perf_stat_process_counter(struct perf_stat_config *config,
struct evsel *counter);
The following commit has been merged into the perf/urgent branch of tip:
Commit-ID: 443f2d5ba13d65ccfd879460f77941875159d154
Gitweb: https://git.kernel.org/tip/443f2d5ba13d65ccfd879460f77941875159d154
Author: Srikar Dronamraju <srikar(a)linux.vnet.ibm.com>
AuthorDate: Wed, 04 Sep 2019 15:17:38 +05:30
Committer: Arnaldo Carvalho de Melo <acme(a)redhat.com>
CommitterDate: Fri, 20 Sep 2019 10:28:26 -03:00
perf stat: Fix a segmentation fault when using repeat forever
Observe a segmentation fault when 'perf stat' is asked to repeat forever
with the interval option.
Without fix:
# perf stat -r 0 -I 5000 -e cycles -a sleep 10
# time counts unit events
5.000211692 3,13,89,82,34,157 cycles
10.000380119 1,53,98,52,22,294 cycles
10.040467280 17,16,79,265 cycles
Segmentation fault
This problem was only observed when we use forever option aka -r 0 and
works with limited repeats. Calling print_counter with ts being set to
NULL, is not a correct option when interval is set. Hence avoid
print_counter(NULL,..) if interval is set.
With fix:
# perf stat -r 0 -I 5000 -e cycles -a sleep 10
# time counts unit events
5.019866622 3,15,14,43,08,697 cycles
10.039865756 3,15,16,31,95,261 cycles
10.059950628 1,26,05,47,158 cycles
5.009902655 3,14,52,62,33,932 cycles
10.019880228 3,14,52,22,89,154 cycles
10.030543876 66,90,18,333 cycles
5.009848281 3,14,51,98,25,437 cycles
10.029854402 3,15,14,93,04,918 cycles
5.009834177 3,14,51,95,92,316 cycles
Committer notes:
Did the 'git bisect' to find the cset introducing the problem to add the
Fixes tag below, and at that time the problem reproduced as:
(gdb) run stat -r0 -I500 sleep 1
<SNIP>
Program received signal SIGSEGV, Segmentation fault.
print_interval (prefix=prefix@entry=0x7fffffffc8d0 "", ts=ts@entry=0x0) at builtin-stat.c:866
866 sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, csv_sep);
(gdb) bt
#0 print_interval (prefix=prefix@entry=0x7fffffffc8d0 "", ts=ts@entry=0x0) at builtin-stat.c:866
#1 0x000000000041860a in print_counters (ts=ts@entry=0x0, argc=argc@entry=2, argv=argv@entry=0x7fffffffd640) at builtin-stat.c:938
#2 0x0000000000419a7f in cmd_stat (argc=2, argv=0x7fffffffd640, prefix=<optimized out>) at builtin-stat.c:1411
#3 0x000000000045c65a in run_builtin (p=p@entry=0x6291b8 <commands+216>, argc=argc@entry=5, argv=argv@entry=0x7fffffffd640) at perf.c:370
#4 0x000000000045c893 in handle_internal_command (argc=5, argv=0x7fffffffd640) at perf.c:429
#5 0x000000000045c8f1 in run_argv (argcp=argcp@entry=0x7fffffffd4ac, argv=argv@entry=0x7fffffffd4a0) at perf.c:473
#6 0x000000000045cac9 in main (argc=<optimized out>, argv=<optimized out>) at perf.c:588
(gdb)
Mostly the same as just before this patch:
Program received signal SIGSEGV, Segmentation fault.
0x00000000005874a7 in print_interval (config=0xa1f2a0 <stat_config>, evlist=0xbc9b90, prefix=0x7fffffffd1c0 "`", ts=0x0) at util/stat-display.c:964
964 sprintf(prefix, "%6lu.%09lu%s", ts->tv_sec, ts->tv_nsec, config->csv_sep);
(gdb) bt
#0 0x00000000005874a7 in print_interval (config=0xa1f2a0 <stat_config>, evlist=0xbc9b90, prefix=0x7fffffffd1c0 "`", ts=0x0) at util/stat-display.c:964
#1 0x0000000000588047 in perf_evlist__print_counters (evlist=0xbc9b90, config=0xa1f2a0 <stat_config>, _target=0xa1f0c0 <target>, ts=0x0, argc=2, argv=0x7fffffffd670)
at util/stat-display.c:1172
#2 0x000000000045390f in print_counters (ts=0x0, argc=2, argv=0x7fffffffd670) at builtin-stat.c:656
#3 0x0000000000456bb5 in cmd_stat (argc=2, argv=0x7fffffffd670) at builtin-stat.c:1960
#4 0x00000000004dd2e0 in run_builtin (p=0xa30e00 <commands+288>, argc=5, argv=0x7fffffffd670) at perf.c:310
#5 0x00000000004dd54d in handle_internal_command (argc=5, argv=0x7fffffffd670) at perf.c:362
#6 0x00000000004dd694 in run_argv (argcp=0x7fffffffd4cc, argv=0x7fffffffd4c0) at perf.c:406
#7 0x00000000004dda11 in main (argc=5, argv=0x7fffffffd670) at perf.c:531
(gdb)
Fixes: d4f63a4741a8 ("perf stat: Introduce print_counters function")
Signed-off-by: Srikar Dronamraju <srikar(a)linux.vnet.ibm.com>
Acked-by: Jiri Olsa <jolsa(a)kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
Tested-by: Ravi Bangoria <ravi.bangoria(a)linux.ibm.com>
Cc: Namhyung Kim <namhyung(a)kernel.org>
Cc: Naveen N. Rao <naveen.n.rao(a)linux.vnet.ibm.com>
Cc: stable(a)vger.kernel.org # v4.2+
Link: http://lore.kernel.org/lkml/20190904094738.9558-3-srikar@linux.vnet.ibm.com
Signed-off-by: Arnaldo Carvalho de Melo <acme(a)redhat.com>
---
tools/perf/builtin-stat.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c
index fa4b148..60cdd38 100644
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@ -1956,7 +1956,7 @@ int cmd_stat(int argc, const char **argv)
perf_evlist__reset_prev_raw_counts(evsel_list);
status = run_perf_stat(argc, argv, run_idx);
- if (forever && status != -1) {
+ if (forever && status != -1 && !interval) {
print_counters(NULL, argc, argv);
perf_stat__reset_stats();
}