4.9.10-stable review
Subsystems (3)
Greg Kroah-Hartman
maintainercover 4.9.10-stable review
This is the start of the stable review cycle for the 4.9.10 release. There are 60 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:05 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.10-rc1.gz
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 <[email protected]>
Linux 4.9.10-rc1
Peter Zijlstra <[email protected]>
perf/core: Fix crash in perf_event_read()
Namhyung Kim <[email protected]>
perf diff: Fix segfault on 'perf diff -o N' option
Namhyung Kim <[email protected]>
perf diff: Fix -o/--order option behavior (again)
Omar Sandoval <[email protected]>
stacktrace, lockdep: Fix address, newline ugliness
Eyal Itkin <[email protected]>
IB/rxe: Fix mem_check_range integer overflow
Eyal Itkin <[email protected]>
IB/rxe: Fix resid update
Yazen Ghannam <[email protected]>
x86/CPU/AMD: Fix Zen SMT topology
Borislav Petkov <[email protected]>
x86/CPU/AMD: Bring back Compute Unit ID
Andrey Ryabinin <[email protected]>
x86/mm/ptdump: Fix soft lockup in page table walker
Takashi Iwai <[email protected]>
Revert "ALSA: line6: Only determine control port properties if needed"
Takashi Iwai <[email protected]>
ALSA: seq: Don't handle loop timeout at snd_seq_pool_done()
Takashi Iwai <[email protected]>
ALSA: seq: Fix race at creating a queue
Hui Wang <[email protected]>
ALSA: hda - adding a new NV HDMI/DP codec ID in the driver
Boris Ostrovsky <[email protected]>
xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
Benjamin Herrenschmidt <[email protected]>
powerpc/powernv: Fix CPU hotplug to handle waking on HVI
Benjamin Herrenschmidt <[email protected]>
powerpc/mm/radix: Update ERAT flushes when invalidating TLB
Jeff Mahoney <[email protected]>
btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls
Mauricio Faria de Oliveira <[email protected]>
scsi: qla2xxx: Avoid that issuing a LIP triggers a kernel crash
ojab <[email protected]>
scsi: mpt3sas: disable ASPM for MPI2 controllers
Dave Carroll <[email protected]>
scsi: aacraid: Fix INTx/MSI-x issue with older controllers
Steffen Maier <[email protected]>
scsi: zfcp: fix use-after-free by not tracing WKA port open/close on failed send
Dexuan Cui <[email protected]>
Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read()
K. Y. Srinivasan <[email protected]>
Drivers: hv: vmbus: On the read path cleanup the logic to interrupt the host
K. Y. Srinivasan <[email protected]>
Drivers: hv: vmbus: On write cleanup the logic to interrupt the host
K. Y. Srinivasan <[email protected]>
Drivers: hv: vmbus: Base host signaling strictly on the ring state
Gal Pressman <[email protected]>
net/mlx5e: Modify TIRs hash only when it's needed
Thorsten Horstmann <[email protected]>
mac80211: Fix adding of mesh vendor IEs
Masashi Honma <[email protected]>
nl80211: Fix mesh HT operation check
Michał Winiarski <[email protected]>
drm/i915: Always convert incoming exec offsets to non-canonical
Alexander Sverdlin <[email protected]>
ARM: 8642/1: LPAE: catch pending imprecise abort on unmask
Sébastien Szymanski <[email protected]>
ARM: dts: imx6dl: fix GPIO4 range
Nicholas Bellinger <[email protected]>
target: Fix COMPARE_AND_WRITE ref leak for non GOOD status
Nicholas Bellinger <[email protected]>
target: Fix multi-session dynamic se_node_acl double free OOPs
Nicholas Bellinger <[email protected]>
target: Fix early transport_generic_handle_tmr abort scenario
Nicholas Bellinger <[email protected]>
target: Use correct SCSI status during EXTENDED_COPY exception
Nicholas Bellinger <[email protected]>
target: Don't BUG_ON during NodeACL dynamic -> explicit conversion
Maarten Lankhorst <[email protected]>
drm/atomic: Fix double free in drm_atomic_state_default_clear
Lee, Shawn C <[email protected]>
drm/i915/bxt: Add MST support when do DPLL calculation
Andrey Ryabinin <[email protected]>
drm/i915: fix use-after-free in page_flip_completed()
Dave Martin <[email protected]>
ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
Arnd Bergmann <[email protected]>
hns: avoid stack overflow with CONFIG_KASAN
Bryant G. Ly <[email protected]>
ibmvscsis: Add SGL limit
Sean Rees <[email protected]>
mm/slub.c: fix random_seq offset destruction
Tejun Heo <[email protected]>
cpumask: use nr_cpumask_bits for parsing functions
Jurij Smakov <[email protected]>
rtlwifi: rtl8192ce: Fix loading of incorrect firmware
Linus Torvalds <[email protected]>
Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
Stephen Smalley <[email protected]>
selinux: fix off-by-one in setprocattr
Dmitry Torokhov <[email protected]>
Input: uinput - fix crash when mixing old and new init style
Vineet Gupta <[email protected]>
ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
Gary R Hook <[email protected]>
crypto: ccp - Fix double add when creating new DMA command
Gary R Hook <[email protected]>
crypto: ccp - Fix DMA operations when IOMMU is enabled
Giovanni Cabiddu <[email protected]>
crypto: qat - zero esram only for DH85x devices
Giovanni Cabiddu <[email protected]>
crypto: qat - fix bar discovery for c62x
Harsh Jain <[email protected]>
crypto: chcr - Check device is allocated before use
Harsh Jain <[email protected]>
crypto: algif_aead - Fix kernel panic on list_del
Mike Snitzer <[email protected]>
dm rq: cope with DM device destruction while in dm_old_request_fn()
Dan Williams <[email protected]>
libnvdimm, pfn: fix memmap reservation size versus 4K alignment
Dan Williams <[email protected]>
libnvdimm, namespace: do not delete namespace-id 0
Dan Williams <[email protected]>
acpi, nfit: fix acpi_nfit_flush_probe() crash
Srinivas Pandruvada <[email protected]>
cpufreq: intel_pstate: Disable energy efficiency optimization
-------------
Diffstat:
Makefile | 4 +- arch/arc/kernel/unaligned.c | 2 +- arch/arm/boot/dts/imx6dl.dtsi | 2 +- arch/arm/kernel/ptrace.c | 2 +- arch/arm/mm/fault.c | 4 +- arch/arm/mm/fault.h | 4 + arch/powerpc/include/asm/reg.h | 3 +- arch/powerpc/include/asm/xics.h | 1 + arch/powerpc/mm/tlb-radix.c | 6 +- arch/powerpc/platforms/powernv/smp.c | 12 ++- arch/powerpc/sysdev/xics/icp-opal.c | 29 +++++++ arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/apic/io_apic.c | 2 - arch/x86/kernel/cpu/amd.c | 16 +++- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/smpboot.c | 12 ++- arch/x86/mm/dump_pagetables.c | 2 + crypto/algif_aead.c | 2 +- drivers/acpi/nfit/core.c | 6 +- drivers/cpufreq/intel_pstate.c | 30 +++++++ drivers/crypto/ccp/ccp-dev-v5.c | 2 +- drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-dmaengine.c | 6 +- drivers/crypto/chelsio/chcr_core.c | 18 ++--- drivers/crypto/qat/qat_c62x/adf_drv.c | 2 +- drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 + drivers/crypto/qat/qat_common/qat_hal.c | 4 +- drivers/gpu/drm/drm_atomic.c | 16 ++-- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 +-- drivers/gpu/drm/i915/intel_display.c | 4 +- drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 +- drivers/hv/channel.c | 93 +++------------------- drivers/hv/channel_mgmt.c | 2 - drivers/hv/hyperv_vmbus.h | 10 +-- drivers/hv/ring_buffer.c | 45 ++++++----- drivers/infiniband/sw/rxe/rxe_mr.c | 8 +- drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- drivers/input/misc/uinput.c | 20 +++-- drivers/md/dm-rq.c | 4 + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 8 +- .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 18 +++-- drivers/net/hyperv/netvsc.c | 6 ++ .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 9 ++- drivers/net/xen-netfront.c | 3 +- drivers/nvdimm/namespace_devs.c | 11 ++- drivers/nvdimm/pfn_devs.c | 7 +- drivers/s390/scsi/zfcp_fsf.c | 8 +- drivers/scsi/aacraid/comminit.c | 8 +- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 + drivers/scsi/qla2xxx/qla_os.c | 2 +- drivers/target/target_core_device.c | 10 ++- drivers/target/target_core_sbc.c | 8 +- drivers/target/target_core_transport.c | 86 +++++++++++++------- drivers/target/target_core_xcopy.c | 2 +- fs/btrfs/ioctl.c | 6 +- include/linux/cpumask.h | 8 +- include/linux/hyperv.h | 45 +++++++++-- include/target/target_core_base.h | 1 + kernel/events/core.c | 25 +++--- kernel/stacktrace.c | 12 +-- mm/slub.c | 4 + net/mac80211/mesh.c | 2 +- net/wireless/nl80211.c | 1 + security/selinux/hooks.c | 2 +- sound/core/seq/seq_memory.c | 9 +-- sound/core/seq/seq_queue.c | 33 +++++--- sound/pci/hda/patch_hdmi.c | 1 + sound/usb/line6/driver.c | 3 +- tools/perf/builtin-diff.c | 2 +- tools/perf/ui/hist.c | 10 +++ tools/perf/util/hist.h | 7 ++ 72 files changed, 464 insertions(+), 291 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/60 cpufreq: intel_pstate: Disable energy efficiency optimization
4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
commit 6e978b22efa1db9f6e71b24440b5f1d93e968ee3 upstream.
Some Kabylake desktop processors may not reach max turbo when running in HWP mode, even if running under sustained 100% utilization.
This occurs when the HWP.EPP (Energy Performance Preference) is set to "balance_power" (0x80) -- the default on most systems.
It occurs because the platform BIOS may erroneously enable an energy-efficiency setting -- MSR_IA32_POWER_CTL BIT-EE, which is not recommended to be enabled on this SKU.
On the failing systems, this BIOS issue was not discovered when the desktop motherboard was tested with Windows, because the BIOS also neglects to provide the ACPI/CPPC table, that Windows requires to enable HWP, and so Windows runs in legacy P-state mode, where this setting has no effect.
Linux' intel_pstate driver does not require ACPI/CPPC to enable HWP, and so it runs in HWP mode, exposing this incorrect BIOS configuration.
There are several ways to address this problem.
First, Linux can also run in legacy P-state mode on this system. As intel_pstate is how Linux enables HWP, booting with "intel_pstate=disable"
will run in acpi-cpufreq/ondemand legacy p-state mode.
Or second, the "performance" governor can be used with intel_pstate, which will modify HWP.EPP to 0.
Or third, starting in 4.10, the /sys/devices/system/cpu/cpufreq/policy*/energy_performance_preference attribute in can be updated from "balance_power" to "performance".
Or fourth, apply this patch, which fixes the erroneous setting of MSR_IA32_POWER_CTL BIT_EE on this model, allowing the default configuration to function as designed.
--- drivers/cpufreq/intel_pstate.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/cpufreq/intel_pstate.c +30 -0
@@ -820,6 +820,25 @@ static void intel_pstate_hwp_enable(struwrmsrl_on_cpu (cpudata->cpu,MSR_PM_ENABLE ,0x1 ); } +#define MSR_IA32_POWER_CTL_BIT_EE 19 + +/* Disable energy efficiency optimization */ +static void intel_pstate_disable_ee (int cpu) +{ +u64 power_ctl; +int ret; + + ret =rdmsrl_on_cpu (cpu,MSR_IA32_POWER_CTL , &power_ctl); +if (ret) +return ; + +if (!(power_ctl &BIT (MSR_IA32_POWER_CTL_BIT_EE ))) { +pr_info ("Disabling energy efficiency optimization\n" ); + power_ctl |=BIT (MSR_IA32_POWER_CTL_BIT_EE ); +wrmsrl_on_cpu (cpu,MSR_IA32_POWER_CTL , power_ctl); + } +} +static int atom_get_min_pstate (void ) {u64 value;
@@ -1420,6 +1439,11 @@ static const struct x86_cpu_id intel_pst {} }; +static const struct x86_cpu_id intel_pstate_cpu_ee_disable_ids[] = { +ICPU (INTEL_FAM6_KABYLAKE_DESKTOP , core_params), + {} +}; +static int intel_pstate_init_cpu (unsigned int cpunum) {struct cpudata *cpu;
@@ -1435,6 +1459,12 @@ static int intel_pstate_init_cpu(unsigne cpu->cpu = cpunum;if (hwp_active) { +const struct x86_cpu_id *id; + + id =x86_match_cpu (intel_pstate_cpu_ee_disable_ids); +if (id) +intel_pstate_disable_ee (cpunum); +intel_pstate_hwp_enable (cpu); pid_params.sample_rate_ms =50 ; pid_params.sample_rate_ns =50 *NSEC_PER_MSEC ;
Greg Kroah-Hartman
maintainerPATCH 2/60 acpi, nfit: fix acpi_nfit_flush_probe() crash
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit e471486c13b82b1338d49c798f78bb62b1ed0a9e upstream.
We queue an on-stack work item to 'nfit_wq' and wait for it to complete as part of a 'flush_probe' request. However, if the user cancels the wait we need to make sure the item is flushed from the queue otherwise we are leaving an out-of-scope stack address on the work list.
BUG: unable to handle kernel paging request at ffffbcb3c72f7cd0 IP: [<ffffffffa9413a7b>] __list_add+0x1b/0xb0 [..] RIP: 0010:[<ffffffffa9413a7b>] [<ffffffffa9413a7b>] __list_add+0x1b/0xb0 RSP: 0018:ffffbcb3c7ba7c00 EFLAGS: 00010046 [..] Call Trace: [<ffffffffa90bb11a>] insert_work+0x3a/0xc0 [<ffffffffa927fdda>] ? seq_open+0x5a/0xa0 [<ffffffffa90bb30a>] __queue_work+0x16a/0x460 [<ffffffffa90bbb08>] queue_work_on+0x38/0x40 [<ffffffffc0cf2685>] acpi_nfit_flush_probe+0x95/0xc0 [nfit] [<ffffffffc0cf25d0>] ? nfit_visible+0x40/0x40 [nfit] [<ffffffffa9571495>] wait_probe_show+0x25/0x60 [<ffffffffa9546b30>] dev_attr_show+0x20/0x50
--- drivers/acpi/nfit/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/acpi/nfit/core.c +5 -1
@@ -2704,6 +2704,7 @@ static int acpi_nfit_flush_probe(structstruct acpi_nfit_desc *acpi_desc =to_acpi_nfit_desc (nd_desc);struct device *dev = acpi_desc->dev;struct acpi_nfit_flush_work flush; +int rc;/* bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */ device_lock (dev);
@@ -2716,7 +2717,10 @@ static int acpi_nfit_flush_probe(structINIT_WORK_ONSTACK (&flush.work, flush_probe);COMPLETION_INITIALIZER_ONSTACK (flush.cmp);queue_work (nfit_wq, &flush.work); -return wait_for_completion_interruptible (&flush.cmp); + + rc =wait_for_completion_interruptible (&flush.cmp); +cancel_work_sync (&flush.work); +return rc; } static int acpi_nfit_clear_to_send(struct nvdimm_bus_descriptor *nd_desc,
Greg Kroah-Hartman
maintainerPATCH 3/60 libnvdimm, namespace: do not delete namespace-id 0
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit 9d032f4201d39e5cf43a8709a047e481f5723fdc upstream.
Given that the naming of pmem devices changes from the pmemX form to the pmemX.Y form when namespace id is greater than 0, arrange for namespaces with id-0 to be exempt from deletion. Otherwise a simple reconfiguration of an existing namespace to a new mode results in a name change of the resulting block device:
# ndctl list --namespace=namespace1.0
{
"dev":"namespace1.0",
"mode":"raw",
"size":2147483648,
"uuid":"3dadf3dc-89b9-4b24-b20e-abc8a4707ce3",
"blockdev":"pmem1"
} # ndctl create-namespace --reconfig=namespace1.0 --mode=memory --force
{
"dev":"namespace1.1",
"mode":"memory",
"size":2111832064,
"uuid":"7b4a6341-7318-4219-a02c-fb57c0bbf613",
"blockdev":"pmem1.1"
}This change does require tooling changes to explicitly look for namespaceX.0 if the seed has already advanced to another namespace.
--- drivers/nvdimm/namespace_devs.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/nvdimm/namespace_devs.c +7 -4
@@ -962,8 +962,8 @@ static ssize_t __size_store(struct devicstruct nvdimm_drvdata *ndd;struct nd_label_id label_id;u32 flags =0 , remainder; +int rc, i, id =-1 ;u8 *uuid =NULL ; -int rc, i;if (dev->driver || ndns->claim)return -EBUSY ;
@@ -972,11 +972,13 @@ static ssize_t __size_store(struct devicstruct nd_namespace_pmem *nspm =to_nd_namespace_pmem (dev); uuid = nspm->uuid; + id = nspm->id; }else if (is_namespace_blk (dev)) {struct nd_namespace_blk *nsblk =to_nd_namespace_blk (dev); uuid = nsblk->uuid; flags =NSLABEL_FLAG_LOCAL ; + id = nsblk->id; }/*
@@ -1039,10 +1041,11 @@ static ssize_t __size_store(struct devic/* * Try to delete the namespace if we deleted all of its -* allocation, this is not the seed device for the region, and -* it is not actively claimed by a btt instance. +* allocation, this is not the seed or 0th device for the +* region, and it is not actively claimed by a btt, pfn, or dax +* instance. */ -if (val ==0 && nd_region->ns_seed != dev && !ndns->claim) +if (val ==0 && id !=0 && nd_region->ns_seed != dev && !ndns->claim)nd_device_unregister (dev,ND_ASYNC );return rc;
Greg Kroah-Hartman
maintainerPATCH 4/60 libnvdimm, pfn: fix memmap reservation size versus 4K alignment
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dan Williams <[email protected]>
commit bfb34527a32a1a576d9bfb7026d3ab0369a6cd60 upstream.
When vmemmap_populate() allocates space for the memmap it does so in 2MB sized chunks. The libnvdimm-pfn driver incorrectly accounts for this when the alignment of the device is set to 4K. When this happens we trigger memory allocation failures in altmap_alloc_block_buf() and trigger warnings of the form:
WARNING: CPU: 0 PID: 3376 at arch/x86/mm/init_64.c:656 arch_add_memory+0xe4/0xf0 [..] Call Trace: dump_stack+0x86/0xc3 __warn+0xcb/0xf0 warn_slowpath_null+0x1d/0x20 arch_add_memory+0xe4/0xf0 devm_memremap_pages+0x29b/0x4e0
--- drivers/nvdimm/pfn_devs.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/nvdimm/pfn_devs.c +2 -5
@@ -627,15 +627,12 @@ static int nd_pfn_init(struct nd_pfn *nd size =resource_size (&nsio->res); npfns = (size - start_pad - end_trunc -SZ_8K ) /SZ_4K ;if (nd_pfn->mode ==PFN_MODE_PMEM ) { -unsigned long memmap_size; -/* * vmemmap_populate_hugepages() allocates the memmap array in * HPAGE_SIZE chunks. */ - memmap_size =ALIGN (64 * npfns,HPAGE_SIZE ); - offset =ALIGN (start +SZ_8K + memmap_size + dax_label_reserve, - nd_pfn->align) - start; + offset =ALIGN (start +SZ_8K +64 * npfns + dax_label_reserve, +max (nd_pfn->align,HPAGE_SIZE )) - start; }else if (nd_pfn->mode ==PFN_MODE_RAM ) offset =ALIGN (start +SZ_8K + dax_label_reserve, nd_pfn->align) - start;
Greg Kroah-Hartman
maintainerPATCH 5/60 dm rq: cope with DM device destruction while in dm_old_request_fn()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Snitzer <[email protected]>
commit 4087a1fffe38106e10646606a27f10d40451862d upstream.
Fixes a crash in dm_table_find_target() due to a NULL struct dm_table being passed from dm_old_request_fn() that races with DM device destruction.
--- drivers/md/dm-rq.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/md/dm-rq.c +4 -0
@@ -804,6 +804,10 @@ static void dm_old_request_fn(struct reqint srcu_idx;struct dm_table *map =dm_get_live_table (md, &srcu_idx); +if (unlikely (!map)) { +dm_put_live_table (md, srcu_idx); +return ; + } ti =dm_table_find_target (map, pos);dm_put_live_table (md, srcu_idx); }
Greg Kroah-Hartman
maintainerPATCH 7/60 crypto: chcr - Check device is allocated before use
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Harsh Jain <[email protected]>
commit f5f7bebc91ab378dea5aad5277c4d283e46472d9 upstream.
Ensure dev is allocated for crypto uld context before using the device for crypto operations.
--- drivers/crypto/chelsio/chcr_core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/crypto/chelsio/chcr_core.c +8 -10
@@ -51,6 +51,7 @@ static struct cxgb4_uld_info chcr_uld_inint assign_chcr_device (struct chcr_dev **dev) {struct uld_ctx *u_ctx; +int ret = -ENXIO ;/* * Which device to use if multiple devices are available TODO
@@ -58,15 +59,14 @@ int assign_chcr_device(struct chcr_dev ** must go to the same device to maintain the ordering. */ mutex_lock (&dev_mutex);/* TODO ? */ - u_ctx = list_first_entry(&uld_ctx_list, struct uld_ctx, entry); -if (!u_ctx) { -mutex_unlock (&dev_mutex); -return -ENXIO ; +list_for_each_entry (u_ctx, &uld_ctx_list, entry) +if (u_ctx && u_ctx->dev) { + *dev = u_ctx->dev; + ret =0 ; +break ; } - - *dev = u_ctx->dev;mutex_unlock (&dev_mutex); -return 0 ; +return ret; }static int chcr_dev_add (struct uld_ctx *u_ctx)
@@ -203,10 +203,8 @@ static int chcr_uld_state_change(void *hstatic int __init chcr_crypto_init (void ) { -if (cxgb4_register_uld (CXGB4_ULD_CRYPTO , &chcr_uld_info)) { +if (cxgb4_register_uld (CXGB4_ULD_CRYPTO , &chcr_uld_info))pr_err ("ULD register fail: No chcr crypto support in cxgb4" ); -return -1 ; - }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 8/60 crypto: qat - fix bar discovery for c62x
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
commit 3484ecbe0e9deb94afb0b9b6172d77e98eb72b94 upstream.
Some accelerators of the c62x series have only two bars. This patch skips BAR0 if the accelerator does not have it.
--- drivers/crypto/qat/qat_c62x/adf_drv.c | 2 +- drivers/crypto/qat/qat_common/adf_accel_devices.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
drivers/crypto/qat/qat_c62x/adf_drv.c +1 -1
@@ -233,7 +233,7 @@ static int adf_probe(struct pci_dev *pde &hw_data->accel_capabilities_mask);/* Find and map all the device's BARS */ - i =0 ; + i = (hw_data->fuses &ADF_DEVICE_FUSECTL_MASK ) ?1 :0 ; bar_mask =pci_select_bars (pdev,IORESOURCE_MEM );for_each_set_bit (bar_nr, (const unsigned long *)&bar_mask,ADF_PCI_MAX_BARS *2 ) {
drivers/crypto/qat/qat_common/adf_accel_devices.h +1 -0
@@ -69,6 +69,7 @@#define ADF_ERRSOU5 (0x3A000 + 0xD8)#define ADF_DEVICE_FUSECTL_OFFSET 0x40#define ADF_DEVICE_LEGFUSE_OFFSET 0x4C +#define ADF_DEVICE_FUSECTL_MASK 0x80000000#define ADF_PCI_MAX_BARS 3#define ADF_DEVICE_NAME_LENGTH 32#define ADF_ETR_MAX_RINGS_PER_BANK 16
Greg Kroah-Hartman
maintainerPATCH 9/60 crypto: qat - zero esram only for DH85x devices
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Giovanni Cabiddu <[email protected]>
commit 685ce0626840e2673fe64ea8807684f7324fec5f upstream.
Zero embedded ram in DH85x devices. This is not needed for newer generations as it is done by HW.
--- drivers/crypto/qat/qat_common/qat_hal.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/qat/qat_common/qat_hal.c +2 -2
@@ -456,7 +456,7 @@ static int qat_hal_init_esram(struct icpunsigned int csr_val;int times =30 ; -if (handle->pci_dev->device ==ADF_C3XXX_PCI_DEVICE_ID ) +if (handle->pci_dev->device !=ADF_DH895XCC_PCI_DEVICE_ID )return 0 ; csr_val =ADF_CSR_RD (csr_addr,0 );
@@ -716,7 +716,7 @@ int qat_hal_init(struct adf_accel_dev *a (void __iomem *)((uintptr_t )handle->hal_cap_ae_xfer_csr_addr_v +LOCAL_TO_XFER_REG_OFFSET ); handle->pci_dev = pci_info->pci_dev; -if (handle->pci_dev->device !=ADF_C3XXX_PCI_DEVICE_ID ) { +if (handle->pci_dev->device ==ADF_DH895XCC_PCI_DEVICE_ID ) { sram_bar = &pci_info->pci_bars[hw_data->get_sram_bar_id (hw_data)]; handle->hal_sram_addr_v = sram_bar->virt_addr;
Greg Kroah-Hartman
maintainerPATCH 10/60 crypto: ccp - Fix DMA operations when IOMMU is enabled
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gary R Hook <[email protected]>
commit 500c0106e638e08c2c661c305ed57d6b67e10908 upstream.
An I/O page fault occurs when the IOMMU is enabled on a system that supports the v5 CCP. DMA operations use a Request ID value that does not match what is expected by the IOMMU, resulting in the I/O page fault. Setting the Request ID value to 0 corrects this issue.
--- drivers/crypto/ccp/ccp-dev-v5.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/crypto/ccp/ccp-dev-v5.c +1 -1
@@ -955,7 +955,7 @@ static irqreturn_t ccp5_irq_handler(intstatic void ccp5_config (struct ccp_device *ccp) {/* Public side */ -iowrite32 (0x00001249 , ccp->io_regs +CMD5_REQID_CONFIG_OFFSET ); +iowrite32 (0x0 , ccp->io_regs +CMD5_REQID_CONFIG_OFFSET ); }static void ccp5other_config (struct ccp_device *ccp)
Greg Kroah-Hartman
maintainerPATCH 11/60 crypto: ccp - Fix double add when creating new DMA command
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gary R Hook <[email protected]>
commit e5da5c5667381d2772374ee6a2967b3576c9483d upstream.
Eliminate a double-add by creating a new list to manage command descriptors when created; move the descriptor to the pending list when the command is submitted.
--- drivers/crypto/ccp/ccp-dev.h | 1 + drivers/crypto/ccp/ccp-dmaengine.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/crypto/ccp/ccp-dev.h +1 -0
@@ -238,6 +238,7 @@ struct ccp_dma_chan {struct ccp_device *ccp;spinlock_t lock; +struct list_head created;struct list_head pending;struct list_head active;struct list_head complete;
drivers/crypto/ccp/ccp-dmaengine.c +5 -1
@@ -63,6 +63,7 @@ static void ccp_free_chan_resources(struccp_free_desc_resources (chan->ccp, &chan->complete);ccp_free_desc_resources (chan->ccp, &chan->active);ccp_free_desc_resources (chan->ccp, &chan->pending); +ccp_free_desc_resources (chan->ccp, &chan->created);spin_unlock_irqrestore (&chan->lock, flags); }
@@ -273,6 +274,7 @@ static dma_cookie_t ccp_tx_submit(structspin_lock_irqsave (&chan->lock, flags); cookie =dma_cookie_assign (tx_desc); +list_del (&desc->entry);list_add_tail (&desc->entry, &chan->pending);spin_unlock_irqrestore (&chan->lock, flags);
@@ -426,7 +428,7 @@ static struct ccp_dma_desc *ccp_create_dspin_lock_irqsave (&chan->lock, sflags); -list_add_tail (&desc->entry, &chan->pending); +list_add_tail (&desc->entry, &chan->created);spin_unlock_irqrestore (&chan->lock, sflags);
@@ -610,6 +612,7 @@ static int ccp_terminate_all(struct dma_/*TODO: Purge the complete list? */ ccp_free_desc_resources (chan->ccp, &chan->active);ccp_free_desc_resources (chan->ccp, &chan->pending); +ccp_free_desc_resources (chan->ccp, &chan->created);spin_unlock_irqrestore (&chan->lock, flags);
@@ -679,6 +682,7 @@ int ccp_dmaengine_register(struct ccp_de chan->ccp = ccp;spin_lock_init (&chan->lock); +INIT_LIST_HEAD (&chan->created);INIT_LIST_HEAD (&chan->pending);INIT_LIST_HEAD (&chan->active);INIT_LIST_HEAD (&chan->complete);
Greg Kroah-Hartman
maintainerPATCH 12/60 ARC: [arcompact] brown paper bag bug in unaligned access delay slot fixup
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vineet Gupta <[email protected]>
commit a524c218bc94c705886a0e0fedeee45d1931da32 upstream.
--- arch/arc/kernel/unaligned.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/kernel/unaligned.c +1 -1
@@ -243,7 +243,7 @@ int misaligned_fixup(unsigned long addre/* clear any remanants of delay slot */ if (delay_mode (regs)) { - regs->ret = regs->bta ~1U; + regs->ret = regs->bta & ~1U ; regs->status32 &= ~STATUS_DE_MASK ; }else { regs->ret += state.instr_len;
Greg Kroah-Hartman
maintainerPATCH 13/60 Input: uinput - fix crash when mixing old and new init style
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Torokhov <[email protected]>
commit 601bbbe0517303c9f8eb3d75e11d64efed1293c9 upstream.
If user tries to initialize uinput device mixing old and new style initialization (i.e. using old UI_SET_ABSBIT instead of UI_ABS_SETUP, we forget to allocate input->absinfo and will crash when trying to send absolute events:
ioctl(ui, UI_DEV_SETUP, &us);
ioctl(ui, UI_SET_PHYS, "Test");
ioctl(ui, UI_SET_EVBIT, EV_ABS);
ioctl(ui, UI_SET_ABSBIT, ABS_X);
ioctl(ui, UI_SET_ABSBIT, ABS_Y);
ioctl(ui, UI_DEV_CREATE, 0);Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=191811
--- drivers/input/misc/uinput.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/input/misc/uinput.c +14 -6
@@ -263,13 +263,21 @@ static int uinput_create_device(struct ureturn -EINVAL ; } -if (test_bit (ABS_MT_SLOT , dev->absbit)) { - nslot =input_abs_get_max (dev,ABS_MT_SLOT ) +1 ; - error =input_mt_init_slots (dev, nslot,0 ); -if (error) +if (test_bit (EV_ABS , dev->evbit)) { +input_alloc_absinfo (dev); +if (!dev->absinfo) { + error = -EINVAL ; goto fail1; - }else if (test_bit (ABS_MT_POSITION_X , dev->absbit)) { -input_set_events_per_packet (dev,60 ); + } + +if (test_bit (ABS_MT_SLOT , dev->absbit)) { + nslot =input_abs_get_max (dev,ABS_MT_SLOT ) +1 ; + error =input_mt_init_slots (dev, nslot,0 ); +if (error) + goto fail1; + }else if (test_bit (ABS_MT_POSITION_X , dev->absbit)) { +input_set_events_per_packet (dev,60 ); + } }if (test_bit (EV_FF , dev->evbit) && !udev->ff_effects_max) {
Greg Kroah-Hartman
maintainerPATCH 14/60 selinux: fix off-by-one in setprocattr
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Smalley <[email protected]>
commit 0c461cb727d146c9ef2d3e86214f498b78b7d125 upstream.
SELinux tries to support setting/clearing of /proc/pid/attr attributes from the shell by ignoring terminating newlines and treating an attribute value that begins with a NUL or newline as an attempt to clear the attribute. However, the test for clearing attributes has always been wrong; it has an off-by-one error, and this could further lead to reading past the end of the allocated buffer since commit bb646cdb12e75d82258c2f2e7746d5952d3e321a ("proc_pid_attr_write():
switch to memdup_user()"). Fix the off-by-one error.
Even with this fix, setting and clearing /proc/pid/attr attributes from the shell is not straightforward since the interface does not support multiple write() calls (so shells that write the value and newline separately will set and then immediately clear the attribute, requiring use of echo -n to set the attribute), whereas trying to use echo -n "" to clear the attribute causes the shell to skip the write() call altogether since POSIX says that a zero-length write causes no side effects. Thus, one must use echo -n to set and echo without -n to clear, as in the following example:
$ echo -n unconfined_u:object_r:user_home_t:s0 > /proc/$$/attr/fscreate $ cat /proc/$$/attr/fscreate unconfined_u:object_r:user_home_t:s0 $ echo "" > /proc/$$/attr/fscreate $ cat /proc/$$/attr/fscreate
Note the use of /proc/$$ rather than /proc/self, as otherwise the cat command will read its own attribute value, not that of the shell.
There are no users of this facility to my knowledge; possibly we should just get rid of it.
UPDATE: Upon further investigation it appears that a local process with the process:setfscreate permission can cause a kernel panic as a result of this bug. This patch fixes CVE-2017-2618.
--- security/selinux/hooks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/hooks.c +1 -1
@@ -5858,7 +5858,7 @@ static int selinux_setprocattr(struct tareturn error;/* Obtain a SID for the context, if one was specified. */ -if (size && str[1 ] && str[1 ] !='\n' ) { +if (size && str[0 ] && str[0 ] !='\n' ) {if (str[size-1 ] =='\n' ) { str[size-1 ] =0 ; size--;
Greg Kroah-Hartman
maintainerPATCH 15/60 Revert "x86/ioapic: Restore IO-APIC irq_chip retrigger callback"
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Linus Torvalds <[email protected]>
commit d966564fcdc19e13eb6ba1fbe6b8101070339c3d upstream.
This reverts commit 020eb3daaba2857b32c4cf4c82f503d6a00a67de.
Gabriel C reports that it causes his machine to not boot, and we haven't tracked down the reason for it yet. Since the bug it fixes has been around for a longish time, we're better off reverting the fix for now.
Gabriel says:
"It hangs early and freezes with a lot RCU warnings.
I bisected it down to :
Quoted 2 lines
Ruslan Ruslichenko (1):
x86/ioapic: Restore IO-APICirq_chipretrigger callback
Reverting this one fixes the problem for me..
The box is a PRIMERGY TX200 S5 , 2 socket , 2 x E5520 CPU(s) installed"
and Ruslan and Thomas are currently stumped.
--- arch/x86/kernel/apic/io_apic.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/kernel/apic/io_apic.c +0 -2
@@ -1876,7 +1876,6 @@ static struct irq_chip ioapic_chip __rea .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
@@ -1888,7 +1887,6 @@ static struct irq_chip ioapic_ir_chip __ .irq_ack = irq_chip_ack_parent, .irq_eoi = ioapic_ir_ack_level, .irq_set_affinity = ioapic_set_affinity, - .irq_retrigger = irq_chip_retrigger_hierarchy, .flags = IRQCHIP_SKIP_SET_WAKE, };
Greg Kroah-Hartman
maintainerPATCH 16/60 rtlwifi: rtl8192ce: Fix loading of incorrect firmware
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jurij Smakov <[email protected]>
commit 52f5631a4c056ad01682393be56d2be237e81610 upstream.
In commit cf4747d7535a ("rtlwifi: Fix regression caused by commit d86e64768859, an error in the edit results in the wrong firmware being loaded for some models of the RTL8188/8192CE. In this condition, the connection suffered from high ping latency, slow transfer rates,
and required higher signal strengths to work at all
See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853073,
https://bugzilla.opensuse.org/show_bug.cgi?id=1017471, and
https://github.com/lwfinger/rtlwifi_new/issues/203 for descriptions of the problems. This patch fixes all of those problems.
--- drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +7 -2
@@ -96,7 +96,7 @@ int rtl92c_init_sw_vars(struct ieee80211struct rtl_priv *rtlpriv =rtl_priv (hw);struct rtl_pci *rtlpci =rtl_pcidev (rtl_pcipriv (hw));struct rtl_hal *rtlhal =rtl_hal (rtl_priv (hw)); -char *fw_name ="rtlwifi/rtl8192cfwU.bin" ; +char *fw_name;rtl8192ce_bt_reg_init (hw);
@@ -168,8 +168,13 @@ int rtl92c_init_sw_vars(struct ieee80211 }/* request fw */ -if (IS_81XXC_VENDOR_UMC_B_CUT (rtlhal->version)) +if (IS_VENDOR_UMC_A_CUT (rtlhal->version) && + !IS_92C_SERIAL (rtlhal->version)) + fw_name ="rtlwifi/rtl8192cfwU.bin" ; +else if (IS_81XXC_VENDOR_UMC_B_CUT (rtlhal->version)) fw_name ="rtlwifi/rtl8192cfwU_B.bin" ; +else + fw_name ="rtlwifi/rtl8192cfw.bin" ; rtlpriv->max_fw_size =0x4000 ;pr_info ("Using firmware %s\n" , fw_name);
Greg Kroah-Hartman
maintainerPATCH 17/60 cpumask: use nr_cpumask_bits for parsing functions
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 4d59b6ccf000862beed6fc0765d3209f98a8d8a2 upstream.
Commit 513e3d2d11c9 ("cpumask: always use nr_cpu_ids in formatting and parsing functions") converted both cpumask printing and parsing functions to use nr_cpu_ids instead of nr_cpumask_bits. While this was okay for the printing functions as it just picked one of the two output formats that we were alternating between depending on a kernel config, doing the same for parsing wasn't okay.
nr_cpumask_bits can be either nr_cpu_ids or NR_CPUS. We can always use nr_cpu_ids but that is a variable while NR_CPUS is a constant, so it can be more efficient to use NR_CPUS when we can get away with it. Converting the printing functions to nr_cpu_ids makes sense because it affects how the masks get presented to userspace and doesn't break anything; however, using nr_cpu_ids for parsing functions can incorrectly leave the higher bits uninitialized while reading in these masks from userland. As all testing and comparison functions use nr_cpumask_bits which can be larger than nr_cpu_ids, the parsed cpumasks can erroneously yield false negative results.
This made the taskstats interface incorrectly return -EINVAL even when the inputs were correct.
Fix it by restoring the parse functions to use nr_cpumask_bits instead of nr_cpu_ids.
--- include/linux/cpumask.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
include/linux/cpumask.h +4 -4
@@ -560,7 +560,7 @@ static inline void cpumask_copy(struct cstatic inline int cpumask_parse_user (const char __user *buf,int len,struct cpumask *dstp) { -return bitmap_parse_user (buf, len,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parse_user (buf, len,cpumask_bits (dstp), nr_cpumask_bits); }/**
@@ -575,7 +575,7 @@ static inline int cpumask_parselist_user struct cpumask *dstp) {return bitmap_parselist_user (buf, len,cpumask_bits (dstp), - nr_cpu_ids); + nr_cpumask_bits); }/**
@@ -590,7 +590,7 @@ static inline int cpumask_parse(const chchar *nl =strchr (buf,'\n' );unsigned int len = nl ? (unsigned int )(nl - buf) :strlen (buf); -return bitmap_parse (buf, len,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parse (buf, len,cpumask_bits (dstp), nr_cpumask_bits); }/**
@@ -602,7 +602,7 @@ static inline int cpumask_parse(const ch*/ static inline int cpulist_parse (const char *buf,struct cpumask *dstp) { -return bitmap_parselist (buf,cpumask_bits (dstp), nr_cpu_ids); +return bitmap_parselist (buf,cpumask_bits (dstp), nr_cpumask_bits); }/**
Greg Kroah-Hartman
maintainerPATCH 18/60 mm/slub.c: fix random_seq offset destruction
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Rees <[email protected]>
commit a810007afe239d59c1115fcaa06eb5b480f876e9 upstream.
Commit 210e7a43fa90 ("mm: SLUB freelist randomization") broke USB hub initialisation as described in
https://bugzilla.kernel.org/show_bug.cgi?id=177551.
Bail out early from init_cache_random_seq if s->random_seq is already initialised. This prevents destroying the previously computed random_seq offsets later in the function.
If the offsets are destroyed, then shuffle_freelist will truncate page->freelist to just the first object (orphaning the rest).
--- mm/slub.c | 4 ++++ 1 file changed, 4 insertions(+)
mm/slub.c +4 -0
@@ -1419,6 +1419,10 @@ static int init_cache_random_seq(structint err;unsigned long i, count =oo_objects (s->oo); +/* Bailout if already initialised */ +if (s->random_seq) +return 0 ; + err =cache_random_seq_create (s, count,GFP_KERNEL );if (err) { pr_err("SLUB: Unable to initialize free list for %s\n",
Greg Kroah-Hartman
maintainerPATCH 19/60 ibmvscsis: Add SGL limit
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bryant G. Ly <[email protected]>
commit b22bc27868e8c11fe3f00937a341b44f80b50364 upstream.
This patch adds internal LIO sgl limit since the driver already sets a max transfer limit on transport layer of 1MB to the client.
--- drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +1 -0
@@ -3929,6 +3929,7 @@ static struct configfs_attribute *ibmvscstatic const struct target_core_fabric_ops ibmvscsis_ops = { .module =THIS_MODULE , .name ="ibmvscsis" , + .max_data_sg_nents =MAX_TXU /PAGE_SIZE , .get_fabric_name = ibmvscsis_get_fabric_name, .tpg_get_wwn = ibmvscsis_get_fabric_wwn, .tpg_get_tag = ibmvscsis_get_tag,
Greg Kroah-Hartman
maintainerPATCH 20/60 hns: avoid stack overflow with CONFIG_KASAN
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
commit b3f2d07f4649adcf6905953a10d217b5683e4077 upstream.
The use of ACCESS_ONCE() looks like a micro-optimization to force gcc to use an indexed load for the register address, but it has an absolutely detrimental effect on builds with gcc-5 and CONFIG_KASAN=y, leading to a very likely kernel stack overflow aside from very complex object code:
hisilicon/hns/hns_dsaf_gmac.c: In function 'hns_gmac_update_stats':hisilicon/hns/hns_dsaf_gmac.c:419:1: error: the frame size of 2912 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_ppe.c: In function 'hns_ppe_reset_common':hisilicon/hns/hns_dsaf_ppe.c:390:1: error: the frame size of 1184 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_ppe.c: In function 'hns_ppe_get_regs':hisilicon/hns/hns_dsaf_ppe.c:621:1: error: the frame size of 3632 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_rcb.c: In function 'hns_rcb_get_common_regs':hisilicon/hns/hns_dsaf_rcb.c:970:1: error: the frame size of 2784 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_gmac.c: In function 'hns_gmac_get_regs':hisilicon/hns/hns_dsaf_gmac.c:641:1: error: the frame size of 5728 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_rcb.c: In function 'hns_rcb_get_ring_regs':hisilicon/hns/hns_dsaf_rcb.c:1021:1: error: the frame size of 2208 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_comm_init':hisilicon/hns/hns_dsaf_main.c:1209:1: error: the frame size of 1904 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_xgmac.c: In function 'hns_xgmac_get_regs':hisilicon/hns/hns_dsaf_xgmac.c:748:1: error: the frame size of 4704 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_update_stats':hisilicon/hns/hns_dsaf_main.c:2420:1: error: the frame size of 1088 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] hisilicon/hns/hns_dsaf_main.c: In function 'hns_dsaf_get_regs':hisilicon/hns/hns_dsaf_main.c:2753:1: error: the frame size of 10768 bytes is larger than 1024 bytes [-Werror=frame-larger-than=]
This does not seem to happen any more with gcc-7, but removing the ACCESS_ONCE seems safe anyway and it avoids a serious issue for some people. I have verified that with gcc-5.3.1, the object code we get is better in the new version both with and without CONFIG_KASAN, as we no longer allocate a 1344 byte stack frame for hns_dsaf_get_regs() but otherwise have practically identical object code.
With gcc-7.0.0, removing ACCESS_ONCE has no effect, the object code is already good either way.
This patch is probably not urgent to get into 4.11 as only KASAN=y builds with certain compilers are affected, but I still think it makes sense to backport into older kernels.
--- drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h +2 -6
@@ -1007,9 +1007,7 @@static inline void dsaf_write_reg (void __iomem *base,u32 reg,u32 value) { -u8 __iomem *reg_addr =ACCESS_ONCE (base); - -writel (value, reg_addr + reg); +writel (value, base + reg); }#define dsaf_write_dev (a, reg, value) \
@@ -1017,9 +1015,7 @@ static inline void dsaf_write_reg(void _static inline u32 dsaf_read_reg (u8 __iomem *base,u32 reg) { -u8 __iomem *reg_addr =ACCESS_ONCE (base); - -return readl (reg_addr + reg); +return readl (base + reg); }static inline void dsaf_write_syscon (struct regmap *base,u32 reg,u32 value)
Greg Kroah-Hartman
maintainerPATCH 21/60 ARM: 8643/3: arm/ptrace: Preserve previous registers for short regset write
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Martin <[email protected]>
commit 228dbbfb5d77f8e047b2a1d78da14b7158433027 upstream.
Ensure that if userspace supplies insufficient data to PTRACE_SETREGSET to fill all the registers, the thread's old registers are preserved.
--- arch/arm/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/kernel/ptrace.c +1 -1
@@ -600,7 +600,7 @@ static int gpr_set(struct task_struct *t const void *kbuf, const void __user *ubuf) { int ret; -struct pt_regs newregs; +struct pt_regs newregs = *task_pt_regs (target); ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &newregs,
Greg Kroah-Hartman
maintainerPATCH 22/60 drm/i915: fix use-after-free in page_flip_completed()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
commit 5351fbb1bf1413f6024892093528280769ca852f upstream.
page_flip_completed() dereferences 'work' variable after executing queue_work(). This is not safe as the 'work' item might be already freed by queued work:
BUG: KASAN: use-after-free in page_flip_completed+0x3ff/0x490 at addr ffff8803dc010f90
Call Trace:
__asan_report_load8_noabort+0x59/0x80
page_flip_completed+0x3ff/0x490
intel_finish_page_flip_mmio+0xe3/0x130
intel_pipe_handle_vblank+0x2d/0x40
gen8_irq_handler+0x4a7/0xed0
__handle_irq_event_percpu+0xf6/0x860
handle_irq_event_percpu+0x6b/0x160
handle_irq_event+0xc7/0x1b0
handle_edge_irq+0x1f4/0xa50
handle_irq+0x41/0x70
do_IRQ+0x9a/0x200
common_interrupt+0x89/0x89 Freed:
kfree+0x113/0x4d0
intel_unpin_work_fn+0x29a/0x3b0
process_one_work+0x79e/0x1b70
worker_thread+0x611/0x1460
kthread+0x241/0x3a0
ret_from_fork+0x27/0x40Move queue_work() after trace_i915_flip_complete() to fix this.
--- drivers/gpu/drm/i915/intel_display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_display.c +2 -2
@@ -4280,10 +4280,10 @@ static void page_flip_completed(struct idrm_crtc_vblank_put (&intel_crtc->base);wake_up_all (&dev_priv->pending_flip_queue); -queue_work (dev_priv->wq, &work->unpin_work); -trace_i915_flip_complete (intel_crtc->plane, work->pending_flip_obj); + +queue_work (dev_priv->wq, &work->unpin_work); }static int intel_crtc_wait_for_pending_flips (struct drm_crtc *crtc)
Greg Kroah-Hartman
maintainerPATCH 23/60 drm/i915/bxt: Add MST support when do DPLL calculation
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lee, Shawn C <[email protected]>
commit 789ea12500e5ce3911d0a6a822277c3133451927 upstream.
Add the missing INTEL_OUTPUT_DP_MST case in bxt_get_dpll() to correctly initialize the crtc_state and port plls when link training a DP MST monitor on BXT/APL devices.
Bugs: https://bugs.freedesktop.org/show_bug.cgi?id=99572
--- drivers/gpu/drm/i915/intel_dpll_mgr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dpll_mgr.c +2 -1
@@ -1723,7 +1723,8 @@ bxt_get_dpll(struct intel_crtc *crtc,return NULL ;if ((encoder->type ==INTEL_OUTPUT_DP || - encoder->type ==INTEL_OUTPUT_EDP ) && + encoder->type ==INTEL_OUTPUT_EDP || + encoder->type ==INTEL_OUTPUT_DP_MST ) && !bxt_ddi_dp_set_dpll_hw_state (clock, &dpll_hw_state))return NULL ;
Greg Kroah-Hartman
maintainerPATCH 24/60 drm/atomic: Fix double free in drm_atomic_state_default_clear
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
commit 92c715fca907686f5298220ece53423e38ba3aed upstream.
drm_atomic_helper_page_flip and drm_atomic_ioctl set their own events in crtc_state->event. But when it's set the event is freed in 2 places.
Solve this by only freeing the event in the atomic ioctl when it allocated its own event.
This has been broken twice. The first time when the code was introduced, but only in the corner case when an event is allocated, but more crtc's were included by atomic check and then failing. This can mostly happen when you do an atomic modeset in i915 and the display clock is changed, which forces all crtc's to be included to the state.
This has been broken worse by adding in-fences support, which caused the double free to be done unconditionally.
[IGT] kms_rotation_crc: starting subtest primary-rotation-180
=============================================================================
BUG kmalloc-128 (Tainted: G U ): Object already free
-----------------------------------------------------------------------------
Disabling lock debugging due to kernel taint
INFO: Allocated in drm_atomic_helper_setup_commit+0x285/0x2f0 [drm_kms_helper] age=0 cpu=3 pid=1529
___slab_alloc+0x308/0x3b0 __slab_alloc+0xd/0x20 kmem_cache_alloc_trace+0x92/0x1c0 drm_atomic_helper_setup_commit+0x285/0x2f0 [drm_kms_helper] intel_atomic_commit+0x35/0x4f0 [i915] drm_atomic_commit+0x46/0x50 [drm] drm_mode_atomic_ioctl+0x7d4/0xab0 [drm] drm_ioctl+0x2b3/0x490 [drm] do_vfs_ioctl+0x69c/0x700 SyS_ioctl+0x4e/0x80 entry_SYSCALL_64_fastpath+0x13/0x94 INFO: Freed in drm_event_cancel_free+0xa3/0xb0 [drm] age=0 cpu=3 pid=1529 __slab_free+0x48/0x2e0 kfree+0x159/0x1a0 drm_event_cancel_free+0xa3/0xb0 [drm] drm_mode_atomic_ioctl+0x86d/0xab0 [drm] drm_ioctl+0x2b3/0x490 [drm] do_vfs_ioctl+0x69c/0x700 SyS_ioctl+0x4e/0x80 entry_SYSCALL_64_fastpath+0x13/0x94
INFO: Slab 0xffffde1f0997b080 objects=17 used=2 fp=0xffff92fb65ec2578 flags=0x200000000008101
INFO: Object 0xffff92fb65ec2578 @offset=1400 fp=0xffff92fb65ec2ae8
Redzone ffff92fb65ec2570: bb bb bb bb bb bb bb bb ........
Object ffff92fb65ec2578: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec2588: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec2598: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec25a8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec25b8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec25c8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec25d8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b kkkkkkkkkkkkkkkk Object ffff92fb65ec25e8: 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b 6b a5 kkkkkkkkkkkkkkk.
Redzone ffff92fb65ec25f8: bb bb bb bb bb bb bb bb ........
Padding ffff92fb65ec2738: 5a 5a 5a 5a 5a 5a 5a 5a ZZZZZZZZ
CPU: 3 PID: 180 Comm: kworker/3:2 Tainted: G BU 4.10.0-rc6-patser+ #5039 Hardware name: /NUC5PPYB, BIOS PYBSWCEL.86A.0031.2015.0601.1712 06/01/2015 Workqueue: events intel_atomic_helper_free_state [i915] Call Trace: dump_stack+0x4d/0x6d print_trailer+0x20c/0x220 free_debug_processing+0x1c6/0x330 ? drm_atomic_state_default_clear+0xf7/0x1c0 [drm] __slab_free+0x48/0x2e0 ? drm_atomic_state_default_clear+0xf7/0x1c0 [drm] kfree+0x159/0x1a0 drm_atomic_state_default_clear+0xf7/0x1c0 [drm] ? drm_atomic_state_clear+0x30/0x30 [drm] intel_atomic_state_clear+0xd/0x20 [i915] drm_atomic_state_clear+0x1a/0x30 [drm] __drm_atomic_state_free+0x13/0x60 [drm] intel_atomic_helper_free_state+0x5d/0x70 [i915] process_one_work+0x260/0x4a0 worker_thread+0x2d1/0x4f0 kthread+0x127/0x130 ? process_one_work+0x4a0/0x4a0 ? kthread_stop+0x120/0x120 ret_from_fork+0x29/0x40
FIX kmalloc-128: Object at 0xffff92fb65ec2578 not freed
--- drivers/gpu/drm/drm_atomic.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/drm_atomic.c +8 -8
@@ -1759,16 +1759,16 @@ out:if (ret && arg->flags &DRM_MODE_PAGE_FLIP_EVENT ) {/* -* TEST_ONLY and PAGE_FLIP_EVENT are mutually exclusive, -* if they weren't, this code should be called on success -* for TEST_ONLY too. +* Free the allocated event. drm_atomic_helper_setup_commit +* can allocate an event too, so only free it if it's ours +* to prevent a double free in drm_atomic_state_clear. */ -for_each_crtc_in_state (state, crtc, crtc_state, i) { -if (!crtc_state->event) -continue ; - -drm_event_cancel_free (dev, &crtc_state->event->base); +struct drm_pending_vblank_event *event = crtc_state->event; +if (event && (event->base.fence || event->base.file_priv)) { +drm_event_cancel_free (dev, &event->base); + crtc_state->event =NULL ; + } } }
Greg Kroah-Hartman
maintainerPATCH 25/60 target: Dont BUG_ON during NodeACL dynamic -> explicit conversion
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 391e2a6de9781e4906dd7e0b1cc097050bf43e11 upstream.
After the v4.2+ RCU conversion to se_node_acl->lun_entry_hlist, a BUG_ON() was added in core_enable_device_list_for_node() to detect when the located orig->se_lun_acl contains an existing se_lun_acl pointer reference.
However, this scenario can happen when a dynamically generated NodeACL is being converted to an explicit NodeACL, when the explicit NodeACL contains a different LUN mapping than the default provided by the WWN endpoint.
So instead of triggering BUG_ON(), go ahead and fail instead following the original pre RCU conversion logic.
--- drivers/target/target_core_device.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/target/target_core_device.c +9 -1
@@ -351,7 +351,15 @@ int core_enable_device_list_for_node(kfree (new);return -EINVAL ; } -BUG_ON (orig->se_lun_acl !=NULL ); +if (orig->se_lun_acl !=NULL ) { +pr_warn_ratelimited ("Detected existing explicit" +" se_lun_acl->se_lun_group reference for %s" +" mapped_lun: %llu, failing\n" , + nacl->initiatorname, mapped_lun); +mutex_unlock (&nacl->lun_entry_mutex); +kfree (new); +return -EINVAL ; + }rcu_assign_pointer (new->se_lun, lun);rcu_assign_pointer (new->se_lun_acl, lun_acl);
Greg Kroah-Hartman
maintainerPATCH 26/60 target: Use correct SCSI status during EXTENDED_COPY exception
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 0583c261e6325f392c1f7a1b9112e31298e1a4bd upstream.
This patch adds the missing target_complete_cmd() SCSI status parameter change in target_xcopy_do_work(), that was originally missing in commit 926317de33.
It correctly propigates up the correct SCSI status during EXTENDED_COPY exception cases, instead of always using the hardcoded SAM_STAT_CHECK_CONDITION from original code.
This is required for ESX host environments that expect to hit SAM_STAT_RESERVATION_CONFLICT for certain scenarios, and SAM_STAT_CHECK_CONDITION results in non-retriable status for these cases.
--- drivers/target/target_core_xcopy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/target_core_xcopy.c +1 -1
@@ -836,7 +836,7 @@ out: " CHECK_CONDITION -> sending response\n", rc); ec_cmd->scsi_status =SAM_STAT_CHECK_CONDITION ; } -target_complete_cmd (ec_cmd,SAM_STAT_CHECK_CONDITION ); +target_complete_cmd (ec_cmd, ec_cmd->scsi_status); }sense_reason_t target_do_xcopy (struct se_cmd *se_cmd)
Greg Kroah-Hartman
maintainerPATCH 27/60 target: Fix early transport_generic_handle_tmr abort scenario
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit c54eeffbe9338fa982dc853d816fda9202a13b5a upstream.
This patch fixes a bug where incoming task management requests can be explicitly aborted during an active LUN_RESET, but who's struct work_struct are canceled in-flight before execution.
This occurs when core_tmr_drain_tmr_list() invokes cancel_work_sync() for the incoming se_tmr_req->task_cmd->work, resulting in cmd->work for target_tmr_work() never getting invoked and the aborted TMR waiting indefinately within transport_wait_for_tasks().
To address this case, perform a CMD_T_ABORTED check early in transport_generic_handle_tmr(), and invoke the normal path via transport_cmd_check_stop_to_fabric() to complete any TMR kthreads blocked waiting for CMD_T_STOP in transport_wait_for_tasks().
Also, move the TRANSPORT_ISTATE_PROCESSING assignment earlier into transport_generic_handle_tmr() so the existing check in core_tmr_drain_tmr_list() avoids attempting abort the incoming se_tmr_req->task_cmd->work if it has already been queued into se_device->tmr_wq.
--- drivers/target/target_core_transport.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/target/target_core_transport.c +15 -2
@@ -3086,7 +3086,6 @@ static void target_tmr_work(struct work_spin_unlock_irqrestore (&cmd->t_state_lock, flags); goto check_stop; } - cmd->t_state =TRANSPORT_ISTATE_PROCESSING ;spin_unlock_irqrestore (&cmd->t_state_lock, flags); cmd->se_tfo->queue_tm_rsp (cmd);
@@ -3099,11 +3098,25 @@ int transport_generic_handle_tmr( struct se_cmd *cmd) {unsigned long flags; +bool aborted = false;spin_lock_irqsave (&cmd->t_state_lock, flags); - cmd->transport_state |=CMD_T_ACTIVE ; +if (cmd->transport_state &CMD_T_ABORTED ) { + aborted = true; + }else { + cmd->t_state =TRANSPORT_ISTATE_PROCESSING ; + cmd->transport_state |=CMD_T_ACTIVE ; + }spin_unlock_irqrestore (&cmd->t_state_lock, flags); +if (aborted) { +pr_warn_ratelimited ("handle_tmr caught CMD_T_ABORTED TMR %d" +"ref_tag: %llu tag: %llu\n" , cmd->se_tmr_req->function, + cmd->se_tmr_req->ref_task_tag, cmd->tag); +transport_cmd_check_stop_to_fabric (cmd); +return 0 ; + } +INIT_WORK (&cmd->work, target_tmr_work);queue_work (cmd->se_dev->tmr_wq, &cmd->work);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 28/60 target: Fix multi-session dynamic se_node_acl double free OOPs
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 01d4d673558985d9a118e1e05026633c3e2ade9b upstream.
This patch addresses a long-standing bug with multi-session (eg: iscsi-target + iser-target) se_node_acl dynamic free withini transport_deregister_session().
This bug is caused when a storage endpoint is configured with demo-mode (generate_node_acls = 1 + cache_dynamic_acls = 1) initiators, and initiator login creates a new dynamic node acl and attaches two sessions to it.
After that, demo-mode for the storage instance is disabled via configfs (generate_node_acls = 0 + cache_dynamic_acls = 0) and the existing dynamic acl is never converted to an explicit ACL.
The end result is dynamic acl resources are released twice when the sessions are shutdown in transport_deregister_session().
If the storage instance is not changed to disable demo-mode, or the dynamic acl is converted to an explict ACL, or there is only a single session associated with the dynamic ACL, the bug is not triggered.
To address this big, move the release of dynamic se_node_acl memory into target_complete_nacl() so it's only freed once when se_node_acl->acl_kref reaches zero.
(Drop unnecessary list_del_init usage - HCH)
--- drivers/target/target_core_transport.c | 69 ++++++++++++++++++++------------- include/target/target_core_base.h | 1 2 files changed, 44 insertions(+), 26 deletions(-)
drivers/target/target_core_transport.c +43 -26
@@ -457,8 +457,20 @@ static void target_complete_nacl(struct {struct se_node_acl *nacl =container_of (kref, struct se_node_acl, acl_kref); +struct se_portal_group *se_tpg = nacl->se_tpg; -complete (&nacl->acl_free_comp); +if (!nacl->dynamic_stop) { +complete (&nacl->acl_free_comp); +return ; + } + +mutex_lock (&se_tpg->acl_node_mutex); +list_del (&nacl->acl_list); +mutex_unlock (&se_tpg->acl_node_mutex); + +core_tpg_wait_for_nacl_pr_ref (nacl); +core_free_device_list_for_node (nacl, se_tpg); +kfree (nacl); }void target_put_nacl (struct se_node_acl *nacl)
@@ -499,12 +511,39 @@ EXPORT_SYMBOL(transport_deregister_sessivoid transport_free_session (struct se_session *se_sess) {struct se_node_acl *se_nacl = se_sess->se_node_acl; +/* * Drop the se_node_acl->nacl_kref obtained from within * core_tpg_get_initiator_node_acl(). */ if (se_nacl) { +struct se_portal_group *se_tpg = se_nacl->se_tpg; +const struct target_core_fabric_ops *se_tfo = se_tpg->se_tpg_tfo; +unsigned long flags; + se_sess->se_node_acl =NULL ; + +/* +* Also determine if we need to drop the extra ->cmd_kref if +* it had been previously dynamically generated, and +* the endpoint is not caching dynamic ACLs. +*/ +mutex_lock (&se_tpg->acl_node_mutex); +if (se_nacl->dynamic_node_acl && + !se_tfo->tpg_check_demo_mode_cache (se_tpg)) { +spin_lock_irqsave (&se_nacl->nacl_sess_lock, flags); +if (list_empty (&se_nacl->acl_sess_list)) + se_nacl->dynamic_stop = true; +spin_unlock_irqrestore (&se_nacl->nacl_sess_lock, flags); + +if (se_nacl->dynamic_stop) +list_del (&se_nacl->acl_list); + } +mutex_unlock (&se_tpg->acl_node_mutex); + +if (se_nacl->dynamic_stop) +target_put_nacl (se_nacl); +target_put_nacl (se_nacl); }if (se_sess->sess_cmd_map) {
@@ -518,16 +557,12 @@ EXPORT_SYMBOL(transport_free_session);void transport_deregister_session (struct se_session *se_sess) {struct se_portal_group *se_tpg = se_sess->se_tpg; -const struct target_core_fabric_ops *se_tfo; -struct se_node_acl *se_nacl;unsigned long flags; -bool drop_nacl = false;if (!se_tpg) {transport_free_session (se_sess);return ; } - se_tfo = se_tpg->se_tpg_tfo;spin_lock_irqsave (&se_tpg->session_lock, flags);list_del (&se_sess->sess_list);
@@ -535,33 +570,15 @@ void transport_deregister_session(struct se_sess->fabric_sess_ptr =NULL ;spin_unlock_irqrestore (&se_tpg->session_lock, flags); -/* -* Determine if we need to do extra work for this initiator node's -* struct se_node_acl if it had been previously dynamically generated. -*/ - se_nacl = se_sess->se_node_acl; - -mutex_lock (&se_tpg->acl_node_mutex); -if (se_nacl && se_nacl->dynamic_node_acl) { -if (!se_tfo->tpg_check_demo_mode_cache (se_tpg)) { -list_del (&se_nacl->acl_list); - drop_nacl = true; - } - } -mutex_unlock (&se_tpg->acl_node_mutex); - -if (drop_nacl) { -core_tpg_wait_for_nacl_pr_ref (se_nacl); -core_free_device_list_for_node (se_nacl, se_tpg); - se_sess->se_node_acl =NULL ; -kfree (se_nacl); - }pr_debug ("TARGET_CORE[%s]: Deregistered fabric_sess\n" , se_tpg->se_tpg_tfo->get_fabric_name ());/* * If last kref is dropping now for an explicit NodeACL, awake sleeping * ->acl_free_comp caller to wakeup configfs se_node_acl->acl_group * removal context from within transport_free_session() code. +* +* For dynamic ACL, target_put_nacl() uses target_complete_nacl() +* to release all remaining generate_node_acl=1 created ACL resources. */ transport_free_session (se_sess);
include/target/target_core_base.h +1 -0
@@ -538,6 +538,7 @@ struct se_node_acl {char initiatorname[TRANSPORT_IQN_LEN ];/* Used to signal demo mode created ACL, disabled by default */ bool dynamic_node_acl; +bool dynamic_stop;u32 queue_depth;u32 acl_index;enum target_prot_type saved_prot_type;
Greg Kroah-Hartman
maintainerPATCH 29/60 target: Fix COMPARE_AND_WRITE ref leak for non GOOD status
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nicholas Bellinger <[email protected]>
commit 9b2792c3da1e80f2d460167d319302a24c9ca2b7 upstream.
This patch addresses a long standing bug where the commit phase of COMPARE_AND_WRITE would result in a se_cmd->cmd_kref reference leak if se_cmd->scsi_status returned non SAM_STAT_GOOD.
This would manifest first as a lost SCSI response, and eventual hung task during fabric driver logout or re-login, as existing shutdown logic waited for the COMPARE_AND_WRITE se_cmd->cmd_kref to reach zero.
To address this bug, compare_and_write_post() has been changed to drop the incorrect !cmd->scsi_status conditional that was preventing *post_ret = 1 for being set during non SAM_STAT_GOOD status.
This patch has been tested with SAM_STAT_CHECK_CONDITION status from normal target_complete_cmd() callback path, as well as the incoming __target_execute_cmd() submission failure path when se_cmd->execute_cmd() returns non zero status.
--- drivers/target/target_core_sbc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/target/target_core_sbc.c +6 -2
@@ -450,6 +450,7 @@ static sense_reason_t compare_and_write_ int *post_ret) {struct se_device *dev = cmd->se_dev; +sense_reason_t ret =TCM_NO_SENSE ;/* * Only set SCF_COMPARE_AND_WRITE_POST to force a response fall-through
@@ -457,9 +458,12 @@ static sense_reason_t compare_and_write_* sent to the backend driver. */ spin_lock_irq (&cmd->t_state_lock); -if ((cmd->transport_state &CMD_T_SENT ) && !cmd->scsi_status) { +if (cmd->transport_state &CMD_T_SENT ) { cmd->se_cmd_flags |=SCF_COMPARE_AND_WRITE_POST ; *post_ret =1 ; + +if (cmd->scsi_status ==SAM_STAT_CHECK_CONDITION ) + ret =TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE ; }spin_unlock_irq (&cmd->t_state_lock);
@@ -469,7 +473,7 @@ static sense_reason_t compare_and_write_*/ up (&dev->caw_sem); -return TCM_NO_SENSE ; +return ret; } static sense_reason_t compare_and_write_callback(struct se_cmd *cmd, bool success,
Greg Kroah-Hartman
maintainerPATCH 31/60 ARM: 8642/1: LPAE: catch pending imprecise abort on unmask
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Sverdlin <[email protected]>
commit 97a98ae5b8acf08d07d972c087b2def060bc9b73 upstream.
Asynchronous external abort is coded differently in DFSR with LPAE enabled.
--- arch/arm/mm/fault.c | 4 ++-- arch/arm/mm/fault.h | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-)
arch/arm/mm/fault.c +2 -2
@@ -610,9 +610,9 @@ static int __init early_abort_handler(unvoid __init early_abt_enable (void ) { - fsr_info[22 ].fn = early_abort_handler; + fsr_info[FSR_FS_AEA ].fn = early_abort_handler;local_abt_enable (); - fsr_info[22 ].fn = do_bad; + fsr_info[FSR_FS_AEA ].fn = do_bad; }#ifndef CONFIG_ARM_LPAE
arch/arm/mm/fault.h +4 -0
@@ -11,11 +11,15 @@#define FSR_FS5_0 (0x3f)#ifdef CONFIG_ARM_LPAE +#define FSR_FS_AEA 17 +static inline int fsr_fs (unsigned int fsr) {return fsr &FSR_FS5_0 ; }#else +#define FSR_FS_AEA 22 +static inline int fsr_fs (unsigned int fsr) {return (fsr &FSR_FS3_0 ) | (fsr &FSR_FS4 ) >>6 ;
Greg Kroah-Hartman
maintainerPATCH 33/60 nl80211: Fix mesh HT operation check
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Masashi Honma <[email protected]>
commit fd551bac4795854adaa87bad7e5136083719802b upstream.
A previous change to fix checks for NL80211_MESHCONF_HT_OPMODE missed setting the flag when replacing FILL_IN_MESH_PARAM_IF_SET with checking codes. This results in dropping the received HT operation value when called by nl80211_update_mesh_config(). Fix this by setting the flag properly.
--- net/wireless/nl80211.c | 1 + 1 file changed, 1 insertion(+)
net/wireless/nl80211.c +1 -0
@@ -5874,6 +5874,7 @@ do { \break ; } cfg->ht_opmode = ht_opmode; + mask |= (1 << (NL80211_MESHCONF_HT_OPMODE -1 )); } FILL_IN_MESH_PARAM_IF_SET(tb, cfg, dot11MeshHWMPactivePathToRootTimeout, 1, 65535, mask,
Greg Kroah-Hartman
maintainerPATCH 34/60 mac80211: Fix adding of mesh vendor IEs
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Horstmann <[email protected]>
commit da7061c82e4a1bc6a5e134ef362c86261906c860 upstream.
The function ieee80211_ie_split_vendor doesn't return 0 on errors. Instead it returns any offset < ielen when WLAN_EID_VENDOR_SPECIFIC is found. The return value in mesh_add_vendor_ies must therefore be checked against ifmsh->ie_len and not 0. Otherwise all ifmsh->ie starting with WLAN_EID_VENDOR_SPECIFIC will be rejected.
--- net/mac80211/mesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/mesh.c +1 -1
@@ -339,7 +339,7 @@ int mesh_add_vendor_ies(struct ieee80211/* fast-forward to vendor IEs */ offset =ieee80211_ie_split_vendor (ifmsh->ie, ifmsh->ie_len,0 ); -if (offset) { +if (offset < ifmsh->ie_len) { len = ifmsh->ie_len - offset; data = ifmsh->ie + offset;if (skb_tailroom (skb) < len)
Greg Kroah-Hartman
maintainerPATCH 35/60 net/mlx5e: Modify TIRs hash only when its needed
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gal Pressman <[email protected]>
commit 1d3398facd08a7fd4202f269317a95668eb880b9 upstream.
We don't need to modify our TIRs unless the user requested a change in the hash function/key, for example when changing indirection only.
Tested:
# Modify TIRs hash is needed
ethtool -X ethX hkey <new key>
ethtool -X ethX hfunc <new func>
# Modify TIRs hash is not needed
ethtool -X ethX equal <new indirection table>
All cases are verified with TCP Multi-Stream traffic over IPv4 & IPv6.
--- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +13 -5
@@ -991,6 +991,7 @@ static int mlx5e_set_rxfh(struct net_dev {struct mlx5e_priv *priv =netdev_priv (dev);int inlen =MLX5_ST_SZ_BYTES (modify_tir_in); +bool hash_changed = false;void *in; if ((hfunc != ETH_RSS_HASH_NO_CHANGE) &&
@@ -1012,14 +1013,21 @@ static int mlx5e_set_rxfh(struct net_devmlx5e_redirect_rqt (priv, rqtn,MLX5E_INDIR_RQT_SIZE ,0 ); } -if (key) +if (hfunc !=ETH_RSS_HASH_NO_CHANGE && + hfunc != priv->params.rss_hfunc) { + priv->params.rss_hfunc = hfunc; + hash_changed = true; + } + +if (key) {memcpy (priv->params.toeplitz_hash_key, key,sizeof (priv->params.toeplitz_hash_key)); + hash_changed = hash_changed || + priv->params.rss_hfunc ==ETH_RSS_HASH_TOP ; + } -if (hfunc !=ETH_RSS_HASH_NO_CHANGE ) - priv->params.rss_hfunc = hfunc; - -mlx5e_modify_tirs_hash (priv, in, inlen); +if (hash_changed) +mlx5e_modify_tirs_hash (priv, in, inlen);mutex_unlock (&priv->state_lock);
Greg Kroah-Hartman
maintainerPATCH 36/60 Drivers: hv: vmbus: Base host signaling strictly on the ring state
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: K. Y. Srinivasan <[email protected]>
commit 74198eb4a42c4a3c4fbef08fa01a291a282f7c2e upstream.
One of the factors that can result in the host concluding that a given guest in mounting a DOS attack is if the guest generates interrupts to the host when the host is not expecting it. If these "spurious" interrupts reach a certain rate, the host can throttle the guest to minimize the impact. The host computation of the "expected number of interrupts" is strictly based on the ring transitions. Until the host logic is fixed, base the guest logic to interrupt solely on the ring state.
--- drivers/hv/channel.c | 23 ++++++++++++++++++++--- drivers/hv/channel_mgmt.c | 2 -- drivers/hv/ring_buffer.c | 7 ------- 3 files changed, 20 insertions(+), 12 deletions(-)
drivers/hv/channel.c +20 -3
@@ -676,10 +676,18 @@ int vmbus_sendpacket_ctl(struct vmbus_ch* NOTE: in this case, the hvsock channel is an exception, because * it looks the host side's hvsock implementation has a throttling * mechanism which can hurt the performance otherwise. +* +* KYS: Oct. 30, 2016: +* It looks like Windows hosts have logic to deal with DOS attacks that +* can be triggered if it receives interrupts when it is not expecting +* the interrupt. The host expects interrupts only when the ring +* transitions from empty to non-empty (or full to non full on the guest +* to host ring). +* So, base the signaling decision solely on the ring state until the +* host logic is fixed. */ -if (((ret ==0 ) && kick_q && signal) || - (ret && !is_hvsock_channel (channel))) +if (((ret ==0 ) && signal))vmbus_setevent (channel);return ret;
@@ -786,9 +794,18 @@ int vmbus_sendpacket_pagebuffer_ctl(stru* If we cannot write to the ring-buffer; signal the host * even if we may not have written anything. This is a rare * enough condition that it should not matter. +* +* KYS: Oct. 30, 2016: +* It looks like Windows hosts have logic to deal with DOS attacks that +* can be triggered if it receives interrupts when it is not expecting +* the interrupt. The host expects interrupts only when the ring +* transitions from empty to non-empty (or full to non full on the guest +* to host ring). +* So, base the signaling decision solely on the ring state until the +* host logic is fixed. */ -if (((ret ==0 ) && kick_q && signal) || (ret)) +if (((ret ==0 ) && signal))vmbus_setevent (channel);return ret;
drivers/hv/channel_mgmt.c +0 -2
@@ -449,8 +449,6 @@ static void vmbus_process_offer(struct v } dev_type =hv_get_dev_type (newchannel); -if (dev_type ==HV_NIC ) -set_channel_signal_state (newchannel,HV_SIGNAL_POLICY_EXPLICIT );init_vp_index (newchannel, dev_type);
drivers/hv/ring_buffer.c +0 -7
@@ -75,13 +75,6 @@ static bool hv_need_to_signal(u32 old_wrif (READ_ONCE (rbi->ring_buffer->interrupt_mask))return false; -/* -* When the client wants to control signaling, -* we only honour the host interrupt mask. -*/ -if (policy ==HV_SIGNAL_POLICY_EXPLICIT ) -return true; -/* check interrupt_mask before read_index */ virt_rmb ();/*
Greg Kroah-Hartman
maintainerPATCH 37/60 Drivers: hv: vmbus: On write cleanup the logic to interrupt the host
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: K. Y. Srinivasan <[email protected]>
commit 1f6ee4e7d83586c8b10bd4f2f4346353d04ce884 upstream.
Signal the host when we determine the host is to be signaled. The currrent code determines the need to signal in the ringbuffer code and actually issues the signal elsewhere. This can result in the host viewing this interrupt as spurious since the host may also poll the channel. Make the necessary adjustments.
--- drivers/hv/channel.c | 99 ++++------------------------------------------ drivers/hv/hyperv_vmbus.h | 6 +- drivers/hv/ring_buffer.c | 30 +++++++++---- include/linux/hyperv.h | 1 4 files changed, 35 insertions(+), 101 deletions(-)
drivers/hv/channel.c +10 -89
@@ -39,7 +39,7 @@* vmbus_setevent- Trigger an event notification on the specified * channel. */ -static void vmbus_setevent (struct vmbus_channel *channel) +void vmbus_setevent (struct vmbus_channel *channel) {struct hv_monitor_page *monitorpage;
@@ -65,6 +65,7 @@ static void vmbus_setevent(struct vmbus_vmbus_set_event (channel); } } +EXPORT_SYMBOL_GPL (vmbus_setevent);/* * vmbus_open - Open the specified channel.
@@ -635,8 +636,6 @@ int vmbus_sendpacket_ctl(struct vmbus_chu32 packetlen_aligned =ALIGN (packetlen,sizeof (u64));struct kvec bufferlist[3 ];u64 aligned_data =0 ; -int ret; -bool signal = false;bool lock = channel->acquire_ring_lock;int num_vecs = ((bufferlen !=0 ) ?3 :1 );
@@ -656,41 +655,9 @@ int vmbus_sendpacket_ctl(struct vmbus_ch bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); - ret =hv_ringbuffer_write (&channel->outbound, bufferlist, num_vecs, - &signal, lock, channel->signal_policy); - -/* -* Signalling the host is conditional on many factors: -* 1. The ring state changed from being empty to non-empty. -* This is tracked by the variable "signal". -* 2. The variable kick_q tracks if more data will be placed -* on the ring. We will not signal if more data is -* to be placed. -* -* Based on the channel signal state, we will decide -* which signaling policy will be applied. -* -* If we cannot write to the ring-buffer; signal the host -* even if we may not have written anything. This is a rare -* enough condition that it should not matter. -* NOTE: in this case, the hvsock channel is an exception, because -* it looks the host side's hvsock implementation has a throttling -* mechanism which can hurt the performance otherwise. -* -* KYS: Oct. 30, 2016: -* It looks like Windows hosts have logic to deal with DOS attacks that -* can be triggered if it receives interrupts when it is not expecting -* the interrupt. The host expects interrupts only when the ring -* transitions from empty to non-empty (or full to non full on the guest -* to host ring). -* So, base the signaling decision solely on the ring state until the -* host logic is fixed. -*/ - -if (((ret ==0 ) && signal)) -vmbus_setevent (channel); +return hv_ringbuffer_write (channel, bufferlist, num_vecs, + lock, kick_q); -return ret; }EXPORT_SYMBOL (vmbus_sendpacket_ctl);
@@ -731,7 +698,6 @@ int vmbus_sendpacket_pagebuffer_ctl(stru u32 flags, bool kick_q) { - int ret;int i;struct vmbus_channel_packet_page_buffer desc;u32 descsize;
@@ -739,7 +705,6 @@ int vmbus_sendpacket_pagebuffer_ctl(struu32 packetlen_aligned;struct kvec bufferlist[3 ];u64 aligned_data =0 ; -bool signal = false;bool lock = channel->acquire_ring_lock;if (pagecount >MAX_PAGE_BUFFER_COUNT )
@@ -777,38 +742,8 @@ int vmbus_sendpacket_pagebuffer_ctl(stru bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); - ret =hv_ringbuffer_write (&channel->outbound, bufferlist,3 , - &signal, lock, channel->signal_policy); - -/* -* Signalling the host is conditional on many factors: -* 1. The ring state changed from being empty to non-empty. -* This is tracked by the variable "signal". -* 2. The variable kick_q tracks if more data will be placed -* on the ring. We will not signal if more data is -* to be placed. -* -* Based on the channel signal state, we will decide -* which signaling policy will be applied. -* -* If we cannot write to the ring-buffer; signal the host -* even if we may not have written anything. This is a rare -* enough condition that it should not matter. -* -* KYS: Oct. 30, 2016: -* It looks like Windows hosts have logic to deal with DOS attacks that -* can be triggered if it receives interrupts when it is not expecting -* the interrupt. The host expects interrupts only when the ring -* transitions from empty to non-empty (or full to non full on the guest -* to host ring). -* So, base the signaling decision solely on the ring state until the -* host logic is fixed. -*/ - -if (((ret ==0 ) && signal)) -vmbus_setevent (channel); - -return ret; +return hv_ringbuffer_write (channel, bufferlist,3 , + lock, kick_q); }EXPORT_SYMBOL_GPL (vmbus_sendpacket_pagebuffer_ctl);
@@ -839,12 +774,10 @@ int vmbus_sendpacket_mpb_desc(struct vmbu32 desc_size, void *buffer, u32 bufferlen, u64 requestid) { - int ret; u32 packetlen;u32 packetlen_aligned;struct kvec bufferlist[3 ];u64 aligned_data =0 ; -bool signal = false;bool lock = channel->acquire_ring_lock; packetlen = desc_size + bufferlen;
@@ -865,13 +798,8 @@ int vmbus_sendpacket_mpb_desc(struct vmb bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); - ret =hv_ringbuffer_write (&channel->outbound, bufferlist,3 , - &signal, lock, channel->signal_policy); - -if (ret ==0 && signal) -vmbus_setevent (channel); - -return ret; +return hv_ringbuffer_write (channel, bufferlist,3 , + lock, true); }EXPORT_SYMBOL_GPL (vmbus_sendpacket_mpb_desc);
@@ -883,14 +811,12 @@ int vmbus_sendpacket_multipagebuffer(strstruct hv_multipage_buffer *multi_pagebuffer, void *buffer, u32 bufferlen, u64 requestid) { - int ret; struct vmbus_channel_packet_multipage_buffer desc;u32 descsize;u32 packetlen;u32 packetlen_aligned;struct kvec bufferlist[3 ];u64 aligned_data =0 ; -bool signal = false;bool lock = channel->acquire_ring_lock;u32 pfncount =NUM_PAGES_SPANNED (multi_pagebuffer->offset, multi_pagebuffer->len);
@@ -930,13 +856,8 @@ int vmbus_sendpacket_multipagebuffer(str bufferlist[2 ].iov_base = &aligned_data; bufferlist[2 ].iov_len = (packetlen_aligned - packetlen); - ret =hv_ringbuffer_write (&channel->outbound, bufferlist,3 , - &signal, lock, channel->signal_policy); - -if (ret ==0 && signal) -vmbus_setevent (channel); - -return ret; +return hv_ringbuffer_write (channel, bufferlist,3 , + lock, true); }EXPORT_SYMBOL_GPL (vmbus_sendpacket_multipagebuffer);
drivers/hv/hyperv_vmbus.h +3 -3
@@ -527,10 +527,10 @@ int hv_ringbuffer_init(struct hv_ring_buvoid hv_ringbuffer_cleanup (struct hv_ring_buffer_info *ring_info); -int hv_ringbuffer_write (struct hv_ring_buffer_info *ring_info, +int hv_ringbuffer_write (struct vmbus_channel *channel,struct kvec *kv_list, -u32 kv_count,bool *signal,bool lock, -enum hv_signal_policy policy); +u32 kv_count,bool lock, +bool kick_q); int hv_ringbuffer_read(struct hv_ring_buffer_info *inring_info, void *buffer, u32 buflen, u32 *buffer_actual_len,
drivers/hv/ring_buffer.c +21 -9
@@ -66,14 +66,25 @@ u32 hv_end_read(struct hv_ring_buffer_in* once the ring buffer is empty, it will clear the * interrupt_mask and re-check to see if new data has * arrived. +* +* KYS: Oct. 30, 2016: +* It looks like Windows hosts have logic to deal with DOS attacks that +* can be triggered if it receives interrupts when it is not expecting +* the interrupt. The host expects interrupts only when the ring +* transitions from empty to non-empty (or full to non full on the guest +* to host ring). +* So, base the signaling decision solely on the ring state until the +* host logic is fixed. */ -static bool hv_need_to_signal (u32 old_write,struct hv_ring_buffer_info *rbi, -enum hv_signal_policy policy) +static void hv_signal_on_write (u32 old_write,struct vmbus_channel *channel, +bool kick_q) { +struct hv_ring_buffer_info *rbi = &channel->outbound; +virt_mb ();if (READ_ONCE (rbi->ring_buffer->interrupt_mask)) -return false; +return ;/* check interrupt_mask before read_index */ virt_rmb ();
@@ -82,9 +93,9 @@ static bool hv_need_to_signal(u32 old_wr* ring transitions from being empty to non-empty. */ if (old_write ==READ_ONCE (rbi->ring_buffer->read_index)) -return true; +vmbus_setevent (channel); -return false; +return ; }/* Get the next write location for the specified ring buffer. */
@@ -273,9 +284,9 @@ void hv_ringbuffer_cleanup(struct hv_rin }/* Write to the ring buffer. */ -int hv_ringbuffer_write (struct hv_ring_buffer_info *outring_info, -struct kvec *kv_list,u32 kv_count,bool *signal,bool lock, -enum hv_signal_policy policy) +int hv_ringbuffer_write (struct vmbus_channel *channel, +struct kvec *kv_list,u32 kv_count,bool lock, +bool kick_q) {int i =0 ;u32 bytes_avail_towrite;
@@ -285,6 +296,7 @@ int hv_ringbuffer_write(struct hv_ring_bu32 old_write;u64 prev_indices =0 ;unsigned long flags =0 ; +struct hv_ring_buffer_info *outring_info = &channel->outbound;for (i =0 ; i < kv_count; i++) totalbytes_towrite += kv_list[i].iov_len;
@@ -337,7 +349,7 @@ int hv_ringbuffer_write(struct hv_ring_bif (lock)spin_unlock_irqrestore (&outring_info->ring_lock, flags); - *signal =hv_need_to_signal (old_write, outring_info, policy); +hv_signal_on_write (old_write, channel, kick_q);return 0 ; }
include/linux/hyperv.h +1 -0
@@ -1447,6 +1447,7 @@ void hv_event_tasklet_enable(struct vmbuvoid hv_process_channel_removal (struct vmbus_channel *channel,u32 relid); +void vmbus_setevent (struct vmbus_channel *channel);/* * Negotiated version with the Host. */
Greg Kroah-Hartman
maintainerPATCH 38/60 Drivers: hv: vmbus: On the read path cleanup the logic to interrupt the host
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: K. Y. Srinivasan <[email protected]>
commit 3372592a140db69fd63837e81f048ab4abf8111e upstream.
Signal the host when we determine the host is to be signaled - on th read path. The currrent code determines the need to signal in the ringbuffer code and actually issues the signal elsewhere. This can result in the host viewing this interrupt as spurious since the host may also poll the channel. Make the necessary adjustments.
--- drivers/hv/channel.c | 11 ++--------- drivers/hv/hyperv_vmbus.h | 4 ++-- drivers/hv/ring_buffer.c | 7 ++++--- include/linux/hyperv.h | 12 ++++++------ 4 files changed, 14 insertions(+), 20 deletions(-)
drivers/hv/channel.c +2 -9
@@ -879,16 +879,9 @@ __vmbus_recvpacket(struct vmbus_channel u32 bufferlen, u32 *buffer_actual_len, u64 *requestid, bool raw) { - int ret; -bool signal = false; + return hv_ringbuffer_read(channel, buffer, bufferlen, +buffer_actual_len ,requestid ,raw ); - ret =hv_ringbuffer_read (&channel->inbound, buffer, bufferlen, - buffer_actual_len, requestid, &signal, raw); - -if (signal) -vmbus_setevent (channel); - -return ret; } int vmbus_recvpacket(struct vmbus_channel *channel, void *buffer,
drivers/hv/hyperv_vmbus.h +2 -2
@@ -532,9 +532,9 @@ int hv_ringbuffer_write(struct vmbus_cha u32 kv_count, bool lock, bool kick_q); -int hv_ringbuffer_read (struct hv_ring_buffer_info *inring_info, +int hv_ringbuffer_read (struct vmbus_channel *channel,void *buffer,u32 buflen,u32 *buffer_actual_len, -u64 *requestid,bool *signal,bool raw); +u64 *requestid,bool raw);void hv_ringbuffer_get_debuginfo (struct hv_ring_buffer_info *ring_info,struct hv_ring_buffer_debug_info *debug_info);
drivers/hv/ring_buffer.c +4 -3
@@ -353,9 +353,9 @@ int hv_ringbuffer_write(struct vmbus_chareturn 0 ; } -int hv_ringbuffer_read (struct hv_ring_buffer_info *inring_info, +int hv_ringbuffer_read (struct vmbus_channel *channel,void *buffer,u32 buflen,u32 *buffer_actual_len, -u64 *requestid,bool *signal,bool raw) +u64 *requestid,bool raw) {u32 bytes_avail_toread;u32 next_read_location =0 ;
@@ -364,6 +364,7 @@ int hv_ringbuffer_read(struct hv_ring_buu32 offset;u32 packetlen;int ret =0 ; +struct hv_ring_buffer_info *inring_info = &channel->inbound;if (buflen <=0 )return -EINVAL ;
@@ -421,7 +422,7 @@ int hv_ringbuffer_read(struct hv_ring_bu/* Update the read index */ hv_set_next_read_location (inring_info, next_read_location); - *signal =hv_need_to_signal_on_read (inring_info); +hv_signal_on_read (channel);return ret; }
include/linux/hyperv.h +6 -6
@@ -1480,10 +1480,11 @@ hv_get_ring_buffer(struct hv_ring_buffer* there is room for the producer to send the pending packet. */ -static inline bool hv_need_to_signal_on_read (struct hv_ring_buffer_info *rbi) +static inline void hv_signal_on_read (struct vmbus_channel *channel) {u32 cur_write_sz;u32 pending_sz; +struct hv_ring_buffer_info *rbi = &channel->inbound;/* * Issue a full memory barrier before making the signaling decision.
@@ -1501,14 +1502,14 @@ static inline bool hv_need_to_signal_on pending_sz =READ_ONCE (rbi->ring_buffer->pending_send_sz);/* If the other end is not blocked on write don't bother. */ if (pending_sz ==0 ) -return false; +return ; cur_write_sz =hv_get_bytes_to_write (rbi);if (cur_write_sz >= pending_sz) -return true; +vmbus_setevent (channel); -return false; +return ; }/*
@@ -1590,8 +1591,7 @@ static inline void commit_rd_index(strucvirt_rmb (); ring_info->ring_buffer->read_index = ring_info->priv_read_index; -if (hv_need_to_signal_on_read (ring_info)) -vmbus_set_event (channel); +hv_signal_on_read (channel); }
Greg Kroah-Hartman
maintainerPATCH 39/60 Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dexuan Cui <[email protected]>
commit 433e19cf33d34bb6751c874a9c00980552fe508c upstream.
Commit a389fcfd2cb5 ("Drivers: hv: vmbus: Fix signaling logic in hv_need_to_signal_on_read()")
added the proper mb(), but removed the test "prev_write_sz < pending_sz" when making the signal decision.
As a result, the guest can signal the host unnecessarily, and then the host can throttle the guest because the host thinks the guest is buggy or malicious; finally the user running stress test can perceive intermittent freeze of the guest.
This patch brings back the test, and properly handles the in-place consumption APIs used by NetVSC (see get_next_pkt_raw(), put_pkt_raw() and commit_rd_index()).
hv_need_to_signal_on_read()")
--- drivers/hv/ring_buffer.c | 1 + drivers/net/hyperv/netvsc.c | 6 ++++++ include/linux/hyperv.h | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-)
drivers/hv/ring_buffer.c +1 -0
@@ -383,6 +383,7 @@ int hv_ringbuffer_read(struct vmbus_chanreturn ret; } +init_cached_read_index (channel); next_read_location =hv_get_next_read_location (inring_info); next_read_location = hv_copyfrom_ringbuffer(inring_info, &desc, sizeof(desc),
drivers/net/hyperv/netvsc.c +6 -0
@@ -1288,6 +1288,9 @@ void netvsc_channel_cb(void *context) ndev =hv_get_drvdata (device); buffer =get_per_channel_state (channel); +/* commit_rd_index() -> hv_signal_on_read() needs this. */ +init_cached_read_index (channel); + do { desc = get_next_pkt_raw(channel); if (desc != NULL) {
@@ -1340,6 +1343,9 @@ void netvsc_channel_cb(void *context) bufferlen = bytes_recvd; } + +init_cached_read_index (channel); + }while (1 );if (bufferlen >NETVSC_PACKET_SIZE )
include/linux/hyperv.h +30 -2
@@ -128,6 +128,7 @@ struct hv_ring_buffer_info {u32 ring_data_startoffset;u32 priv_write_index;u32 priv_read_index; +u32 cached_read_index; };/*
@@ -180,6 +181,19 @@ static inline u32 hv_get_bytes_to_write(return write; } +static inline u32 hv_get_cached_bytes_to_write ( +const struct hv_ring_buffer_info *rbi) +{ +u32 read_loc, write_loc, dsize, write; + + dsize = rbi->ring_datasize; + read_loc = rbi->cached_read_index; + write_loc = rbi->ring_buffer->write_index; + + write = write_loc >= read_loc ? dsize - (write_loc - read_loc) : + read_loc - write_loc; +return write; +}/* * VMBUS version is 32 bit entity broken up into * two 16 bit quantities: major_number. minor_number.
@@ -1482,7 +1496,7 @@ hv_get_ring_buffer(struct hv_ring_bufferstatic inline void hv_signal_on_read (struct vmbus_channel *channel) { -u32 cur_write_sz; +u32 cur_write_sz, cached_write_sz;u32 pending_sz;struct hv_ring_buffer_info *rbi = &channel->inbound;
@@ -1506,12 +1520,24 @@ static inline void hv_signal_on_read(st cur_write_sz =hv_get_bytes_to_write (rbi); -if (cur_write_sz >= pending_sz) +if (cur_write_sz < pending_sz) +return ; + + cached_write_sz =hv_get_cached_bytes_to_write (rbi); +if (cached_write_sz < pending_sz)vmbus_setevent (channel);return ; } +static inline void +init_cached_read_index (struct vmbus_channel *channel) +{ +struct hv_ring_buffer_info *rbi = &channel->inbound; + + rbi->cached_read_index = rbi->ring_buffer->read_index; +} +/* * An API to support in-place processing of incoming VMBUS packets. */
@@ -1573,6 +1599,8 @@ static inline void put_pkt_raw(struct vm* This call commits the read index and potentially signals the host. * Here is the pattern for using the "in-place" consumption APIs: * +* init_cached_read_index(); +* * while (get_next_pkt_raw() { * process the packet "in-place"; * put_pkt_raw();
Greg Kroah-Hartman
maintainerPATCH 40/60 scsi: zfcp: fix use-after-free by not tracing WKA port open/close on failed send
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steffen Maier <[email protected]>
commit 2dfa6688aafdc3f74efeb1cf05fb871465d67f79 upstream.
Dan Carpenter kindly reported:
<quote>
The patch d27a7cb91960: "zfcp: trace on request for open and close of WKA port" from Aug 10, 2016, leads to the following static checker warning:
drivers/s390/scsi/zfcp_fsf.c:1615 zfcp_fsf_open_wka_port() warn: 'req' was already freed.
drivers/s390/scsi/zfcp_fsf.c
1609 zfcp_fsf_start_timer(req, ZFCP_FSF_REQUEST_TIMEOUT);
1610 retval = zfcp_fsf_req_send(req);
1611 if (retval)
1612 zfcp_fsf_req_free(req);
^^^Freed.
1613 out:
1614 spin_unlock_irq(&qdio->req_q_lock);
1615 if (req && !IS_ERR(req))
1616 zfcp_dbf_rec_run_wka("fsowp_1", wka_port, req->req_id);
^^^^^^^^^^^Use after free.
1617 return retval;
1618 }
Same thing for zfcp_fsf_close_wka_port() as well.
</quote>
Rather than relying on req being NULL (or ERR_PTR) for all cases where we don't want to trace or should not trace,
simply check retval which is unconditionally initialized with -EIO != 0 and it can only become 0 on successful retval = zfcp_fsf_req_send(req). With that we can also remove the then again unnecessary unconditional initialization of req which was introduced with that earlier commit.
--- drivers/s390/scsi/zfcp_fsf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/s390/scsi/zfcp_fsf.c +4 -4
@@ -1583,7 +1583,7 @@ out:int zfcp_fsf_open_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req =NULL ; +struct zfcp_fsf_req *req;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1612,7 +1612,7 @@ int zfcp_fsf_open_wka_port(struct zfcp_fzfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); -if (req && !IS_ERR (req)) +if (!retval)zfcp_dbf_rec_run_wka ("fsowp_1" , wka_port, req->req_id);return retval; }
@@ -1638,7 +1638,7 @@ static void zfcp_fsf_close_wka_port_handint zfcp_fsf_close_wka_port (struct zfcp_fc_wka_port *wka_port) {struct zfcp_qdio *qdio = wka_port->adapter->qdio; -struct zfcp_fsf_req *req =NULL ; +struct zfcp_fsf_req *req;int retval = -EIO ;spin_lock_irq (&qdio->req_q_lock);
@@ -1667,7 +1667,7 @@ int zfcp_fsf_close_wka_port(struct zfcp_zfcp_fsf_req_free (req); out:spin_unlock_irq (&qdio->req_q_lock); -if (req && !IS_ERR (req)) +if (!retval)zfcp_dbf_rec_run_wka ("fscwp_1" , wka_port, req->req_id);return retval; }
Greg Kroah-Hartman
maintainerPATCH 41/60 scsi: aacraid: Fix INTx/MSI-x issue with older controllers
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dave Carroll <[email protected]>
commit 8af8e1c22f9994bb1849c01d66c24fe23f9bc9a0 upstream.
commit 78cbccd3bd68 ("aacraid: Fix for KDUMP driver hang")
caused a problem on older controllers which do not support MSI-x (namely ASR3405,ASR3805). This patch conditionalizes the previous patch to controllers which support MSI-x
--- drivers/scsi/aacraid/comminit.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/scsi/aacraid/comminit.c +6 -2
@@ -50,9 +50,13 @@ struct aac_common aac_config = {static inline int aac_is_msix_mode (struct aac_dev *dev) { -u32 status; +u32 status =0 ; - status =src_readl (dev, MUnit.OMR); +if (dev->pdev->device ==PMC_DEVICE_S6 || + dev->pdev->device ==PMC_DEVICE_S7 || + dev->pdev->device ==PMC_DEVICE_S8 ) { + status =src_readl (dev, MUnit.OMR); + }return (status &AAC_INT_MODE_MSIX ); }
Greg Kroah-Hartman
maintainerPATCH 42/60 scsi: mpt3sas: disable ASPM for MPI2 controllers
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: ojab <[email protected]>
commit ffdadd68af5a397b8a52289ab39d62e1acb39e63 upstream.
MPI2 controllers sometimes got lost (i.e. disappear from /sys/bus/pci/devices) if ASMP is enabled.
--- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/scsi/mpt3sas/mpt3sas_scsih.c +3 -0
@@ -51,6 +51,7 @@#include <linux/workqueue.h> #include <linux/delay.h> #include <linux/pci.h> +#include <linux/pci-aspm.h> #include <linux/interrupt.h> #include <linux/aer.h> #include <linux/raid_class.h>
@@ -8706,6 +8707,8 @@ _scsih_probe(struct pci_dev *pdev, constswitch (hba_mpi_version) {case MPI2_VERSION : +pci_disable_link_state (pdev,PCIE_LINK_STATE_L0S | +PCIE_LINK_STATE_L1 |PCIE_LINK_STATE_CLKPM );/* Use mpt2sas driver host template for SAS 2.0 HBA's */ shost =scsi_host_alloc (&mpt2sas_driver_template,sizeof (struct MPT3SAS_ADAPTER ));
Greg Kroah-Hartman
maintainerPATCH 43/60 scsi: qla2xxx: Avoid that issuing a LIP triggers a kernel crash
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mauricio Faria de Oliveira <[email protected]>
commit 2780f3c8f0233de90b6b47a23fc422b7780c5436 upstream.
Avoid that issuing a LIP as follows:
find /sys -name 'issue_lip'|while read f; do echo 1 > $f; done
triggers the following:
BUG: unable to handle kernel NULL pointer dereference at (null) Call Trace: qla2x00_abort_all_cmds+0xed/0x140 [qla2xxx] qla2x00_abort_isp_cleanup+0x1e3/0x280 [qla2xxx] qla2x00_abort_isp+0xef/0x690 [qla2xxx] qla2x00_do_dpc+0x36c/0x880 [qla2xxx] kthread+0x10c/0x140
[mkp: consolidated Mauricio's and Bart's fixes]
--- drivers/scsi/qla2xxx/qla_os.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_os.c +1 -1
@@ -1459,7 +1459,7 @@ qla2x00_abort_all_cmds(scsi_qla_host_t */* Don't abort commands in adapter during EEH * recovery as it's not accessible/responding. */ -if (!ha->flags.eeh_busy) { +if (GET_CMD_SP (sp) && !ha->flags.eeh_busy) {/* Get a reference to the sp and drop the lock. * The reference ensures this sp->done() call * - and not the call in qla2xxx_eh_abort() -
Greg Kroah-Hartman
maintainerPATCH 44/60 btrfs: fix btrfs_compat_ioctl failures on non-compat ioctls
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Mahoney <[email protected]>
commit 2a362249187a8d0f6d942d6e1d763d150a296f47 upstream.
Commit 4c63c2454ef incorrectly assumed that returning -ENOIOCTLCMD would cause the native ioctl to be called. The ->compat_ioctl callback is expected to handle all ioctls, not just compat variants. As a result, when using 32-bit userspace on 64-bit kernels, everything except those three ioctls would return -ENOTTY.
--- fs/btrfs/ioctl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/btrfs/ioctl.c +4 -2
@@ -5648,6 +5648,10 @@ long btrfs_ioctl(struct file *file, unsi#ifdef CONFIG_COMPAT long btrfs_compat_ioctl (struct file *file,unsigned int cmd,unsigned long arg) { +/* +* These all access 32-bit values anyway so no further +* handling is necessary. +*/ switch (cmd) {case FS_IOC32_GETFLAGS : cmd =FS_IOC_GETFLAGS ;
@@ -5658,8 +5662,6 @@ long btrfs_compat_ioctl(struct file *filcase FS_IOC32_GETVERSION : cmd =FS_IOC_GETVERSION ;break ; -default : -return -ENOIOCTLCMD ; }return btrfs_ioctl (file, cmd, (unsigned long )compat_ptr (arg));
Greg Kroah-Hartman
maintainerPATCH 45/60 powerpc/mm/radix: Update ERAT flushes when invalidating TLB
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit 90c1e3c2fafec57fcb55b5d69bcf293b1a5fc8b3 upstream.
Three tiny changes to the ERAT flushing logic: First don't make it depend on DD1. It hasn't been decided yet but we might run DD2 in a mode that also requires explicit flushes for performance reasons so make it unconditional. We also add a missing isync, and finally remove the flush from _tlbiel_va as it is only necessary for congruence-class invalidations (PID, LPID and full TLB), not targetted invalidations.
--- arch/powerpc/mm/tlb-radix.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
arch/powerpc/mm/tlb-radix.c +1 -5
@@ -50,9 +50,7 @@ static inline void _tlbiel_pid(unsignedfor (set =0 ; set <POWER9_TLB_SETS_RADIX ; set++) {__tlbiel_pid (pid, set, ric); } -if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) - asm volatile(PPC_INVALIDATE_ERAT : : :"memory"); -return ; + asmvolatile (PPC_INVALIDATE_ERAT "; isync" : : :"memory" ); }static inline void _tlbie_pid (unsigned long pid,unsigned long ric)
@@ -85,8 +83,6 @@ static inline void _tlbiel_va(unsigned l asm volatile(PPC_TLBIEL(%0, %4, %3, %2, %1) : : "r"(rb), "i"(r), "i"(prs), "i"(ric), "r"(rs) : "memory"); asm volatile("ptesync": : :"memory"); -if (cpu_has_feature (CPU_FTR_POWER9_DD1 )) - asm volatile(PPC_INVALIDATE_ERAT : : :"memory"); } static inline void _tlbie_va(unsigned long va, unsigned long pid,
Greg Kroah-Hartman
maintainerPATCH 46/60 powerpc/powernv: Fix CPU hotplug to handle waking on HVI
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Benjamin Herrenschmidt <[email protected]>
commit 9b256714979fad61ae11d90b53cf67dd5e6484eb upstream.
The IPIs come in as HVI not EE, so we need to test the appropriate SRR1 bits. The encoding is such that it won't have false positives on P7 and P8 so we can just test it like that. We also need to handle the icp-opal variant of the flush.
--- arch/powerpc/include/asm/reg.h | 3 ++- arch/powerpc/include/asm/xics.h | 1 + arch/powerpc/platforms/powernv/smp.c | 12 ++++++++++-- arch/powerpc/sysdev/xics/icp-opal.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/reg.h +2 -1
@@ -641,9 +641,10 @@#define SRR1_ISI_N_OR_G 0x10000000/* ISI: Access is no-exec or G */ #define SRR1_ISI_PROT 0x08000000/* ISI: Other protection fault */ #define SRR1_WAKEMASK 0x00380000/* reason for wakeup */ -#define SRR1_WAKEMASK_P8 0x003c0000/* reason for wakeup on POWER8 */ +#define SRR1_WAKEMASK_P8 0x003c0000/* reason for wakeup on POWER8 and 9 */ #define SRR1_WAKESYSERR 0x00300000/* System error */ #define SRR1_WAKEEE 0x00200000/* External interrupt */ +#define SRR1_WAKEHVI 0x00240000/* Hypervisor Virtualization Interrupt (P9) */ #define SRR1_WAKEMT 0x00280000/* mtctrl */ #define SRR1_WAKEHMI 0x00280000/* Hypervisor maintenance */ #define SRR1_WAKEDEC 0x00180000/* Decrementer interrupt */
arch/powerpc/include/asm/xics.h +1 -0
@@ -44,6 +44,7 @@ static inline int icp_hv_init(void) { re#ifdef CONFIG_PPC_POWERNV extern int icp_opal_init (void ); +extern void icp_opal_flush_interrupt (void );#else static inline int icp_opal_init (void ) {return -ENODEV ; }#endif
arch/powerpc/platforms/powernv/smp.c +10 -2
@@ -155,8 +155,10 @@ static void pnv_smp_cpu_kill_self(void) wmask =SRR1_WAKEMASK_P8 ; idle_states =pnv_get_supported_cpuidle_states (); +/* We don't want to take decrementer interrupts while we are offline, -* so clear LPCR:PECE1. We keep PECE2 enabled. +* so clear LPCR:PECE1. We keep PECE2 (and LPCR_PECE_HVEE on P9) +* enabled as to let IPIs in. */ mtspr (SPRN_LPCR ,mfspr (SPRN_LPCR ) & ~(u64 )LPCR_PECE1 );
@@ -206,8 +208,12 @@ static void pnv_smp_cpu_kill_self(void)* contains 0. */ if (((srr1 & wmask) ==SRR1_WAKEEE ) || + ((srr1 & wmask) ==SRR1_WAKEHVI ) || (local_paca->irq_happened &PACA_IRQ_EE )) { -icp_native_flush_interrupt (); +if (cpu_has_feature (CPU_FTR_ARCH_300 )) +icp_opal_flush_interrupt (); +else +icp_native_flush_interrupt (); }else if ((srr1 & wmask) ==SRR1_WAKEHDBELL ) {unsigned long msg =PPC_DBELL_TYPE (PPC_DBELL_SERVER ); asm volatile(PPC_MSGCLR(%0) : : "r" (msg));
@@ -221,6 +227,8 @@ static void pnv_smp_cpu_kill_self(void)if (srr1 && !generic_check_cpu_restart (cpu))DBG ("CPU%d Unexpected exit while offline !\n" , cpu); } + +/* Re-enable decrementer interrupts */ mtspr (SPRN_LPCR ,mfspr (SPRN_LPCR ) |LPCR_PECE1 );DBG ("CPU%d coming online...\n" , cpu); }
arch/powerpc/sysdev/xics/icp-opal.c +29 -0
@@ -132,6 +132,35 @@ static irqreturn_t icp_opal_ipi_action(i return smp_ipi_demux(); } +/* +* Called when an interrupt is received on an off-line CPU to +* clear the interrupt, so that the CPU can go back to nap mode. +*/ +void icp_opal_flush_interrupt (void ) +{ +unsigned int xirr; +unsigned int vec; + +do { + xirr =icp_opal_get_xirr (); + vec = xirr &0x00ffffff ; +if (vec ==XICS_IRQ_SPURIOUS ) +break ; +if (vec ==XICS_IPI ) { +/* Clear pending IPI */ +int cpu =smp_processor_id (); +kvmppc_set_host_ipi (cpu,0 ); +opal_int_set_mfrr (get_hard_smp_processor_id (cpu),0xff ); + }else { +pr_err ("XICS: hw interrupt 0x%x to offline cpu, " +"disabling\n" , vec); +xics_mask_unknown_vec (vec); + } + +/* EOI the interrupt */ + }while (opal_int_eoi (xirr) >0 ); +} +#endif /* CONFIG_SMP */ static const struct icp_ops icp_opal_ops = {
Greg Kroah-Hartman
maintainerPATCH 47/60 xen-netfront: Delete rx_refill_timer in xennet_disconnect_backend()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Boris Ostrovsky <[email protected]>
commit 74470954857c264168d2b5a113904cf0cfd27d18 upstream.
rx_refill_timer should be deleted as soon as we disconnect from the backend since otherwise it is possible for the timer to go off before we get to xennet_destroy_queues(). If this happens we may dereference queue->rx.sring which is set to NULL in xennet_disconnect_backend().
--- drivers/net/xen-netfront.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/xen-netfront.c +2 -1
@@ -1397,6 +1397,8 @@ static void xennet_disconnect_backend(stfor (i =0 ; i < num_queues && info->queues; ++i) {struct netfront_queue *queue = &info->queues[i]; +del_timer_sync (&queue->rx_refill_timer); +if (queue->tx_irq && (queue->tx_irq == queue->rx_irq))unbind_from_irqhandler (queue->tx_irq, queue);if (queue->tx_irq && (queue->tx_irq != queue->rx_irq)) {
@@ -1751,7 +1753,6 @@ static void xennet_destroy_queues(structif (netif_running (info->netdev))napi_disable (&queue->napi); -del_timer_sync (&queue->rx_refill_timer);netif_napi_del (&queue->napi); }
Greg Kroah-Hartman
maintainerPATCH 48/60 ALSA: hda - adding a new NV HDMI/DP codec ID in the driver
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hui Wang <[email protected]>
commit af677166cf63c179dc2485053166e02c4aea01eb upstream.
Without this change, the HDMI/DP codec will be recognised as a generic codec, and there is no sound when playing through this codec.
As suggested by NVidia side, after adding the new ID in the driver, the sound playing works well.
--- sound/pci/hda/patch_hdmi.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_hdmi.c +1 -0
@@ -3638,6 +3638,7 @@ HDA_CODEC_ENTRY(0x10de0070, "GPU 70 HDMIHDA_CODEC_ENTRY (0x10de0071 ,"GPU 71 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0072 ,"GPU 72 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de007d ,"GPU 7d HDMI/DP" , patch_nvhdmi), +HDA_CODEC_ENTRY (0x10de0080 ,"GPU 80 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0082 ,"GPU 82 HDMI/DP" , patch_nvhdmi),HDA_CODEC_ENTRY (0x10de0083 ,"GPU 83 HDMI/DP" , patch_nvhdmi), HDA_CODEC_ENTRY(0x10de8001, "MCP73 HDMI", patch_nvhdmi_2ch),
Greg Kroah-Hartman
maintainerPATCH 49/60 ALSA: seq: Fix race at creating a queue
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 4842e98f26dd80be3623c4714a244ba52ea096a8 upstream.
When a sequencer queue is created in snd_seq_queue_alloc(),it adds the new queue element to the public list before referencing it. Thus the queue might be deleted before the call of snd_seq_queue_use(), and it results in the use-after-free error, as spotted by syzkaller.
The fix is to reference the queue object at the right time.
--- sound/core/seq/seq_queue.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
sound/core/seq/seq_queue.c +20 -13
@@ -181,6 +181,8 @@ void __exit snd_seq_queues_delete(void) } } +static void queue_use (struct snd_seq_queue *queue,int client,int use); +/* allocate a new queue - * return queue index value or negative value for error */
@@ -192,11 +194,11 @@ int snd_seq_queue_alloc(int client, intif (q ==NULL )return -ENOMEM ; q->info_flags = info_flags; +queue_use (q, client,1 );if (queue_list_add (q) <0 ) {queue_delete (q);return -ENOMEM ; } -snd_seq_queue_use (q->queue, client,1 );/* use this queue */ return q->queue; }
@@ -502,19 +504,9 @@ int snd_seq_queue_timer_set_tempo(int qureturn result; } - -/* use or unuse this queue - -* if it is the first client, starts the timer. -* if it is not longer used by any clients, stop the timer. -*/ -int snd_seq_queue_use (int queueid,int client,int use) +/* use or unuse this queue */ +static void queue_use (struct snd_seq_queue *queue,int client,int use) { -struct snd_seq_queue *queue; - - queue =queueptr (queueid); -if (queue ==NULL ) -return -EINVAL ; -mutex_lock (&queue->timer_mutex);if (use) {if (!test_and_set_bit (client, queue->clients_bitmap)) queue->clients++;
@@ -529,6 +521,21 @@ int snd_seq_queue_use(int queueid, int c }else {snd_seq_timer_close (queue); } +} + +/* use or unuse this queue - +* if it is the first client, starts the timer. +* if it is not longer used by any clients, stop the timer. +*/ +int snd_seq_queue_use (int queueid,int client,int use) +{ +struct snd_seq_queue *queue; + + queue =queueptr (queueid); +if (queue ==NULL ) +return -EINVAL ; +mutex_lock (&queue->timer_mutex); +queue_use (queue, client, use);mutex_unlock (&queue->timer_mutex);queuefree (queue);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 50/60 ALSA: seq: Dont handle loop timeout at snd_seq_pool_done()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 37a7ea4a9b81f6a864c10a7cb0b96458df5310a3 upstream.
snd_seq_pool_done() syncs with closing of all opened threads, but it aborts the wait loop with a timeout, and proceeds to the release resource even if not all threads have been closed. The timeout was 5 seconds, and if you run a crazy stuff, it can exceed easily, and may result in the access of the invalid memory address -- this is what syzkaller detected in a bug report.
As a fix, let the code graduate from naiveness, simply remove the loop timeout.
--- sound/core/seq/seq_memory.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
sound/core/seq/seq_memory.c +1 -8
@@ -419,7 +419,6 @@ int snd_seq_pool_done(struct snd_seq_poo {unsigned long flags;struct snd_seq_event_cell *ptr; -int max_count =5 *HZ ;if (snd_BUG_ON (!pool))return -EINVAL ;
@@ -432,14 +431,8 @@ int snd_seq_pool_done(struct snd_seq_pooif (waitqueue_active (&pool->output_sleep))wake_up (&pool->output_sleep); -while (atomic_read (&pool->counter) >0 ) { -if (max_count ==0 ) { -pr_warn ("ALSA: snd_seq_pool_done timeout: %d cells remain\n" ,atomic_read (&pool->counter)); -break ; - } +while (atomic_read (&pool->counter) >0 )schedule_timeout_uninterruptible (1 ); - max_count--; - }/* release all resources */ spin_lock_irqsave (&pool->lock, flags);
Greg Kroah-Hartman
maintainerPATCH 51/60 Revert "ALSA: line6: Only determine control port properties if needed"
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit f3d83317a69e7d658e7c83e24f8b31ac533c39e3 upstream.
This reverts commit f6a0dd107ad0c8b59d1c9735eea4b8cb9f460949.
The commit caused a regression on LINE6 Transport that has no control caps. Although reverting the commit may result back in a spurious error message for some device again, it's the simplest regression fix, hence it's taken as is at first. The further code fix will follow later.
--- sound/usb/line6/driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
sound/usb/line6/driver.c +2 -1
@@ -754,8 +754,9 @@ int line6_probe(struct usb_interface *in goto error; } +line6_get_interval (line6); +if (properties->capabilities &LINE6_CAP_CONTROL ) { -line6_get_interval (line6); ret =line6_init_cap_control (line6);if (ret <0 ) goto error;
Greg Kroah-Hartman
maintainerPATCH 52/60 x86/mm/ptdump: Fix soft lockup in page table walker
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrey Ryabinin <[email protected]>
commit 146fbb766934dc003fcbf755b519acef683576bf upstream.
CONFIG_KASAN=y needs a lot of virtual memory mapped for its shadow. In that case ptdump_walk_pgd_level_core() takes a lot of time to walk across all page tables and doing this without
a rescheduling causes soft lockups:
NMI watchdog: BUG: soft lockup - CPU#3 stuck for 23s! [swapper/0:1]
...
Call Trace: ptdump_walk_pgd_level_core+0x40c/0x550 ptdump_walk_pgd_level_checkwx+0x17/0x20 mark_rodata_ro+0x13b/0x150 kernel_init+0x2f/0x120 ret_from_fork+0x2c/0x40
I guess that this issue might arise even without KASAN on huge machines with several terabytes of RAM.
Stick cond_resched() in pgd loop to fix this.
--- arch/x86/mm/dump_pagetables.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/mm/dump_pagetables.c +2 -0
@@ -15,6 +15,7 @@#include <linux/debugfs.h> #include <linux/mm.h> #include <linux/init.h> +#include <linux/sched.h> #include <linux/seq_file.h> #include <asm/pgtable.h>
@@ -406,6 +407,7 @@ static void ptdump_walk_pgd_level_core(s }else note_page (m, &st,__pgprot (0 ),1 ); +cond_resched (); start++; }
Greg Kroah-Hartman
maintainerPATCH 53/60 x86/CPU/AMD: Bring back Compute Unit ID
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Borislav Petkov <[email protected]>
commit 79a8b9aa388b0620cc1d525d7c0f0d9a8a85e08e upstream.
Commit:
a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology")
restored the initial approach we had with the Fam15h topology of enumerating CU (Compute Unit) threads as cores. And this is still correct - they're beefier than HT threads but still have some shared functionality.
Our current approach has a problem with the Mad Max Steam game, for example. Yves Dionne reported a certain "choppiness" while playing on v4.9.5.
That problem stems most likely from the fact that the CU threads share resources within one CU and when we schedule to a thread of a different compute unit, this incurs latency due to migrating the working set to a different CU through the caches.
When the thread siblings mask mirrors that aspect of the CUs and threads, the scheduler pays attention to it and tries to schedule within one CU first. Which takes care of the latency, of course.
--- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/amd.c | 9 ++++++++- arch/x86/kernel/cpu/common.c | 1 + arch/x86/kernel/smpboot.c | 12 +++++++++--- 4 files changed, 19 insertions(+), 4 deletions(-)
arch/x86/include/asm/processor.h +1 -0
@@ -104,6 +104,7 @@ struct cpuinfo_x86 {__u8 x86_phys_bits;/* CPUID returned core id bits: */ __u8 x86_coreid_bits; +__u8 cu_id;/* Max extended CPUID function supported: */ __u32 extended_cpuid_level;/* Maximum supported CPUID level, -1=no CPUID: */
arch/x86/kernel/cpu/amd.c +8 -1
@@ -309,8 +309,15 @@ static void amd_get_topology(struct cpui/* get information required for multi-node processors */ if (boot_cpu_has (X86_FEATURE_TOPOEXT )) { +u32 eax, ebx, ecx, edx; - node_id =cpuid_ecx (0x8000001e ) &7 ; +cpuid (0x8000001e , &eax, &ebx, &ecx, &edx); + + node_id = ecx &0xff ; + smp_num_siblings = ((ebx >>8 ) &0xff ) +1 ; + +if (c->x86 ==0x15 ) + c->cu_id = ebx &0xff ;/* * We may have multiple LLCs if L3 caches exist, so check if we
arch/x86/kernel/cpu/common.c +1 -0
@@ -1015,6 +1015,7 @@ static void identify_cpu(struct cpuinfo_ c->x86_model_id[0 ] ='\0' ;/* Unset */ c->x86_max_cores =1 ; c->x86_coreid_bits =0 ; + c->cu_id =0xff ;#ifdef CONFIG_X86_64 c->x86_clflush_size =64 ; c->x86_phys_bits =36 ;
arch/x86/kernel/smpboot.c +9 -3
@@ -423,9 +423,15 @@ static bool match_smt(struct cpuinfo_x86int cpu1 = c->cpu_index, cpu2 = o->cpu_index;if (c->phys_proc_id == o->phys_proc_id && -per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2) && - c->cpu_core_id == o->cpu_core_id) -return topology_sane (c, o,"smt" ); +per_cpu (cpu_llc_id, cpu1) ==per_cpu (cpu_llc_id, cpu2)) { +if (c->cpu_core_id == o->cpu_core_id) +return topology_sane (c, o,"smt" ); + +if ((c->cu_id !=0xff ) && + (o->cu_id !=0xff ) && + (c->cu_id == o->cu_id)) +return topology_sane (c, o,"smt" ); + } }else if (c->phys_proc_id == o->phys_proc_id && c->cpu_core_id == o->cpu_core_id) {
Greg Kroah-Hartman
maintainerPATCH 54/60 x86/CPU/AMD: Fix Zen SMT topology
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yazen Ghannam <[email protected]>
commit 08b259631b5a1d912af4832847b5642f377d9101 upstream.
After:
a33d331761bc ("x86/CPU/AMD: Fix Bulldozer topology")
our SMT scheduling topology for Fam17h systems is broken, because the ThreadId is included in the ApicId when SMT is enabled.
So, without further decoding cpu_core_id is unique for each thread rather than the same for threads on the same core. This didn't affect systems with SMT disabled. Make cpu_core_id be what it is defined to be.
--- arch/x86/kernel/cpu/amd.c | 7 +++++++ 1 file changed, 7 insertions(+)
arch/x86/kernel/cpu/amd.c +7 -0
@@ -319,6 +319,13 @@ static void amd_get_topology(struct cpuiif (c->x86 ==0x15 ) c->cu_id = ebx &0xff ; +if (c->x86 >=0x17 ) { + c->cpu_core_id = ebx &0xff ; + +if (smp_num_siblings >1 ) + c->x86_max_cores /= smp_num_siblings; + } +/* * We may have multiple LLCs if L3 caches exist, so check if we * have an L3 cache by looking at the L3 cache CPUID leaf.
Greg Kroah-Hartman
maintainerPATCH 55/60 IB/rxe: Fix resid update
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eyal Itkin <[email protected]>
commit 628f07d33c1f2e7bf31e0a4a988bb07914bd5e73 upstream.
Update the response's resid field when larger than MTU, instead of only updating the local resid variable.
--- drivers/infiniband/sw/rxe/rxe_resp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_resp.c +1 -1
@@ -472,7 +472,7 @@ static enum resp_states check_rkey(struc goto err2; } - resid = mtu; + qp->resp.resid = mtu; }else {if (pktlen != resid) { state =RESPST_ERR_LENGTH ;
Greg Kroah-Hartman
maintainerPATCH 56/60 IB/rxe: Fix mem_check_range integer overflow
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eyal Itkin <[email protected]>
commit 647bf3d8a8e5777319da92af672289b2a6c4dc66 upstream.
Update the range check to avoid integer-overflow in edge case. Resolves CVE 2016-8636.
--- drivers/infiniband/sw/rxe/rxe_mr.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_mr.c +5 -3
@@ -59,9 +59,11 @@ int mem_check_range(struct rxe_mem *mem,case RXE_MEM_TYPE_MR :case RXE_MEM_TYPE_FMR : -return ((iova < mem->iova) || - ((iova + length) > (mem->iova + mem->length))) ? - -EFAULT :0 ; +if (iova < mem->iova || + length > mem->length || + iova > mem->iova + mem->length - length) +return -EFAULT ; +return 0 ;default :return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 57/60 stacktrace, lockdep: Fix address, newline ugliness
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Omar Sandoval <[email protected]>
commit bfeda41d06d85ad9d52f2413cfc2b77be5022f75 upstream.
Since KERN_CONT became meaningful again, lockdep stack traces have had annoying extra newlines, like this:
[ 5.561122] -> #1 (B){+.+...}:
[ 5.561528]
[ 5.561532] [<ffffffff810d8873>] lock_acquire+0xc3/0x210
[ 5.562178]
[ 5.562181] [<ffffffff816f6414>] mutex_lock_nested+0x74/0x6d0
[ 5.562861]
[ 5.562880] [<ffffffffa01aa3c3>] init_btrfs_fs+0x21/0x196 [btrfs]
[ 5.563717]
[ 5.563721] [<ffffffff81000472>] do_one_initcall+0x52/0x1b0
[ 5.564554]
[ 5.564559] [<ffffffff811a3af6>] do_init_module+0x5f/0x209
[ 5.565357]
[ 5.565361] [<ffffffff81122f4d>] load_module+0x218d/0x2b80
[ 5.566020]
[ 5.566021] [<ffffffff81123beb>] SyS_finit_module+0xeb/0x120
[ 5.566694]
[ 5.566696] [<ffffffff816fd241>] entry_SYSCALL_64_fastpath+0x1f/0xc2That's happening because each printk() call now gets printed on its own line, and we do a separate call to print the spaces before the symbol. Fix it by doing the printk() directly instead of using the print_ip_sym() helper.
Additionally, the symbol address isn't very helpful, so let's get rid of that, too. The final result looks like this:
[ 5.194518] -> #1 (B){+.+...}:
[ 5.195002] lock_acquire+0xc3/0x210
[ 5.195439] mutex_lock_nested+0x74/0x6d0
[ 5.196491] do_one_initcall+0x52/0x1b0
[ 5.196939] do_init_module+0x5f/0x209
[ 5.197355] load_module+0x218d/0x2b80
[ 5.197792] SyS_finit_module+0xeb/0x120
[ 5.198251] entry_SYSCALL_64_fastpath+0x1f/0xc2--- kernel/stacktrace.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
kernel/stacktrace.c +4 -8
@@ -18,10 +18,8 @@ void print_stack_trace(struct stack_tracif (WARN_ON (!trace->entries))return ; -for (i =0 ; i < trace->nr_entries; i++) { -printk ("%*c" ,1 + spaces,' ' ); -print_ip_sym (trace->entries[i]); - } +for (i =0 ; i < trace->nr_entries; i++) +printk ("%*c%pS\n" ,1 + spaces,' ' , (void *)trace->entries[i]); }EXPORT_SYMBOL_GPL (print_stack_trace);
@@ -29,7 +27,6 @@ int snprint_stack_trace(char *buf, size_ struct stack_trace *trace, int spaces) {int i; -unsigned long ip;int generated;int total =0 ;
@@ -37,9 +34,8 @@ int snprint_stack_trace(char *buf, size_return 0 ;for (i =0 ; i < trace->nr_entries; i++) { - ip = trace->entries[i]; - generated =snprintf (buf, size,"%*c[<%p>] %pS\n" , -1 + spaces,' ' , (void *) ip, (void *) ip); + generated =snprintf (buf, size,"%*c%pS\n" ,1 + spaces,' ' , + (void *)trace->entries[i]); total += generated;
Greg Kroah-Hartman
maintainerPATCH 58/60 perf diff: Fix -o/--order option behavior (again)
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit a1c9f97f0b64e6337d9cfcc08c134450934fdd90 upstream.
Commit 21e6d8428664 ("perf diff: Use perf_hpp__register_sort_field interface") changed list_add() to perf_hpp__register_sort_field().
This resulted in a behavior change since the field was added to the tail instead of the head. So the -o option is mostly ignored due to its order in the list.
This patch fixes it by adding perf_hpp__prepend_sort_field().
--- tools/perf/builtin-diff.c | 2 +- tools/perf/ui/hist.c | 6 ++++++ tools/perf/util/hist.h | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
tools/perf/builtin-diff.c +1 -1
@@ -1199,7 +1199,7 @@ static int ui_init(void)BUG_ON (1 ); } -perf_hpp__register_sort_field (fmt); +perf_hpp__prepend_sort_field (fmt);return 0 ; }
tools/perf/ui/hist.c +6 -0
@@ -521,6 +521,12 @@ void perf_hpp_list__register_sort_field(list_add_tail (&format->sort_list, &list->sorts); } +void perf_hpp_list__prepend_sort_field (struct perf_hpp_list *list, +struct perf_hpp_fmt *format) +{ +list_add (&format->sort_list, &list->sorts); +} +void perf_hpp__column_unregister (struct perf_hpp_fmt *format) {list_del (&format->list);
tools/perf/util/hist.h +7 -0
@@ -282,6 +282,8 @@ void perf_hpp_list__column_register(stru struct perf_hpp_fmt *format);void perf_hpp_list__register_sort_field (struct perf_hpp_list *list,struct perf_hpp_fmt *format); +void perf_hpp_list__prepend_sort_field (struct perf_hpp_list *list, +struct perf_hpp_fmt *format);static inline void perf_hpp__column_register (struct perf_hpp_fmt *format) {
@@ -293,6 +295,11 @@ static inline void perf_hpp__register_soperf_hpp_list__register_sort_field (&perf_hpp_list, format); } +static inline void perf_hpp__prepend_sort_field (struct perf_hpp_fmt *format) +{ +perf_hpp_list__prepend_sort_field (&perf_hpp_list, format); +} +#define perf_hpp_list__for_each_format (_list, format) \ list_for_each_entry(format, &(_list)->fields, list)
Greg Kroah-Hartman
maintainerPATCH 59/60 perf diff: Fix segfault on perf diff -o N option
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namhyung Kim <[email protected]>
commit 8381cdd0e32dd748bd34ca3ace476949948bd793 upstream.
The -o/--order option is to select column number to sort a diff result.
It does the job by adding a hpp field at the beginning of the sort list. But it should not be added to the output field list as it has no callbacks required by a output field.
During the setup_sorting(), the perf_hpp__setup_output_field() appends the given sort keys to the output field if it's not there already.
Originally it was checked by fmt->list being non-empty. But commit 3f931f2c4274 ("perf hists: Make hpp setup function generic") changed it to check the ->equal callback.
Anyways, we don't need to add the pseudo hpp field to the output field list since it won't be used for output. So just skip fields if they have no ->color or ->entry callbacks.
--- tools/perf/ui/hist.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/ui/hist.c +4 -0
@@ -566,6 +566,10 @@ void perf_hpp__setup_output_field(structperf_hpp_list__for_each_sort_list (list, fmt) {struct perf_hpp_fmt *pos; +/* skip sort-only fields ("sort_compute" in perf diff) */ +if (!fmt->entry && !fmt->color) +continue ; +perf_hpp_list__for_each_format (list, pos) {if (fmt_equal (fmt, pos)) goto next;
Greg Kroah-Hartman
maintainerPATCH 60/60 perf/core: Fix crash in perf_event_read()
In reply to Greg Kroah-Hartman4.9-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
commit 451d24d1e5f40bad000fa9abe36ddb16fc9928cb upstream.
Alexei had his box explode because doing read() on a package (rapl/uncore) event that isn't currently scheduled in ends up doing an out-of-bounds load.
Rework the code to more explicitly deal with event->oncpu being -1.
--- kernel/events/core.c | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)
kernel/events/core.c +15 -10
@@ -3461,14 +3461,15 @@ struct perf_read_data {int ret; }; -static int find_cpu_to_read (struct perf_event *event,int local_cpu) +static int __perf_event_read_cpu (struct perf_event *event,int event_cpu) { -int event_cpu = event->oncpu;u16 local_pkg, event_pkg;if (event->group_caps &PERF_EV_CAP_READ_ACTIVE_PKG ) { - event_pkg =topology_physical_package_id (event_cpu); - local_pkg =topology_physical_package_id (local_cpu); +int local_cpu =smp_processor_id (); + + event_pkg =topology_physical_package_id (event_cpu); + local_pkg =topology_physical_package_id (local_cpu);if (event_pkg == local_pkg)return local_cpu;
@@ -3598,7 +3599,7 @@ u64 perf_event_read_local(struct perf_evstatic int perf_event_read (struct perf_event *event,bool group) { -int ret =0 , cpu_to_read, local_cpu; +int event_cpu, ret =0 ;/* * If event is enabled and currently active on a CPU, update the
@@ -3611,21 +3612,25 @@ static int perf_event_read(struct perf_e .ret = 0, }; - local_cpu =get_cpu (); - cpu_to_read =find_cpu_to_read (event, local_cpu); -put_cpu (); + event_cpu =READ_ONCE (event->oncpu); +if ((unsigned )event_cpu >= nr_cpu_ids) +return 0 ; + +preempt_disable (); + event_cpu =__perf_event_read_cpu (event, event_cpu);/* * Purposely ignore the smp_call_function_single() return * value. * -* If event->oncpu isn't a valid CPU it means the event got +* If event_cpu isn't a valid CPU it means the event got * scheduled out and that will have updated the event count. * * Therefore, either way, we'll have an up-to-date event count * after this. */ - (void )smp_call_function_single (cpu_to_read, __perf_event_read, &data,1 ); + (void )smp_call_function_single (event_cpu, __perf_event_read, &data,1 ); +preempt_enable (); ret = data.ret; }else if (event->state ==PERF_EVENT_STATE_INACTIVE ) {struct perf_event_context *ctx = event->ctx;
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.10 release. There are 60 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:05 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 9 lines
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Greg Kroah-Hartman
maintainerQuoted 15 lines · Shuah Khan
Quoted 14 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.10 release. There are 60 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:05 UTC 2017. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.9.10-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-4.9.y
and the diffstat can be found below.
Quoted 6 lines
Quoted 4 lines
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
Wonderful, thanks so much for testing and letting me know.
greg k-h
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.10 release. There are 60 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:05 UTC 2017. Anything received after that time might be too late.
Build results:
total: 149 pass: 149 fail: 0 Qemu test results: total: 122 pass: 122 fail: 0
Details are available at http://kerneltests.org/builders.
Guenter
Greg Kroah-Hartman
maintainerQuoted 9 lines · Guenter Roeck
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 4.9.10 release. There are 60 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 15 13:03:05 UTC 2017. Anything received after that time might be too late.
Quoted 6 lines
Build results:
total: 149 pass: 149 fail: 0 Qemu test results: total: 122 pass: 122 fail: 0Details are available at http://kerneltests.org/builders.
Thanks for testing all of these and letting me know.
greg k-h