Linux 5.0.4
Greg KH
maintainerI'm announcing the release of the 5.0.4 kernel.
All users of the 5.0 kernel series must upgrade.
The updated 5.0.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.0.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/DMA-API.txt | 8 Documentation/arm64/silicon-errata.txt | 2 Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt | 4 Documentation/process/stable-kernel-rules.rst | 3 Makefile | 2 arch/arm/crypto/crct10dif-ce-core.S | 14 arch/arm/crypto/crct10dif-ce-glue.c | 23 arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 8 arch/arm64/crypto/aes-ce-ccm-core.S | 5 arch/arm64/crypto/aes-ce-ccm-glue.c | 4 arch/arm64/crypto/aes-neonbs-core.S | 8 arch/arm64/crypto/crct10dif-ce-glue.c | 25 - arch/arm64/include/asm/hardirq.h | 31 + arch/arm64/kernel/irq.c | 3 arch/arm64/kernel/kgdb.c | 14 arch/arm64/kernel/probes/kprobes.c | 6 arch/arm64/kvm/sys_regs.c | 2 arch/arm64/mm/fault.c | 9 arch/m68k/Makefile | 5 arch/mips/include/asm/kvm_host.h | 2 arch/powerpc/include/asm/book3s/64/hugetlb.h | 8 arch/powerpc/include/asm/kvm_host.h | 2 arch/powerpc/include/asm/powernv.h | 2 arch/powerpc/kernel/entry_32.S | 9 arch/powerpc/kernel/process.c | 2 arch/powerpc/kernel/ptrace.c | 10 arch/powerpc/kernel/smp.c | 90 +-- arch/powerpc/kernel/traps.c | 12 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 26 - arch/powerpc/mm/slb.c | 5 arch/powerpc/platforms/83xx/suspend-asm.S | 34 + arch/powerpc/platforms/embedded6xx/wii.c | 4 arch/powerpc/platforms/powernv/idle.c | 27 - arch/powerpc/platforms/powernv/opal-msglog.c | 2 arch/powerpc/platforms/powernv/smp.c | 25 + arch/s390/include/asm/kvm_host.h | 2 arch/s390/kernel/setup.c | 31 - arch/x86/crypto/aegis128-aesni-glue.c | 38 - arch/x86/crypto/aegis128l-aesni-glue.c | 38 - arch/x86/crypto/aegis256-aesni-glue.c | 38 - arch/x86/crypto/aesni-intel_glue.c | 13 arch/x86/crypto/morus1280_glue.c | 40 - arch/x86/crypto/morus640_glue.c | 39 - arch/x86/events/intel/uncore.c | 1 arch/x86/events/intel/uncore.h | 12 arch/x86/events/intel/uncore_snb.c | 4 arch/x86/include/asm/kvm_host.h | 2 arch/x86/kernel/ftrace.c | 42 - arch/x86/kernel/kprobes/opt.c | 5 arch/x86/kernel/kvmclock.c | 6 arch/x86/kvm/mmu.c | 39 - arch/x86/kvm/vmx/nested.c | 43 + arch/x86/kvm/vmx/vmx.c | 16 arch/x86/kvm/x86.c | 4 arch/x86/kvm/x86.h | 7 arch/x86/xen/mmu_pv.c | 13 crypto/aead.c | 4 crypto/aegis128.c | 14 crypto/aegis128l.c | 14 crypto/aegis256.c | 14 crypto/ahash.c | 42 + crypto/cfb.c | 14 crypto/morus1280.c | 13 crypto/morus640.c | 13 crypto/ofb.c | 91 +-- crypto/pcbc.c | 14 crypto/shash.c | 18 crypto/skcipher.c | 27 - crypto/testmgr.c | 14 crypto/testmgr.h | 53 ++ drivers/acpi/device_sysfs.c | 6 drivers/acpi/nfit/core.c | 84 +-- drivers/base/power/wakeup.c | 8 drivers/char/ipmi/ipmi_si.h | 4 drivers/char/ipmi/ipmi_si_hardcode.c | 236 +++++++--- drivers/char/ipmi/ipmi_si_intf.c | 28 - drivers/char/ipmi/ipmi_si_mem_io.c | 5 drivers/char/ipmi/ipmi_si_platform.c | 29 - drivers/char/ipmi/ipmi_si_port_io.c | 5 drivers/char/tpm/st33zp24/st33zp24.c | 2 drivers/char/tpm/tpm-interface.c | 11 drivers/char/tpm/tpm_atmel.c | 2 drivers/char/tpm/tpm_crb.c | 22 drivers/char/tpm/tpm_i2c_atmel.c | 6 drivers/char/tpm/tpm_i2c_infineon.c | 2 drivers/char/tpm/tpm_i2c_nuvoton.c | 2 drivers/char/tpm/tpm_ibmvtpm.c | 8 drivers/char/tpm/tpm_infineon.c | 2 drivers/char/tpm/tpm_nsc.c | 2 drivers/char/tpm/tpm_tis_core.c | 2 drivers/char/tpm/tpm_vtpm_proxy.c | 3 drivers/char/tpm/xen-tpmfront.c | 2 drivers/clk/clk-twl6040.c | 53 ++ drivers/clk/ingenic/cgu.c | 10 drivers/clk/ingenic/cgu.h | 2 drivers/clk/samsung/clk-exynos5-subcmu.c | 13 drivers/clk/uniphier/clk-uniphier-cpugear.c | 2 drivers/clocksource/Kconfig | 10 drivers/clocksource/arm_arch_timer.c | 55 ++ drivers/clocksource/exynos_mct.c | 23 drivers/cpufreq/pxa2xx-cpufreq.c | 4 drivers/cpufreq/qcom-cpufreq-kryo.c | 20 drivers/cpufreq/tegra124-cpufreq.c | 2 drivers/cpuidle/governor.c | 1 drivers/crypto/caam/caamalg.c | 1 drivers/crypto/caam/caamhash.c | 93 +-- drivers/crypto/ccree/cc_buffer_mgr.c | 8 drivers/crypto/ccree/cc_cipher.c | 7 drivers/crypto/rockchip/rk3288_crypto.c | 2 drivers/crypto/rockchip/rk3288_crypto.h | 4 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 39 + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 2 drivers/dma/sh/usb-dmac.c | 2 drivers/gpio/gpio-pca953x.c | 3 drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 8 drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 drivers/gpu/drm/drm_fb_helper.c | 4 drivers/gpu/drm/radeon/evergreen_cs.c | 1 drivers/hwtracing/intel_th/gth.c | 4 drivers/hwtracing/stm/core.c | 11 drivers/i2c/busses/i2c-tegra.c | 8 drivers/iio/adc/exynos_adc.c | 19 drivers/infiniband/hw/hfi1/hfi.h | 2 drivers/infiniband/hw/hfi1/init.c | 14 drivers/infiniband/sw/rdmavt/qp.c | 59 +- drivers/irqchip/irq-brcmstb-l2.c | 10 drivers/irqchip/irq-gic-v3-its.c | 2 drivers/md/bcache/extents.c | 13 drivers/md/bcache/request.c | 7 drivers/md/bcache/writeback.h | 3 drivers/md/dm-integrity.c | 8 drivers/md/raid10.c | 2 drivers/md/raid5.c | 2 drivers/media/dvb-frontends/lgdt330x.c | 2 drivers/media/i2c/cx25840/cx25840-core.c | 3 drivers/media/i2c/cx25840/cx25840-core.h | 1 drivers/media/i2c/ov5640.c | 2 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 2 drivers/media/platform/vimc/Makefile | 3 drivers/media/platform/vimc/vimc-capture.c | 18 drivers/media/platform/vimc/vimc-common.c | 35 - drivers/media/platform/vimc/vimc-common.h | 15 drivers/media/platform/vimc/vimc-debayer.c | 26 - drivers/media/platform/vimc/vimc-scaler.c | 28 - drivers/media/platform/vimc/vimc-sensor.c | 56 -- drivers/media/platform/vimc/vimc-streamer.c | 188 +++++++ drivers/media/platform/vimc/vimc-streamer.h | 38 + drivers/media/usb/uvc/uvc_video.c | 8 drivers/mfd/sm501.c | 3 drivers/misc/cxl/guest.c | 2 drivers/misc/cxl/pci.c | 39 + drivers/misc/mei/bus.c | 21 drivers/misc/mei/hbm.c | 7 drivers/misc/vmw_balloon.c | 5 drivers/mmc/core/core.c | 4 drivers/mmc/host/renesas_sdhi_core.c | 11 drivers/mmc/host/sdhci-esdhc-imx.c | 1 drivers/net/dsa/lantiq_gswip.c | 21 drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 2 drivers/nvdimm/label.c | 23 drivers/nvdimm/namespace_devs.c | 4 drivers/nvdimm/pfn_devs.c | 4 drivers/nvmem/core.c | 4 drivers/opp/core.c | 2 drivers/parport/parport_pc.c | 2 drivers/pci/controller/dwc/pcie-designware-host.c | 2 drivers/pci/controller/dwc/pcie-qcom.c | 2 drivers/pci/controller/pci-aardvark.c | 2 drivers/pci/controller/pci-mvebu.c | 2 drivers/pci/hotplug/pciehp_hpc.c | 17 drivers/pci/pci-bridge-emul.c | 86 ++- drivers/pci/pci-bridge-emul.h | 13 drivers/pci/pcie/dpc.c | 27 + drivers/pci/probe.c | 36 - drivers/power/supply/cpcap-charger.c | 1 drivers/regulator/max77620-regulator.c | 10 drivers/regulator/s2mpa01.c | 10 drivers/regulator/s2mps11.c | 6 drivers/s390/crypto/vfio_ap_drv.c | 44 + drivers/s390/crypto/vfio_ap_ops.c | 4 drivers/s390/crypto/vfio_ap_private.h | 1 drivers/s390/virtio/virtio_ccw.c | 4 drivers/scsi/aacraid/linit.c | 13 drivers/scsi/qla2xxx/qla_init.c | 99 ---- drivers/scsi/qla2xxx/qla_isr.c | 2 drivers/scsi/qla2xxx/qla_os.c | 2 drivers/scsi/sd.c | 59 ++ drivers/scsi/virtio_scsi.c | 2 drivers/soc/qcom/rpmh.c | 34 - drivers/spi/spi-gpio.c | 4 drivers/spi/spi-omap2-mcspi.c | 4 drivers/spi/spi-pxa2xx.c | 1 drivers/spi/spi-ti-qspi.c | 6 drivers/staging/media/imx/imx-ic-prpencvf.c | 26 - drivers/staging/media/imx/imx-media-csi.c | 44 + drivers/target/iscsi/iscsi_target.c | 4 drivers/tty/serial/8250/8250_of.c | 4 drivers/tty/serial/8250/8250_pci.c | 141 +++++ drivers/tty/serial/xilinx_uartps.c | 8 drivers/tty/vt/vt.c | 15 drivers/usb/chipidea/ci_hdrc_tegra.c | 1 drivers/usb/typec/tps6598x.c | 26 - fs/9p/v9fs_vfs.h | 23 fs/9p/vfs_file.c | 6 fs/9p/vfs_inode.c | 23 fs/9p/vfs_inode_dotl.c | 27 - fs/9p/vfs_super.c | 4 fs/btrfs/acl.c | 9 fs/btrfs/dev-replace.c | 1 fs/btrfs/disk-io.c | 8 fs/btrfs/extent_io.c | 4 fs/btrfs/ioctl.c | 21 fs/btrfs/scrub.c | 24 - fs/btrfs/volumes.c | 4 fs/cifs/cifs_fs_sb.h | 1 fs/cifs/cifsfs.c | 1 fs/cifs/cifsglob.h | 20 fs/cifs/cifssmb.c | 17 fs/cifs/connect.c | 26 + fs/cifs/file.c | 12 fs/cifs/inode.c | 2 fs/cifs/smb2misc.c | 17 fs/cifs/smb2ops.c | 28 + fs/cifs/smb2transport.c | 14 fs/cifs/transport.c | 6 fs/dax.c | 19 fs/devpts/inode.c | 1 fs/ext2/super.c | 39 + fs/ext4/ext4.h | 3 fs/ext4/ioctl.c | 100 +++- fs/ext4/resize.c | 3 fs/jbd2/transaction.c | 33 - fs/kernfs/mount.c | 8 fs/nfs/nfs4proc.c | 12 fs/nfs/pagelist.c | 29 - fs/nfsd/nfs3proc.c | 16 fs/nfsd/nfs3xdr.c | 1 fs/nfsd/nfs4state.c | 8 fs/nfsd/nfsctl.c | 2 fs/overlayfs/copy_up.c | 59 +- fs/overlayfs/overlayfs.h | 2 fs/overlayfs/util.c | 55 +- fs/pipe.c | 14 fs/splice.c | 4 include/asm-generic/vmlinux.lds.h | 2 include/linux/device-mapper.h | 2 include/linux/dma-mapping.h | 8 include/linux/hardirq.h | 7 include/linux/kvm_host.h | 2 include/linux/pipe_fs_i.h | 1 include/linux/property.h | 2 include/linux/swiotlb.h | 11 kernel/cgroup/cgroup.c | 9 kernel/dma/direct.c | 11 kernel/dma/mapping.c | 14 kernel/dma/swiotlb.c | 14 kernel/rcu/tree.c | 19 kernel/sysctl.c | 11 kernel/trace/trace.c | 1 kernel/trace/trace_event_perf.c | 16 kernel/trace/trace_events_hist.c | 5 mm/memory-failure.c | 14 mm/memory.c | 5 mm/vmalloc.c | 2 net/9p/client.c | 2 net/sunrpc/clnt.c | 124 +++-- net/sunrpc/svcsock.c | 20 security/selinux/hooks.c | 8 sound/soc/codecs/pcm186x.c | 8 sound/soc/fsl/fsl_esai.c | 7 tools/perf/util/auxtrace.c | 4 tools/perf/util/auxtrace.h | 3 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 37 + tools/perf/util/intel-pt.c | 2 tools/perf/util/symbol.c | 2 virt/kvm/arm/mmu.c | 2 virt/kvm/kvm_main.c | 7 278 files changed, 3048 insertions(+), 1608 deletions(-)
Aditya Pakki (1):
md: Fix failed allocation of md_register_thread
Adrian Hunter (5):
perf intel-pt: Fix CYC timestamp calculation after OVF perf tools: Fix split_kallsyms_for_kcore() for trampoline symbols perf auxtrace: Define auxtrace record alignment
perf intel-pt: Fix overlap calculation for padding perf intel-pt: Fix divide by zero when TSC is not available
Al Viro (1):
fix cgroup_do_mount() handling of failure exits
Alexander Shishkin (2):
stm class: Prevent division by zero
intel_th: Don't reference unassigned outputs
Alexander Usyskin (2):
mei: hbm: clean the feature flags on link reset
mei: bus: move hw module get/put to probe/release
Anand Jain (1):
btrfs: scrub: fix circular locking dependency warning
Andy Shevchenko (2):
ACPI / device_sysfs: Avoid OF modalias creation for removed device
spi: pxa2xx: Setup maximum supported DMA transfer length
Aneesh Kumar K.V (1):
powerpc/hugetlb: Don't do runtime allocation of 16G pages in LPAR configuration
Anssi Hannula (1):
serial: uartps: Fix stuck ISR if RX disabled with non-empty FIFO
Ard Biesheuvel (4):
crypto: arm/crct10dif - revert to C code for short inputs
crypto: arm64/crct10dif - revert to C code for short inputs
crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling
crypto: arm64/aes-ccm - fix bugs in non-NEON fallback routine
Arnd Bergmann (1):
cpufreq: pxa2xx: remove incorrect __init annotation
BOUGH CHEN (1):
mmc: sdhci-esdhc-imx: fix HS400 timing issue
Bart Van Assche (1):
scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock
Bartosz Golaszewski (1):
nvmem: core: don't check the return value of notifier chain call
Ben Gardon (1):
Revert "KVM/MMU: Flush tlb directly in the kvm_zap_gfn_range()"
Bjorn Andersson (1):
PCI: qcom: Don't deassert reset GPIO during probe
Bjorn Helgaas (1):
PCI/ASPM: Use LTR if already enabled by platform
Chen-Yu Tsai (1):
media: sun6i: Fix CSI regmap's max_register
Christophe Leroy (5):
powerpc/32: Clear on-stack exception marker upon exception return powerpc/wii: properly disable use of BATs when requested. powerpc/83xx: Also save/restore SPRG4-7 during suspend powerpc/traps: fix recoverability of machine check handling on book3s/32 powerpc/traps: Fix the message printed when stack overflows
Codrin Ciubotariu (2):
ASoC: codecs: pcm186x: fix wrong usage of DECLARE_TLV_DB_SCALE()
ASoC: codecs: pcm186x: Fix energysense SLEEP bit
Cody P Schafer (1):
media: cx25840: mark pad sig_types to fix cx231xx init
Coly Li (1):
bcache: use (REQ_META|REQ_PRIO) to indicate bio for metadata
Corey Minyard (1):
ipmi_si: Fix crash when using hard-coded device
Dan Carpenter (2):
vmw_balloon: release lock on error in vmballoon_reset()
btrfs: drop the lock on error in btrfs_dev_replace_cancel
Dan Robertson (1):
btrfs: init csum_list before possible free
Dan Williams (6):
nfit: Fix nfit_intel_shutdown_status() command submission acpi/nfit: Fix bus command validation
nfit/ars: Attempt a short-ARS whenever the ARS state is idle at boot nfit/ars: Attempt short-ARS even in the no_init_ars case libnvdimm/label: Clear 'updating' flag after label-set update libnvdimm/pmem: Honor force_raw for legacy pmem regions
Daniel Axtens (1):
bcache: never writeback a discard operation
Dave Martin (1):
arm64: KVM: Fix architecturally invalid reset value for FPEXC32_EL2
Dexuan Cui (1):
nfit: acpi_nfit_ctl(): Check out_obj->type in the right place
Dmitry Osipenko (1):
usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
Dongdong Liu (1):
PCI/DPC: Fix print AER status in DPC event handling
Doug Berger (1):
irqchip/brcmstb-l2: Use _irqsave locking variants in non-interrupt code
Eric Biggers (15):
crypto: cfb - add missing 'chunksize' property
crypto: cfb - remove bogus memcpy() with src == dest
crypto: ofb - fix handling partial blocks and make thread-safe
crypto: ahash - fix another early termination in hash walk
crypto: aead - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
crypto: aegis - fix handling chunked inputs
crypto: arm64/aes-neonbs - fix returning final keystream block
crypto: hash - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
crypto: morus - fix handling chunked inputs
crypto: pcbc - remove bogus memcpy()s with src == dest
crypto: skcipher - set CRYPTO_TFM_NEED_KEY if ->setkey() fails
crypto: testmgr - skip crc32c context test for ahash algorithms
crypto: x86/aegis - fix handling chunked inputs and MAY_SLEEP
crypto: x86/aesni-gcm - fix crash on empty plaintext
crypto: x86/morus - fix handling chunked inputs and MAY_SLEEP
Evan Quan (1):
drm/amd/powerplay: correct power reading on fiji
Felipe Franciosi (1):
scsi: virtio_scsi: don't send sc payload with tmfs
Felix Fietkau (1):
mt76: fix corrupted software generated tx CCMP PN
Filipe Manana (4):
Btrfs: setup a nofs context for memory allocation at btrfs_create_tree()
Btrfs: setup a nofs context for memory allocation at __btrfs_set_acl
Btrfs: fix corruption reading shared and compressed extents after hole punching
Btrfs: fix deadlock between clone/dedupe and rename
Finn Thain (1):
m68k: Add -ffreestanding to CFLAGS
Franck LENORMAND (1):
crypto: caam - fix hash context DMA unmap size
French, Nicholas A (1):
media: lgdt330x: fix lock status reporting
Gilad Ben-Yossef (2):
crypto: ccree - unmap buffer before copying IV
crypto: ccree - don't copy zero size ciphertext
Giridhar Malavali (1):
scsi: qla2xxx: Avoid PCI IRQ affinity mapping when multiqueue is not supported
Greg Kroah-Hartman (2):
stable-kernel-rules.rst: add link to networking patch queue Linux 5.0.4
Gustavo A. R. Silva (4):
crypto: ccree - fix missing break in switch statement
ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify
mfd: sm501: Fix potential NULL pointer dereference drm/radeon/evergreen_cs: fix missing break in switch statement
Hadar Gat (1):
crypto: ccree - fix free of unallocated mlli buffer
Halil Pasic (1):
s390/virtio: handle find on invalid queue gracefully
Harry Wentland (1):
drm/amd/display: don't call dm_pp_ function from an fpu block
Heikki Krogerus (1):
device property: Fix the length used in PROPERTY_ENTRY_STRING()
Himanshu Madhani (1):
scsi: qla2xxx: Fix LUN discovery if loop id is not assigned yet by firmware
Horia Geantă (1):
crypto: caam - fix DMA mapping of stack memory
Hou Tao (1):
9p: use inode->i_lock to protect i_size_write() under 32-bit
J. Bruce Fields (3):
security/selinux: fix SECURITY_LSM_NATIVE_LABELS on reused superblock
nfsd: fix performance-limiting session calculation
svcrpc: fix UDP on servers with lots of threads
Jan Kara (2):
ext4: fix crash during online resizing
ext2: Fix underflow in ext2_max_size()
Jan Stancek (1):
mm/memory.c: do_fault: avoid usage of stale vm_area_struct
Jann Horn (2):
tracing/perf: Use strndup_user() instead of buggy open-coded version
splice: don't merge into linked buffers
Jarkko Sakkinen (2):
tpm/tpm_crb: Avoid unaligned reads in crb_recv()
tpm: Unify the send callback behaviour
Jay Dolan (2):
serial: 8250_pci: Fix number of ports for ACCES serial cards
serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()
Jiong Wu (1):
mmc:fix a bug when max_discard is 0
Joerg Roedel (3):
dma: Introduce dma_max_mapping_size()
swiotlb: Introduce swiotlb_max_mapping_size()
swiotlb: Add is_swiotlb_active() function
Johan Hovold (2):
net: dsa: lantiq_gswip: fix use-after-free on failed probe
net: dsa: lantiq_gswip: fix OF child-node lookups
Johannes Thumshirn (1):
btrfs: ensure that a DUP or RAID1 block group has exactly two stripes
Jordan Niethe (1):
powerpc/powernv: Make opal log only readable by root
Josh Poimboeuf (1):
x86/unwind/orc: Fix ORC unwind table alignment
Juergen Gross (1):
xen: fix dom0 boot on huge systems
Julien Thierry (1):
arm64: Fix HCR.TGE status for NMI contexts
Kan Liang (1):
perf/x86/intel/uncore: Fix client IMC events return huge result
Krzysztof Kozlowski (5):
iio: adc: exynos-adc: Fix NULL pointer exception on unbind
iio: adc: exynos-adc: Use proper number of channels for Exynos4x12
regulator: s2mps11: Fix steps for buck7, buck8 and LDO35
clk: samsung: exynos5: Fix possible NULL pointer exception on platform_device_alloc() failure
clk: samsung: exynos5: Fix kfree() of const memory on setting driver_override
Kunihiko Hayashi (1):
clk: uniphier: Fix update register for CPU-gear
Loic Poulain (1):
media: i2c: ov5640: Fix post-reset delay
Lubomir Rintel (2):
libertas_tf: don't set URB_ZERO_PACKET on IN USB transfer
serial: 8250_of: assume reg-shift of 2 for mrvl,mmp-uart
Lucas A. M. Magalhães (1):
media: vimc: Add vimc-streamer for stream control
Lucas Stach (1):
PCI: dwc: skip MSI init if MSIs have been explicitly disabled
Mark Cave-Ayland (1):
powerpc: Fix 32-bit KVM-PR lockup and host crash with MacOS guest
Mark Walton (1):
gpio: pca953x: Fix dereference of irq data in shutdown
Mark Zhang (1):
regulator: max77620: Initialize values for DT properties
Martin K. Petersen (1):
scsi: sd: Optimal I/O size should be a multiple of physical block size
Martin Schwidefsky (2):
s390/setup: fix early warning messages s390/setup: fix boot crash for machine without EDAT-1
Masami Hiramatsu (1):
x86/kprobes: Prohibit probing on optprobe template code
Matthew Wilcox (1):
dax: Flush partial PMDs correctly
Michael Ellerman (2):
powerpc/kvm: Save and restore host AMR/IAMR/UAMOR powerpc/ptrace: Simplify vr_get/set() to avoid GCC warning
Michael J. Ruhl (2):
IB/hfi1: Close race condition on user context disable and close IB/rdmavt: Fix concurrency panics in QP post_send and modify to error
Mika Westerberg (1):
PCI: pciehp: Disable Data Link Layer State Changed event on suspend
Mike Marciniszyn (1):
IB/rdmavt: Fix loopback send with invalidate ordering
Mikulas Patocka (1):
dm integrity: limit the rate of error messages
NeilBrown (2):
dm: fix to_sector() for 32bit
nfsd: fix memory corruption caused by readdir
Nicholas Piggin (3):
powerpc/64s/hash: Fix assert_slb_presence() use of the slbfee. instruction powerpc/smp: Fix NMI IPI timeout
powerpc/smp: Fix NMI IPI xmon timeout
Nicolas Pitre (1):
vt: perform safe console erase in the right order
Nikolaus Voss (1):
usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
Noralf Trønnes (1):
drm/fb-helper: generic: Fix drm_fbdev_client_restore()
Oliver O'Halloran (1):
libnvdimm: Fix altmap reservation size calculation
Pankaj Gupta (1):
crypto: caam - fixed handling of sg list
Paul Cercueil (2):
clk: ingenic: Fix round_rate misbehaving with non-integer dividers
clk: ingenic: Fix doc of ingenic_cgu_div_info
Paul Mackerras (1):
powerpc/powernv: Don't reprogram SLW image on every KVM guest entry/exit
Pavel Machek (1):
cpcap-charger: generate events for userspace
Pavel Shilovsky (4):
CIFS: Fix leaking locked VFS cache pages in writeback retry
CIFS: Do not reset lease state to NONE on lease break
CIFS: Do not skip SMB2 message IDs on send failures
CIFS: Fix read after write for files with read caching
Pavel Tatashin (1):
x86/kvmclock: set offset for kvm unstable clock
Phuong Nguyen (1):
dmaengine: usb-dmac: Make DMAC system sleep callbacks explicit
Pierre Morel (1):
s390: vfio_ap: link the vfio_ap devices to the vfio_ap bus subsystem
QiaoChong (1):
parport_pc: fix find_superio io compare code, should use equal test.
Quinn Tran (1):
scsi: qla2xxx: Use complete switch scan for RSCN events
Rafael J. Wysocki (1):
cpuidle: governor: Add new governors to cpuidle_governors again
Roman Penyaev (1):
mm/vmalloc: fix size check for remap_vmalloc_range_partial()
Russell King (1):
spi: spi-gpio: fix SPI_CS_HIGH capability
S.j. Wang (1):
ASoC: fsl_esai: fix register setting issue in RIGHT_J mode
Sagar Biradar (1):
scsi: aacraid: Fix performance issue on logical drives
Sakari Ailus (1):
media: uvcvideo: Avoid NULL pointer dereference at the end of streaming
Samuel Holland (1):
clocksource/drivers/arch_timer: Workaround for Allwinner A64 timer instability
Sean Christopherson (9):
KVM: Call kvm_arch_memslots_updated() before updating memslots
KVM: VMX: Compare only a single byte for VMCS' "launched" in vCPU-run
KVM: VMX: Zero out *all* general purpose registers after VM-Exit
KVM: x86/mmu: Detect MMIO generation wrap in any address space
KVM: x86/mmu: Do not cache MMIO accesses while memslots are in flux
KVM: nVMX: Sign extend displacements of VMX instr's mem operands
KVM: nVMX: Apply addr size mask to effective address for VMX instructions
KVM: nVMX: Ignore limit checks on VMX instructions using flat segments
KVM: nVMX: Check a single byte for VMCS "launched" in nested early checks
Sowjanya Komatineni (2):
i2c: tegra: fix maximum transfer size
i2c: tegra: update maximum transfer size
Stephen Boyd (1):
soc: qcom: rpmh: Avoid accessing freed memory from batch API
Steve French (1):
smb3: make default i/o size for smb3 mounts larger
Steve Longerbeam (4):
media: imx: prpencvf: Stop upstream before disabling IDMA channel
media: imx-csi: Input connections to CSI should be optional
media: imx: csi: Disable CSI immediately after last EOF
media: imx: csi: Stop upstream before disabling IDMA channel
Steven Rostedt (VMware) (1):
x86/ftrace: Fix warning and considate ftrace_jmp_replace() and ftrace_call_replace()
Stuart Menefy (3):
regulator: s2mpa01: Fix step values for some LDOs clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown
Takeshi Saito (1):
mmc: renesas_sdhi: Fix card initialization failure in high speed mode
Tang Junhui (1):
bcache: treat stale && dirty keys as bad keys
Thomas Petazzoni (2):
PCI: pci-bridge-emul: Create per-bridge copy of register behavior
PCI: pci-bridge-emul: Extend pci_bridge_emul_init() with flags
Tom Zanussi (1):
tracing: Use strncpy instead of memcpy for string keys in hist triggers
Tony Lindgren (1):
clk: clk-twl6040: Fix imprecise external abort for pdmclk
Trond Myklebust (7):
NFS: Fix I/O request leakages
NFS: Fix an I/O request leakage in nfs_do_recoalesce
NFS: Don't recoalesce on error in nfs_pageio_complete_mirror() NFSv4.1: Reinitialise sequence results before retransmitting a request
SUNRPC: Prevent thundering herd when the socket is not connected
SUNRPC: Fix up RPC back channel transmission
SUNRPC: Respect RPC call timeouts when retrying transmission
Vaibhav Jain (1):
cxl: Wrap iterations over afu slices inside 'afu_list_lock'
Varad Gautam (1):
fs/devpts: always delete dcache dentry-s in dput()
Vignesh R (2):
spi: ti-qspi: Fix mmap read when more than one CS in use
spi: omap2-mcspi: Fix DMA and FIFO event trigger size mismatch
Viresh Kumar (3):
cpufreq: kryo: Release OPP tables on module removal PM / wakeup: Rework wakeup source timer cancellation PM / OPP: Update performance state when freq == old_freq
Vivek Goyal (2):
ovl: During copy up, first copy up data and then xattrs
ovl: Do not lose security.capability xattr over metadata file copy-up
Wei Yang (1):
libnvdimm, pfn: Fix over-trim in trim_pfn_device()
Will Deacon (2):
arm64: debug: Don't propagate UNKNOWN FAR into si_code for debug signals
arm64: debug: Ensure debug handlers check triggering exception level
Xin Long (1):
selinux: add the missing walk_size + len check in selinux_sctp_bind_connect
Yang Yingliang (1):
ipmi_si: fix use-after-free of resource->name
Yangtao Li (1):
cpufreq: tegra124: add missing of_node_put()
Yihao Wu (1):
nfsd: fix wrong check in write_v4_end_grace()
Zenghui Yu (1):
irqchip/gic-v3-its: Avoid parsing _indirect_ twice for Device table
Zev Weiss (1):
kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv
Zhang Zhijie (2):
crypto: rockchip - fix scatterlist nents error
crypto: rockchip - update new iv to device in multiple operations
Zhang, Jun (1):
rcu: Do RCU GP kthread self-wakeup from softirq and interrupt
Zhi Jin (1):
stm class: Fix an endless loop in channel allocation
yangerkun (4):
ext4: fix check of inode in swap_inode_boot_loader
ext4: cleanup pagecache before swap i_data
ext4: update quota information while swapping boot loader inode
ext4: add mask of ext4 flags to swap
zhangyi (F) (3):
tracing: Do not free iter->trace in fail path of tracing_open_pipe()
jbd2: clear dirty flag when revoking a buffer from an older transaction
jbd2: fix compile warning when using JBUFFER_TRACE
zhengbin (1):
9p/net: fix memory leak in p9_client_create
zhongjiang (1):
mm: hwpoison: fix thp split handing in soft_offline_in_use_page()
Greg KH
maintainerDocumentation/DMA-API.txt +8 -0
@@ -195,6 +195,14 @@ Requesting the required mask does not alter the current mask. If you wish to take advantage of it, you should issue a dma_set_mask() call to set the mask to the value returned. +:: + + size_t + dma_direct_max_mapping_size(struct device *dev); + +Returns the maximum size of a mapping for the device. The size parameter +of the mapping functions like dma_map_single(), dma_map_page() and +others should not be larger than the returned value. Part Id - Streaming DMA mappings --------------------------------
Documentation/arm64/silicon-errata.txt +2 -0
@@ -44,6 +44,8 @@ stable kernels. | Implementor | Component | Erratum ID | Kconfig | +----------------+-----------------+-----------------+-----------------------------+ +| Allwinner | A64/R18 | UNKNOWN1 | SUN50I_ERRATUM_UNKNOWN1 | +| | | | | | ARM | Cortex-A53 | #826319 | ARM64_ERRATUM_826319 | | ARM | Cortex-A53 | #827319 | ARM64_ERRATUM_827319 | | ARM | Cortex-A53 | #824069 | ARM64_ERRATUM_824069 |
Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt +3 -1
@@ -11,11 +11,13 @@ New driver handles the following Required properties: - compatible: Must be "samsung,exynos-adc-v1" - for exynos4412/5250 controllers. + for Exynos5250 controllers. Must be "samsung,exynos-adc-v2" for future controllers. Must be "samsung,exynos3250-adc" for controllers compatible with ADC of Exynos3250. + Must be "samsung,exynos4212-adc" for + controllers compatible with ADC of Exynos4212 and Exynos4412. Must be "samsung,exynos7-adc" for the ADC in Exynos7 and compatibles Must be "samsung,s3c2410-adc" for
Documentation/process/stable-kernel-rules.rst +3 -0
@@ -38,6 +38,9 @@ Procedure for submitting patches to the -stable tree - If the patch covers files in net/ or drivers/net please follow netdev stable submission guidelines as described in :ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>` + after first checking the stable networking queue at + https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive= + to ensure the requested patch is not already queued up. - Security patches should not be handled (solely) by the -stable review process but should follow the procedures in :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 0 -SUBLEVEL = 3 +SUBLEVEL = 4 EXTRAVERSION = NAME = Shy Crocodile
arch/arm/crypto/crct10dif-ce-core.S +7 -7
@@ -124,10 +124,10 @@ ENTRY(crc_t10dif_pmull) vext.8 q10, qzr, q0, #4 // receive the initial 64B data, xor the initial crc value - vld1.64 {q0-q1}, [arg2, :128]! - vld1.64 {q2-q3}, [arg2, :128]! - vld1.64 {q4-q5}, [arg2, :128]! - vld1.64 {q6-q7}, [arg2, :128]! + vld1.64 {q0-q1}, [arg2]! + vld1.64 {q2-q3}, [arg2]! + vld1.64 {q4-q5}, [arg2]! + vld1.64 {q6-q7}, [arg2]! CPU_LE( vrev64.8 q0, q0 ) CPU_LE( vrev64.8 q1, q1 ) CPU_LE( vrev64.8 q2, q2 )
@@ -167,7 +167,7 @@ CPU_LE( vrev64.8 q7, q7 ) _fold_64_B_loop: .macro fold64, reg1, reg2 - vld1.64 {q11-q12}, [arg2, :128]! + vld1.64 {q11-q12}, [arg2]! vmull.p64 q8, \reg1\()h, d21 vmull.p64 \reg1, \reg1\()l, d20
@@ -238,7 +238,7 @@ _16B_reduction_loop: vmull.p64 q7, d15, d21 veor.8 q7, q7, q8 - vld1.64 {q0}, [arg2, :128]! + vld1.64 {q0}, [arg2]! CPU_LE( vrev64.8 q0, q0 ) vswp d0, d1 veor.8 q7, q7, q0
@@ -335,7 +335,7 @@ _less_than_128: vmov.i8 q0, #0 vmov s3, arg1_low32 // get the initial crc value - vld1.64 {q7}, [arg2, :128]! + vld1.64 {q7}, [arg2]! CPU_LE( vrev64.8 q7, q7 ) vswp d14, d15 veor.8 q7, q7, q0
arch/arm/crypto/crct10dif-ce-glue.c +6 -17
@@ -35,26 +35,15 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data, unsigned int length) {u16 *crc =shash_desc_ctx (desc); -unsigned int l; -if (!may_use_simd ()) { - *crc =crc_t10dif_generic (*crc, data, length); +if (length >=CRC_T10DIF_PMULL_CHUNK_SIZE &&may_use_simd ()) { +kernel_neon_begin (); + *crc =crc_t10dif_pmull (*crc, data, length); +kernel_neon_end (); }else { -if (unlikely ((u32 )data %CRC_T10DIF_PMULL_CHUNK_SIZE )) { - l =min_t (u32, length,CRC_T10DIF_PMULL_CHUNK_SIZE - - ((u32 )data %CRC_T10DIF_PMULL_CHUNK_SIZE )); - - *crc =crc_t10dif_generic (*crc, data, l); - - length -= l; - data += l; - } -if (length >0 ) { -kernel_neon_begin (); - *crc =crc_t10dif_pmull (*crc, data, length); -kernel_neon_end (); - } + *crc =crc_t10dif_generic (*crc, data, length); } +return 0 ; }
arch/arm/mach-s3c24xx/mach-osiris-dvs.c +4 -4
@@ -65,16 +65,16 @@ static int osiris_dvs_notify(struct notifier_block *nb,switch (val) {case CPUFREQ_PRECHANGE : -if (old_dvs & !new_dvs || - cur_dvs & !new_dvs) { +if ((old_dvs && !new_dvs) || + (cur_dvs && !new_dvs)) {pr_debug ("%s: exiting dvs\n" , __func__); cur_dvs = false;gpio_set_value (OSIRIS_GPIO_DVS ,1 ); }break ;case CPUFREQ_POSTCHANGE : -if (!old_dvs & new_dvs || - !cur_dvs & new_dvs) { +if ((!old_dvs && new_dvs) || + (!cur_dvs && new_dvs)) {pr_debug ("entering dvs\n" ); cur_dvs = true;gpio_set_value (OSIRIS_GPIO_DVS ,0 );
arch/arm64/crypto/aes-ce-ccm-core.S +3 -2
@@ -74,12 +74,13 @@ ENTRY(ce_aes_ccm_auth_data) beq 10f ext v0.16b, v0.16b, v0.16b, #1 /* rotate out the mac bytes */ b 7b -8: mov w7, w8 +8: cbz w8, 91f + mov w7, w8 add w8, w8, #16 9: ext v1.16b, v1.16b, v1.16b, #1 adds w7, w7, #1 bne 9b - eor v0.16b, v0.16b, v1.16b +91: eor v0.16b, v0.16b, v1.16b st1 {v0.16b}, [x0] 10: str w8, [x3] ret
arch/arm64/crypto/aes-ce-ccm-glue.c +1 -3
@@ -125,7 +125,7 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], abytes -= added; } -while (abytes >AES_BLOCK_SIZE ) { +while (abytes >=AES_BLOCK_SIZE ) {__aes_arm64_encrypt (key->key_enc, mac, mac,num_rounds (key));crypto_xor (mac, in,AES_BLOCK_SIZE );
@@ -139,8 +139,6 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], num_rounds(key));crypto_xor (mac, in, abytes); *macp = abytes; - }else { - *macp =0 ; } } }
arch/arm64/crypto/aes-neonbs-core.S +6 -2
@@ -971,18 +971,22 @@ CPU_LE( rev x8, x8 ) 8: next_ctr v0 st1 {v0.16b}, [x24] - cbz x23, 0f + cbz x23, .Lctr_done cond_yield_neon 98b b 99b -0: frame_pop +.Lctr_done: + frame_pop ret /* * If we are handling the tail of the input (x6 != NULL), return the * final keystream block back to the caller. */ +0: cbz x25, 8b + st1 {v0.16b}, [x25] + b 8b 1: cbz x25, 8b st1 {v1.16b}, [x25] b 8b
arch/arm64/crypto/crct10dif-ce-glue.c +6 -19
@@ -39,26 +39,13 @@ static int crct10dif_update(struct shash_desc *desc, const u8 *data, unsigned int length) {u16 *crc =shash_desc_ctx (desc); -unsigned int l; -if (unlikely ((u64 )data %CRC_T10DIF_PMULL_CHUNK_SIZE )) { - l =min_t (u32, length,CRC_T10DIF_PMULL_CHUNK_SIZE - - ((u64 )data %CRC_T10DIF_PMULL_CHUNK_SIZE )); - - *crc =crc_t10dif_generic (*crc, data, l); - - length -= l; - data += l; - } - -if (length >0 ) { -if (may_use_simd ()) { -kernel_neon_begin (); - *crc =crc_t10dif_pmull (*crc, data, length); -kernel_neon_end (); - }else { - *crc =crc_t10dif_generic (*crc, data, length); - } +if (length >=CRC_T10DIF_PMULL_CHUNK_SIZE &&may_use_simd ()) { +kernel_neon_begin (); + *crc =crc_t10dif_pmull (*crc, data, length); +kernel_neon_end (); + }else { + *crc =crc_t10dif_generic (*crc, data, length); }return 0 ;
arch/arm64/include/asm/hardirq.h +31 -0
@@ -17,8 +17,12 @@#define __ASM_HARDIRQ_H#include <linux/cache.h> +#include <linux/percpu.h> #include <linux/threads.h> +#include <asm/barrier.h> #include <asm/irq.h> +#include <asm/kvm_arm.h> +#include <asm/sysreg.h> #define NR_IPI 7
@@ -37,6 +41,33 @@ u64 smp_irq_stat_cpu(unsigned int cpu);#define __ARCH_IRQ_EXIT_IRQS_DISABLED 1 +struct nmi_ctx { +u64 hcr; +}; + +DECLARE_PER_CPU(struct nmi_ctx, nmi_contexts); + +#define arch_nmi_enter () \ + do { \ + if (is_kernel_in_hyp_mode()) { \ + struct nmi_ctx *nmi_ctx = this_cpu_ptr(&nmi_contexts); \ + nmi_ctx->hcr = read_sysreg(hcr_el2); \ + if (!(nmi_ctx->hcr & HCR_TGE)) { \ + write_sysreg(nmi_ctx->hcr | HCR_TGE, hcr_el2); \ + isb(); \ + } \ + } \ + } while (0) + +#define arch_nmi_exit () \ + do { \ + if (is_kernel_in_hyp_mode()) { \ + struct nmi_ctx *nmi_ctx = this_cpu_ptr(&nmi_contexts); \ + if (!(nmi_ctx->hcr & HCR_TGE)) \ + write_sysreg(nmi_ctx->hcr, hcr_el2); \ + } \ + } while (0) +static inline void ack_bad_irq (unsigned int irq) {extern unsigned long irq_err_count;
arch/arm64/kernel/irq.c +3 -0
@@ -33,6 +33,9 @@unsigned long irq_err_count; +/* Only access this in an NMI enter/exit */ +DEFINE_PER_CPU(struct nmi_ctx, nmi_contexts); + DEFINE_PER_CPU(unsigned long *, irq_stack_ptr);int arch_show_interrupts (struct seq_file *p,int prec)
arch/arm64/kernel/kgdb.c +10 -4
@@ -244,27 +244,33 @@ int kgdb_arch_handle_exception(int exception_vector, int signo,static int kgdb_brk_fn (struct pt_regs *regs,unsigned int esr) { +if (user_mode (regs)) +return DBG_HOOK_ERROR ; +kgdb_handle_exception (1 ,SIGTRAP ,0 , regs); -return 0 ; +return DBG_HOOK_HANDLED ; }NOKPROBE_SYMBOL (kgdb_brk_fn) static int kgdb_compiled_brk_fn(struct pt_regs *regs, unsigned int esr) { +if (user_mode (regs)) +return DBG_HOOK_ERROR ; + compiled_break =1 ;kgdb_handle_exception (1 ,SIGTRAP ,0 , regs); -return 0 ; +return DBG_HOOK_HANDLED ; }NOKPROBE_SYMBOL (kgdb_compiled_brk_fn);static int kgdb_step_brk_fn (struct pt_regs *regs,unsigned int esr) { -if (!kgdb_single_step) +if (user_mode (regs) || !kgdb_single_step)return DBG_HOOK_ERROR ;kgdb_handle_exception (1 ,SIGTRAP ,0 , regs); -return 0 ; +return DBG_HOOK_HANDLED ; }NOKPROBE_SYMBOL (kgdb_step_brk_fn);
arch/arm64/kernel/probes/kprobes.c +6 -0
@@ -450,6 +450,9 @@ kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr)struct kprobe_ctlblk *kcb =get_kprobe_ctlblk ();int retval; +if (user_mode (regs)) +return DBG_HOOK_ERROR ; +/* return error if this is not our step */ retval =kprobe_ss_hit (kcb,instruction_pointer (regs));
@@ -466,6 +469,9 @@ kprobe_single_step_handler(struct pt_regs *regs, unsigned int esr)int __kprobes kprobe_breakpoint_handler (struct pt_regs *regs,unsigned int esr) { +if (user_mode (regs)) +return DBG_HOOK_ERROR ; +kprobe_handler (regs);return DBG_HOOK_HANDLED ; }
arch/arm64/kvm/sys_regs.c +1 -1
@@ -1476,7 +1476,7 @@ static const struct sys_reg_desc sys_reg_descs[] = { { SYS_DESC(SYS_DACR32_EL2), NULL, reset_unknown, DACR32_EL2 }, { SYS_DESC(SYS_IFSR32_EL2), NULL, reset_unknown, IFSR32_EL2 }, - { SYS_DESC(SYS_FPEXC32_EL2), NULL, reset_val, FPEXC32_EL2, 0x70 }, + { SYS_DESC(SYS_FPEXC32_EL2), NULL, reset_val, FPEXC32_EL2, 0x700 }, }; static bool trap_dbgidr(struct kvm_vcpu *vcpu,
arch/arm64/mm/fault.c +5 -4
@@ -824,11 +824,12 @@ void __init hook_debug_fault_code(int nr, debug_fault_info[nr].name = name; } -asmlinkage int __exception do_debug_exception(unsigned long addr, +asmlinkage int __exception do_debug_exception(unsigned long addr_if_watchpoint,unsigned int esr,struct pt_regs *regs) {const struct fault_info *inf =esr_to_debug_fault_info (esr); +unsigned long pc =instruction_pointer (regs);int rv;/*
@@ -838,14 +839,14 @@ asmlinkage int __exception do_debug_exception(unsigned long addr,if (interrupts_enabled (regs))trace_hardirqs_off (); -if (user_mode (regs) && !is_ttbr0_addr (instruction_pointer (regs))) +if (user_mode (regs) && !is_ttbr0_addr (pc))arm64_apply_bp_hardening (); -if (!inf->fn (addr, esr, regs)) { +if (!inf->fn (addr_if_watchpoint, esr, regs)) { rv =1 ; }else {arm64_notify_die (inf->name, regs, - inf->sig, inf->code, (void __user *)addr, esr); + inf->sig, inf->code, (void __user *)pc, esr); rv =0 ; }
arch/m68k/Makefile +4 -1
@@ -58,7 +58,10 @@ cpuflags-$(CONFIG_M5206e) := $(call cc-option,-mcpu=5206e,-m5200) cpuflags-$(CONFIG_M5206) := $(call cc-option,-mcpu=5206,-m5200) KBUILD_AFLAGS += $(cpuflags-y) -KBUILD_CFLAGS += $(cpuflags-y) -pipe +KBUILD_CFLAGS += $(cpuflags-y) + +KBUILD_CFLAGS += -pipe -ffreestanding + ifdef CONFIG_MMU # without -fno-strength-reduce the 53c7xx.c driver fails ;-( KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2
arch/mips/include/asm/kvm_host.h +1 -1
@@ -1134,7 +1134,7 @@ static inline void kvm_arch_hardware_unsetup(void) {}static inline void kvm_arch_sync_events (struct kvm *kvm) {}static inline void kvm_arch_free_memslot (struct kvm *kvm,struct kvm_memory_slot *free,struct kvm_memory_slot *dont) {} -static inline void kvm_arch_memslots_updated (struct kvm *kvm,struct kvm_memslots *slots) {} +static inline void kvm_arch_memslots_updated (struct kvm *kvm,u64 gen) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) {}static inline void kvm_arch_vcpu_unblocking (struct kvm_vcpu *vcpu) {}
arch/powerpc/include/asm/book3s/64/hugetlb.h +8 -0
@@ -35,6 +35,14 @@ static inline int hstate_get_psize(struct hstate *hstate)#ifdef CONFIG_ARCH_HAS_GIGANTIC_PAGE static inline bool gigantic_page_supported (void ) { +/* +* We used gigantic page reservation with hypervisor assist in some case. +* We cannot use runtime allocation of gigantic pages in those platforms +* This is hash translation mode LPARs. +*/ +if (firmware_has_feature (FW_FEATURE_LPAR ) && !radix_enabled ()) +return false; +return true; }#endif
arch/powerpc/include/asm/kvm_host.h +1 -1
@@ -837,7 +837,7 @@ struct kvm_vcpu_arch {static inline void kvm_arch_hardware_disable (void ) {}static inline void kvm_arch_hardware_unsetup (void ) {}static inline void kvm_arch_sync_events (struct kvm *kvm) {} -static inline void kvm_arch_memslots_updated (struct kvm *kvm,struct kvm_memslots *slots) {} +static inline void kvm_arch_memslots_updated (struct kvm *kvm,u64 gen) {}static inline void kvm_arch_flush_shadow_all (struct kvm *kvm) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_exit (void ) {}
arch/powerpc/include/asm/powernv.h +2 -0
@@ -23,6 +23,8 @@ extern int pnv_npu2_handle_fault(struct npu_context *context, uintptr_t *ea, unsigned long *flags, unsigned long *status, int count); +void pnv_program_cpu_hotplug_lpcr (unsigned int cpu,u64 lpcr_val); +void pnv_tm_init (void );#else static inline void powernv_set_nmmu_ptcr (unsigned long ptcr) { }
arch/powerpc/kernel/entry_32.S +9 -0
@@ -745,6 +745,9 @@ fast_exception_return: mtcr r10 lwz r10,_LINK(r11) mtlr r10 + /* Clear the exception_marker on the stack to avoid confusing stacktrace */ + li r10, 0 + stw r10, 8(r11) REST_GPR(10, r11) #if defined(CONFIG_PPC_8xx) && defined(CONFIG_PERF_EVENTS) mtspr SPRN_NRI, r0
@@ -982,6 +985,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX) mtcrf 0xFF,r10 mtlr r11 + /* Clear the exception_marker on the stack to avoid confusing stacktrace */ + li r10, 0 + stw r10, 8(r1) /* * Once we put values in SRR0 and SRR1, we are in a state * where exceptions are not recoverable, since taking an
@@ -1021,6 +1027,9 @@ exc_exit_restart_end: mtlr r11 lwz r10,_CCR(r1) mtcrf 0xff,r10 + /* Clear the exception_marker on the stack to avoid confusing stacktrace */ + li r10, 0 + stw r10, 8(r1) REST_2GPRS(9, r1) .globl exc_exit_restart exc_exit_restart:
arch/powerpc/kernel/process.c +1 -1
@@ -176,7 +176,7 @@ static void __giveup_fpu(struct task_struct *tsk)save_fpu (tsk); msr = tsk->thread.regs->msr; - msr &= ~MSR_FP ; + msr &= ~(MSR_FP |MSR_FE0 |MSR_FE1 );#ifdef CONFIG_VSX if (cpu_has_feature (CPU_FTR_VSX )) msr &= ~MSR_VSX ;
arch/powerpc/kernel/ptrace.c +8 -2
@@ -561,6 +561,7 @@ static int vr_get(struct task_struct *target, const struct user_regset *regset,/* * Copy out only the low-order word of vrsave. */ +int start, end;union {elf_vrreg_t reg;u32 word;
@@ -569,8 +570,10 @@ static int vr_get(struct task_struct *target, const struct user_regset *regset, vrsave.word = target->thread.vrsave; + start =33 *sizeof (vector128); + end = start +sizeof (vrsave); ret =user_regset_copyout (&pos, &count, &kbuf, &ubuf, &vrsave, -33 *sizeof (vector128),-1 ); + start, end); }return ret;
@@ -608,6 +611,7 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,/* * We use only the first word of vrsave. */ +int start, end;union {elf_vrreg_t reg;u32 word;
@@ -616,8 +620,10 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset, vrsave.word = target->thread.vrsave; + start =33 *sizeof (vector128); + end = start +sizeof (vrsave); ret =user_regset_copyin (&pos, &count, &kbuf, &ubuf, &vrsave, -33 *sizeof (vector128),-1 ); + start, end);if (!ret) target->thread.vrsave = vrsave.word; }
arch/powerpc/kernel/smp.c +28 -62
168 lines not on this page · raw message
arch/powerpc/kernel/traps.c +6 -6
@@ -763,15 +763,15 @@ void machine_check_exception(struct pt_regs *regs)if (check_io_access (regs)) goto bail; -/* Must die if the interrupt is not recoverable */ -if (!(regs->msr &MSR_RI )) -nmi_panic (regs,"Unrecoverable Machine check" ); -if (!nested)nmi_exit ();die ("Machine check" , regs,SIGBUS ); +/* Must die if the interrupt is not recoverable */ +if (!(regs->msr &MSR_RI )) +nmi_panic (regs,"Unrecoverable Machine check" ); +return ; bail:
@@ -1542,8 +1542,8 @@ void alignment_exception(struct pt_regs *regs)void StackOverflow (struct pt_regs *regs) { -printk (KERN_CRIT "Kernel stack overflow in process %p, r1=%lx\n" , - current, regs->gpr[1 ]); +pr_crit ("Kernel stack overflow in process %s[%d], r1=%lx\n" , + current->comm,task_pid_nr (current), regs->gpr[1 ]);debugger (regs);show_regs (regs);panic ("kernel stack overflow" );
arch/powerpc/kvm/book3s_hv_rmhandlers.S +17 -9
@@ -58,6 +58,8 @@ END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) #define STACK_SLOT_DAWR (SFS-56) #define STACK_SLOT_DAWRX (SFS-64) #define STACK_SLOT_HFSCR (SFS-72) +#define STACK_SLOT_AMR (SFS-80) +#define STACK_SLOT_UAMOR (SFS-88) /* the following is used by the P9 short path */ #define STACK_SLOT_NVGPRS (SFS-152) /* 18 gprs */
@@ -726,11 +728,9 @@ BEGIN_FTR_SECTION mfspr r5, SPRN_TIDR mfspr r6, SPRN_PSSCR mfspr r7, SPRN_PID - mfspr r8, SPRN_IAMR std r5, STACK_SLOT_TID(r1) std r6, STACK_SLOT_PSSCR(r1) std r7, STACK_SLOT_PID(r1) - std r8, STACK_SLOT_IAMR(r1) mfspr r5, SPRN_HFSCR std r5, STACK_SLOT_HFSCR(r1) END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300)
@@ -738,11 +738,18 @@ BEGIN_FTR_SECTION mfspr r5, SPRN_CIABR mfspr r6, SPRN_DAWR mfspr r7, SPRN_DAWRX + mfspr r8, SPRN_IAMR std r5, STACK_SLOT_CIABR(r1) std r6, STACK_SLOT_DAWR(r1) std r7, STACK_SLOT_DAWRX(r1) + std r8, STACK_SLOT_IAMR(r1) END_FTR_SECTION_IFSET(CPU_FTR_ARCH_207S) + mfspr r5, SPRN_AMR + std r5, STACK_SLOT_AMR(r1) + mfspr r6, SPRN_UAMOR + std r6, STACK_SLOT_UAMOR(r1) + BEGIN_FTR_SECTION /* Set partition DABR */ /* Do this before re-enabling PMU to avoid P7 DABR corruption bug */
@@ -1631,22 +1638,25 @@ ALT_FTR_SECTION_END_IFCLR(CPU_FTR_ARCH_300) mtspr SPRN_PSPB, r0 mtspr SPRN_WORT, r0 BEGIN_FTR_SECTION - mtspr SPRN_IAMR, r0 mtspr SPRN_TCSCR, r0 /* Set MMCRS to 1<<31 to freeze and disable the SPMC counters */ li r0, 1 sldi r0, r0, 31 mtspr SPRN_MMCRS, r0 END_FTR_SECTION_IFCLR(CPU_FTR_ARCH_300) -8: - /* Save and reset AMR and UAMOR before turning on the MMU */ + /* Save and restore AMR, IAMR and UAMOR before turning on the MMU */ + ld r8, STACK_SLOT_IAMR(r1) + mtspr SPRN_IAMR, r8 + +8: /* Power7 jumps back in here */ mfspr r5,SPRN_AMR mfspr r6,SPRN_UAMOR std r5,VCPU_AMR(r9) std r6,VCPU_UAMOR(r9) - li r6,0 - mtspr SPRN_AMR,r6 + ld r5,STACK_SLOT_AMR(r1) + ld r6,STACK_SLOT_UAMOR(r1) + mtspr SPRN_AMR, r5 mtspr SPRN_UAMOR, r6 /* Switch DSCR back to host value */
@@ -1746,11 +1756,9 @@ BEGIN_FTR_SECTION ld r5, STACK_SLOT_TID(r1) ld r6, STACK_SLOT_PSSCR(r1) ld r7, STACK_SLOT_PID(r1) - ld r8, STACK_SLOT_IAMR(r1) mtspr SPRN_TIDR, r5 mtspr SPRN_PSSCR, r6 mtspr SPRN_PID, r7 - mtspr SPRN_IAMR, r8 END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) #ifdef CONFIG_PPC_RADIX_MMU
arch/powerpc/mm/slb.c +5 -0
@@ -69,6 +69,11 @@ static void assert_slb_presence(bool present, unsigned long ea)if (!cpu_has_feature (CPU_FTR_ARCH_206 ))return ; +/* +* slbfee. requires bit 24 (PPC bit 39) be clear in RB. Hardware +* ignores all other bits from 0-27, so just clear them all. +*/ + ea &= ~((1UL <<28 ) -1 ); asm volatile(__PPC_SLBFEE_DOT(%0, %1) : "=r"(tmp) : "r"(ea) : "cr0");WARN_ON (present == (tmp ==0 ));
arch/powerpc/platforms/83xx/suspend-asm.S +27 -7
@@ -26,13 +26,13 @@ #define SS_MSR 0x74 #define SS_SDR1 0x78 #define SS_LR 0x7c -#define SS_SPRG 0x80 /* 4 SPRGs */ -#define SS_DBAT 0x90 /* 8 DBATs */ -#define SS_IBAT 0xd0 /* 8 IBATs */ -#define SS_TB 0x110 -#define SS_CR 0x118 -#define SS_GPREG 0x11c /* r12-r31 */ -#define STATE_SAVE_SIZE 0x16c +#define SS_SPRG 0x80 /* 8 SPRGs */ +#define SS_DBAT 0xa0 /* 8 DBATs */ +#define SS_IBAT 0xe0 /* 8 IBATs */ +#define SS_TB 0x120 +#define SS_CR 0x128 +#define SS_GPREG 0x12c /* r12-r31 */ +#define STATE_SAVE_SIZE 0x17c .section .data .align 5
@@ -103,6 +103,16 @@ _GLOBAL(mpc83xx_enter_deep_sleep) stw r7, SS_SPRG+12(r3) stw r8, SS_SDR1(r3) + mfspr r4, SPRN_SPRG4 + mfspr r5, SPRN_SPRG5 + mfspr r6, SPRN_SPRG6 + mfspr r7, SPRN_SPRG7 + + stw r4, SS_SPRG+16(r3) + stw r5, SS_SPRG+20(r3) + stw r6, SS_SPRG+24(r3) + stw r7, SS_SPRG+28(r3) + mfspr r4, SPRN_DBAT0U mfspr r5, SPRN_DBAT0L mfspr r6, SPRN_DBAT1U
@@ -493,6 +503,16 @@ mpc83xx_deep_resume: mtspr SPRN_IBAT7U, r6 mtspr SPRN_IBAT7L, r7 + lwz r4, SS_SPRG+16(r3) + lwz r5, SS_SPRG+20(r3) + lwz r6, SS_SPRG+24(r3) + lwz r7, SS_SPRG+28(r3) + + mtspr SPRN_SPRG4, r4 + mtspr SPRN_SPRG5, r5 + mtspr SPRN_SPRG6, r6 + mtspr SPRN_SPRG7, r7 + lwz r4, SS_SPRG+0(r3) lwz r5, SS_SPRG+4(r3) lwz r6, SS_SPRG+8(r3)
arch/powerpc/platforms/embedded6xx/wii.c +4 -0
@@ -83,6 +83,10 @@ unsigned long __init wii_mmu_mapin_mem2(unsigned long top)/* MEM2 64MB@0x10000000 */ delta = wii_hole_start + wii_hole_size; size = top - delta; + +if (__map_without_bats) +return delta; +for (bl =128 <<10 ; bl < max_size; bl <<=1 ) {if (bl *2 > size)break ;
arch/powerpc/platforms/powernv/idle.c +2 -25
@@ -458,7 +458,8 @@ EXPORT_SYMBOL_GPL(pnv_power9_force_smt4_release);#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ #ifdef CONFIG_HOTPLUG_CPU -static void pnv_program_cpu_hotplug_lpcr (unsigned int cpu,u64 lpcr_val) + +void pnv_program_cpu_hotplug_lpcr (unsigned int cpu,u64 lpcr_val) {u64 pir =get_hard_smp_processor_id (cpu);
@@ -481,20 +482,6 @@ unsigned long pnv_cpu_offline(unsigned int cpu) {unsigned long srr1;u32 idle_states =pnv_get_supported_cpuidle_states (); -u64 lpcr_val; - -/* -* We don't want to take decrementer interrupts while we are -* offline, so clear LPCR:PECE1. We keep PECE2 (and -* LPCR_PECE_HVEE on P9) enabled as to let IPIs in. -* -* If the CPU gets woken up by a special wakeup, ensure that -* the SLW engine sets LPCR with decrementer bit cleared, else -* the CPU will come back to the kernel due to a spurious -* wakeup. -*/ - lpcr_val =mfspr (SPRN_LPCR ) & ~(u64 )LPCR_PECE1 ; -pnv_program_cpu_hotplug_lpcr (cpu, lpcr_val);__ppc64_runlatch_off ();
@@ -526,16 +513,6 @@ unsigned long pnv_cpu_offline(unsigned int cpu)__ppc64_runlatch_on (); -/* -* Re-enable decrementer interrupts in LPCR. -* -* Further, we want stop states to be woken up by decrementer -* for non-hotplug cases. So program the LPCR via stop api as -* well. -*/ - lpcr_val =mfspr (SPRN_LPCR ) | (u64 )LPCR_PECE1 ; -pnv_program_cpu_hotplug_lpcr (cpu, lpcr_val); - return srr1; }#endif
arch/powerpc/platforms/powernv/opal-msglog.c +1 -1
@@ -98,7 +98,7 @@ static ssize_t opal_msglog_read(struct file *file, struct kobject *kobj, }static struct bin_attribute opal_msglog_attr = { - .attr = {.name ="msglog" , .mode =0444 }, + .attr = {.name ="msglog" , .mode =0400 }, .read = opal_msglog_read };
arch/powerpc/platforms/powernv/smp.c +25 -0
@@ -39,6 +39,7 @@#include <asm/cpuidle.h> #include <asm/kexec.h> #include <asm/reg.h> +#include <asm/powernv.h> #include "powernv.h"
@@ -153,6 +154,7 @@ static void pnv_smp_cpu_kill_self(void) {unsigned int cpu;unsigned long srr1, wmask; +u64 lpcr_val;/* Standard hot unplug procedure */ /*
@@ -174,6 +176,19 @@ static void pnv_smp_cpu_kill_self(void)if (cpu_has_feature (CPU_FTR_ARCH_207S )) wmask =SRR1_WAKEMASK_P8 ; +/* +* We don't want to take decrementer interrupts while we are +* offline, so clear LPCR:PECE1. We keep PECE2 (and +* LPCR_PECE_HVEE on P9) enabled so as to let IPIs in. +* +* If the CPU gets woken up by a special wakeup, ensure that +* the SLW engine sets LPCR with decrementer bit cleared, else +* the CPU will come back to the kernel due to a spurious +* wakeup. +*/ + lpcr_val =mfspr (SPRN_LPCR ) & ~(u64 )LPCR_PECE1 ; +pnv_program_cpu_hotplug_lpcr (cpu, lpcr_val); +while (!generic_check_cpu_restart (cpu)) {/* * Clear IPI flag, since we don't handle IPIs while
@@ -246,6 +261,16 @@ static void pnv_smp_cpu_kill_self(void) } +/* +* Re-enable decrementer interrupts in LPCR. +* +* Further, we want stop states to be woken up by decrementer +* for non-hotplug cases. So program the LPCR via stop api as +* well. +*/ + lpcr_val =mfspr (SPRN_LPCR ) | (u64 )LPCR_PECE1 ; +pnv_program_cpu_hotplug_lpcr (cpu, lpcr_val); +DBG ("CPU%d coming online...\n" , cpu); }
arch/s390/include/asm/kvm_host.h +1 -1
@@ -878,7 +878,7 @@ static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}static inline void kvm_arch_sched_in (struct kvm_vcpu *vcpu,int cpu) {}static inline void kvm_arch_free_memslot (struct kvm *kvm,struct kvm_memory_slot *free,struct kvm_memory_slot *dont) {} -static inline void kvm_arch_memslots_updated (struct kvm *kvm,struct kvm_memslots *slots) {} +static inline void kvm_arch_memslots_updated (struct kvm *kvm,u64 gen) {}static inline void kvm_arch_flush_shadow_all (struct kvm *kvm) {}static inline void kvm_arch_flush_shadow_memslot (struct kvm *kvm,struct kvm_memory_slot *slot) {}
arch/s390/kernel/setup.c +22 -9
@@ -369,7 +369,7 @@ void __init arch_call_rest_init(void) : : [_frame] "a" (frame)); } -static void __init setup_lowcore (void ) +static void __init setup_lowcore_dat_off (void ) {struct lowcore *lc;
@@ -380,19 +380,16 @@ static void __init setup_lowcore(void) lc =memblock_alloc_low (sizeof (*lc),sizeof (*lc)); lc->restart_psw.mask =PSW_KERNEL_BITS ; lc->restart_psw.addr = (unsigned long ) restart_int_handler; - lc->external_new_psw.mask =PSW_KERNEL_BITS | -PSW_MASK_DAT |PSW_MASK_MCHECK ; + lc->external_new_psw.mask =PSW_KERNEL_BITS |PSW_MASK_MCHECK ; lc->external_new_psw.addr = (unsigned long ) ext_int_handler; lc->svc_new_psw.mask =PSW_KERNEL_BITS | -PSW_MASK_DAT |PSW_MASK_IO |PSW_MASK_EXT |PSW_MASK_MCHECK ; +PSW_MASK_IO |PSW_MASK_EXT |PSW_MASK_MCHECK ; lc->svc_new_psw.addr = (unsigned long ) system_call; - lc->program_new_psw.mask =PSW_KERNEL_BITS | -PSW_MASK_DAT |PSW_MASK_MCHECK ; + lc->program_new_psw.mask =PSW_KERNEL_BITS |PSW_MASK_MCHECK ; lc->program_new_psw.addr = (unsigned long ) pgm_check_handler; lc->mcck_new_psw.mask =PSW_KERNEL_BITS ; lc->mcck_new_psw.addr = (unsigned long ) mcck_int_handler; - lc->io_new_psw.mask =PSW_KERNEL_BITS | -PSW_MASK_DAT |PSW_MASK_MCHECK ; + lc->io_new_psw.mask =PSW_KERNEL_BITS |PSW_MASK_MCHECK ; lc->io_new_psw.addr = (unsigned long ) io_int_handler; lc->clock_comparator = clock_comparator_max; lc->nodat_stack = ((unsigned long ) &init_thread_union)
@@ -452,6 +449,16 @@ static void __init setup_lowcore(void) lowcore_ptr[0 ] = lc; } +static void __init setup_lowcore_dat_on (void ) +{ +__ctl_clear_bit (0 ,28 ); + S390_lowcore.external_new_psw.mask |=PSW_MASK_DAT ; + S390_lowcore.svc_new_psw.mask |=PSW_MASK_DAT ; + S390_lowcore.program_new_psw.mask |=PSW_MASK_DAT ; + S390_lowcore.io_new_psw.mask |=PSW_MASK_DAT ; +__ctl_set_bit (0 ,28 ); +} +static struct resource code_resource = { .name ="Kernel code" , .flags =IORESOURCE_BUSY |IORESOURCE_SYSTEM_RAM ,
@@ -1072,7 +1079,7 @@ void __init setup_arch(char **cmdline_p)#endif setup_resources (); -setup_lowcore (); +setup_lowcore_dat_off ();smp_fill_possible_mask ();cpu_detect_mhz_feature ();cpu_init ();
@@ -1085,6 +1092,12 @@ void __init setup_arch(char **cmdline_p)*/ paging_init (); +/* +* After paging_init created the kernel page table, the new PSWs +* in lowcore can now run with DAT enabled. +*/ +setup_lowcore_dat_on (); +/* Setup default console */ conmode_default ();set_preferred_console ();
arch/x86/crypto/aegis128-aesni-glue.c +15 -23
@@ -119,31 +119,20 @@ static void crypto_aegis128_aesni_process_ad( }static void crypto_aegis128_aesni_process_crypt ( -struct aegis_state *state,struct aead_request *req, +struct aegis_state *state,struct skcipher_walk *walk,const struct aegis_crypt_ops *ops) { -struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize, base; - - ops->skcipher_walk_init (&walk, req, false); - -while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; - - ops->crypt_blocks (state, chunksize, src, dst); - - base = chunksize & ~(AEGIS128_BLOCK_SIZE -1 ); - src += base; - dst += base; - chunksize &=AEGIS128_BLOCK_SIZE -1 ; - -if (chunksize >0 ) - ops->crypt_tail (state, chunksize, src, dst); +while (walk->nbytes >=AEGIS128_BLOCK_SIZE ) { + ops->crypt_blocks (state, +round_down (walk->nbytes,AEGIS128_BLOCK_SIZE ), + walk->src.virt.addr, walk->dst.virt.addr); +skcipher_walk_done (walk, walk->nbytes %AEGIS128_BLOCK_SIZE ); + } -skcipher_walk_done (&walk,0 ); +if (walk->nbytes) { + ops->crypt_tail (state, walk->nbytes, walk->src.virt.addr, + walk->dst.virt.addr); +skcipher_walk_done (walk,0 ); } }
@@ -186,13 +175,16 @@ static void crypto_aegis128_aesni_crypt(struct aead_request *req, {struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_ctx *ctx =crypto_aegis128_aesni_ctx (tfm); +struct skcipher_walk walk;struct aegis_state state; + ops->skcipher_walk_init (&walk, req, true); +kernel_fpu_begin ();crypto_aegis128_aesni_init (&state, ctx->key.bytes, req->iv);crypto_aegis128_aesni_process_ad (&state, req->src, req->assoclen); -crypto_aegis128_aesni_process_crypt (&state, req, ops); +crypto_aegis128_aesni_process_crypt (&state, &walk, ops);crypto_aegis128_aesni_final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end ();
arch/x86/crypto/aegis128l-aesni-glue.c +15 -23
@@ -119,31 +119,20 @@ static void crypto_aegis128l_aesni_process_ad( }static void crypto_aegis128l_aesni_process_crypt ( -struct aegis_state *state,struct aead_request *req, +struct aegis_state *state,struct skcipher_walk *walk,const struct aegis_crypt_ops *ops) { -struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize, base; - - ops->skcipher_walk_init (&walk, req, false); - -while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; - - ops->crypt_blocks (state, chunksize, src, dst); - - base = chunksize & ~(AEGIS128L_BLOCK_SIZE -1 ); - src += base; - dst += base; - chunksize &=AEGIS128L_BLOCK_SIZE -1 ; - -if (chunksize >0 ) - ops->crypt_tail (state, chunksize, src, dst); +while (walk->nbytes >=AEGIS128L_BLOCK_SIZE ) { + ops->crypt_blocks (state,round_down (walk->nbytes, +AEGIS128L_BLOCK_SIZE ), + walk->src.virt.addr, walk->dst.virt.addr); +skcipher_walk_done (walk, walk->nbytes %AEGIS128L_BLOCK_SIZE ); + } -skcipher_walk_done (&walk,0 ); +if (walk->nbytes) { + ops->crypt_tail (state, walk->nbytes, walk->src.virt.addr, + walk->dst.virt.addr); +skcipher_walk_done (walk,0 ); } }
@@ -186,13 +175,16 @@ static void crypto_aegis128l_aesni_crypt(struct aead_request *req, {struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_ctx *ctx =crypto_aegis128l_aesni_ctx (tfm); +struct skcipher_walk walk;struct aegis_state state; + ops->skcipher_walk_init (&walk, req, true); +kernel_fpu_begin ();crypto_aegis128l_aesni_init (&state, ctx->key.bytes, req->iv);crypto_aegis128l_aesni_process_ad (&state, req->src, req->assoclen); -crypto_aegis128l_aesni_process_crypt (&state, req, ops); +crypto_aegis128l_aesni_process_crypt (&state, &walk, ops);crypto_aegis128l_aesni_final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end ();
arch/x86/crypto/aegis256-aesni-glue.c +15 -23
@@ -119,31 +119,20 @@ static void crypto_aegis256_aesni_process_ad( }static void crypto_aegis256_aesni_process_crypt ( -struct aegis_state *state,struct aead_request *req, +struct aegis_state *state,struct skcipher_walk *walk,const struct aegis_crypt_ops *ops) { -struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize, base; - - ops->skcipher_walk_init (&walk, req, false); - -while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; - - ops->crypt_blocks (state, chunksize, src, dst); - - base = chunksize & ~(AEGIS256_BLOCK_SIZE -1 ); - src += base; - dst += base; - chunksize &=AEGIS256_BLOCK_SIZE -1 ; - -if (chunksize >0 ) - ops->crypt_tail (state, chunksize, src, dst); +while (walk->nbytes >=AEGIS256_BLOCK_SIZE ) { + ops->crypt_blocks (state, +round_down (walk->nbytes,AEGIS256_BLOCK_SIZE ), + walk->src.virt.addr, walk->dst.virt.addr); +skcipher_walk_done (walk, walk->nbytes %AEGIS256_BLOCK_SIZE ); + } -skcipher_walk_done (&walk,0 ); +if (walk->nbytes) { + ops->crypt_tail (state, walk->nbytes, walk->src.virt.addr, + walk->dst.virt.addr); +skcipher_walk_done (walk,0 ); } }
@@ -186,13 +175,16 @@ static void crypto_aegis256_aesni_crypt(struct aead_request *req, {struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct aegis_ctx *ctx =crypto_aegis256_aesni_ctx (tfm); +struct skcipher_walk walk;struct aegis_state state; + ops->skcipher_walk_init (&walk, req, true); +kernel_fpu_begin ();crypto_aegis256_aesni_init (&state, ctx->key, req->iv);crypto_aegis256_aesni_process_ad (&state, req->src, req->assoclen); -crypto_aegis256_aesni_process_crypt (&state, req, ops); +crypto_aegis256_aesni_process_crypt (&state, &walk, ops);crypto_aegis256_aesni_final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end ();
arch/x86/crypto/aesni-intel_glue.c +8 -5
@@ -821,11 +821,14 @@ static int gcmaes_crypt_by_sg(bool enc, struct aead_request *req,scatterwalk_map_and_copy (assoc, req->src,0 , assoclen,0 ); } - src_sg =scatterwalk_ffwd (src_start, req->src, req->assoclen); -scatterwalk_start (&src_sg_walk, src_sg); -if (req->src != req->dst) { - dst_sg =scatterwalk_ffwd (dst_start, req->dst, req->assoclen); -scatterwalk_start (&dst_sg_walk, dst_sg); +if (left) { + src_sg =scatterwalk_ffwd (src_start, req->src, req->assoclen); +scatterwalk_start (&src_sg_walk, src_sg); +if (req->src != req->dst) { + dst_sg =scatterwalk_ffwd (dst_start, req->dst, + req->assoclen); +scatterwalk_start (&dst_sg_walk, dst_sg); + } }kernel_fpu_begin ();
arch/x86/crypto/morus1280_glue.c +16 -24
@@ -85,31 +85,20 @@ static void crypto_morus1280_glue_process_ad(static void crypto_morus1280_glue_process_crypt (struct morus1280_state *state,struct morus1280_ops ops, -struct aead_request *req) +struct skcipher_walk *walk) { -struct skcipher_walk walk; -u8 *cursor_src, *cursor_dst; -unsigned int chunksize, base; - - ops.skcipher_walk_init (&walk, req, false); - -while (walk.nbytes) { - cursor_src = walk.src.virt.addr; - cursor_dst = walk.dst.virt.addr; - chunksize = walk.nbytes; - - ops.crypt_blocks (state, cursor_src, cursor_dst, chunksize); - - base = chunksize & ~(MORUS1280_BLOCK_SIZE -1 ); - cursor_src += base; - cursor_dst += base; - chunksize &=MORUS1280_BLOCK_SIZE -1 ; - -if (chunksize >0 ) - ops.crypt_tail (state, cursor_src, cursor_dst, - chunksize); +while (walk->nbytes >=MORUS1280_BLOCK_SIZE ) { + ops.crypt_blocks (state, walk->src.virt.addr, + walk->dst.virt.addr, +round_down (walk->nbytes, +MORUS1280_BLOCK_SIZE )); +skcipher_walk_done (walk, walk->nbytes %MORUS1280_BLOCK_SIZE ); + } -skcipher_walk_done (&walk,0 ); +if (walk->nbytes) { + ops.crypt_tail (state, walk->src.virt.addr, walk->dst.virt.addr, + walk->nbytes); +skcipher_walk_done (walk,0 ); } }
@@ -147,12 +136,15 @@ static void crypto_morus1280_glue_crypt(struct aead_request *req,struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct morus1280_ctx *ctx =crypto_aead_ctx (tfm);struct morus1280_state state; +struct skcipher_walk walk; + + ops.skcipher_walk_init (&walk, req, true);kernel_fpu_begin (); ctx->ops->init (&state, &ctx->key, req->iv);crypto_morus1280_glue_process_ad (&state, ctx->ops, req->src, req->assoclen); -crypto_morus1280_glue_process_crypt (&state, ops, req); +crypto_morus1280_glue_process_crypt (&state, ops, &walk); ctx->ops->final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end ();
arch/x86/crypto/morus640_glue.c +15 -24
@@ -85,31 +85,19 @@ static void crypto_morus640_glue_process_ad(static void crypto_morus640_glue_process_crypt (struct morus640_state *state,struct morus640_ops ops, -struct aead_request *req) +struct skcipher_walk *walk) { -struct skcipher_walk walk; -u8 *cursor_src, *cursor_dst; -unsigned int chunksize, base; - - ops.skcipher_walk_init (&walk, req, false); - -while (walk.nbytes) { - cursor_src = walk.src.virt.addr; - cursor_dst = walk.dst.virt.addr; - chunksize = walk.nbytes; - - ops.crypt_blocks (state, cursor_src, cursor_dst, chunksize); - - base = chunksize & ~(MORUS640_BLOCK_SIZE -1 ); - cursor_src += base; - cursor_dst += base; - chunksize &=MORUS640_BLOCK_SIZE -1 ; - -if (chunksize >0 ) - ops.crypt_tail (state, cursor_src, cursor_dst, - chunksize); +while (walk->nbytes >=MORUS640_BLOCK_SIZE ) { + ops.crypt_blocks (state, walk->src.virt.addr, + walk->dst.virt.addr, +round_down (walk->nbytes,MORUS640_BLOCK_SIZE )); +skcipher_walk_done (walk, walk->nbytes %MORUS640_BLOCK_SIZE ); + } -skcipher_walk_done (&walk,0 ); +if (walk->nbytes) { + ops.crypt_tail (state, walk->src.virt.addr, walk->dst.virt.addr, + walk->nbytes); +skcipher_walk_done (walk,0 ); } }
@@ -143,12 +131,15 @@ static void crypto_morus640_glue_crypt(struct aead_request *req,struct crypto_aead *tfm =crypto_aead_reqtfm (req);struct morus640_ctx *ctx =crypto_aead_ctx (tfm);struct morus640_state state; +struct skcipher_walk walk; + + ops.skcipher_walk_init (&walk, req, true);kernel_fpu_begin (); ctx->ops->init (&state, &ctx->key, req->iv);crypto_morus640_glue_process_ad (&state, ctx->ops, req->src, req->assoclen); -crypto_morus640_glue_process_crypt (&state, ops, req); +crypto_morus640_glue_process_crypt (&state, ops, &walk); ctx->ops->final (&state, tag_xor, req->assoclen, cryptlen);kernel_fpu_end ();
arch/x86/events/intel/uncore.c +1 -0
@@ -740,6 +740,7 @@ static int uncore_pmu_event_init(struct perf_event *event)/* fixed counters have event field hardcoded to zero */ hwc->config =0ULL ; }else if (is_freerunning_event (event)) { + hwc->config = event->attr.config;if (!check_valid_freerunning_event (box, event))return -EINVAL ; event->hw.idx =UNCORE_PMC_IDX_FREERUNNING ;
arch/x86/events/intel/uncore.h +6 -6
@@ -292,8 +292,8 @@ static inlineunsigned int uncore_freerunning_counter (struct intel_uncore_box *box,struct perf_event *event) { -unsigned int type =uncore_freerunning_type (event->attr.config); -unsigned int idx =uncore_freerunning_idx (event->attr.config); +unsigned int type =uncore_freerunning_type (event->hw.config); +unsigned int idx =uncore_freerunning_idx (event->hw.config);struct intel_uncore_pmu *pmu = box->pmu; return pmu->type->freerunning[type].counter_base +
@@ -377,7 +377,7 @@ static inlineunsigned int uncore_freerunning_bits (struct intel_uncore_box *box,struct perf_event *event) { -unsigned int type =uncore_freerunning_type (event->attr.config); +unsigned int type =uncore_freerunning_type (event->hw.config);return box->pmu->type->freerunning[type].bits; }
@@ -385,7 +385,7 @@ unsigned int uncore_freerunning_bits(struct intel_uncore_box *box,static inline int uncore_num_freerunning (struct intel_uncore_box *box,struct perf_event *event) { -unsigned int type =uncore_freerunning_type (event->attr.config); +unsigned int type =uncore_freerunning_type (event->hw.config);return box->pmu->type->freerunning[type].num_counters; }
@@ -399,8 +399,8 @@ static inline int uncore_num_freerunning_types(struct intel_uncore_box *box,static inline bool check_valid_freerunning_event (struct intel_uncore_box *box,struct perf_event *event) { -unsigned int type =uncore_freerunning_type (event->attr.config); -unsigned int idx =uncore_freerunning_idx (event->attr.config); +unsigned int type =uncore_freerunning_type (event->hw.config); +unsigned int idx =uncore_freerunning_idx (event->hw.config);return (type <uncore_num_freerunning_types (box, event)) && (idx <uncore_num_freerunning (box, event));
arch/x86/events/intel/uncore_snb.c +3 -1
@@ -448,9 +448,11 @@ static int snb_uncore_imc_event_init(struct perf_event *event)/* must be done before validate_group */ event->hw.event_base = base; - event->hw.config = cfg; event->hw.idx = idx; +/* Convert to standard encoding format for freerunning counters */ + event->hw.config = ((cfg -1 ) <<8 ) |0x10ff ; +/* no group validation needed, we have free running counters */ return 0 ;
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1255,7 +1255,7 @@ void kvm_mmu_clear_dirty_pt_masked(struct kvm *kvm,struct kvm_memory_slot *slot, gfn_t gfn_offset, unsigned long mask);void kvm_mmu_zap_all (struct kvm *kvm); -void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,struct kvm_memslots *slots); +void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,u64 gen);unsigned int kvm_mmu_calculate_mmu_pages (struct kvm *kvm);void kvm_mmu_change_mmu_pages (struct kvm *kvm,unsigned int kvm_nr_mmu_pages);
arch/x86/kernel/ftrace.c +17 -25
80 lines not on this page · raw message
arch/x86/kernel/kprobes/opt.c +5 -0
@@ -141,6 +141,11 @@ asm (void optprobe_template_func (void );STACK_FRAME_NON_STANDARD (optprobe_template_func); +NOKPROBE_SYMBOL (optprobe_template_func); +NOKPROBE_SYMBOL (optprobe_template_entry); +NOKPROBE_SYMBOL (optprobe_template_val); +NOKPROBE_SYMBOL (optprobe_template_call); +NOKPROBE_SYMBOL (optprobe_template_end);#define TMPL_MOVE_IDX \ ((long)optprobe_template_val - (long)optprobe_template_entry)
arch/x86/kernel/kvmclock.c +1 -5
@@ -104,12 +104,8 @@ static u64 kvm_sched_clock_read(void)static inline void kvm_sched_clock_init (bool stable) { -if (!stable) { - pv_ops.time.sched_clock = kvm_clock_read; +if (!stable)clear_sched_clock_stable (); -return ; - } - kvm_sched_clock_offset =kvm_clock_read (); pv_ops.time.sched_clock = kvm_sched_clock_read;
arch/x86/kvm/mmu.c +23 -16
@@ -5635,13 +5635,8 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end) {struct kvm_memslots *slots;struct kvm_memory_slot *memslot; -bool flush_tlb = true; -bool flush = false;int i; -if (kvm_available_flush_tlb_with_range ()) - flush_tlb = false; -spin_lock (&kvm->mmu_lock);for (i =0 ; i <KVM_ADDRESS_SPACE_NUM ; i++) { slots =__kvm_memslots (kvm, i);
@@ -5653,17 +5648,12 @@ void kvm_zap_gfn_range(struct kvm *kvm, gfn_t gfn_start, gfn_t gfn_end)if (start >= end)continue ; - flush |=slot_handle_level_range (kvm, memslot, - kvm_zap_rmapp,PT_PAGE_TABLE_LEVEL , -PT_MAX_HUGEPAGE_LEVEL , start, - end -1 , flush_tlb); +slot_handle_level_range (kvm, memslot, kvm_zap_rmapp, +PT_PAGE_TABLE_LEVEL ,PT_MAX_HUGEPAGE_LEVEL , + start, end -1 , true); } } -if (flush) -kvm_flush_remote_tlbs_with_address (kvm, gfn_start, - gfn_end - gfn_start +1 ); -spin_unlock (&kvm->mmu_lock); }
@@ -5901,13 +5891,30 @@ static bool kvm_has_zapped_obsolete_pages(struct kvm *kvm)return unlikely (!list_empty_careful (&kvm->arch.zapped_obsolete_pages)); } -void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,struct kvm_memslots *slots) +void kvm_mmu_invalidate_mmio_sptes (struct kvm *kvm,u64 gen) { + gen &=MMIO_GEN_MASK ; + +/* +* Shift to eliminate the "update in-progress" flag, which isn't +* included in the spte's generation number. +*/ + gen >>=1 ; + +/* +* Generation numbers are incremented in multiples of the number of +* address spaces in order to provide unique generations across all +* address spaces. Strip what is effectively the address space +* modifier prior to checking for a wrap of the MMIO generation so +* that a wrap in any address space is detected. +*/ + gen &= ~((u64 )KVM_ADDRESS_SPACE_NUM -1 ); +/* -* The very rare case: if the generation-number is round, +* The very rare case: if the MMIO generation number has wrapped, * zap all shadow pages. */ -if (unlikely ((slots->generation &MMIO_GEN_MASK ) ==0 )) { +if (unlikely (gen ==0 )) {kvm_debug_ratelimited ("kvm: zapping shadow pages for mmio generation wraparound\n" );kvm_mmu_invalidate_zap_all_pages (kvm); }
arch/x86/kvm/vmx/nested.c +37 -6
79 lines not on this page · raw message
arch/x86/kvm/vmx/vmx.c +12 -4
@@ -6399,7 +6399,7 @@ static void __vmx_vcpu_run(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx)"mov %%" _ASM_AX", %%cr2 \n\t" "3: \n\t" /* Check if vmlaunch or vmresume is needed */ -"cmpl $0, %c[launched](%%" _ASM_CX") \n\t" +"cmpb $0, %c[launched](%%" _ASM_CX") \n\t" /* Load guest registers. Don't clobber flags. */ "mov %c[rax](%%" _ASM_CX"), %%" _ASM_AX" \n\t" "mov %c[rbx](%%" _ASM_CX"), %%" _ASM_BX" \n\t"
@@ -6449,10 +6449,15 @@ static void __vmx_vcpu_run(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx)"mov %%r13, %c[r13](%%" _ASM_CX") \n\t" "mov %%r14, %c[r14](%%" _ASM_CX") \n\t" "mov %%r15, %c[r15](%%" _ASM_CX") \n\t" +/* -* Clear host registers marked as clobbered to prevent -* speculative use. -*/ +* Clear all general purpose registers (except RSP, which is loaded by +* the CPU during VM-Exit) to prevent speculative use of the guest's +* values, even those that are saved/loaded via the stack. In theory, +* an L1 cache miss when restoring registers could lead to speculative +* execution with the guest's values. Zeroing XORs are dirt cheap, +* i.e. the extra paranoia is essentially free. +*/ "xor %%r8d, %%r8d \n\t" "xor %%r9d, %%r9d \n\t" "xor %%r10d, %%r10d \n\t"
@@ -6467,8 +6472,11 @@ static void __vmx_vcpu_run(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx) "xor %%eax, %%eax \n\t" "xor %%ebx, %%ebx \n\t" + "xor %%ecx, %%ecx \n\t" + "xor %%edx, %%edx \n\t" "xor %%esi, %%esi \n\t" "xor %%edi, %%edi \n\t" + "xor %%ebp, %%ebp \n\t" "pop %%" _ASM_BP "; pop %%" _ASM_DX " \n\t" : ASM_CALL_CONSTRAINT : "c"(vmx), "d"((unsigned long)HOST_RSP), "S"(evmcs_rsp),
arch/x86/kvm/x86.c +2 -2
@@ -9348,13 +9348,13 @@ int kvm_arch_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,return -ENOMEM ; } -void kvm_arch_memslots_updated (struct kvm *kvm,struct kvm_memslots *slots) +void kvm_arch_memslots_updated (struct kvm *kvm,u64 gen) {/* * memslots->generation has been incremented. * mmio generation may have reached its maximum value. */ -kvm_mmu_invalidate_mmio_sptes (kvm, slots); +kvm_mmu_invalidate_mmio_sptes (kvm, gen); } int kvm_arch_prepare_memory_region(struct kvm *kvm,
arch/x86/kvm/x86.h +6 -1
@@ -181,6 +181,11 @@ static inline bool emul_is_noncanonical_address(u64 la,static inline void vcpu_cache_mmio_info (struct kvm_vcpu *vcpu,gva_t gva,gfn_t gfn,unsigned access) { +u64 gen =kvm_memslots (vcpu->kvm)->generation; + +if (unlikely (gen &1 )) +return ; +/* * If this is a shadow nested page table, the "GVA" is * actually a nGPA.
@@ -188,7 +193,7 @@ static inline void vcpu_cache_mmio_info(struct kvm_vcpu *vcpu, vcpu->arch.mmio_gva =mmu_is_nested (vcpu) ?0 : gva &PAGE_MASK ; vcpu->arch.access = access; vcpu->arch.mmio_gfn = gfn; - vcpu->arch.mmio_gen =kvm_memslots (vcpu->kvm)->generation; + vcpu->arch.mmio_gen = gen; }static inline bool vcpu_match_mmio_gen (struct kvm_vcpu *vcpu)
arch/x86/xen/mmu_pv.c +6 -7
@@ -2114,10 +2114,10 @@ void __init xen_relocate_p2m(void) pt =early_memremap (pt_phys,PAGE_SIZE );clear_page (pt);for (idx_pte =0 ; - idx_pte <min (n_pte,PTRS_PER_PTE ); - idx_pte++) { -set_pte (pt + idx_pte, -pfn_pte (p2m_pfn,PAGE_KERNEL )); + idx_pte <min (n_pte,PTRS_PER_PTE ); + idx_pte++) { + pt[idx_pte] =pfn_pte (p2m_pfn, +PAGE_KERNEL ); p2m_pfn++; } n_pte -=PTRS_PER_PTE ;
@@ -2125,8 +2125,7 @@ void __init xen_relocate_p2m(void)make_lowmem_page_readonly (__va (pt_phys));pin_pagetable_pfn (MMUEXT_PIN_L1_TABLE ,PFN_DOWN (pt_phys)); -set_pmd (pmd + idx_pt, -__pmd (_PAGE_TABLE | pt_phys)); + pmd[idx_pt] =__pmd (_PAGE_TABLE | pt_phys); pt_phys +=PAGE_SIZE ; } n_pt -=PTRS_PER_PMD ;
@@ -2134,7 +2133,7 @@ void __init xen_relocate_p2m(void)make_lowmem_page_readonly (__va (pmd_phys));pin_pagetable_pfn (MMUEXT_PIN_L2_TABLE ,PFN_DOWN (pmd_phys)); -set_pud (pud + idx_pmd,__pud (_PAGE_TABLE | pmd_phys)); + pud[idx_pmd] =__pud (_PAGE_TABLE | pmd_phys); pmd_phys +=PAGE_SIZE ; } n_pmd -=PTRS_PER_PUD ;
crypto/aead.c +3 -1
@@ -61,8 +61,10 @@ int crypto_aead_setkey(struct crypto_aead *tfm,else err =crypto_aead_alg (tfm)->setkey (tfm, key, keylen); -if (err) +if (unlikely (err)) { +crypto_aead_set_flags (tfm,CRYPTO_TFM_NEED_KEY );return err; + }crypto_aead_clear_flags (tfm,CRYPTO_TFM_NEED_KEY );return 0 ;
crypto/aegis128.c +7 -7
@@ -290,19 +290,19 @@ static void crypto_aegis128_process_crypt(struct aegis_state *state, const struct aegis128_ops *ops) {struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize; ops->skcipher_walk_init (&walk, req, false);while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; +unsigned int nbytes = walk.nbytes; - ops->crypt_chunk (state, dst, src, chunksize); +if (nbytes < walk.total) + nbytes =round_down (nbytes, walk.stride); -skcipher_walk_done (&walk,0 ); + ops->crypt_chunk (state, walk.dst.virt.addr, walk.src.virt.addr, + nbytes); + +skcipher_walk_done (&walk, walk.nbytes - nbytes); } }
crypto/aegis128l.c +7 -7
@@ -353,19 +353,19 @@ static void crypto_aegis128l_process_crypt(struct aegis_state *state, const struct aegis128l_ops *ops) {struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize; ops->skcipher_walk_init (&walk, req, false);while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; +unsigned int nbytes = walk.nbytes; - ops->crypt_chunk (state, dst, src, chunksize); +if (nbytes < walk.total) + nbytes =round_down (nbytes, walk.stride); -skcipher_walk_done (&walk,0 ); + ops->crypt_chunk (state, walk.dst.virt.addr, walk.src.virt.addr, + nbytes); + +skcipher_walk_done (&walk, walk.nbytes - nbytes); } }
crypto/aegis256.c +7 -7
@@ -303,19 +303,19 @@ static void crypto_aegis256_process_crypt(struct aegis_state *state, const struct aegis256_ops *ops) {struct skcipher_walk walk; -u8 *src, *dst; -unsigned int chunksize; ops->skcipher_walk_init (&walk, req, false);while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; - chunksize = walk.nbytes; +unsigned int nbytes = walk.nbytes; - ops->crypt_chunk (state, dst, src, chunksize); +if (nbytes < walk.total) + nbytes =round_down (nbytes, walk.stride); -skcipher_walk_done (&walk,0 ); + ops->crypt_chunk (state, walk.dst.virt.addr, walk.src.virt.addr, + nbytes); + +skcipher_walk_done (&walk, walk.nbytes - nbytes); } }
crypto/ahash.c +26 -16
84 lines not on this page · raw message
crypto/cfb.c +10 -4
@@ -77,12 +77,14 @@ static int crypto_cfb_encrypt_segment(struct skcipher_walk *walk,do {crypto_cfb_encrypt_one (tfm, iv, dst);crypto_xor (dst, src, bsize); -memcpy (iv, dst, bsize); + iv = dst; src += bsize; dst += bsize; }while ((nbytes -= bsize) >= bsize); +memcpy (walk->iv, iv, bsize); +return nbytes; }
@@ -162,7 +164,7 @@ static int crypto_cfb_decrypt_inplace(struct skcipher_walk *walk,const unsigned int bsize =crypto_cfb_bsize (tfm);unsigned int nbytes = walk->nbytes;u8 *src = walk->src.virt.addr; -u8 *iv = walk->iv; +u8 *const iv = walk->iv;u8 tmp[MAX_CIPHER_BLOCKSIZE ]; do {
@@ -172,8 +174,6 @@ static int crypto_cfb_decrypt_inplace(struct skcipher_walk *walk, src += bsize; }while ((nbytes -= bsize) >= bsize); -memcpy (walk->iv, iv, bsize); -return nbytes; }
@@ -298,6 +298,12 @@ static int crypto_cfb_create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.base.cra_blocksize =1 ; inst->alg.base.cra_alignmask = alg->cra_alignmask; +/* +* To simplify the implementation, configure the skcipher walk to only +* give a partial block at the very end, never earlier. +*/ + inst->alg.chunksize = alg->cra_blocksize; + inst->alg.ivsize = alg->cra_blocksize; inst->alg.min_keysize = alg->cra_cipher.cia_min_keysize; inst->alg.max_keysize = alg->cra_cipher.cia_max_keysize;
crypto/morus1280.c +7 -6
@@ -366,18 +366,19 @@ static void crypto_morus1280_process_crypt(struct morus1280_state *state, const struct morus1280_ops *ops) {struct skcipher_walk walk; -u8 *dst; -const u8 *src; ops->skcipher_walk_init (&walk, req, false);while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; +unsigned int nbytes = walk.nbytes; - ops->crypt_chunk (state, dst, src, walk.nbytes); +if (nbytes < walk.total) + nbytes =round_down (nbytes, walk.stride); -skcipher_walk_done (&walk,0 ); + ops->crypt_chunk (state, walk.dst.virt.addr, walk.src.virt.addr, + nbytes); + +skcipher_walk_done (&walk, walk.nbytes - nbytes); } }
crypto/morus640.c +7 -6
@@ -365,18 +365,19 @@ static void crypto_morus640_process_crypt(struct morus640_state *state, const struct morus640_ops *ops) {struct skcipher_walk walk; -u8 *dst; -const u8 *src; ops->skcipher_walk_init (&walk, req, false);while (walk.nbytes) { - src = walk.src.virt.addr; - dst = walk.dst.virt.addr; +unsigned int nbytes = walk.nbytes; - ops->crypt_chunk (state, dst, src, walk.nbytes); +if (nbytes < walk.total) + nbytes =round_down (nbytes, walk.stride); -skcipher_walk_done (&walk,0 ); + ops->crypt_chunk (state, walk.dst.virt.addr, walk.src.virt.addr, + nbytes); + +skcipher_walk_done (&walk, walk.nbytes - nbytes); } }
crypto/ofb.c +37 -54
132 lines not on this page · raw message
crypto/pcbc.c +4 -10
@@ -51,7 +51,7 @@ static int crypto_pcbc_encrypt_segment(struct skcipher_request *req,unsigned int nbytes = walk->nbytes;u8 *src = walk->src.virt.addr;u8 *dst = walk->dst.virt.addr; -u8 *iv = walk->iv; +u8 *const iv = walk->iv; do { crypto_xor(iv, src, bsize);
@@ -72,7 +72,7 @@ static int crypto_pcbc_encrypt_inplace(struct skcipher_request *req,int bsize =crypto_cipher_blocksize (tfm);unsigned int nbytes = walk->nbytes;u8 *src = walk->src.virt.addr; -u8 *iv = walk->iv; +u8 *const iv = walk->iv;u8 tmpbuf[MAX_CIPHER_BLOCKSIZE ]; do {
@@ -84,8 +84,6 @@ static int crypto_pcbc_encrypt_inplace(struct skcipher_request *req, src += bsize; }while ((nbytes -= bsize) >= bsize); -memcpy (walk->iv, iv, bsize); -return nbytes; }
@@ -121,7 +119,7 @@ static int crypto_pcbc_decrypt_segment(struct skcipher_request *req,unsigned int nbytes = walk->nbytes;u8 *src = walk->src.virt.addr;u8 *dst = walk->dst.virt.addr; -u8 *iv = walk->iv; +u8 *const iv = walk->iv; do { crypto_cipher_decrypt_one(tfm, dst, src);
@@ -132,8 +130,6 @@ static int crypto_pcbc_decrypt_segment(struct skcipher_request *req, dst += bsize; }while ((nbytes -= bsize) >= bsize); -memcpy (walk->iv, iv, bsize); -return nbytes; }
@@ -144,7 +140,7 @@ static int crypto_pcbc_decrypt_inplace(struct skcipher_request *req,int bsize =crypto_cipher_blocksize (tfm);unsigned int nbytes = walk->nbytes;u8 *src = walk->src.virt.addr; -u8 *iv = walk->iv; +u8 *const iv = walk->iv;u8 tmpbuf[MAX_CIPHER_BLOCKSIZE ]__aligned(__alignof__(u32)) ; do {
@@ -156,8 +152,6 @@ static int crypto_pcbc_decrypt_inplace(struct skcipher_request *req, src += bsize; }while ((nbytes -= bsize) >= bsize); -memcpy (walk->iv, iv, bsize); -return nbytes; }
crypto/shash.c +13 -5
@@ -53,6 +53,13 @@ static int shash_setkey_unaligned(struct crypto_shash *tfm, const u8 *key,return err; } +static void shash_set_needkey (struct crypto_shash *tfm,struct shash_alg *alg) +{ +if (crypto_shash_alg_has_setkey (alg) && + !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY )) +crypto_shash_set_flags (tfm,CRYPTO_TFM_NEED_KEY ); +} +int crypto_shash_setkey (struct crypto_shash *tfm,const u8 *key,unsigned int keylen) {
@@ -65,8 +72,10 @@ int crypto_shash_setkey(struct crypto_shash *tfm, const u8 *key,else err = shash->setkey (tfm, key, keylen); -if (err) +if (unlikely (err)) { +shash_set_needkey (tfm, shash);return err; + }crypto_shash_clear_flags (tfm,CRYPTO_TFM_NEED_KEY );return 0 ;
@@ -373,7 +382,8 @@ int crypto_init_shash_ops_async(struct crypto_tfm *tfm) crt->final = shash_async_final; crt->finup = shash_async_finup; crt->digest = shash_async_digest; - crt->setkey = shash_async_setkey; +if (crypto_shash_alg_has_setkey (alg)) + crt->setkey = shash_async_setkey;crypto_ahash_set_flags (crt,crypto_shash_get_flags (shash) &CRYPTO_TFM_NEED_KEY );
@@ -395,9 +405,7 @@ static int crypto_shash_init_tfm(struct crypto_tfm *tfm) hash->descsize = alg->descsize; -if (crypto_shash_alg_has_setkey (alg) && - !(alg->base.cra_flags &CRYPTO_ALG_OPTIONAL_KEY )) -crypto_shash_set_flags (hash,CRYPTO_TFM_NEED_KEY ); +shash_set_needkey (hash, alg);return 0 ; }
crypto/skcipher.c +18 -9
@@ -585,6 +585,12 @@ static unsigned int crypto_skcipher_extsize(struct crypto_alg *alg)return crypto_alg_extsize (alg); } +static void skcipher_set_needkey (struct crypto_skcipher *tfm) +{ +if (tfm->keysize) +crypto_skcipher_set_flags (tfm,CRYPTO_TFM_NEED_KEY ); +} +static int skcipher_setkey_blkcipher (struct crypto_skcipher *tfm,const u8 *key,unsigned int keylen) {
@@ -598,8 +604,10 @@ static int skcipher_setkey_blkcipher(struct crypto_skcipher *tfm, err =crypto_blkcipher_setkey (blkcipher, key, keylen);crypto_skcipher_set_flags (tfm,crypto_blkcipher_get_flags (blkcipher) &CRYPTO_TFM_RES_MASK ); -if (err) +if (unlikely (err)) { +skcipher_set_needkey (tfm);return err; + }crypto_skcipher_clear_flags (tfm,CRYPTO_TFM_NEED_KEY );return 0 ;
@@ -677,8 +685,7 @@ static int crypto_init_skcipher_ops_blkcipher(struct crypto_tfm *tfm) skcipher->ivsize =crypto_blkcipher_ivsize (blkcipher); skcipher->keysize = calg->cra_blkcipher.max_keysize; -if (skcipher->keysize) -crypto_skcipher_set_flags (skcipher,CRYPTO_TFM_NEED_KEY ); +skcipher_set_needkey (skcipher);return 0 ; }
@@ -698,8 +705,10 @@ static int skcipher_setkey_ablkcipher(struct crypto_skcipher *tfm,crypto_skcipher_set_flags (tfm,crypto_ablkcipher_get_flags (ablkcipher) &CRYPTO_TFM_RES_MASK ); -if (err) +if (unlikely (err)) { +skcipher_set_needkey (tfm);return err; + }crypto_skcipher_clear_flags (tfm,CRYPTO_TFM_NEED_KEY );return 0 ;
@@ -776,8 +785,7 @@ static int crypto_init_skcipher_ops_ablkcipher(struct crypto_tfm *tfm)sizeof (struct ablkcipher_request ); skcipher->keysize = calg->cra_ablkcipher.max_keysize; -if (skcipher->keysize) -crypto_skcipher_set_flags (skcipher,CRYPTO_TFM_NEED_KEY ); +skcipher_set_needkey (skcipher);return 0 ; }
@@ -820,8 +828,10 @@ static int skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,else err = cipher->setkey (tfm, key, keylen); -if (err) +if (unlikely (err)) { +skcipher_set_needkey (tfm);return err; + }crypto_skcipher_clear_flags (tfm,CRYPTO_TFM_NEED_KEY );return 0 ;
@@ -852,8 +862,7 @@ static int crypto_skcipher_init_tfm(struct crypto_tfm *tfm) skcipher->ivsize = alg->ivsize; skcipher->keysize = alg->max_keysize; -if (skcipher->keysize) -crypto_skcipher_set_flags (skcipher,CRYPTO_TFM_NEED_KEY ); +skcipher_set_needkey (skcipher);if (alg->exit) skcipher->base.exit = crypto_skcipher_exit_tfm;
crypto/testmgr.c +10 -4
@@ -1894,14 +1894,21 @@ static int alg_test_crc32c(const struct alg_test_desc *desc, err =alg_test_hash (desc, driver, type, mask);if (err) - goto out; +return err; tfm =crypto_alloc_shash (driver, type, mask);if (IS_ERR (tfm)) { +if (PTR_ERR (tfm) == -ENOENT ) { +/* +* This crc32c implementation is only available through +* ahash API, not the shash API, so the remaining part +* of the test is not applicable to it. +*/ +return 0 ; + }printk (KERN_ERR "alg: crc32c: Failed to load transform for %s: " "%ld\n" , driver,PTR_ERR (tfm)); - err =PTR_ERR (tfm); - goto out; +return PTR_ERR (tfm); } do {
@@ -1928,7 +1935,6 @@ static int alg_test_crc32c(const struct alg_test_desc *desc,crypto_free_shash (tfm); -out:return err; }
crypto/testmgr.h +51 -2
71 lines not on this page · raw message
drivers/acpi/device_sysfs.c +5 -1
@@ -202,11 +202,15 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias, {struct acpi_buffer buf = {ACPI_ALLOCATE_BUFFER };const union acpi_object *of_compatible, *obj; +acpi_status status;int len, count;int i, nval;char *c; -acpi_get_name (acpi_dev->handle,ACPI_SINGLE_NAME , &buf); + status =acpi_get_name (acpi_dev->handle,ACPI_SINGLE_NAME , &buf); +if (ACPI_FAILURE (status)) +return -ENODEV ; +/* DT strings are all in lower case */ for (c = buf.pointer; *c !='\0' ; c++) *c =tolower (*c);
drivers/acpi/nfit/core.c +47 -37
176 lines not on this page · raw message
drivers/base/power/wakeup.c +7 -1
@@ -118,7 +118,6 @@ void wakeup_source_drop(struct wakeup_source *ws)if (!ws)return ; -del_timer_sync (&ws->timer);__pm_relax (ws); }EXPORT_SYMBOL_GPL (wakeup_source_drop);
@@ -205,6 +204,13 @@ void wakeup_source_remove(struct wakeup_source *ws)list_del_rcu (&ws->entry);raw_spin_unlock_irqrestore (&events_lock, flags);synchronize_srcu (&wakeup_srcu); + +del_timer_sync (&ws->timer); +/* +* Clear timer.function to make wakeup_source_not_registered() treat +* this wakeup source as not registered. +*/ + ws->timer.function =NULL ; }EXPORT_SYMBOL_GPL (wakeup_source_remove);
drivers/char/ipmi/ipmi_si.h +3 -1
@@ -25,7 +25,9 @@ void ipmi_irq_finish_setup(struct si_sm_io *io);int ipmi_si_remove_by_dev (struct device *dev);void ipmi_si_remove_by_data (int addr_space,enum si_type si_type,unsigned long addr); -int ipmi_si_hardcode_find_bmc (void ); +void ipmi_hardcode_init (void ); +void ipmi_si_hardcode_exit (void ); +int ipmi_si_hardcode_match (int addr_type,unsigned long addr);void ipmi_si_platform_init (void );void ipmi_si_platform_shutdown (void );
drivers/char/ipmi/ipmi_si_hardcode.c +174 -62
269 lines not on this page · raw message
drivers/char/ipmi/ipmi_si_intf.c +22 -6
@@ -1862,6 +1862,18 @@ int ipmi_si_add_smi(struct si_sm_io *io)int rv =0 ;struct smi_info *new_smi, *dup; +/* +* If the user gave us a hard-coded device at the same +* address, they presumably want us to use it and not what is +* in the firmware. +*/ +if (io->addr_source !=SI_HARDCODED && +ipmi_si_hardcode_match (io->addr_type, io->addr_data)) { +dev_info (io->dev, +"Hard-coded device at this address already exists" ); +return -ENODEV ; + } +if (!io->io_setup) {if (io->addr_type ==IPMI_IO_ADDR_SPACE ) { io->io_setup = ipmi_si_port_setup;
@@ -2085,11 +2097,16 @@ static int try_smi_init(struct smi_info *new_smi)WARN_ON (new_smi->io.dev->init_name !=NULL ); out_err: +if (rv && new_smi->io.io_cleanup) { + new_smi->io.io_cleanup (&new_smi->io); + new_smi->io.io_cleanup =NULL ; + } +kfree (init_name);return rv; } -static int init_ipmi_si (void ) +static int __init init_ipmi_si (void ) {struct smi_info *e;enum ipmi_addr_src type =SI_INVALID ;
@@ -2097,11 +2114,9 @@ static int init_ipmi_si(void)if (initialized)return 0 ; -pr_info ("IPMI System Interface driver\n" ); +ipmi_hardcode_init (); -/* If the user gave us a device, they presumably want us to use it */ -if (!ipmi_si_hardcode_find_bmc ()) - goto do_scan; +pr_info ("IPMI System Interface driver\n" );ipmi_si_platform_init ();
@@ -2113,7 +2128,6 @@ static int init_ipmi_si(void)with multiple BMCs we assume that there will be several instances of a given type so if we succeed in registering a type then also try to register everything else of the same type */ -do_scan:mutex_lock (&smi_infos_lock);list_for_each_entry (e, &smi_infos, link) {/* Try to register a device if it has an IRQ and we either
@@ -2299,6 +2313,8 @@ static void cleanup_ipmi_si(void)list_for_each_entry_safe (e, tmp_e, &smi_infos, link)cleanup_one_si (e);mutex_unlock (&smi_infos_lock); + +ipmi_si_hardcode_exit (); }module_exit (cleanup_ipmi_si);
drivers/char/ipmi/ipmi_si_mem_io.c +3 -2
@@ -81,8 +81,6 @@ int ipmi_si_mem_setup(struct si_sm_io *io)if (!addr)return -ENODEV ; - io->io_cleanup = mem_cleanup; -/* * Figure out the actual readb/readw/readl/etc routine to use based * upon the register size.
@@ -141,5 +139,8 @@ int ipmi_si_mem_setup(struct si_sm_io *io)mem_region_cleanup (io, io->io_size);return -EIO ; } + + io->io_cleanup = mem_cleanup; +return 0 ; }
drivers/char/ipmi/ipmi_si_platform.c +22 -7
@@ -128,8 +128,6 @@ ipmi_get_info_from_resources(struct platform_device *pdev,if (res_second->start > io->addr_data) io->regspacing = res_second->start - io->addr_data; } - io->regsize =DEFAULT_REGSIZE ; - io->regshift =0 ;return res; }
@@ -137,7 +135,7 @@ ipmi_get_info_from_resources(struct platform_device *pdev,static int platform_ipmi_probe (struct platform_device *pdev) {
Lines of this file are not shown. View the raw message.
drivers/clk/clk-twl6040.c +51 -2
53 lines not on this page · raw message
drivers/clk/samsung/clk-exynos5-subcmu.c +9 -4
Lines of this file are not shown. View the raw message.
drivers/clk/uniphier/clk-uniphier-cpugear.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/clocksource/arm_arch_timer.c +55 -0
55 lines not on this page · raw message
drivers/crypto/caam/caamhash.c +26 -67
93 lines not on this page · raw message
drivers/crypto/rockchip/rk3288_crypto.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/crypto/rockchip/rk3288_crypto.h +3 -1
Lines of this file are not shown. View the raw message.
drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +37 -2
Lines of this file are not shown. View the raw message.
drivers/crypto/rockchip/rk3288_crypto_ahash.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c +6 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +3 -3
Lines of this file are not shown. View the raw message.
drivers/infiniband/sw/rdmavt/qp.c +39 -20
59 lines not on this page · raw message
drivers/media/i2c/cx25840/cx25840-core.c +2 -1
Lines of this file are not shown. View the raw message.
drivers/media/i2c/cx25840/cx25840-core.h +0 -1
Lines of this file are not shown. View the raw message.
drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-capture.c +9 -9
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-common.c +0 -35
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-common.h +2 -13
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-debayer.c +4 -22
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-scaler.c +4 -24
Lines of this file are not shown. View the raw message.
drivers/media/platform/vimc/vimc-sensor.c +13 -43
56 lines not on this page · raw message
drivers/media/platform/vimc/vimc-streamer.c new file +188 -0
188 lines not on this page · raw message
drivers/media/platform/vimc/vimc-streamer.h new file +38 -0
Lines of this file are not shown. View the raw message.
drivers/net/wireless/marvell/libertas_tf/if_usb.c +0 -2
Lines of this file are not shown. View the raw message.
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/pci/controller/dwc/pcie-designware-host.c +1 -1
Lines of this file are not shown. View the raw message.
drivers/pci/pci-bridge-emul.c +59 -27
86 lines not on this page · raw message
drivers/s390/crypto/vfio_ap_drv.c +35 -9
44 lines not on this page · raw message
drivers/scsi/qla2xxx/qla_init.c +8 -91
99 lines not on this page · raw message
drivers/scsi/sd.c +50 -9
59 lines not on this page · raw message
drivers/staging/media/imx/imx-ic-prpencvf.c +17 -9
Lines of this file are not shown. View the raw message.
drivers/staging/media/imx/imx-media-csi.c +28 -16
44 lines not on this page · raw message
drivers/tty/serial/8250/8250_pci.c +123 -18
141 lines not on this page · raw message
fs/ext4/ioctl.c +73 -27
100 lines not on this page · raw message
fs/overlayfs/copy_up.c +44 -15
59 lines not on this page · raw message
fs/overlayfs/util.c +35 -20
55 lines not on this page · raw message
net/sunrpc/clnt.c +74 -50
124 lines not on this page · raw message
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +34 -3
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.