Linux 4.14.149
Greg KH
maintainerI'm announcing the release of the 4.14.149 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/powerpc/kvm/book3s_hv.c | 9 arch/powerpc/kvm/book3s_xive.c | 18 + arch/powerpc/mm/hash_utils_64.c | 9 arch/powerpc/platforms/powernv/opal.c | 11 - arch/powerpc/platforms/pseries/lpar.c | 8 arch/s390/kernel/process.c | 22 +- arch/s390/kernel/topology.c | 3 arch/s390/kvm/kvm-s390.c | 2 arch/x86/kvm/vmx.c | 2 crypto/skcipher.c | 42 ++-- drivers/block/nbd.c | 61 ++++-- drivers/crypto/caam/caamalg_desc.c | 9 drivers/crypto/caam/caamalg_desc.h | 2 drivers/crypto/cavium/zip/zip_main.c | 3 drivers/crypto/qat/qat_common/adf_common_drv.h | 2 drivers/devfreq/tegra-devfreq.c | 12 - drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 drivers/gpu/drm/omapdrm/dss/dss.c | 2 drivers/hwtracing/coresight/coresight-etm4x.c | 14 + drivers/mmc/host/sdhci-of-esdhc.c | 7 drivers/mmc/host/sdhci.c | 15 + drivers/net/can/spi/mcp251x.c | 19 +- drivers/net/ieee802154/atusb.c | 3 drivers/pwm/pwm-stm32-lp.c | 6 drivers/s390/cio/ccwgroup.c | 2 drivers/s390/cio/css.c | 2 drivers/thermal/thermal_core.c | 2 drivers/watchdog/aspeed_wdt.c | 4 drivers/watchdog/imx2_wdt.c | 4 drivers/xen/pci.c | 21 +- drivers/xen/xenbus/xenbus_dev_frontend.c | 20 +- fs/9p/vfs_file.c | 3 fs/ceph/inode.c | 7 fs/ceph/mds_client.c | 4 fs/fuse/cuse.c | 1 fs/nfs/nfs4xdr.c | 2 fs/nfs/pnfs.c | 9 fs/statfs.c | 17 - include/linux/ieee80211.h | 53 +++++ include/sound/soc-dapm.h | 2 kernel/elfcore.c | 1 kernel/locking/qspinlock_paravirt.h | 2 kernel/sched/core.c | 4 kernel/time/tick-broadcast-hrtimer.c | 57 +++--- kernel/time/timer.c | 8 mm/usercopy.c | 8 net/netfilter/nf_tables_api.c | 7 net/netfilter/nft_lookup.c | 3 net/wireless/nl80211.c | 42 ++++ net/wireless/reg.c | 2 net/wireless/scan.c | 14 - net/wireless/wext-compat.c | 2 security/integrity/ima/ima_crypto.c | 5 sound/soc/codecs/sgtl5000.c | 232 +++++++++++++++++++++---- tools/lib/traceevent/Makefile | 4 tools/lib/traceevent/event-parse.c | 3 tools/perf/Makefile.config | 2 tools/perf/arch/x86/util/unwind-libunwind.c | 2 tools/perf/builtin-stat.c | 5 tools/perf/util/header.c | 2 tools/perf/util/stat.c | 17 + tools/perf/util/stat.h | 1 63 files changed, 656 insertions(+), 206 deletions(-)
Alexander Sverdlin (1):
crypto: qat - Silence smp_processor_id() warning
Andrew Donnellan (1):
powerpc/powernv: Restrict OPAL symbol map to only be readable by root
Andrew Murray (1):
coresight: etm4x: Use explicit barriers on enable/disable
Arnaldo Carvalho de Melo (1):
perf unwind: Fix libunwind build failure on i386 systems
Balasubramani Vivekanandan (1):
tick: broadcast-hrtimer: Fix a race in bc_set_next
Chengguang Xu (1):
9p: avoid attaching writeback_fid on mmap with type PRIVATE
Cédric Le Goater (1):
KVM: PPC: Book3S HV: XIVE: Free escalation interrupts before disabling the VP
Dan Melnic (1):
block/ndb: add WQ_UNBOUND to the knbd-recv workqueue
Dmitry Osipenko (1):
PM / devfreq: tegra: Fix kHz to Hz conversion
Eric Sandeen (1):
vfs: Fix EOVERFLOW testing in put_compat_statfs64
Erqi Chen (1):
ceph: reconnect connection if session hang in opening state
Fabrice Gasnier (1):
pwm: stm32-lp: Add check in case requested period cannot be achieved
Florian Westphal (1):
netfilter: nf_tables: allow lookups in dynamic sets
Gautham R. Shenoy (1):
powerpc/pseries: Fix cpu_hotplug_lock acquisition in resize_hpt()
Greg Kroah-Hartman (1):
Linux 4.14.149
Herbert Xu (1):
crypto: skcipher - Unmap pages after an external error
Horia Geantă (1):
crypto: caam - fix concurrency issue in givencrypt descriptor
Ido Schimmel (1):
thermal: Fix use-after-free when unregistering thermal zone device
Igor Druzhinin (1):
xen/pci: reserve MCFG areas earlier
Jack Wang (1):
KVM: nVMX: handle page fault in vmread fix
Jia-Ju Bai (1):
fs: nfs: Fix possible null-pointer dereferences in encode_attrs()
Jiri Olsa (1):
perf tools: Fix segfault in cpu_cache_level__read()
Johan Hovold (1):
ieee802154: atusb: fix use-after-free at disconnect
Johannes Berg (3):
cfg80211: initialize on-stack chandefs
cfg80211: add and use strongly typed element iteration macros
nl80211: validate beacon head
Jouni Malinen (1):
cfg80211: Use const more consistently in for_each_element macros
Juergen Gross (1):
xen/xenbus: fix self-deadlock after killing user process
KeMeng Shi (1):
sched/core: Fix migration to invalid CPU in __set_cpus_allowed_ptr()
Kees Cook (1):
usercopy: Avoid HIGHMEM pfn warning
Li RongQing (1):
timer: Read jiffies once when forwarding base clk
Luis Henriques (1):
ceph: fix directories inode i_blkbits initialization
Marc Kleine-Budde (1):
can: mcp251x: mcp251x_hw_reset(): allow more time after a reset
Mike Christie (1):
nbd: fix max number of supported devs
Oleksandr Suvorov (2):
ASoC: Define a set of DAPM pre/post-up events
ASoC: sgtl5000: Improve VAG power and mute control
Paul Mackerras (1):
KVM: PPC: Book3S HV: Don't lose pending doorbell request on migration on P9
Rasmus Villemoes (1):
watchdog: imx2_wdt: fix min() calculation in imx2_wdt_set_timeout
Russell King (2):
mmc: sdhci: improve ADMA error reporting
mmc: sdhci-of-esdhc: set DMA snooping based on DMA coherence
Ryan Chen (1):
watchdog: aspeed: Add support for AST2600
Sascha Hauer (1):
ima: always return negative code for error
Srikar Dronamraju (2):
perf stat: Fix a segmentation fault when using repeat forever perf stat: Reset previous counts on repeat with interval
Steven Rostedt (VMware) (2):
tools lib traceevent: Fix "robust" test of do_generate_dynamic_list_file tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure
Thomas Huth (1):
KVM: s390: Test for bad access register and size at the start of S390_MEM_OP
Thomas Richter (1):
perf build: Add detection of java-11-openjdk-devel package
Tomi Valkeinen (1):
drm/omap: fix max fclk divider for omap36xx
Trek (1):
drm/amdgpu: Check for valid number of registers to read
Trond Myklebust (1):
pNFS: Ensure we do clear the return-on-close layout stateid on fatal errors
Valdis Kletnieks (1):
kernel/elfcore.c: include proper prototypes
Vasily Gorbik (4):
s390/process: avoid potential reading of freed stack s390/topology: avoid firing events before kobjs are created s390/cio: avoid calling strlen on null pointer s390/cio: exclude subchannels with no parent from pseudo check
Wanpeng Li (1):
Revert "locking/pvqspinlock: Don't wait if vCPU is preempted"
Wei Yongjun (1):
crypto: cavium/zip - Add missing single_release()
Xiubo Li (1):
nbd: fix crash when the blksize is zero
zhengbin (1):
fuse: fix memleak in cuse_channel_open
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 148 +SUBLEVEL = 149 EXTRAVERSION = NAME = Petit Gorille
arch/powerpc/kvm/book3s_hv.c +8 -1
@@ -1356,7 +1356,14 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id, *val =get_reg_val (id, vcpu->arch.pspb);break ;case KVM_REG_PPC_DPDES : - *val =get_reg_val (id, vcpu->arch.vcore->dpdes); +/* +* On POWER9, where we are emulating msgsndp etc., +* we return 1 bit for each vcpu, which can come from +* either vcore->dpdes or doorbell_request. +* On POWER8, doorbell_request is 0. +*/ + *val =get_reg_val (id, vcpu->arch.vcore->dpdes | + vcpu->arch.doorbell_request);break ;case KVM_REG_PPC_VTB : *val =get_reg_val (id, vcpu->arch.vcore->vtb);
arch/powerpc/kvm/book3s_xive.c +10 -8
@@ -1001,20 +1001,22 @@ void kvmppc_xive_cleanup_vcpu(struct kvm_vcpu *vcpu)/* Mask the VP IPI */ xive_vm_esb_load (&xc->vp_ipi_data,XIVE_ESB_SET_PQ_01 ); -/* Disable the VP */ -xive_native_disable_vp (xc->vp_id); - -/* Free the queues & associated interrupts */ +/* Free escalations */ for (i =0 ; i <KVMPPC_XIVE_Q_COUNT ; i++) { -struct xive_q *q = &xc->queues[i]; - -/* Free the escalation irq */ if (xc->esc_virq[i]) {free_irq (xc->esc_virq[i], vcpu);irq_dispose_mapping (xc->esc_virq[i]);kfree (xc->esc_virq_names[i]); } -/* Free the queue */ + } + +/* Disable the VP */ +xive_native_disable_vp (xc->vp_id); + +/* Free the queues */ +for (i =0 ; i <KVMPPC_XIVE_Q_COUNT ; i++) { +struct xive_q *q = &xc->queues[i]; +xive_native_disable_queue (xc->vp_id, q, i);if (q->qpage) { free_pages((unsigned long)q->qpage,
arch/powerpc/mm/hash_utils_64.c +8 -1
@@ -35,6 +35,7 @@#include <linux/memblock.h> #include <linux/context_tracking.h> #include <linux/libfdt.h> +#include <linux/cpu.h> #include <asm/debugfs.h> #include <asm/processor.h>
@@ -1852,10 +1853,16 @@ static int hpt_order_get(void *data, u64 *val)static int hpt_order_set (void *data,u64 val) { +int ret; +if (!mmu_hash_ops.resize_hpt)return -ENODEV ; -return mmu_hash_ops.resize_hpt (val); +cpus_read_lock (); + ret = mmu_hash_ops.resize_hpt (val); +cpus_read_unlock (); + +return ret; }DEFINE_SIMPLE_ATTRIBUTE (fops_hpt_order, hpt_order_get, hpt_order_set,"%llu\n" );
arch/powerpc/platforms/powernv/opal.c +7 -4
@@ -617,7 +617,10 @@ static ssize_t symbol_map_read(struct file *fp, struct kobject *kobj, bin_attr->size); } -static BIN_ATTR_RO(symbol_map, 0); +static struct bin_attribute symbol_map_attr = { + .attr = {.name ="symbol_map" , .mode =0400 }, + .read = symbol_map_read +};static void opal_export_symmap (void ) {
@@ -634,10 +637,10 @@ static void opal_export_symmap(void)return ;/* Setup attributes */ - bin_attr_symbol_map.private =__va (be64_to_cpu (syms[0 ])); - bin_attr_symbol_map.size =be64_to_cpu (syms[1 ]); + symbol_map_attr.private =__va (be64_to_cpu (syms[0 ])); + symbol_map_attr.size =be64_to_cpu (syms[1 ]); - rc =sysfs_create_bin_file (opal_kobj, &bin_attr_symbol_map); + rc =sysfs_create_bin_file (opal_kobj, &symbol_map_attr);if (rc)pr_warn ("Error %d creating OPAL symbols file\n" , rc); }
arch/powerpc/platforms/pseries/lpar.c +6 -2
@@ -643,7 +643,10 @@ static int pseries_lpar_resize_hpt_commit(void *data)return 0 ; } -/* Must be called in user context */ +/* +* Must be called in process context. The caller must hold the +* cpus_lock. +*/ static int pseries_lpar_resize_hpt (unsigned long shift) {struct hpt_resize_state state = {
@@ -699,7 +702,8 @@ static int pseries_lpar_resize_hpt(unsigned long shift) t1 =ktime_get (); - rc =stop_machine (pseries_lpar_resize_hpt_commit, &state,NULL ); + rc =stop_machine_cpuslocked (pseries_lpar_resize_hpt_commit, + &state,NULL ); t2 =ktime_get ();
arch/s390/kernel/process.c +16 -6
@@ -185,20 +185,30 @@ unsigned long get_wchan(struct task_struct *p)if (!p || p == current || p->state ==TASK_RUNNING || !task_stack_page (p))return 0 ; + +if (!try_get_task_stack (p)) +return 0 ; + low =task_stack_page (p); high = (struct stack_frame *)task_pt_regs (p); sf = (struct stack_frame *) p->thread.ksp; -if (sf <= low || sf > high) -return 0 ; +if (sf <= low || sf > high) { + return_address =0 ; + goto out; + }for (count =0 ; count <16 ; count++) { sf = (struct stack_frame *) sf->back_chain; -if (sf <= low || sf > high) -return 0 ; +if (sf <= low || sf > high) { + return_address =0 ; + goto out; + } return_address = sf->gprs[8 ];if (!in_sched_functions (return_address)) -return return_address; + goto out; } -return 0 ; +out: +put_task_stack (p); +return return_address; }unsigned long arch_align_stack (unsigned long sp)
arch/s390/kernel/topology.c +2 -1
@@ -300,7 +300,8 @@ int arch_update_cpu_topology(void) rc =__arch_update_cpu_topology ();for_each_online_cpu (cpu) { dev =get_cpu_device (cpu); -kobject_uevent (&dev->kobj,KOBJ_CHANGE ); +if (dev) +kobject_uevent (&dev->kobj,KOBJ_CHANGE ); }return rc; }
arch/s390/kvm/kvm-s390.c +1 -1
@@ -3658,7 +3658,7 @@ static long kvm_s390_guest_mem_op(struct kvm_vcpu *vcpu,const u64 supported_flags =KVM_S390_MEMOP_F_INJECT_EXCEPTION |KVM_S390_MEMOP_F_CHECK_ONLY ; -if (mop->flags & ~supported_flags) +if (mop->flags & ~supported_flags || mop->ar >=NUM_ACRS || !mop->size)return -EINVAL ;if (mop->size >MEM_OP_MAX_SIZE )
arch/x86/kvm/vmx.c +1 -1
@@ -8026,7 +8026,7 @@ static int handle_vmread(struct kvm_vcpu *vcpu)/* _system ok, nested_vmx_check_permission has verified cpl=0 */ if (kvm_write_guest_virt_system (vcpu, gva, &field_value, (is_long_mode (vcpu) ?8 :4 ), -NULL )) + &e))kvm_inject_page_fault (vcpu, &e); }
crypto/skcipher.c +23 -19
83 lines not on this page · raw message
drivers/block/nbd.c +45 -16
153 lines not on this page · raw message
drivers/crypto/caam/caamalg_desc.c +9 -0
@@ -476,6 +476,7 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata, const bool is_qi) {u32 geniv, moveiv; +u32 *wait_cmd;/* Note: Context registers are saved. */ init_sh_desc_key_aead (desc, cdata, adata, is_rfc3686, nonce);
@@ -566,6 +567,14 @@ void cnstr_shdsc_aead_givencap(u32 * const desc, struct alginfo *cdata,/* Will read cryptlen */ append_math_add (desc,VARSEQINLEN ,SEQINLEN ,REG0 ,CAAM_CMD_SZ ); + +/* +* Wait for IV transfer (ofifo -> class2) to finish before starting +* ciphertext transfer (ofifo -> external memory). +*/ + wait_cmd =append_jump (desc,JUMP_JSL |JUMP_TEST_ALL |JUMP_COND_NIFP ); +set_jump_tgt_here (desc, wait_cmd); +append_seq_fifo_load (desc,0 ,FIFOLD_CLASS_BOTH |KEY_VLF |FIFOLD_TYPE_MSG1OUT2 |FIFOLD_TYPE_LASTBOTH );append_seq_fifo_store (desc,0 ,FIFOST_TYPE_MESSAGE_DATA |KEY_VLF );
drivers/crypto/caam/caamalg_desc.h +1 -1
@@ -12,7 +12,7 @@#define DESC_AEAD_BASE (4 * CAAM_CMD_SZ)#define DESC_AEAD_ENC_LEN (DESC_AEAD_BASE + 11 * CAAM_CMD_SZ)#define DESC_AEAD_DEC_LEN (DESC_AEAD_BASE + 15 * CAAM_CMD_SZ) -#define DESC_AEAD_GIVENC_LEN (DESC_AEAD_ENC_LEN + 7 * CAAM_CMD_SZ) +#define DESC_AEAD_GIVENC_LEN (DESC_AEAD_ENC_LEN + 8 * CAAM_CMD_SZ)#define DESC_QI_AEAD_ENC_LEN (DESC_AEAD_ENC_LEN + 3 * CAAM_CMD_SZ)#define DESC_QI_AEAD_DEC_LEN (DESC_AEAD_DEC_LEN + 3 * CAAM_CMD_SZ)#define DESC_QI_AEAD_GIVENC_LEN (DESC_AEAD_GIVENC_LEN + 3 * CAAM_CMD_SZ)
drivers/crypto/cavium/zip/zip_main.c +3 -0
@@ -595,6 +595,7 @@ static const struct file_operations zip_stats_fops = { .owner = THIS_MODULE, .open = zip_stats_open, .read = seq_read, + .release = single_release, };static int zip_clear_open (struct inode *inode,struct file *file)
@@ -606,6 +607,7 @@ static const struct file_operations zip_clear_fops = { .owner = THIS_MODULE, .open = zip_clear_open, .read = seq_read, + .release = single_release, };static int zip_regs_open (struct inode *inode,struct file *file)
@@ -617,6 +619,7 @@ static const struct file_operations zip_regs_fops = { .owner = THIS_MODULE, .open = zip_regs_open, .read = seq_read, + .release = single_release, };/* Root directory for thunderx_zip debugfs entry */
drivers/crypto/qat/qat_common/adf_common_drv.h +1 -1
@@ -95,7 +95,7 @@ struct service_hndl {static inline int get_current_node (void ) { -return topology_physical_package_id (smp_processor_id ()); +return topology_physical_package_id (raw_smp_processor_id ()); }int adf_service_register (struct service_hndl *service);
drivers/devfreq/tegra-devfreq.c +5 -7
@@ -485,11 +485,11 @@ static int tegra_devfreq_target(struct device *dev, unsigned long *freq, {struct tegra_devfreq *tegra =dev_get_drvdata (dev);struct dev_pm_opp *opp; -unsigned long rate = *freq *KHZ ; +unsigned long rate; - opp =devfreq_recommended_opp (dev, &rate, flags); + opp =devfreq_recommended_opp (dev, freq, flags);if (IS_ERR (opp)) { -dev_err (dev,"Failed to find opp for %lu KHz\n" , *freq); +dev_err (dev,"Failed to find opp for %lu Hz\n" , *freq);return PTR_ERR (opp); } rate =dev_pm_opp_get_freq (opp);
@@ -498,8 +498,6 @@ static int tegra_devfreq_target(struct device *dev, unsigned long *freq,clk_set_min_rate (tegra->emc_clock, rate);clk_set_rate (tegra->emc_clock,0 ); - *freq = rate; -return 0 ; }
@@ -509,7 +507,7 @@ static int tegra_devfreq_get_dev_status(struct device *dev,struct tegra_devfreq *tegra =dev_get_drvdata (dev);struct tegra_devfreq_device *actmon_dev; - stat->current_frequency = tegra->cur_freq; + stat->current_frequency = tegra->cur_freq *KHZ ;/* To be used by the tegra governor */ stat->private_data = tegra;
@@ -564,7 +562,7 @@ static int tegra_governor_get_target(struct devfreq *devfreq, target_freq =max (target_freq, dev->target_freq); } - *freq = target_freq; + *freq = target_freq *KHZ ;return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +3 -0
@@ -540,6 +540,9 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_fileif (sh_num ==AMDGPU_INFO_MMR_SH_INDEX_MASK ) sh_num =0xffffffff ; +if (info->read_mmr_reg.count >128 ) +return -EINVAL ; + regs =kmalloc_array (info->read_mmr_reg.count,sizeof (*regs),GFP_KERNEL );if (!regs)return -ENOMEM ;
drivers/gpu/drm/omapdrm/dss/dss.c +1 -1
@@ -1100,7 +1100,7 @@ static const struct dss_features omap34xx_dss_feats = {static const struct dss_features omap3630_dss_feats = { .model =DSS_MODEL_OMAP3 , - .fck_div_max =32 , + .fck_div_max =31 , .fck_freq_max =173000000 , .dss_fck_multiplier =1 , .parent_clk_name ="dpll4_ck" ,
drivers/hwtracing/coresight/coresight-etm4x.c +12 -2
@@ -181,6 +181,12 @@ static void etm4_enable_hw(void *info)if (coresight_timeout (drvdata->base,TRCSTATR ,TRCSTATR_IDLE_BIT ,0 ))dev_err (drvdata->dev,"timeout while waiting for Idle Trace Status\n" ); +/* +* As recommended by section 4.3.7 ("Synchronization when using the +* memory-mapped interface") of ARM IHI 0064D +*/ +dsb (sy); +isb ();CS_LOCK (drvdata->base);
@@ -331,8 +337,12 @@ static void etm4_disable_hw(void *info)/* EN, bit[0] Trace unit enable bit */ control &= ~0x1 ; -/* make sure everything completes before disabling */ -mb (); +/* +* Make sure everything completes before disabling, as recommended +* by section 7.3.77 ("TRCVICTLR, ViewInst Main Control Register, +* SSTATUS") of ARM IHI 0064D +*/ +dsb (sy);isb ();writel_relaxed (control, drvdata->base +TRCPRGCTLR );
drivers/mmc/host/sdhci-of-esdhc.c +6 -1
@@ -435,7 +435,12 @@ static int esdhc_of_enable_dma(struct sdhci_host *host)dma_set_mask_and_coherent (dev,DMA_BIT_MASK (40 )); value =sdhci_readl (host,ESDHC_DMA_SYSCTL ); - value |=ESDHC_DMA_SNOOP ; + +if (of_dma_is_coherent (dev->of_node)) + value |=ESDHC_DMA_SNOOP ; +else + value &= ~ESDHC_DMA_SNOOP ; +sdhci_writel (host, value,ESDHC_DMA_SYSCTL );return 0 ; }
drivers/mmc/host/sdhci.c +10 -5
@@ -2638,6 +2638,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask, u32 *intmask_p)static void sdhci_adma_show_error (struct sdhci_host *host) {void *desc = host->adma_table; +dma_addr_t dma = host->adma_addr;sdhci_dumpregs (host);
@@ -2645,18 +2646,21 @@ static void sdhci_adma_show_error(struct sdhci_host *host)struct sdhci_adma2_64_desc *dma_desc = desc;if (host->flags &SDHCI_USE_64_BIT_DMA ) -DBG ("%p: DMA 0x%08x%08x, LEN 0x%04x, Attr=0x%02x\n" , - desc,le32_to_cpu (dma_desc->addr_hi), +SDHCI_DUMP ("%08llx: DMA 0x%08x%08x, LEN 0x%04x, Attr=0x%02x\n" , + (unsigned long long )dma, +le32_to_cpu (dma_desc->addr_hi),le32_to_cpu (dma_desc->addr_lo),le16_to_cpu (dma_desc->len),le16_to_cpu (dma_desc->cmd));else -DBG ("%p: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n" , - desc,le32_to_cpu (dma_desc->addr_lo), +SDHCI_DUMP ("%08llx: DMA 0x%08x, LEN 0x%04x, Attr=0x%02x\n" , + (unsigned long long )dma, +le32_to_cpu (dma_desc->addr_lo),le16_to_cpu (dma_desc->len),le16_to_cpu (dma_desc->cmd)); desc += host->desc_sz; + dma += host->desc_sz;if (dma_desc->cmd &cpu_to_le16 (ADMA2_END ))break ;
@@ -2732,7 +2736,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask) != MMC_BUS_TEST_R) host->data->error = -EILSEQ ; else if (intmask & SDHCI_INT_ADMA_ERROR) { -pr_err ("%s: ADMA error\n" ,mmc_hostname (host->mmc)); +pr_err ("%s: ADMA error: 0x%08x\n" ,mmc_hostname (host->mmc), + intmask);sdhci_adma_show_error (host); host->data->error = -EIO ;if (host->ops->adma_workaround)
drivers/net/can/spi/mcp251x.c +14 -5
@@ -627,7 +627,7 @@ static int mcp251x_setup(struct net_device *net, struct mcp251x_priv *priv,static int mcp251x_hw_reset (struct spi_device *spi) {struct mcp251x_priv *priv =spi_get_drvdata (spi); -u8 reg; +unsigned long timeout;int ret;/* Wait for oscillator startup timer after power up */
@@ -641,10 +641,19 @@ static int mcp251x_hw_reset(struct spi_device *spi)/* Wait for oscillator startup timer after reset */ mdelay (MCP251X_OST_DELAY_MS ); - reg =mcp251x_read_reg (spi,CANSTAT ); -if ((reg &CANCTRL_REQOP_MASK ) !=CANCTRL_REQOP_CONF ) -return -ENODEV ; - +/* Wait for reset to finish */ + timeout = jiffies +HZ ; +while ((mcp251x_read_reg (spi,CANSTAT ) &CANCTRL_REQOP_MASK ) != +CANCTRL_REQOP_CONF ) { +usleep_range (MCP251X_OST_DELAY_MS *1000 , +MCP251X_OST_DELAY_MS *1000 *2 ); + +if (time_after (jiffies, timeout)) { +dev_err (&spi->dev, +"MCP251x didn't enter in conf mode after reset\n" ); +return -EBUSY ; + } + }return 0 ; }
drivers/net/ieee802154/atusb.c +2 -1
@@ -907,10 +907,11 @@ static void atusb_disconnect(struct usb_interface *interface)ieee802154_unregister_hw (atusb->hw); +usb_put_dev (atusb->usb_dev); +ieee802154_free_hw (atusb->hw);usb_set_intfdata (interface,NULL ); -usb_put_dev (atusb->usb_dev);pr_debug ("atusb_disconnect done\n" ); }
drivers/pwm/pwm-stm32-lp.c +6 -0
@@ -59,6 +59,12 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm,/* Calculate the period and prescaler value */ div = (unsigned long long )clk_get_rate (priv->clk) * state->period;do_div (div,NSEC_PER_SEC ); +if (!div) { +/* Clock is too slow to achieve requested period. */ +dev_dbg (priv->chip.dev,"Can't reach %u ns\n" , state->period); +return -EINVAL ; + } + prd = div;while (div >STM32_LPTIM_MAX_ARR ) { presc++;
drivers/s390/cio/ccwgroup.c +1 -1
@@ -369,7 +369,7 @@ int ccwgroup_create_dev(struct device *parent, struct ccwgroup_driver *gdrv, goto error; }/* Check for trailing stuff. */ -if (i == num_devices &&strlen (buf) >0 ) { +if (i == num_devices && buf &&strlen (buf) >0 ) { rc = -EINVAL ; goto error; }
drivers/s390/cio/css.c +2 -0
@@ -1178,6 +1178,8 @@ device_initcall(cio_settle_init);int sch_is_pseudo_sch (struct subchannel *sch) { +if (!sch->dev.parent) +return 0 ;return sch ==to_css (sch->dev.parent)->pseudo_subchannel; }
drivers/thermal/thermal_core.c +1 -1
@@ -299,7 +299,7 @@ static void thermal_zone_device_set_polling(struct thermal_zone_device *tz,mod_delayed_work (system_freezable_wq, &tz->poll_queue,msecs_to_jiffies (delay)); else - cancel_delayed_work(&tz->poll_queue); + cancel_delayed_work_sync(&tz->poll_queue); }static void monitor_thermal_zone (struct thermal_zone_device *tz)
drivers/watchdog/aspeed_wdt.c +3 -1
@@ -38,6 +38,7 @@ static const struct aspeed_wdt_config ast2500_config = {static const struct of_device_id aspeed_wdt_of_table[] = { { .compatible ="aspeed,ast2400-wdt" , .data = &ast2400_config }, { .compatible ="aspeed,ast2500-wdt" , .data = &ast2500_config }, + { .compatible ="aspeed,ast2600-wdt" , .data = &ast2500_config }, { }, };MODULE_DEVICE_TABLE (of, aspeed_wdt_of_table);
@@ -257,7 +258,8 @@ static int aspeed_wdt_probe(struct platform_device *pdev)set_bit (WDOG_HW_RUNNING , &wdt->wdd.status); } -if (of_device_is_compatible (np,"aspeed,ast2500-wdt" )) { +if ((of_device_is_compatible (np,"aspeed,ast2500-wdt" )) || + (of_device_is_compatible (np,"aspeed,ast2600-wdt" ))) {u32 reg =readl (wdt->base +WDT_RESET_WIDTH ); reg &= config->ext_pulse_width_mask;
drivers/watchdog/imx2_wdt.c +2 -2
@@ -58,7 +58,7 @@#define IMX2_WDT_WMCR 0x08/* Misc Register */ -#define IMX2_WDT_MAX_TIME 128 +#define IMX2_WDT_MAX_TIME 128U#define IMX2_WDT_DEFAULT_TIME 60/* in seconds */ #define WDOG_SEC_TO_COUNT (s) ((s * 2 - 1) << 8)
@@ -183,7 +183,7 @@ static int imx2_wdt_set_timeout(struct watchdog_device *wdog, {unsigned int actual; - actual =min (new_timeout, wdog->max_hw_heartbeat_ms *1000 ); + actual =min (new_timeout,IMX2_WDT_MAX_TIME );__imx2_wdt_set_timeout (wdog, actual); wdog->timeout = new_timeout;return 0 ;
drivers/xen/pci.c +15 -6
@@ -29,6 +29,8 @@#include "../pci/pci.h" #ifdef CONFIG_PCI_MMCONFIG #include <asm/pci_x86.h> + +static int xen_mcfg_late (void );#endif static bool __read_mostly pci_seg_supported = true;
@@ -40,7 +42,18 @@ static int xen_add_device(struct device *dev)#ifdef CONFIG_PCI_IOV struct pci_dev *physfn = pci_dev->physfn;#endif - +#ifdef CONFIG_PCI_MMCONFIG +static bool pci_mcfg_reserved = false; +/* +* Reserve MCFG areas in Xen on first invocation due to this being +* potentially called from inside of acpi_init immediately after +* MCFG table has been finally parsed. +*/ +if (!pci_mcfg_reserved) { +xen_mcfg_late (); + pci_mcfg_reserved = true; + } +#endif if (pci_seg_supported) {struct {struct physdev_pci_device_add add;
@@ -213,7 +226,7 @@ static int __init register_xen_pci_notifier(void)arch_initcall (register_xen_pci_notifier);#ifdef CONFIG_PCI_MMCONFIG -static int __init xen_mcfg_late (void ) +static int xen_mcfg_late (void ) {struct pci_mmcfg_region *cfg;int rc;
@@ -252,8 +265,4 @@ static int __init xen_mcfg_late(void) }return 0 ; } -/* -* Needs to be done after acpi_init which are subsys_initcall. -*/ -subsys_initcall_sync (xen_mcfg_late);#endif
drivers/xen/xenbus/xenbus_dev_frontend.c +18 -2
@@ -55,6 +55,7 @@#include <linux/string.h> #include <linux/slab.h> #include <linux/miscdevice.h> +#include <linux/workqueue.h> #include <xen/xenbus.h> #include <xen/xen.h>
@@ -113,6 +114,8 @@ struct xenbus_file_priv {wait_queue_head_t read_waitq;struct kref kref; + +struct work_struct wq; };/* Read out any raw xenbus messages queued up. */
@@ -297,14 +300,14 @@ static void watch_fired(struct xenbus_watch *watch,mutex_unlock (&adap->dev_data->reply_mutex); } -static void xenbus_file_free (struct kref *kref) +static void xenbus_worker (struct work_struct *wq) {struct xenbus_file_priv *u;struct xenbus_transaction_holder *trans, *tmp;struct watch_adapter *watch, *tmp_watch;struct read_buffer *rb, *tmp_rb; - u = container_of(kref, struct xenbus_file_priv, kref); + u = container_of(wq, struct xenbus_file_priv, wq);/* * No need for locking here because there are no other users,
@@ -330,6 +333,18 @@ static void xenbus_file_free(struct kref *kref)kfree (u); } +static void xenbus_file_free (struct kref *kref) +{ +struct xenbus_file_priv *u; + +/* +* We might be called in xenbus_thread(). +* Use workqueue to avoid deadlock. +*/ + u = container_of(kref, struct xenbus_file_priv, kref); +schedule_work (&u->wq); +} +static struct xenbus_transaction_holder *xenbus_get_transaction (struct xenbus_file_priv *u,uint32_t tx_id) {
@@ -626,6 +641,7 @@ static int xenbus_file_open(struct inode *inode, struct file *filp)INIT_LIST_HEAD (&u->watches);INIT_LIST_HEAD (&u->read_buffers);init_waitqueue_head (&u->read_waitq); +INIT_WORK (&u->wq, xenbus_worker);mutex_init (&u->reply_mutex);mutex_init (&u->msgbuffer_mutex);
fs/9p/vfs_file.c +3 -0
@@ -528,6 +528,7 @@ v9fs_mmap_file_mmap(struct file *filp, struct vm_area_struct *vma) v9inode =V9FS_I (inode);mutex_lock (&v9inode->v_mutex);if (!v9inode->writeback_fid && + (vma->vm_flags &VM_SHARED ) && (vma->vm_flags &VM_WRITE )) {/* * clone a fid and add it to writeback_fid
@@ -629,6 +630,8 @@ static void v9fs_mmap_vm_close(struct vm_area_struct *vma) (vma->vm_end - vma->vm_start - 1), }; +if (!(vma->vm_flags &VM_SHARED )) +return ;p9_debug (P9_DEBUG_VFS ,"9p VMA close, %p, flushing" , vma);
fs/ceph/inode.c +6 -1
@@ -789,7 +789,12 @@ static int fill_inode(struct inode *inode, struct page *locked_page, ci->i_version =le64_to_cpu (info->version); inode->i_version++; inode->i_rdev =le32_to_cpu (info->rdev); - inode->i_blkbits =fls (le32_to_cpu (info->layout.fl_stripe_unit)) -1 ; +/* directories have fl_stripe_unit set to zero */ +if (le32_to_cpu (info->layout.fl_stripe_unit)) + inode->i_blkbits = +fls (le32_to_cpu (info->layout.fl_stripe_unit)) -1 ; +else + inode->i_blkbits =CEPH_BLOCK_SHIFT ;if ((new_version || (new_issued &CEPH_CAP_AUTH_SHARED )) && (issued &CEPH_CAP_AUTH_EXCL ) ==0 ) {
fs/ceph/mds_client.c +3 -1
@@ -3543,7 +3543,9 @@ static void delayed_work(struct work_struct *work)pr_info ("mds%d hung\n" , s->s_mds); } } -if (s->s_state <CEPH_MDS_SESSION_OPEN ) { +if (s->s_state ==CEPH_MDS_SESSION_NEW || + s->s_state ==CEPH_MDS_SESSION_RESTARTING || + s->s_state ==CEPH_MDS_SESSION_REJECTED ) {/* this mds is failed or recovering, just wait */ ceph_put_mds_session (s);continue ;
fs/fuse/cuse.c +1 -0
@@ -513,6 +513,7 @@ static int cuse_channel_open(struct inode *inode, struct file *file) rc =cuse_send_init (cc);if (rc) {fuse_dev_free (fud); +fuse_conn_put (&cc->fc);return rc; } file->private_data = fud;
fs/nfs/nfs4xdr.c +1 -1
@@ -1132,7 +1132,7 @@ static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, }else *p++ =cpu_to_be32 (NFS4_SET_TO_SERVER_TIME ); } -if (bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL ) { +if (label && (bmval[2 ] &FATTR4_WORD2_SECURITY_LABEL )) { *p++ =cpu_to_be32 (label->lfs); *p++ =cpu_to_be32 (label->pi); *p++ =cpu_to_be32 (label->len);
fs/nfs/pnfs.c +7 -2
@@ -1319,10 +1319,15 @@ void pnfs_roc_release(struct nfs4_layoutreturn_args *args,const nfs4_stateid *res_stateid =NULL ;struct nfs4_xdr_opaque_data *ld_private = args->ld_private; -if (ret ==0 ) { - arg_stateid = &args->stateid; +switch (ret) { +case -NFS4ERR_NOMATCHING_LAYOUT : +break ; +case 0 :if (res->lrs_present) res_stateid = &res->stateid; +/* Fallthrough */ +default : + arg_stateid = &args->stateid; }pnfs_layoutreturn_free_lsegs (lo, arg_stateid, &args->range, res_stateid);
fs/statfs.c +4 -13
@@ -304,19 +304,10 @@ COMPAT_SYSCALL_DEFINE2(fstatfs, unsigned int, fd, struct compat_statfs __user *,static int put_compat_statfs64 (struct compat_statfs64 __user *ubuf,struct kstatfs *kbuf) {struct compat_statfs64 buf; -if (sizeof (ubuf->f_bsize) ==4 ) { -if ((kbuf->f_type | kbuf->f_bsize | kbuf->f_namelen | - kbuf->f_frsize | kbuf->f_flags) &0xffffffff00000000ULL ) -return -EOVERFLOW ; -/* f_files and f_ffree may be -1; it's okay -* to stuff that into 32 bits */ -if (kbuf->f_files !=0xffffffffffffffffULL - && (kbuf->f_files &0xffffffff00000000ULL )) -return -EOVERFLOW ; -if (kbuf->f_ffree !=0xffffffffffffffffULL - && (kbuf->f_ffree &0xffffffff00000000ULL )) -return -EOVERFLOW ; - } + +if ((kbuf->f_bsize | kbuf->f_frsize) &0xffffffff00000000ULL ) +return -EOVERFLOW ; +memset (&buf,0 ,sizeof (struct compat_statfs64 )); buf.f_type = kbuf->f_type; buf.f_bsize = kbuf->f_bsize;
include/linux/ieee80211.h +53 -0
57 lines not on this page · raw message
include/sound/soc-dapm.h +2 -0
@@ -349,6 +349,8 @@ struct device;#define SND_SOC_DAPM_WILL_PMD 0x80/* called at start of sequence */ #define SND_SOC_DAPM_PRE_POST_PMD \ (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD) +#define SND_SOC_DAPM_PRE_POST_PMU \ + (SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU)/* convenience event type detection */ #define SND_SOC_DAPM_EVENT_ON (e) \
kernel/elfcore.c +1 -0
@@ -3,6 +3,7 @@#include <linux/fs.h> #include <linux/mm.h> #include <linux/binfmts.h> +#include <linux/elfcore.h> Elf_Half __weak elf_core_extra_phdrs (void ) {
kernel/locking/qspinlock_paravirt.h +1 -1
@@ -247,7 +247,7 @@ pv_wait_early(struct pv_node *prev, int loop)if ((loop &PV_PREV_CHECK_MASK ) !=0 )return false; -return READ_ONCE (prev->state) != vcpu_running ||vcpu_is_preempted (prev->cpu); +return READ_ONCE (prev->state) != vcpu_running; }/*
kernel/sched/core.c +2 -2
@@ -1111,7 +1111,8 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,if (cpumask_equal (&p->cpus_allowed, new_mask)) goto out; -if (!cpumask_intersects (new_mask, cpu_valid_mask)) { + dest_cpu =cpumask_any_and (cpu_valid_mask, new_mask); +if (dest_cpu >= nr_cpu_ids) { ret = -EINVAL ; goto out; }
@@ -1132,7 +1133,6 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,if (cpumask_test_cpu (task_cpu (p), new_mask)) goto out; - dest_cpu =cpumask_any_and (cpu_valid_mask, new_mask);if (task_running (rq, p) || p->state ==TASK_WAKING ) {struct migration_arg arg = { p, dest_cpu };/* Need help from migration thread: drop lock and wait. */
kernel/time/tick-broadcast-hrtimer.c +29 -28
73 lines not on this page · raw message
kernel/time/timer.c +5 -3
@@ -1545,21 +1545,23 @@ void timer_clear_idle(void)static int collect_expired_timers (struct timer_base *base,struct hlist_head *heads) { +unsigned long now =READ_ONCE (jiffies); +/* * NOHZ optimization. After a long idle sleep we need to forward the * base to current jiffies. Avoid a loop by searching the bitfield for * the next expiring timer. */ -if ((long )(jiffies - base->clk) >2 ) { +if ((long )(now - base->clk) >2 ) {unsigned long next =__next_timer_interrupt (base);/* * If the next timer is ahead of time forward to current * jiffies, otherwise forward to the next expiry time: */ -if (time_after (next, jiffies)) { +if (time_after (next, now)) {/* The call site will increment clock! */ - base->clk = jiffies -1 ; + base->clk = now -1 ;return 0 ; } base->clk = next;
mm/usercopy.c +7 -1
@@ -15,6 +15,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/mm.h> +#include <linux/highmem.h> #include <linux/slab.h> #include <linux/sched.h> #include <linux/sched/task.h>
@@ -203,7 +204,12 @@ static inline const char *check_heap_object(const void *ptr, unsigned long n,if (!virt_addr_valid (ptr))return NULL ; - page =virt_to_head_page (ptr); +/* +* When CONFIG_HIGHMEM=y, kmap_to_page() will give either the +* highmem page or fallback to virt_to_page(). The following +* is effectively a highmem-aware virt_to_head_page(). +*/ + page =compound_head (kmap_to_page ((void *)ptr));/* Check slab allocator for flags and size. */ if (PageSlab (page))
net/netfilter/nf_tables_api.c +5 -2
@@ -3131,8 +3131,11 @@ static int nf_tables_newset(struct net *net, struct sock *nlsk, NFT_SET_OBJECT))return -EINVAL ;/* Only one of these operations is supported */ -if ((flags & (NFT_SET_MAP |NFT_SET_EVAL |NFT_SET_OBJECT )) == - (NFT_SET_MAP |NFT_SET_EVAL |NFT_SET_OBJECT )) +if ((flags & (NFT_SET_MAP |NFT_SET_OBJECT )) == + (NFT_SET_MAP |NFT_SET_OBJECT )) +return -EOPNOTSUPP ; +if ((flags & (NFT_SET_EVAL |NFT_SET_OBJECT )) == + (NFT_SET_EVAL |NFT_SET_OBJECT ))return -EOPNOTSUPP ; }
net/netfilter/nft_lookup.c +0 -3
@@ -76,9 +76,6 @@ static int nft_lookup_init(const struct nft_ctx *ctx,if (IS_ERR (set))return PTR_ERR (set); -if (set->flags &NFT_SET_EVAL ) -return -EOPNOTSUPP ; - priv->sreg =nft_parse_register (tb[NFTA_LOOKUP_SREG ]); err =nft_validate_register_load (priv->sreg, set->klen);if (err <0 )
net/wireless/nl80211.c +41 -1
66 lines not on this page · raw message
net/wireless/reg.c +1 -1
@@ -1567,7 +1567,7 @@ static void reg_call_notifier(struct wiphy *wiphy,static bool reg_wdev_chan_valid (struct wiphy *wiphy,struct wireless_dev *wdev) { -struct cfg80211_chan_def chandef; +struct cfg80211_chan_def chandef = {};struct cfg80211_registered_device *rdev =wiphy_to_rdev (wiphy);enum nl80211_iftype iftype;
net/wireless/scan.c +6 -8
@@ -484,6 +484,8 @@ const u8 *cfg80211_find_ie_match(u8 eid, const u8 *ies, int len, const u8 *match, int match_len, int match_offset) { + const struct element *elem; +/* match_offset can't be smaller than 2, unless match_len is * zero, in which case match_offset must be zero as well. */
@@ -491,14 +493,10 @@ const u8 *cfg80211_find_ie_match(u8 eid, const u8 *ies, int len, (!match_len && match_offset)))return NULL ; -while (len >=2 && len >= ies[1 ] +2 ) { -if ((ies[0 ] == eid) && - (ies[1 ] +2 >= match_offset + match_len) && - !memcmp (ies + match_offset, match, match_len)) -return ies; - - len -= ies[1 ] +2 ; - ies += ies[1 ] +2 ; +for_each_element_id (elem, eid, ies, len) { +if (elem->datalen >= match_offset -2 + match_len && + !memcmp (elem->data + match_offset -2 , match, match_len)) +return (void *)elem; }return NULL ;
net/wireless/wext-compat.c +1 -1
@@ -800,7 +800,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev, {struct wireless_dev *wdev = dev->ieee80211_ptr;struct cfg80211_registered_device *rdev =wiphy_to_rdev (wdev->wiphy); -struct cfg80211_chan_def chandef; +struct cfg80211_chan_def chandef = {};int ret;switch (wdev->iftype) {
security/integrity/ima/ima_crypto.c +4 -1
@@ -293,8 +293,11 @@ static int ima_calc_file_hash_atfm(struct file *file, rbuf_len =min_t (loff_t, i_size - offset, rbuf_size[active]); rc =integrity_kernel_read (file, offset, rbuf[active], rbuf_len); -if (rc != rbuf_len) +if (rc != rbuf_len) { +if (rc >=0 ) + rc = -EINVAL ; goto out3; + }if (rbuf[1 ] && offset) {/* Using two buffers, and it is not the first
sound/soc/codecs/sgtl5000.c +202 -30
282 lines not on this page · raw message
tools/lib/traceevent/Makefile +2 -2
@@ -259,8 +259,8 @@ endef define do_generate_dynamic_list_file symbol_type=`$(NM) -u -D $1 | awk 'NF>1 {print $$1}' | \ - xargs echo "U W w" | tr ' ' '\n' | sort -u | xargs echo`;\ - if [ "$$symbol_type" = "U W w" ];then \ + xargs echo "U w W" | tr 'w ' 'W\n' | sort -u | xargs echo`;\ + if [ "$$symbol_type" = "U W" ];then \ (echo '{'; \ $(NM) -u -D $1 | awk 'NF>1 {print "\t"$$2";"}' | sort -u;\ echo '};'; \
tools/lib/traceevent/event-parse.c +1 -2
@@ -268,10 +268,10 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid) errno =ENOMEM ;return -1 ; } + pevent->cmdlines = cmdlines; cmdlines[pevent->cmdline_count].comm =strdup (comm);if (!cmdlines[pevent->cmdline_count].comm) { -free (cmdlines); errno =ENOMEM ;return -1 ; }
@@ -282,7 +282,6 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid) pevent->cmdline_count++;qsort (cmdlines, pevent->cmdline_count,sizeof (*cmdlines), cmdline_cmp); - pevent->cmdlines = cmdlines;return 0 ; }
tools/perf/Makefile.config +1 -1
@@ -795,7 +795,7 @@ ifndef NO_JVMTI JDIR=$(shell /usr/sbin/update-java-alternatives -l | head -1 | awk '{print $$3}') else ifneq (,$(wildcard /usr/sbin/alternatives)) - JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed 's%/jre/bin/java.%%g') + JDIR=$(shell /usr/sbin/alternatives --display java | tail -1 | cut -d' ' -f 5 | sed -e 's%/jre/bin/java.%%g' -e 's%/bin/java.%%g') endif endif ifndef JDIR
tools/perf/arch/x86/util/unwind-libunwind.c +1 -1
@@ -1,11 +1,11 @@// SPDX-License-Identifier: GPL-2.0 #include <errno.h> +#include "../../util/debug.h" #ifndef REMOTE_UNWIND_LIBUNWIND #include <libunwind.h> #include "perf_regs.h" #include "../../util/unwind.h" -#include "../../util/debug.h" #endif #ifdef HAVE_ARCH_X86_64_SUPPORT
tools/perf/builtin-stat.c +4 -1
@@ -2769,8 +2769,11 @@ 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); -if (forever && status !=-1 ) { +if (forever && status !=-1 && !interval) {print_counters (NULL , argc, argv);perf_stat__reset_stats (); }
tools/perf/util/header.c +1 -1
@@ -1063,7 +1063,7 @@ static int cpu_cache_level__read(struct cpu_cache_level *cache, u32 cpu, u16 levscnprintf (file,PATH_MAX ,"%s/shared_cpu_list" , path);if (sysfs__read_str (file, &cache->map, &len)) { -free (cache->map); +free (cache->size);free (cache->type);return -1 ; }
tools/perf/util/stat.c +17 -0
@@ -154,6 +154,15 @@ static void perf_evsel__free_prev_raw_counts(struct perf_evsel *evsel) evsel->prev_raw_counts =NULL ; } +static void perf_evsel__reset_prev_raw_counts (struct perf_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 perf_evsel *evsel,bool alloc_raw) {int ncpus =perf_evsel__nr_cpus (evsel);
@@ -204,6 +213,14 @@ void perf_evlist__reset_stats(struct perf_evlist *evlist) } } +void perf_evlist__reset_prev_raw_counts (struct perf_evlist *evlist) +{ +struct perf_evsel *evsel; + +evlist__for_each_entry (evlist, evsel) +perf_evsel__reset_prev_raw_counts (evsel); +} +static void zero_per_pkg (struct perf_evsel *counter) {if (counter->per_pkg_mask)
tools/perf/util/stat.h +1 -0
@@ -100,6 +100,7 @@ void perf_stat__collect_metric_expr(struct perf_evlist *);int perf_evlist__alloc_stats (struct perf_evlist *evlist,bool alloc_raw);void perf_evlist__free_stats (struct perf_evlist *evlist);void perf_evlist__reset_stats (struct perf_evlist *evlist); +void perf_evlist__reset_prev_raw_counts (struct perf_evlist *evlist);int perf_stat_process_counter (struct perf_stat_config *config,struct perf_evsel *counter);