Linux 4.19.93
Greg KH
maintainerI'm announcing the release of the 4.19.93 kernel.
All users of the 4.19 kernel series must upgrade.
The updated 4.19.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.19.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/arm/boot/compressed/libfdt_env.h | 4 arch/arm/mm/proc-v7-bugs.c | 3 arch/powerpc/Makefile | 4 arch/powerpc/boot/libfdt_env.h | 2 arch/powerpc/include/asm/spinlock.h | 4 arch/powerpc/kernel/security.c | 21 +-- arch/powerpc/kernel/time.c | 2 arch/powerpc/mm/hash_utils_64.c | 10 + arch/powerpc/platforms/pseries/cmm.c | 5 arch/powerpc/platforms/pseries/setup.c | 7 - arch/powerpc/tools/relocs_check.sh | 2 arch/powerpc/tools/unrel_branch_check.sh | 4 arch/s390/kernel/perf_cpum_sf.c | 17 ++- arch/x86/kernel/cpu/mcheck/mce.c | 2 drivers/cdrom/cdrom.c | 12 +- drivers/clk/clk-gpio.c | 2 drivers/clk/pxa/clk-pxa27x.c | 1 drivers/clk/qcom/clk-rcg2.c | 2 drivers/clk/qcom/common.c | 3 drivers/clocksource/asm9260_timer.c | 4 drivers/clocksource/timer-of.c | 2 drivers/dma/xilinx/xilinx_dma.c | 1 drivers/gpio/gpio-mpc8xxx.c | 3 drivers/hid/hid-core.c | 4 drivers/hid/hid-ids.h | 1 drivers/hid/hid-logitech-hidpp.c | 3 drivers/hid/hid-quirks.c | 1 drivers/hid/hid-rmi.c | 3 drivers/input/touchscreen/atmel_mxt_ts.c | 4 drivers/iommu/rockchip-iommu.c | 7 - drivers/iommu/tegra-smmu.c | 11 + drivers/irqchip/irq-bcm7038-l1.c | 4 drivers/irqchip/irq-ingenic.c | 15 +- drivers/leds/leds-lm3692x.c | 13 +- drivers/mailbox/imx-mailbox.c | 4 drivers/md/bcache/btree.c | 2 drivers/net/bonding/bond_main.c | 3 drivers/net/ethernet/amazon/ena/ena_netdev.c | 10 + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c | 7 - drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 14 +- drivers/net/gtp.c | 111 +++++++++++--------- drivers/net/hamradio/6pack.c | 4 drivers/net/hamradio/mkiss.c | 4 drivers/nvdimm/btt.c | 8 - drivers/pci/hotplug/rpaphp_core.c | 38 +++--- drivers/pinctrl/intel/pinctrl-baytrail.c | 81 +++++++------- drivers/ptp/ptp_clock.c | 31 ++--- drivers/ptp/ptp_private.h | 2 drivers/s390/crypto/zcrypt_error.h | 2 drivers/scsi/NCR5380.c | 6 - drivers/scsi/atari_scsi.c | 6 - drivers/scsi/csiostor/csio_lnode.c | 15 +- drivers/scsi/hisi_sas/hisi_sas_main.c | 8 + drivers/scsi/iscsi_tcp.c | 8 + drivers/scsi/lpfc/lpfc_els.c | 2 drivers/scsi/lpfc/lpfc_hbadisc.c | 7 + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 drivers/scsi/lpfc/lpfc_sli.c | 15 ++ drivers/scsi/mac_scsi.c | 2 drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 drivers/scsi/pm8001/pm80xx_hwi.c | 2 drivers/scsi/scsi_debug.c | 5 drivers/scsi/scsi_trace.c | 11 + drivers/scsi/sun3_scsi.c | 4 drivers/scsi/ufs/ufshcd.c | 21 ++- drivers/spi/spi-fsl-spi.c | 7 - drivers/target/iscsi/iscsi_target.c | 10 + drivers/target/iscsi/iscsi_target_auth.c | 2 drivers/tty/serial/atmel_serial.c | 43 +++---- drivers/vhost/vsock.c | 4 drivers/watchdog/watchdog_dev.c | 70 +++++------- fs/ext4/inode.c | 16 ++ fs/f2fs/f2fs.h | 23 ++-- fs/f2fs/inode.c | 6 - fs/f2fs/namei.c | 15 ++ fs/jbd2/commit.c | 4 fs/ocfs2/acl.c | 4 fs/quota/dquot.c | 29 +++-- fs/readdir.c | 40 +++++++ fs/userfaultfd.c | 18 +-- include/linux/hrtimer.h | 14 +- include/linux/libfdt_env.h | 3 include/linux/posix-clock.h | 19 +-- include/linux/quota.h | 2 include/linux/rculist_nulls.h | 37 ++++++ include/linux/skbuff.h | 6 - include/net/dst.h | 13 +- include/net/dst_ops.h | 3 include/net/inet_hashtables.h | 12 +- include/net/sock.h | 5 include/scsi/iscsi_proto.h | 1 kernel/dma/debug.c | 1 kernel/sysctl.c | 2 kernel/time/hrtimer.c | 11 + kernel/time/posix-clock.c | 31 ++--- net/bridge/br_netfilter_hooks.c | 3 net/bridge/br_nf_core.c | 3 net/bridge/netfilter/ebtables.c | 33 ++--- net/core/sysctl_net_core.c | 2 net/decnet/dn_route.c | 6 - net/ipv4/icmp.c | 11 + net/ipv4/inet_connection_sock.c | 2 net/ipv4/inet_diag.c | 3 net/ipv4/inet_hashtables.c | 19 +-- net/ipv4/inetpeer.c | 12 +- net/ipv4/ip_tunnel.c | 2 net/ipv4/ip_vti.c | 2 net/ipv4/route.c | 9 + net/ipv4/tcp_ipv4.c | 7 - net/ipv4/tcp_output.c | 11 + net/ipv4/udp.c | 2 net/ipv4/xfrm4_policy.c | 5 net/ipv6/inet6_connection_sock.c | 2 net/ipv6/inet6_hashtables.c | 3 net/ipv6/ip6_gre.c | 2 net/ipv6/ip6_tunnel.c | 4 net/ipv6/ip6_vti.c | 2 net/ipv6/route.c | 22 ++- net/ipv6/sit.c | 2 net/ipv6/xfrm6_policy.c | 5 net/netfilter/ipvs/ip_vs_xmit.c | 2 net/netfilter/nf_queue.c | 2 net/sctp/transport.c | 2 scripts/kallsyms.c | 2 security/apparmor/label.c | 12 +- sound/pci/hda/hda_controller.c | 2 tools/perf/builtin-script.c | 2 tools/perf/util/perf_regs.h | 2 tools/perf/util/strbuf.c | 1 131 files changed, 836 insertions(+), 443 deletions(-)
Adrian Hunter (1):
perf script: Fix brstackinsn for AUXTRACE
Alexander Lobakin (1):
net, sysctl: Fix compiler warning when only cBPF is present
Anatol Pomazau (1):
scsi: iscsi: Don't send data to unbound connection
Andrew Duggan (1):
HID: rmi: Check that the RMI_STARTED bit is set before unregistering the RMI transport device
Aneesh Kumar K.V (2):
powerpc/pseries: Don't fail hash page table insert for bolted mapping powerpc/book3s64/hash: Add cond_resched to avoid soft lockup warning
Anthony Steinhauser (1):
powerpc/security/book3s64: Report L1TF status in sysfs
Antonio Messina (1):
udp: fix integer overflow while computing available space in sk_rcvbuf
Arnaldo Carvalho de Melo (1):
perf regs: Make perf_reg_name() return "unknown" instead of NULL
Bart Van Assche (2):
scsi: tracing: Fix handling of TRANSFER LENGTH == 0 for READ(6) and WRITE(6)
scsi: target: iscsi: Wait for all commands to finish before freeing a session
Bean Huo (1):
scsi: ufs: fix potential bug which ends in system hang
Blaž Hrastnik (1):
HID: Improve Windows Precision Touchpad detection.
Cambda Zhu (1):
tcp: Fix highest_sack and highest_sack_seq
Chao Yu (2):
f2fs: fix to update time in lazytime mode
f2fs: fix to update dir's i_pino during cross_rename
Christophe Leroy (2):
spi: fsl: don't map irq during probe
spi: fsl: use platform_get_irq() instead of of_irq_to_resource()
Chuhong Yuan (1):
clocksource/drivers/asm9260: Add a check for of_clk_get
Colin Ian King (1):
apparmor: fix unsigned len comparison with less than zero
Coly Li (1):
bcache: at least try to shrink 1 node in bch_mca_scan()
Dan Carpenter (1):
scsi: csiostor: Don't enable IRQs too early
Daniel Baluta (1):
mailbox: imx: Fix Tx doorbell shutdown path
David Disseldorp (1):
scsi: target: compare full CHAP_A Algorithm strings
David Engraf (1):
tty/serial: atmel: fix out of range clock divider handling
David Hildenbrand (1):
powerpc/pseries/cmm: Implement release() function for sysfs device
Diego Elio Pettenò (1):
cdrom: respect device capabilities during opening action
Ding Xiang (1):
ocfs2: fix passing zero to 'PTR_ERR' warning
Doug Berger (1):
ARM: 8937/1: spectre-v2: remove Brahma-B53 from hardening
Eric Dumazet (9):
dma-debug: add a schedule point in debug_dma_dump_mappings() 6pack,mkiss: fix possible deadlock
netfilter: bridge: make sure to pull arp header in br_nf_forward_arp()
inetpeer: fix data-race in inet_putpeer / inet_putpeer
net: add a READ_ONCE() in skb_peek_tail()
net: icmp: fix data-race in cmp_global_allow()
hrtimer: Annotate lockless access to timer->state tcp/dccp: fix possible race __inet_lookup_established()
tcp: do not send empty skb from tcp_write_xmit()
Evan Green (1):
Input: atmel_mxt_ts - disable IRQ across suspend
Ezequiel Garcia (1):
iommu: rockchip: Free domain on .domain_free
Finn Thain (2):
scsi: atari_scsi: sun3_scsi: Set sg_tablesize to 1 instead of SG_NONE
scsi: NCR5380: Add disconnect_mask module parameter
Florian Fainelli (1):
irqchip/irq-bcm7038-l1: Enable parent IRQ if necessary
Florian Westphal (1):
netfilter: ebtables: compat: reject all padding in matches/watchers
Geert Uytterhoeven (1):
clocksource/drivers/timer-of: Use unique device name instead of timer
Greg Kroah-Hartman (2):
Revert "powerpc/vcpu: Assume dedicated processors as non-preempt" Linux 4.19.93
Guido Günther (1):
leds: lm3692x: Handle failure to probe the regulator
Gustavo L. F. Walbon (1):
powerpc/security: Fix wrong message when RFI Flush is disable
Hangbin Liu (8):
net: add bool confirm_neigh parameter for dst_ops.update_pmtu
ip6_gre: do not confirm neighbor when do pmtu update
gtp: do not confirm neighbor when do pmtu update net/dst: add new function skb_dst_update_pmtu_no_confirm
tunnel: do not confirm neighbor when do pmtu update
vti: do not confirm neighbor when do pmtu update
sit: do not confirm neighbor when do pmtu update net/dst: do not confirm neighbor for vxlan and geneve pmtu update
Hans de Goede (2):
HID: logitech-hidpp: Silence intermittent get_battery_capacity errors
pinctrl: baytrail: Really serialize all register accesses
Harald Freudenberger (1):
s390/zcrypt: handle new reply code FILTERED_BY_HYPERVISOR
James Smart (5):
scsi: lpfc: Fix discovery failures when target device connectivity bounces
scsi: lpfc: Fix locking on mailbox command completion
scsi: lpfc: Fix SLI3 hba in loop mode not discovering devices
scsi: lpfc: Fix duplicate unreg_rpi error in port offline flow
scsi: lpfc: fix: Coverity: lpfc_cmpl_els_rsp(): Null pointer dereferences
Jan H. Schönherr (1):
x86/mce: Fix possibly incorrect severity calculation on AMD
Jan Kara (1):
jbd2: Fix statistics for the number of logged blocks
Jeffrey Hugo (1):
clk: qcom: Allow constant ratio freq tables for rcg
Jinke Fan (1):
HID: quirks: Add quirk for HP MSU1465 PIXART OEM mouse
Johannes Weiner (1):
kernel: sysctl: make drop_caches write-only
Kevin Hao (1):
watchdog: Fix the race between the release of watchdog_core_data and cdev
Konstantin Khlebnikov (1):
fs/quota: handle overflows of sysctl fs.quota.* and report as unsigned long
Linus Torvalds (2):
Make filldir[64]() verify the directory entry filename is valid filldir[64]: remove WARN_ON_ONCE() for bad directory entries
Mahesh Bandewar (1):
bonding: fix active-backup transition after link failure
Marco Oliverio (1):
netfilter: nf_queue: enqueue skbs with NULL dst
Martin Blumenstingl (1):
net: stmmac: dwmac-meson8b: Fix the RGMII TX delay on Meson8b/8m2 SoCs
Masahiro Yamada (2):
scripts/kallsyms: fix definitely-lost memory leak
libfdt: define INT32_MAX and UINT32_MAX in libfdt_env.h
Matthew Bobrowski (2):
ext4: update direct I/O read lock pattern for IOCB_NOWAIT
ext4: iomap that extends beyond EOF should be marked dirty
Mattias Jacobsson (1):
perf strbuf: Remove redundant va_end() in strbuf_addv()
Maurizio Lombardi (1):
scsi: scsi_debug: num_tgts must be >= 0
Michael Ellerman (2):
powerpc/pseries: Mark accumulate_stolen_time() as notrace powerpc/tools: Don't quote $objdump in scripts
Michael Hennerich (1):
clk: clk-gpio: propagate rate change to parent
Mike Rapoport (1):
userfaultfd: require CAP_SYS_PTRACE for UFFD_FEATURE_EVENT_FORK
Nathan Chancellor (1):
powerpc: Don't add -mabi= flags when building with Clang
Netanel Belgazal (1):
net: ena: fix napi handler misbehavior when the napi budget is zero
Nicholas Graumann (1):
dmaengine: xilinx_dma: Clear desc_pendingcount in xilinx_dma_reset
Paul Cercueil (1):
irqchip: ingenic: Error out if IRQ domain creation failed
Qian Cai (1):
libnvdimm/btt: fix variable 'rc' set but not used
Robert Jarzmik (1):
clk: pxa: fix one of the pxa RTC clocks
Russell King (1):
net: marvell: mvpp2: phylink requires the link interrupt
Sreekanth Reddy (1):
scsi: mpt3sas: Fix clear pending bit in ioctl status
Stefano Garzarella (1):
vhost/vsock: accept only packets with the right dst_cid
Subhash Jadavani (1):
scsi: ufs: Fix error handing during hibern8 enter
Taehee Yoo (4):
gtp: do not allow adding duplicate tid and ms_addr pdp context
gtp: fix wrong condition in gtp_genl_dump_pdp()
gtp: fix an use-after-free in ipv4_pdp_find()
gtp: avoid zero size hashtable
Takashi Iwai (1):
ALSA: hda - Downgrade error message for single-cmd fallback
Thierry Reding (1):
iommu/tegra-smmu: Fix page tables in > 4 GiB memory
Thomas Richter (1):
s390/cpum_sf: Check for SDBT and SDB consistency
Tyrel Datwyler (4):
PCI: rpaphp: Fix up pointer to first drc-info entry
PCI: rpaphp: Don't rely on firmware feature to imply drc-info support
PCI: rpaphp: Annotate and correctly byte swap DRC properties
PCI: rpaphp: Correctly match ibm, my-drc-index to drc-name when using drc-info
Vladimir Oltean (1):
gpio: mpc8xxx: Don't overwrite default irq_set_type callback
Vladis Dronov (1):
ptp: fix the race between the release of ptp_clock and cdev
Vladyslav Tarasiuk (1):
net/mlxfw: Fix out-of-memory error in mfa2 flash burning
Xiang Chen (1):
scsi: hisi_sas: Replace in_softirq() check in hisi_sas_task_exec()
peter chang (1):
scsi: pm80xx: Fix for SATA device discovery
Greg KH
maintainerMakefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 19 -SUBLEVEL = 92 +SUBLEVEL = 93 EXTRAVERSION = NAME = "People's Front"
arch/arm/boot/compressed/libfdt_env.h +3 -1
@@ -2,11 +2,13 @@#ifndef _ARM_LIBFDT_ENV_H#define _ARM_LIBFDT_ENV_H +#include <linux/limits.h> #include <linux/types.h> #include <linux/string.h> #include <asm/byteorder.h> -#define INT_MAX ((int)(~0U>>1)) +#define INT32_MAX S32_MAX +#define UINT32_MAX U32_MAXtypedef __be16 fdt16_t ;typedef __be32 fdt32_t ;
arch/arm/mm/proc-v7-bugs.c +3 -0
@@ -65,6 +65,9 @@ static void cpu_v7_spectre_init(void)break ;#ifdef CONFIG_ARM_PSCI +case ARM_CPU_PART_BRAHMA_B53 : +/* Requires no workaround */ +break ;default :/* Other ARM CPUs require no workaround */ if (read_cpuid_implementor () ==ARM_CPU_IMP_ARM )
arch/powerpc/Makefile +4 -0
@@ -90,11 +90,13 @@ MULTIPLEWORD := -mmultiple endif ifdef CONFIG_PPC64 +ifndef CONFIG_CC_IS_CLANG cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) cflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mcall-aixdesc) aflags-$(CONFIG_CPU_BIG_ENDIAN) += $(call cc-option,-mabi=elfv1) aflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mabi=elfv2 endif +endif ifneq ($(cc-name),clang) cflags-$(CONFIG_CPU_LITTLE_ENDIAN) += -mno-strict-align
@@ -134,6 +136,7 @@ endif endif CFLAGS-$(CONFIG_PPC64) := $(call cc-option,-mtraceback=no) +ifndef CONFIG_CC_IS_CLANG ifdef CONFIG_CPU_LITTLE_ENDIAN CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2,$(call cc-option,-mcall-aixdesc)) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv2)
@@ -142,6 +145,7 @@ CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcall-aixdesc) AFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mabi=elfv1) endif +endif CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mcmodel=medium,$(call cc-option,-mminimal-toc)) CFLAGS-$(CONFIG_PPC64) += $(call cc-option,-mno-pointers-to-nested-functions)
arch/powerpc/boot/libfdt_env.h +2 -0
@@ -6,6 +6,8 @@#include <string.h> #define INT_MAX ((int)(~0U>>1)) +#define UINT32_MAX ((u32)~0U) +#define INT32_MAX ((s32)(UINT32_MAX >> 1))#include "of.h"
arch/powerpc/include/asm/spinlock.h +1 -3
@@ -53,12 +53,10 @@#endif #ifdef CONFIG_PPC_PSERIES -DECLARE_STATIC_KEY_FALSE (shared_processor); -#define vcpu_is_preempted vcpu_is_preemptedstatic inline bool vcpu_is_preempted (int cpu) { -if (!static_branch_unlikely (&shared_processor)) +if (!firmware_has_feature (FW_FEATURE_SPLPAR ))return false;return !!(be32_to_cpu (lppaca_of (cpu).yield_count) &1 ); }
arch/powerpc/kernel/security.c +11 -10
@@ -134,32 +134,33 @@ ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, cha thread_priv =security_ftr_enabled (SEC_FTR_L1D_THREAD_PRIV ); -if (rfi_flush || thread_priv) { +if (rfi_flush) {struct seq_buf s;seq_buf_init (&s, buf,PAGE_SIZE -1 ); -seq_buf_printf (&s,"Mitigation: " ); - -if (rfi_flush) -seq_buf_printf (&s,"RFI Flush" ); - -if (rfi_flush && thread_priv) -seq_buf_printf (&s,", " ); - +seq_buf_printf (&s,"Mitigation: RFI Flush" );if (thread_priv) -seq_buf_printf (&s,"L1D private per thread" ); +seq_buf_printf (&s,", L1D private per thread" );seq_buf_printf (&s,"\n" );return s.len; } +if (thread_priv) +return sprintf (buf,"Vulnerable: L1D private per thread\n" ); +if (!security_ftr_enabled (SEC_FTR_L1D_FLUSH_HV ) && !security_ftr_enabled (SEC_FTR_L1D_FLUSH_PR ))return sprintf (buf,"Not affected\n" ); return sprintf(buf, "Vulnerable\n"); } + +ssize_t cpu_show_l1tf (struct device *dev,struct device_attribute *attr,char *buf) +{ +return cpu_show_meltdown (dev, attr, buf); +}#endif ssize_t cpu_show_spectre_v1 (struct device *dev,struct device_attribute *attr,char *buf)
arch/powerpc/kernel/time.c +1 -1
@@ -235,7 +235,7 @@ static u64 scan_dispatch_log(u64 stop_tb)* Accumulate stolen time by scanning the dispatch trace log. * Called on entry from user mode. */ -void accumulate_stolen_time (void ) +void notrace accumulate_stolen_time(void) {u64 sst, ust;unsigned long save_irq_soft_mask =irq_soft_mask_return ();
arch/powerpc/mm/hash_utils_64.c +9 -1
@@ -296,10 +296,18 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend, ret = mmu_hash_ops.hpte_insert (hpteg, vpn, paddr, tprot,HPTE_V_BOLTED , psize, psize, ssize); - +if (ret ==-1 ) { +/* Try to remove a non bolted entry */ + ret = mmu_hash_ops.hpte_remove (hpteg); +if (ret !=-1 ) + ret = mmu_hash_ops.hpte_insert (hpteg, vpn, paddr, tprot, +HPTE_V_BOLTED , psize, psize, + ssize); + }if (ret <0 )break ; +cond_resched ();#ifdef CONFIG_DEBUG_PAGEALLOC if (debug_pagealloc_enabled () && (paddr >>PAGE_SHIFT ) < linear_map_hash_count)
arch/powerpc/platforms/pseries/cmm.c +5 -0
@@ -425,6 +425,10 @@ static struct bus_type cmm_subsys = { .dev_name = "cmm", }; +static void cmm_release_device (struct device *dev) +{ +} +/** * cmm_sysfs_register - Register with sysfs *
@@ -440,6 +444,7 @@ static int cmm_sysfs_register(struct device *dev) dev->id =0 ; dev->bus = &cmm_subsys; + dev->release = cmm_release_device;if ((rc =device_register (dev))) goto subsys_unregister;
arch/powerpc/platforms/pseries/setup.c +0 -7
@@ -75,9 +75,6 @@#include "pseries.h" #include "../../../../drivers/pci/pci.h" -DEFINE_STATIC_KEY_FALSE (shared_processor); -EXPORT_SYMBOL_GPL (shared_processor); -int CMO_PrPSP =-1 ;int CMO_SecPSP =-1 ;unsigned long CMO_PageSize = (ASM_CONST (1 ) <<IOMMU_PAGE_SHIFT_4K );
@@ -764,10 +761,6 @@ static void __init pSeries_setup_arch(void)if (firmware_has_feature (FW_FEATURE_LPAR )) {vpa_init (boot_cpuid); - -if (lppaca_shared_proc (get_lppaca ())) -static_branch_enable (&shared_processor); - ppc_md.power_save = pseries_lpar_idle; ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;#ifdef CONFIG_PCI_IOV
arch/powerpc/tools/relocs_check.sh +1 -1
@@ -23,7 +23,7 @@ objdump="$1" vmlinux="$2" bad_relocs=$( -"$objdump" -R "$vmlinux" | +$objdump -R "$vmlinux" | # Only look at relocation lines. grep -E '\<R_' | # These relocations are okay
arch/powerpc/tools/unrel_branch_check.sh +2 -2
@@ -18,14 +18,14 @@ vmlinux="$2" #__end_interrupts should be located within the first 64K end_intr=0x$( -"$objdump" -R "$vmlinux" -d --start-address=0xc000000000000000 \ +$objdump -R "$vmlinux" -d --start-address=0xc000000000000000 \ --stop-address=0xc000000000010000 | grep '\<__end_interrupts>:' | awk '{print $1}' ) BRANCHES=$( -"$objdump" -R "$vmlinux" -D --start-address=0xc000000000000000 \ +$objdump -R "$vmlinux" -D --start-address=0xc000000000000000 \ --stop-address=${end_intr} | grep -e "^c[0-9a-f]*:[[:space:]]*\([0-9a-f][0-9a-f][[:space:]]\)\{4\}[[:space:]]*b" | grep -v '\<__start_initialization_multiplatform>' |
arch/s390/kernel/perf_cpum_sf.c +15 -2
@@ -193,7 +193,7 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb, unsigned long num_sdb, gfp_t gfp_flags) { int i, rc; -unsigned long *new, *tail; +unsigned long *new, *tail, *tail_prev =NULL ;if (!sfb->sdbt || !sfb->tail)return -EINVAL ;
@@ -232,6 +232,7 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb, sfb->num_sdbt++;/* Link current page to tail of chain */ *tail = (unsigned long )(void *) new +1 ; + tail_prev = tail; tail = new; }
@@ -241,10 +242,22 @@ static int realloc_sampling_buffer(struct sf_buffer *sfb,* issue, a new realloc call (if required) might succeed. */ rc =alloc_sample_data_block (tail, gfp_flags); -if (rc) +if (rc) { +/* Undo last SDBT. An SDBT with no SDB at its first +* entry but with an SDBT entry instead can not be +* handled by the interrupt handler code. +* Avoid this situation. +*/ +if (tail_prev) { + sfb->num_sdbt--; +free_page ((unsigned long ) new); + tail = tail_prev; + }break ; + } sfb->num_sdb++; tail++; + tail_prev = new =NULL ;/* Allocated at least one SBD */ }/* Link sampling buffer to its origin */
arch/x86/kernel/cpu/mcheck/mce.c +1 -1
@@ -812,8 +812,8 @@ static int mce_no_way_out(struct mce *m, char **msg, unsigned long *validp,if (quirk_no_way_out)quirk_no_way_out (i, m, regs); + m->bank = i;if (mce_severity (m, mca_cfg.tolerant, &tmp, true) >=MCE_PANIC_SEVERITY ) { - m->bank = i;mce_read_aux (m, i); *msg = tmp;return 1 ;
drivers/cdrom/cdrom.c +11 -1
@@ -996,6 +996,12 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype *tracks) tracks->xa =0 ; tracks->error =0 ;cd_dbg (CD_COUNT_TRACKS ,"entering cdrom_count_tracks\n" ); + +if (!CDROM_CAN (CDC_PLAY_AUDIO )) { + tracks->error =CDS_NO_INFO ; +return ; + } +/* Grab the TOC header so we can see how many tracks there are */ ret = cdi->ops->audio_ioctl (cdi,CDROMREADTOCHDR , &header);if (ret) {
@@ -1162,7 +1168,8 @@ int cdrom_open(struct cdrom_device_info *cdi, struct block_device *bdev, ret =open_for_data (cdi);if (ret) goto err; -cdrom_mmc3_profile (cdi); +if (CDROM_CAN (CDC_GENERIC_PACKET )) +cdrom_mmc3_profile (cdi);if (mode &FMODE_WRITE ) { ret = -EROFS ;if (cdrom_open_write (cdi))
@@ -2882,6 +2889,9 @@ int cdrom_get_last_written(struct cdrom_device_info *cdi, long *last_written)it doesn't give enough information or fails. then we return the toc contents. */ use_toc: +if (!CDROM_CAN (CDC_PLAY_AUDIO )) +return -ENOSYS ; + toc.cdte_format =CDROM_MSF ; toc.cdte_track =CDROM_LEADOUT ;if ((ret = cdi->ops->audio_ioctl (cdi,CDROMREADTOCENTRY , &toc)))
drivers/clk/clk-gpio.c +1 -1
@@ -248,7 +248,7 @@ static int gpio_clk_driver_probe(struct platform_device *pdev)else clk =clk_register_gpio_gate (&pdev->dev, node->name, parent_names ? parent_names[0 ] :NULL , gpiod, -0 ); +CLK_SET_RATE_PARENT );if (IS_ERR (clk))return PTR_ERR (clk);
drivers/clk/pxa/clk-pxa27x.c +1 -0
@@ -463,6 +463,7 @@ struct dummy_clk { };static struct dummy_clk dummy_clks[]__initdata = {DUMMY_CLK (NULL ,"pxa27x-gpio" ,"osc_32_768khz" ), +DUMMY_CLK (NULL ,"pxa-rtc" ,"osc_32_768khz" ),DUMMY_CLK (NULL ,"sa1100-rtc" ,"osc_32_768khz" ),DUMMY_CLK ("UARTCLK" ,"pxa2xx-ir" ,"STUART" ), };
drivers/clk/qcom/clk-rcg2.c +2 -0
@@ -206,6 +206,8 @@ static int _freq_tbl_determine_rate(struct clk_hw *hw, const struct freq_tbl *f,if (clk_flags &CLK_SET_RATE_PARENT ) { rate = f->freq;if (f->pre_div) { +if (!rate) + rate = req->rate; rate /=2 ; rate *= f->pre_div +1 ; }
drivers/clk/qcom/common.c +3 -0
@@ -29,6 +29,9 @@ struct freq_tbl *qcom_find_freq(const struct freq_tbl *f, unsigned long rate)if (!f)return NULL ; +if (!f->freq) +return f; +for (; f->freq; f++)if (rate <= f->freq)return f;
drivers/clocksource/asm9260_timer.c +4 -0
@@ -198,6 +198,10 @@ static int __init asm9260_timer_init(struct device_node *np) } clk =of_clk_get (np,0 ); +if (IS_ERR (clk)) { +pr_err ("Failed to get clk!\n" ); +return PTR_ERR (clk); + } ret =clk_prepare_enable (clk);if (ret) {
drivers/clocksource/timer-of.c +1 -1
@@ -199,7 +199,7 @@ int __init timer_of_init(struct device_node *np, struct timer_of *to) }if (!to->clkevt.name) - to->clkevt.name = np->name; + to->clkevt.name = np->full_name; to->np = np;
drivers/dma/xilinx/xilinx_dma.c +1 -0
@@ -1427,6 +1427,7 @@ static int xilinx_dma_reset(struct xilinx_dma_chan *chan) chan->err = false; chan->idle = true; + chan->desc_pendingcount =0 ; chan->desc_submitcount =0 ;return err;
drivers/gpio/gpio-mpc8xxx.c +2 -1
@@ -348,7 +348,8 @@ static int mpc8xxx_probe(struct platform_device *pdev)* It's assumed that only a single type of gpio controller is available * on the current machine, so overwriting global data is fine. */ - mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type; +if (devtype->irq_set_type) + mpc8xxx_irq_chip.irq_set_type = devtype->irq_set_type;if (devtype->gpio_dir_out) gc->direction_output = devtype->gpio_dir_out;
drivers/hid/hid-core.c +4 -0
@@ -780,6 +780,10 @@ static void hid_scan_feature_usage(struct hid_parser *parser, u32 usage)if (usage ==0xff0000c5 && parser->global.report_count ==256 && parser->global.report_size ==8 ) parser->scan_flags |=HID_SCAN_FLAG_MT_WIN_8 ; + +if (usage ==0xff0000c6 && parser->global.report_count ==1 && + parser->global.report_size ==8 ) + parser->scan_flags |=HID_SCAN_FLAG_MT_WIN_8 ; }static void hid_scan_collection (struct hid_parser *parser,unsigned type)
drivers/hid/hid-ids.h +1 -0
@@ -563,6 +563,7 @@#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A 0x094a#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0941 0x0941#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641 0x0641 +#define USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_1f4a 0x1f4a#define USB_VENDOR_ID_HUION 0x256c#define USB_DEVICE_ID_HUION_TABLET 0x006e
drivers/hid/hid-logitech-hidpp.c +3 -0
@@ -978,6 +978,9 @@ static int hidpp20_batterylevel_get_battery_capacity(struct hidpp_device *hidpp, ret =hidpp_send_fap_command_sync (hidpp, feature_index,CMD_BATTERY_LEVEL_STATUS_GET_BATTERY_LEVEL_STATUS ,NULL ,0 , &response); +/* Ignore these intermittent errors */ +if (ret ==HIDPP_ERROR_RESOURCE_ERROR ) +return -EIO ;if (ret >0 ) {hid_err (hidpp->hid_dev,"%s: received protocol error 0x%02x\n" , __func__, ret);
drivers/hid/hid-quirks.c +1 -0
@@ -96,6 +96,7 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_094A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0941), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_0641), HID_QUIRK_ALWAYS_POLL }, + { HID_USB_DEVICE(USB_VENDOR_ID_HP, USB_PRODUCT_ID_HP_PIXART_OEM_USB_OPTICAL_MOUSE_1f4a), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_IDEACOM, USB_DEVICE_ID_IDEACOM_IDC6680), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_INNOMEDIA, USB_DEVICE_ID_INNEX_GENESIS_ATARI), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_EASYPEN_M610X), HID_QUIRK_MULTI_INPUT },
drivers/hid/hid-rmi.c +2 -1
@@ -737,7 +737,8 @@ static void rmi_remove(struct hid_device *hdev) {struct rmi_data *hdata =hid_get_drvdata (hdev); -if (hdata->device_flags &RMI_DEVICE ) { +if ((hdata->device_flags &RMI_DEVICE ) + &&test_bit (RMI_STARTED , &hdata->flags)) {clear_bit (RMI_STARTED , &hdata->flags);cancel_work_sync (&hdata->reset_work);rmi_unregister_transport_device (&hdata->xport);
drivers/input/touchscreen/atmel_mxt_ts.c +4 -0
@@ -3162,6 +3162,8 @@ static int __maybe_unused mxt_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); +disable_irq (data->irq); +return 0 ; }
@@ -3174,6 +3176,8 @@ static int __maybe_unused mxt_resume(struct device *dev)if (!input_dev)return 0 ; +enable_irq (data->irq); +mutex_lock (&input_dev->mutex);if (input_dev->users)
drivers/iommu/rockchip-iommu.c +5 -2
@@ -977,13 +977,13 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type)if (!dma_dev)return NULL ; - rk_domain =devm_kzalloc (dma_dev,sizeof (*rk_domain),GFP_KERNEL ); + rk_domain =kzalloc (sizeof (*rk_domain),GFP_KERNEL );if (!rk_domain)return NULL ;if (type ==IOMMU_DOMAIN_DMA &&iommu_get_dma_cookie (&rk_domain->domain)) -return NULL ; + goto err_free_domain;/* * rk32xx iommus use a 2 level pagetable.
@@ -1018,6 +1018,8 @@ static struct iommu_domain *rk_iommu_domain_alloc(unsigned type) err_put_cookie:if (type ==IOMMU_DOMAIN_DMA )iommu_put_dma_cookie (&rk_domain->domain); +err_free_domain: +kfree (rk_domain);return NULL ; }
@@ -1046,6 +1048,7 @@ static void rk_iommu_domain_free(struct iommu_domain *domain)if (domain->type ==IOMMU_DOMAIN_DMA )iommu_put_dma_cookie (&rk_domain->domain); +kfree (rk_domain); }static int rk_iommu_add_device (struct device *dev)
drivers/iommu/tegra-smmu.c +6 -5
@@ -164,9 +164,9 @@ static bool smmu_dma_addr_valid(struct tegra_smmu *smmu, dma_addr_t addr)return (addr & smmu->pfn_mask) == addr; } -static dma_addr_t smmu_pde_to_dma (u32 pde) +static dma_addr_t smmu_pde_to_dma (struct tegra_smmu *smmu,u32 pde) { -return pde <<12 ; +return (dma_addr_t)(pde & smmu->pfn_mask) <<12 ; }static void smmu_flush_ptc_all (struct tegra_smmu *smmu)
@@ -551,6 +551,7 @@ static u32 *tegra_smmu_pte_lookup(struct tegra_smmu_as *as, unsigned long iova, dma_addr_t *dmap) {unsigned int pd_index =iova_pd_index (iova); +struct tegra_smmu *smmu = as->smmu;struct page *pt_page;u32 *pd;
@@ -559,7 +560,7 @@ static u32 *tegra_smmu_pte_lookup(struct tegra_smmu_as *as, unsigned long iova,return NULL ; pd =page_address (as->pd); - *dmap =smmu_pde_to_dma (pd[pd_index]); + *dmap =smmu_pde_to_dma (smmu, pd[pd_index]);return tegra_smmu_pte_offset (pt_page, iova); }
@@ -601,7 +602,7 @@ static u32 *as_get_pte(struct tegra_smmu_as *as, dma_addr_t iova, }else {u32 *pd =page_address (as->pd); - *dmap =smmu_pde_to_dma (pd[pde]); + *dmap =smmu_pde_to_dma (smmu, pd[pde]); }return tegra_smmu_pte_offset (as->pts[pde], iova);
@@ -626,7 +627,7 @@ static void tegra_smmu_pte_put_use(struct tegra_smmu_as *as, unsigned long iova)if (--as->count[pde] ==0 ) {struct tegra_smmu *smmu = as->smmu;u32 *pd =page_address (as->pd); -dma_addr_t pte_dma =smmu_pde_to_dma (pd[pde]); +dma_addr_t pte_dma =smmu_pde_to_dma (smmu, pd[pde]);tegra_smmu_set_pde (as, iova,0 );
drivers/irqchip/irq-bcm7038-l1.c +4 -0
@@ -284,6 +284,10 @@ static int __init bcm7038_l1_init_one(struct device_node *dn,pr_err ("failed to map parent interrupt %d\n" , parent_irq);return -EINVAL ; } + +if (of_property_read_bool (dn,"brcm,irq-can-wake" )) +enable_irq_wake (parent_irq); +irq_set_chained_handler_and_data (parent_irq, bcm7038_l1_irq_handle, intc);
drivers/irqchip/irq-ingenic.c +10 -5
@@ -117,6 +117,14 @@ static int __init ingenic_intc_of_init(struct device_node *node, goto out_unmap_irq; } + domain =irq_domain_add_legacy (node, num_chips *32 , +JZ4740_IRQ_BASE ,0 , + &irq_domain_simple_ops,NULL ); +if (!domain) { + err = -ENOMEM ; + goto out_unmap_base; + } +for (i =0 ; i < num_chips; i++) {/* Mask all irqs */ writel(0xffffffff, intc->base + (i * CHIP_SIZE) +
@@ -143,14 +151,11 @@ static int __init ingenic_intc_of_init(struct device_node *node, IRQ_NOPROBE | IRQ_LEVEL); } - domain =irq_domain_add_legacy (node, num_chips *32 ,JZ4740_IRQ_BASE ,0 , - &irq_domain_simple_ops,NULL ); -if (!domain) -pr_warn ("unable to register IRQ domain\n" ); -setup_irq (parent_irq, &intc_cascade_action);return 0 ; +out_unmap_base: +iounmap (intc->base); out_unmap_irq:irq_dispose_mapping (parent_irq); out_free:
drivers/leds/leds-lm3692x.c +11 -2
@@ -337,9 +337,18 @@ static int lm3692x_probe_dt(struct lm3692x_led *led)return ret; } - led->regulator =devm_regulator_get (&led->client->dev,"vled" ); -if (IS_ERR (led->regulator)) + led->regulator =devm_regulator_get_optional (&led->client->dev,"vled" ); +if (IS_ERR (led->regulator)) { + ret =PTR_ERR (led->regulator); +if (ret != -ENODEV ) { +if (ret != -EPROBE_DEFER ) +dev_err (&led->client->dev, +"Failed to get vled regulator: %d\n" , + ret); +return ret; + } led->regulator =NULL ; + } child =device_get_next_child_node (&led->client->dev, child);if (!child) {
drivers/mailbox/imx-mailbox.c +3 -1
@@ -214,8 +214,10 @@ static void imx_mu_shutdown(struct mbox_chan *chan)struct imx_mu_priv *priv =to_imx_mu_priv (chan->mbox);struct imx_mu_con_priv *cp = chan->con_priv; -if (cp->type ==IMX_MU_TYPE_TXDB ) +if (cp->type ==IMX_MU_TYPE_TXDB ) {tasklet_kill (&cp->txdb_tasklet); +return ; + }imx_mu_xcr_rmw (priv,0 ,IMX_MU_xCR_TIEn (cp->idx) |IMX_MU_xCR_RIEn (cp->idx));
drivers/md/bcache/btree.c +2 -0
@@ -713,6 +713,8 @@ static unsigned long bch_mca_scan(struct shrinker *shrink,* IO can always make forward progress: */ nr /= c->btree_pages; +if (nr ==0 ) + nr =1 ; nr = min_t(unsigned long, nr, mca_can_free(c)); i =0 ;
drivers/net/bonding/bond_main.c +0 -3
@@ -2223,9 +2223,6 @@ static void bond_miimon_commit(struct bonding *bond) }else if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP ) {/* make it immediately active */ bond_set_active_slave (slave); - }else if (slave != primary) { -/* prevent it from being the active one */ -bond_set_backup_slave (slave); } netdev_info(bond->dev, "link status definitely up for interface %s, %u Mbps %s duplex\n",
drivers/net/ethernet/amazon/ena/ena_netdev.c +7 -3
@@ -1197,8 +1197,8 @@ static int ena_io_poll(struct napi_struct *napi, int budget) struct ena_napi *ena_napi = container_of(napi, struct ena_napi, napi);struct ena_ring *tx_ring, *rx_ring; -u32 tx_work_done; -u32 rx_work_done; +int tx_work_done; +int rx_work_done =0 ;int tx_budget;int napi_comp_call =0 ;int ret;
@@ -1215,7 +1215,11 @@ static int ena_io_poll(struct napi_struct *napi, int budget) } tx_work_done =ena_clean_tx_irq (tx_ring, tx_budget); - rx_work_done =ena_clean_rx_irq (rx_ring, napi, budget); +/* On netpoll the budget is zero and the handler should only clean the +* tx completions. +*/ +if (likely (budget)) + rx_work_done =ena_clean_rx_irq (rx_ring, napi, budget);/* If the device is about to reset or down, avoid unmask * the interrupt and return 0 so NAPI won't reschedule
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +1 -1
@@ -3341,7 +3341,7 @@ static int mvpp2_open(struct net_device *dev) valid = true; } -if (priv->hw_version ==MVPP22 && port->link_irq && !port->phylink) { +if (priv->hw_version ==MVPP22 && port->link_irq) { err =request_irq (port->link_irq, mvpp2_link_status_isr,0 , dev->name, port);if (err) {
drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.c +4 -3
@@ -37,6 +37,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/netlink.h> +#include <linux/vmalloc.h> #include <linux/xz.h> #include "mlxfw_mfa2.h" #include "mlxfw_mfa2_file.h"
@@ -579,7 +580,7 @@ mlxfw_mfa2_file_component_get(const struct mlxfw_mfa2_file *mfa2_file, comp_size =be32_to_cpu (comp->size); comp_buf_size = comp_size + mlxfw_mfa2_comp_magic_len; - comp_data =kmalloc (sizeof (*comp_data) + comp_buf_size,GFP_KERNEL ); + comp_data =vzalloc (sizeof (*comp_data) + comp_buf_size);if (!comp_data)return ERR_PTR (-ENOMEM ); comp_data->comp.data_size = comp_size;
@@ -601,7 +602,7 @@ mlxfw_mfa2_file_component_get(const struct mlxfw_mfa2_file *mfa2_file, comp_data->comp.data = comp_data->buff + mlxfw_mfa2_comp_magic_len;return &comp_data->comp; err_out: -kfree (comp_data); +vfree (comp_data);return ERR_PTR (err); }
@@ -610,7 +611,7 @@ void mlxfw_mfa2_file_component_put(struct mlxfw_mfa2_component *comp)const struct mlxfw_mfa2_comp_data *comp_data; comp_data = container_of(comp, struct mlxfw_mfa2_comp_data, comp); -kfree (comp_data); +vfree (comp_data); }void mlxfw_mfa2_file_fini (struct mlxfw_mfa2_file *mfa2_file)
drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c +11 -3
@@ -118,6 +118,14 @@ static int meson8b_init_rgmii_tx_clk(struct meson8b_dwmac *dwmac)struct device *dev = dwmac->dev;const char *parent_name, *mux_parent_names[MUX_CLK_NUM_PARENTS ];struct meson8b_dwmac_clk_configs *clk_configs; +static const struct clk_div_table div_table[] = { + { .div =2 , .val =2 , }, + { .div =3 , .val =3 , }, + { .div =4 , .val =4 , }, + { .div =5 , .val =5 , }, + { .div =6 , .val =6 , }, + { .div =7 , .val =7 , }, + }; clk_configs =devm_kzalloc (dev,sizeof (*clk_configs),GFP_KERNEL );if (!clk_configs)
@@ -152,9 +160,9 @@ static int meson8b_init_rgmii_tx_clk(struct meson8b_dwmac *dwmac) clk_configs->m250_div.reg = dwmac->regs +PRG_ETH0 ; clk_configs->m250_div.shift =PRG_ETH0_CLK_M250_DIV_SHIFT ; clk_configs->m250_div.width =PRG_ETH0_CLK_M250_DIV_WIDTH ; - clk_configs->m250_div.flags =CLK_DIVIDER_ONE_BASED | -CLK_DIVIDER_ALLOW_ZERO | -CLK_DIVIDER_ROUND_CLOSEST ; + clk_configs->m250_div.table = div_table; + clk_configs->m250_div.flags =CLK_DIVIDER_ALLOW_ZERO | +CLK_DIVIDER_ROUND_CLOSEST ; clk =meson8b_dwmac_register_clk (dwmac,"m250_div" , &parent_name,1 , &clk_divider_ops, &clk_configs->m250_div.hw);
drivers/net/gtp.c +64 -47
219 lines not on this page · raw message
drivers/net/hamradio/6pack.c +2 -2
@@ -654,10 +654,10 @@ static void sixpack_close(struct tty_struct *tty) {struct sixpack *sp; -write_lock_bh (&disc_data_lock); +write_lock_irq (&disc_data_lock); sp = tty->disc_data; tty->disc_data =NULL ; -write_unlock_bh (&disc_data_lock); +write_unlock_irq (&disc_data_lock);if (!sp)return ;
drivers/net/hamradio/mkiss.c +2 -2
@@ -783,10 +783,10 @@ static void mkiss_close(struct tty_struct *tty) {struct mkiss *ax; -write_lock_bh (&disc_data_lock); +write_lock_irq (&disc_data_lock); ax = tty->disc_data; tty->disc_data =NULL ; -write_unlock_bh (&disc_data_lock); +write_unlock_irq (&disc_data_lock);if (!ax)return ;
drivers/nvdimm/btt.c +4 -4
@@ -1260,11 +1260,11 @@ static int btt_read_pg(struct btt *btt, struct bio_integrity_payload *bip, ret =btt_data_read (arena, page, off, postmap, cur_len);if (ret) { -int rc; -/* Media error - set the e_flag */ - rc =btt_map_write (arena, premap, postmap,0 ,1 , -NVDIMM_IO_ATOMIC ); +if (btt_map_write (arena, premap, postmap,0 ,1 ,NVDIMM_IO_ATOMIC )) +dev_warn_ratelimited (to_dev (arena), +"Error persistently tracking bad blocks at %#x\n" , + premap); goto out_rtt; }
drivers/pci/hotplug/rpaphp_core.c +21 -17
@@ -154,11 +154,11 @@ static enum pci_bus_speed get_max_bus_speed(struct slot *slot)return speed; } -static int get_children_props (struct device_node *dn,const int **drc_indexes, -const int **drc_names,const int **drc_types, -const int **drc_power_domains) +static int get_children_props (struct device_node *dn,const __be32 **drc_indexes, +const __be32 **drc_names,const __be32 **drc_types, +const __be32 **drc_power_domains) { -const int *indexes, *names, *types, *domains; +const __be32 *indexes, *names, *types, *domains; indexes =of_get_property (dn,"ibm,drc-indexes" ,NULL ); names =of_get_property (dn,"ibm,drc-names" ,NULL );
@@ -194,8 +194,8 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name, char *drc_type, unsigned int my_index) { char *name_tmp, *type_tmp; -const int *indexes, *names; -const int *types, *domains; +const __be32 *indexes, *names; +const __be32 *types, *domains;int i, rc; rc =get_children_props (dn->parent, &indexes, &names, &types, &domains);
@@ -208,7 +208,7 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name,/* Iterate through parent properties, looking for my-drc-index */ for (i =0 ; i <be32_to_cpu (indexes[0 ]); i++) { -if ((unsigned int ) indexes[i +1 ] == my_index) +if (be32_to_cpu (indexes[i +1 ]) == my_index)break ; name_tmp += (strlen (name_tmp) +1 );
@@ -239,6 +239,8 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, value =of_prop_next_u32 (info,NULL , &entries);if (!value)return -EINVAL ; +else + value++;for (j =0 ; j < entries; j++) {of_read_drc_info_cell (&info, &value, &drc);
@@ -246,9 +248,10 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,/* Should now know end of current entry */ /* Found it */ -if (my_index <= drc.last_drc_index) { +if (my_index >= drc.drc_index_start && my_index <= drc.last_drc_index) { +int index = my_index - drc.drc_index_start;sprintf (cell_drc_name,"%s%d" , drc.drc_name_prefix, - my_index); + drc.drc_name_suffix_start + index);break ; } }
@@ -265,7 +268,7 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,int rpaphp_check_drc_props (struct device_node *dn,char *drc_name,char *drc_type) { -const unsigned int *my_index; +const __be32 *my_index; my_index =of_get_property (dn,"ibm,my-drc-index" ,NULL );if (!my_index) {
@@ -273,12 +276,12 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name,return -EINVAL ; } -if (firmware_has_feature (FW_FEATURE_DRC_INFO )) +if (of_find_property (dn->parent,"ibm,drc-info" ,NULL ))return rpaphp_check_drc_props_v2 (dn, drc_name, drc_type, - *my_index); +be32_to_cpu (*my_index));else return rpaphp_check_drc_props_v1 (dn, drc_name, drc_type, - *my_index); +be32_to_cpu (*my_index)); }EXPORT_SYMBOL_GPL (rpaphp_check_drc_props);
@@ -309,10 +312,11 @@ static int is_php_type(char *drc_type)* for built-in pci slots (even when the built-in slots are * dlparable.) */ -static int is_php_dn (struct device_node *dn,const int **indexes, -const int **names,const int **types,const int **power_domains) +static int is_php_dn (struct device_node *dn,const __be32 **indexes, +const __be32 **names,const __be32 **types, +const __be32 **power_domains) { -const int *drc_types; +const __be32 *drc_types;int rc; rc =get_children_props (dn, indexes, names, &drc_types, power_domains);
@@ -347,7 +351,7 @@ int rpaphp_add_slot(struct device_node *dn)struct slot *slot;int retval =0 ;int i; -const int *indexes, *names, *types, *power_domains; +const __be32 *indexes, *names, *types, *power_domains;char *name, *type;if (!dn->name ||strcmp (dn->name,"pci" ))
drivers/pinctrl/intel/pinctrl-baytrail.c +44 -37
296 lines not on this page · raw message
drivers/ptp/ptp_clock.c +14 -17
@@ -175,9 +175,9 @@ static struct posix_clock_operations ptp_clock_ops = { .read = ptp_read, }; -static void delete_ptp_clock (struct posix_clock *pc) +static void ptp_clock_release (struct device *dev) { - struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); + struct ptp_clock *ptp = container_of(dev, struct ptp_clock, dev);mutex_destroy (&ptp->tsevq_mux);mutex_destroy (&ptp->pincfg_mux);
@@ -222,7 +222,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, } ptp->clock.ops = ptp_clock_ops; - ptp->clock.release = delete_ptp_clock; ptp->info = info; ptp->devid =MKDEV (major, index); ptp->index = index;
@@ -249,15 +248,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,if (err) goto no_pin_groups; -/* Create a new device in our class. */ - ptp->dev =device_create_with_groups (ptp_class, parent, ptp->devid, - ptp, ptp->pin_attr_groups, -"ptp%d" , ptp->index); -if (IS_ERR (ptp->dev)) { - err =PTR_ERR (ptp->dev); - goto no_device; - } -/* Register a new PPS source. */ if (info->pps) {struct pps_source_info pps;
@@ -273,8 +263,18 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info, } } -/* Create a posix clock. */ - err =posix_clock_register (&ptp->clock, ptp->devid); +/* Initialize a new device of our class in our clock structure. */ +device_initialize (&ptp->dev); + ptp->dev.devt = ptp->devid; + ptp->dev.class = ptp_class; + ptp->dev.parent = parent; + ptp->dev.groups = ptp->pin_attr_groups; + ptp->dev.release = ptp_clock_release; +dev_set_drvdata (&ptp->dev, ptp); +dev_set_name (&ptp->dev,"ptp%d" , ptp->index); + +/* Create a posix clock and link it to the device. */ + err =posix_clock_register (&ptp->clock, &ptp->dev);if (err) {pr_err ("failed to create posix clock\n" ); goto no_clock;
@@ -286,8 +286,6 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,if (ptp->pps_source)pps_unregister_source (ptp->pps_source); no_pps: -device_destroy (ptp_class, ptp->devid); -no_device:ptp_cleanup_pin_groups (ptp); no_pin_groups:if (ptp->kworker)
@@ -317,7 +315,6 @@ int ptp_clock_unregister(struct ptp_clock *ptp)if (ptp->pps_source)pps_unregister_source (ptp->pps_source); -device_destroy (ptp_class, ptp->devid);ptp_cleanup_pin_groups (ptp);posix_clock_unregister (&ptp->clock);
drivers/ptp/ptp_private.h +1 -1
@@ -41,7 +41,7 @@ struct timestamp_event_queue {struct ptp_clock {struct posix_clock clock; -struct device *dev; +struct device dev;struct ptp_clock_info *info;dev_t devid;int index;/* index into clocks.map */
drivers/s390/crypto/zcrypt_error.h +2 -0
@@ -62,6 +62,7 @@ struct error_hdr {#define REP82_ERROR_EVEN_MOD_IN_OPND 0x85#define REP82_ERROR_RESERVED_FIELD 0x88#define REP82_ERROR_INVALID_DOMAIN_PENDING 0x8A +#define REP82_ERROR_FILTERED_BY_HYPERVISOR 0x8B#define REP82_ERROR_TRANSPORT_FAIL 0x90#define REP82_ERROR_PACKET_TRUNCATED 0xA0#define REP82_ERROR_ZERO_BUFFER_LEN 0xB0
@@ -92,6 +93,7 @@ static inline int convert_error(struct zcrypt_queue *zq,case REP82_ERROR_INVALID_DOMAIN_PRECHECK :case REP82_ERROR_INVALID_DOMAIN_PENDING :case REP82_ERROR_INVALID_SPECIAL_CMD : +case REP82_ERROR_FILTERED_BY_HYPERVISOR :// REP88_ERROR_INVALID_KEY // '82' CEX2A // REP88_ERROR_OPERAND // '84' CEX2A // REP88_ERROR_OPERAND_EVEN_MOD // '85' CEX2A
drivers/scsi/NCR5380.c +5 -1
@@ -129,6 +129,9 @@#define NCR5380_release_dma_irq (x)#endif +static unsigned int disconnect_mask = ~0 ; +module_param (disconnect_mask, int,0444 ); +static int do_abort (struct Scsi_Host *);static void do_reset (struct Scsi_Host *);static void bus_reset_cleanup (struct Scsi_Host *);
@@ -946,7 +949,8 @@ static bool NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)int err;bool ret = true;bool can_disconnect = instance->irq !=NO_IRQ && - cmd->cmnd[0 ] !=REQUEST_SENSE ; + cmd->cmnd[0 ] !=REQUEST_SENSE && + (disconnect_mask &BIT (scmd_id (cmd)));NCR5380_dprint (NDEBUG_ARBITRATION , instance); dsprintk(NDEBUG_ARBITRATION, instance, "starting arbitration, id = %d\n",
drivers/scsi/atari_scsi.c +3 -3
@@ -742,7 +742,7 @@ static int __init atari_scsi_probe(struct platform_device *pdev) atari_scsi_template.sg_tablesize =SG_ALL ; }else { atari_scsi_template.can_queue =1 ; - atari_scsi_template.sg_tablesize =SG_NONE ; + atari_scsi_template.sg_tablesize =1 ; }if (setup_can_queue >0 )
@@ -751,8 +751,8 @@ static int __init atari_scsi_probe(struct platform_device *pdev)if (setup_cmd_per_lun >0 ) atari_scsi_template.cmd_per_lun = setup_cmd_per_lun; -/* Leave sg_tablesize at 0 on a Falcon! */ -if (ATARIHW_PRESENT (TT_SCSI ) && setup_sg_tablesize >=0 ) +/* Don't increase sg_tablesize on Falcon! */ +if (ATARIHW_PRESENT (TT_SCSI ) && setup_sg_tablesize >0 ) atari_scsi_template.sg_tablesize = setup_sg_tablesize;if (setup_hostid >=0 ) {
drivers/scsi/csiostor/csio_lnode.c +9 -6
@@ -301,6 +301,7 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req)struct fc_fdmi_port_name *port_name;uint8_t buf[64 ];uint8_t *fc4_type; +unsigned long flags;if (fdmi_req->wr_status !=FW_SUCCESS ) { csio_ln_dbg(ln, "WR error:%x in processing fdmi rhba cmd\n",
@@ -385,13 +386,13 @@ csio_ln_fdmi_rhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) len = (uint32_t )(pld - (uint8_t *)cmd);/* Submit FDMI RPA request */ -spin_lock_irq (&hw->lock); +spin_lock_irqsave (&hw->lock, flags);if (csio_ln_mgmt_submit_req (fdmi_req, csio_ln_fdmi_done,FCOE_CT , &fdmi_req->dma_buf, len)) {CSIO_INC_STATS (ln, n_fdmi_err);csio_ln_dbg (ln,"Failed to issue fdmi rpa req\n" ); } -spin_unlock_irq (&hw->lock); +spin_unlock_irqrestore (&hw->lock, flags); }/*
@@ -412,6 +413,7 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req)struct fc_fdmi_rpl *reg_pl;struct fs_fdmi_attrs *attrib_blk;uint8_t buf[64 ]; +unsigned long flags;if (fdmi_req->wr_status !=FW_SUCCESS ) { csio_ln_dbg(ln, "WR error:%x in processing fdmi dprt cmd\n",
@@ -491,13 +493,13 @@ csio_ln_fdmi_dprt_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) attrib_blk->numattrs =htonl (numattrs);/* Submit FDMI RHBA request */ -spin_lock_irq (&hw->lock); +spin_lock_irqsave (&hw->lock, flags);if (csio_ln_mgmt_submit_req (fdmi_req, csio_ln_fdmi_rhba_cbfn,FCOE_CT , &fdmi_req->dma_buf, len)) {CSIO_INC_STATS (ln, n_fdmi_err);csio_ln_dbg (ln,"Failed to issue fdmi rhba req\n" ); } -spin_unlock_irq (&hw->lock); +spin_unlock_irqrestore (&hw->lock, flags); }/*
@@ -512,6 +514,7 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req)void *cmd;struct fc_fdmi_port_name *port_name;uint32_t len; +unsigned long flags;if (fdmi_req->wr_status !=FW_SUCCESS ) { csio_ln_dbg(ln, "WR error:%x in processing fdmi dhba cmd\n",
@@ -542,13 +545,13 @@ csio_ln_fdmi_dhba_cbfn(struct csio_hw *hw, struct csio_ioreq *fdmi_req) len +=sizeof (*port_name);/* Submit FDMI request */ -spin_lock_irq (&hw->lock); +spin_lock_irqsave (&hw->lock, flags);if (csio_ln_mgmt_submit_req (fdmi_req, csio_ln_fdmi_dprt_cbfn,FCOE_CT , &fdmi_req->dma_buf, len)) {CSIO_INC_STATS (ln, n_fdmi_err);csio_ln_dbg (ln,"Failed to issue fdmi dprt req\n" ); } -spin_unlock_irq (&hw->lock); +spin_unlock_irqrestore (&hw->lock, flags); }/**
drivers/scsi/hisi_sas/hisi_sas_main.c +7 -1
@@ -485,7 +485,13 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags,struct hisi_sas_dq *dq =NULL ;if (unlikely (test_bit (HISI_SAS_REJECT_CMD_BIT , &hisi_hba->flags))) { -if (in_softirq ()) +/* +* For IOs from upper layer, it may already disable preempt +* in the IO path, if disable preempt again in down(), +* function schedule() will report schedule_bug(), so check +* preemptible() before goto down(). +*/ +if (!preemptible ())return -EINVAL ;down (&hisi_hba->sem);
drivers/scsi/iscsi_tcp.c +8 -0
@@ -374,8 +374,16 @@ static int iscsi_sw_tcp_pdu_xmit(struct iscsi_task *task) {struct iscsi_conn *conn = task->conn;unsigned int noreclaim_flag; +struct iscsi_tcp_conn *tcp_conn = conn->dd_data; +struct iscsi_sw_tcp_conn *tcp_sw_conn = tcp_conn->dd_data;int rc =0 ; +if (!tcp_sw_conn->sock) { +iscsi_conn_printk (KERN_ERR , conn, +"Transport not bound to socket!\n" ); +return -EINVAL ; + } + noreclaim_flag =memalloc_noreclaim_save ();while (iscsi_sw_tcp_xmit_qlen (conn)) {
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -4110,7 +4110,7 @@ lpfc_cmpl_els_rsp(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,mempool_free (mbox, phba->mbox_mem_pool); } out: -if (ndlp &&NLP_CHK_NODE_ACT (ndlp)) { +if (ndlp &&NLP_CHK_NODE_ACT (ndlp) && shost) {spin_lock_irq (shost->host_lock); ndlp->nlp_flag &= ~(NLP_ACC_REGLOGIN |NLP_RM_DFLT_RPI );spin_unlock_irq (shost->host_lock);
drivers/scsi/lpfc/lpfc_hbadisc.c +6 -1
@@ -5231,9 +5231,14 @@ lpfc_setup_disc_node(struct lpfc_vport *vport, uint32_t did)/* If we've already received a PLOGI from this NPort * we don't need to try to discover it again. */ -if (ndlp->nlp_flag &NLP_RCV_PLOGI ) +if (ndlp->nlp_flag &NLP_RCV_PLOGI && + !(ndlp->nlp_type & + (NLP_FCP_TARGET |NLP_NVME_TARGET )))return NULL ; + ndlp->nlp_prev_state = ndlp->nlp_state; +lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE ); +spin_lock_irq (shost->host_lock); ndlp->nlp_flag |=NLP_NPR_2B_DISC ;spin_unlock_irq (shost->host_lock);
drivers/scsi/lpfc/lpfc_nportdisc.c +3 -1
@@ -483,8 +483,10 @@ lpfc_rcv_plogi(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp,* single discovery thread, this will cause a huge delay in * discovery. Also this will cause multiple state machines * running in parallel for this node. +* This only applies to a fabric environment. */ -if (ndlp->nlp_state ==NLP_STE_PLOGI_ISSUE ) { +if ((ndlp->nlp_state ==NLP_STE_PLOGI_ISSUE ) && + (vport->fc_flag &FC_FABRIC )) {/* software abort outstanding PLOGI */ lpfc_els_abort (phba, ndlp); }
drivers/scsi/lpfc/lpfc_sli.c +14 -1
@@ -12928,13 +12928,19 @@ lpfc_sli4_sp_handle_mbox_event(struct lpfc_hba *phba, struct lpfc_mcqe *mcqe) phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE ;/* Setting active mailbox pointer need to be in sync to flag clear */ phba->sli.mbox_active =NULL ; +if (bf_get (lpfc_trailer_consumed, mcqe)) +lpfc_sli4_mq_release (phba->sli4_hba.mbx_wq);spin_unlock_irqrestore (&phba->hbalock, iflags);/* Wake up worker thread to post the next pending mailbox command */ lpfc_worker_wake_up (phba); +return workposted; + out_no_mqe_complete: +spin_lock_irqsave (&phba->hbalock, iflags);if (bf_get (lpfc_trailer_consumed, mcqe))lpfc_sli4_mq_release (phba->sli4_hba.mbx_wq); -return workposted; +spin_unlock_irqrestore (&phba->hbalock, iflags); +return false; }/**
@@ -17861,6 +17867,13 @@ lpfc_sli4_alloc_rpi(struct lpfc_hba *phba)static void __lpfc_sli4_free_rpi (struct lpfc_hba *phba,int rpi) { +/* +* if the rpi value indicates a prior unreg has already +* been done, skip the unreg. +*/ +if (rpi ==LPFC_RPI_ALLOC_ERROR ) +return ; +if (test_and_clear_bit (rpi, phba->sli4_hba.rpi_bmask)) { phba->sli4_hba.rpi_count--; phba->sli4_hba.max_cfg_param.rpi_used--;
drivers/scsi/mac_scsi.c +1 -1
@@ -429,7 +429,7 @@ static int __init mac_scsi_probe(struct platform_device *pdev) mac_scsi_template.can_queue = setup_can_queue;if (setup_cmd_per_lun >0 ) mac_scsi_template.cmd_per_lun = setup_cmd_per_lun; -if (setup_sg_tablesize >=0 ) +if (setup_sg_tablesize >0 ) mac_scsi_template.sg_tablesize = setup_sg_tablesize;if (setup_hostid >=0 ) mac_scsi_template.this_id = setup_hostid &7 ;
drivers/scsi/mpt3sas/mpt3sas_ctl.c +2 -1
@@ -1597,7 +1597,8 @@ _ctl_diag_register_2(struct MPT3SAS_ADAPTER *ioc," for diag buffers, requested size(%d)\n" , ioc->name, __func__, request_data_sz);mpt3sas_base_free_smid (ioc, smid); -return -ENOMEM ; + rc = -ENOMEM ; + goto out; } ioc->diag_buffer[buffer_type] = request_data; ioc->diag_buffer_sz[buffer_type] = request_data_sz;
drivers/scsi/pm8001/pm80xx_hwi.c +2 -0
@@ -2382,6 +2382,8 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, void *piomb)pm8001_printk ("task 0x%p done with io_status 0x%x" " resp 0x%x stat 0x%x but aborted by upper layer!\n" , t, status, ts->resp, ts->stat)); +if (t->slow_task) +complete (&t->slow_task->completion);pm8001_ccb_task_free (pm8001_ha, t, ccb, tag); }else {spin_unlock_irqrestore (&t->task_state_lock, flags);
drivers/scsi/scsi_debug.c +5 -0
@@ -5351,6 +5351,11 @@ static int __init scsi_debug_init(void)return -EINVAL ; } +if (sdebug_num_tgts <0 ) { +pr_err ("num_tgts must be >= 0\n" ); +return -EINVAL ; + } +if (sdebug_guard >1 ) {pr_err ("guard must be 0 or 1\n" );return -EINVAL ;
drivers/scsi/scsi_trace.c +7 -4
@@ -30,15 +30,18 @@ static const char * scsi_trace_rw6(struct trace_seq *p, unsigned char *cdb, int len) { const char *ret = trace_seq_buffer_ptr(p); -sector_t lba =0 , txlen =0 ; +u32 lba =0 , txlen; lba |= ((cdb[1 ] &0x1F ) <<16 ); lba |= (cdb[2 ] <<8 ); lba |= cdb[3 ]; - txlen = cdb[4 ]; +/* +* From SBC-2: a TRANSFER LENGTH field set to zero specifies that 256 +* logical blocks shall be read (READ(6)) or written (WRITE(6)). +*/ + txlen = cdb[4 ] ? cdb[4 ] :256 ; -trace_seq_printf (p,"lba=%llu txlen=%llu" , - (unsigned long long )lba, (unsigned long long )txlen); +trace_seq_printf (p,"lba=%u txlen=%u" , lba, txlen);trace_seq_putc (p,0 );return ret;
drivers/scsi/sun3_scsi.c +2 -2
@@ -498,7 +498,7 @@ static struct scsi_host_template sun3_scsi_template = { .eh_host_reset_handler = sun3scsi_host_reset, .can_queue = 16, .this_id = 7, - .sg_tablesize = SG_NONE, + .sg_tablesize = 1, .cmd_per_lun = 2, .use_clustering = DISABLE_CLUSTERING, .cmd_size = NCR5380_CMD_SIZE,
@@ -520,7 +520,7 @@ static int __init sun3_scsi_probe(struct platform_device *pdev) sun3_scsi_template.can_queue = setup_can_queue;if (setup_cmd_per_lun >0 ) sun3_scsi_template.cmd_per_lun = setup_cmd_per_lun; -if (setup_sg_tablesize >=0 ) +if (setup_sg_tablesize >0 ) sun3_scsi_template.sg_tablesize = setup_sg_tablesize;if (setup_hostid >=0 ) sun3_scsi_template.this_id = setup_hostid &7 ;
drivers/scsi/ufs/ufshcd.c +15 -6
@@ -3011,10 +3011,10 @@ static int __ufshcd_query_descriptor(struct ufs_hba *hba, goto out_unlock; } - hba->dev_cmd.query.descriptor =NULL ; *buf_len =be16_to_cpu (response->upiu_res.length); out_unlock: + hba->dev_cmd.query.descriptor =NULL ;mutex_unlock (&hba->dev_cmd.lock); out:ufshcd_release (hba);
@@ -3875,15 +3875,24 @@ static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba) ktime_to_us(ktime_sub(ktime_get(), start)), ret);if (ret) { +int err; +dev_err (hba->dev,"%s: hibern8 enter failed. ret = %d\n" , __func__, ret);/* -* If link recovery fails then return error so that caller -* don't retry the hibern8 enter again. +* If link recovery fails then return error code returned from +* ufshcd_link_recovery(). +* If link recovery succeeds then return -EAGAIN to attempt +* hibern8 enter retry again. */ -if (ufshcd_link_recovery (hba)) - ret = -ENOLINK ; + err =ufshcd_link_recovery (hba); +if (err) { +dev_err (hba->dev,"%s: link recovery failed" , __func__); + ret = err; + }else { + ret = -EAGAIN ; + } }else ufshcd_vops_hibern8_notify (hba,UIC_CMD_DME_HIBER_ENTER ,POST_CHANGE );
@@ -3897,7 +3906,7 @@ static int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)for (retries =UIC_HIBERN8_ENTER_RETRIES ; retries >0 ; retries--) { ret =__ufshcd_uic_hibern8_enter (hba); -if (!ret || ret == -ENOLINK ) +if (!ret) goto out; } out:
drivers/spi/spi-fsl-spi.c +3 -4
@@ -832,9 +832,9 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)if (ret) goto err; - irq =irq_of_parse_and_map (np,0 ); -if (!irq) { - ret = -EINVAL ; + irq =platform_get_irq (ofdev,0 ); +if (irq <0 ) { + ret = irq; goto err; }
@@ -847,7 +847,6 @@ static int of_fsl_spi_probe(struct platform_device *ofdev)return 0 ; err: -irq_dispose_mapping (irq);if (type ==TYPE_FSL )of_fsl_spi_free_chipselects (dev);return ret;
drivers/target/iscsi/iscsi_target.c +8 -2
@@ -1157,7 +1157,9 @@ int iscsit_setup_scsi_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, hdr->cmdsn,be32_to_cpu (hdr->data_length), payload_length, conn->cid); -target_get_sess_cmd (&cmd->se_cmd, true); +if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) +return iscsit_add_reject_cmd (cmd, +ISCSI_REASON_WAITING_FOR_LOGOUT , buf); cmd->sense_reason =transport_lookup_cmd_lun (&cmd->se_cmd,scsilun_to_int (&hdr->lun));
@@ -1998,7 +2000,9 @@ iscsit_handle_task_mgt_cmd(struct iscsi_conn *conn, struct iscsi_cmd *cmd, conn->sess->se_sess,0 ,DMA_NONE , TCM_SIMPLE_TAG, cmd->sense_buffer + 2); -target_get_sess_cmd (&cmd->se_cmd, true); +if (target_get_sess_cmd (&cmd->se_cmd, true) <0 ) +return iscsit_add_reject_cmd (cmd, +ISCSI_REASON_WAITING_FOR_LOGOUT , buf);/* * TASK_REASSIGN for ERL=2 / connection stays inside of
@@ -4204,6 +4208,8 @@ int iscsit_close_connection(* must wait until they have completed. */ iscsit_check_conn_usage_count (conn); +target_sess_cmd_list_set_waiting (sess->se_sess); +target_wait_for_sess_cmds (sess->se_sess);ahash_request_free (conn->conn_tx_hash);if (conn->conn_rx_hash) {
drivers/target/iscsi/iscsi_target_auth.c +1 -1
@@ -78,7 +78,7 @@ static int chap_check_algorithm(const char *a_str)if (!token) goto out; -if (!strncmp (token,"5" ,1 )) { +if (!strcmp (token,"5" )) {pr_debug ("Selected MD5 Algorithm\n" );kfree (orig);return CHAP_DIGEST_MD5 ;
drivers/tty/serial/atmel_serial.c +22 -21
55 lines not on this page · raw message
drivers/vhost/vsock.c +3 -1
@@ -436,7 +436,9 @@ static void vhost_vsock_handle_tx_kick(struct vhost_work *work)virtio_transport_deliver_tap_pkt (pkt);/* Only accept correctly addressed packets */ -if (le64_to_cpu (pkt->hdr.src_cid) == vsock->guest_cid) +if (le64_to_cpu (pkt->hdr.src_cid) == vsock->guest_cid && +le64_to_cpu (pkt->hdr.dst_cid) == +vhost_transport_get_local_cid ())virtio_transport_recv_pkt (pkt);else virtio_transport_free_pkt (pkt);
drivers/watchdog/watchdog_dev.c +32 -38
195 lines not on this page · raw message
fs/ext4/inode.c +14 -2
@@ -3544,8 +3544,14 @@ static int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length,return ret; } +/* +* Writes that span EOF might trigger an I/O size update on completion, +* so consider them to be dirty for the purposes of O_DSYNC, even if +* there is no other metadata changes being made or are pending here. +*/ iomap->flags =0 ; -if (ext4_inode_datasync_dirty (inode)) +if (ext4_inode_datasync_dirty (inode) || + offset + length >i_size_read (inode)) iomap->flags |=IOMAP_F_DIRTY ; iomap->bdev = inode->i_sb->s_bdev; iomap->dax_dev = sbi->s_daxdev;
@@ -3848,7 +3854,13 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter)* writes & truncates and since we take care of writing back page cache, * we are protected against page writeback as well. */ -inode_lock_shared (inode); +if (iocb->ki_flags &IOCB_NOWAIT ) { +if (!inode_trylock_shared (inode)) +return -EAGAIN ; + }else { +inode_lock_shared (inode); + } + ret =filemap_write_and_wait_range (mapping, iocb->ki_pos, iocb->ki_pos + count -1 );if (ret)
fs/f2fs/f2fs.h +15 -8
@@ -2578,6 +2578,20 @@ static inline void clear_file(struct inode *inode, int type)f2fs_mark_inode_dirty_sync (inode, true); } +static inline bool f2fs_is_time_consistent (struct inode *inode) +{ +if (!timespec64_equal (F2FS_I (inode)->i_disk_time, &inode->i_atime)) +return false; +if (!timespec64_equal (F2FS_I (inode)->i_disk_time +1 , &inode->i_ctime)) +return false; +if (!timespec64_equal (F2FS_I (inode)->i_disk_time +2 , &inode->i_mtime)) +return false; +if (!timespec64_equal (F2FS_I (inode)->i_disk_time +3 , + &F2FS_I (inode)->i_crtime)) +return false; +return true; +} +static inline bool f2fs_skip_inode_update (struct inode *inode,int dsync) {bool ret;
@@ -2595,14 +2609,7 @@ static inline bool f2fs_skip_inode_update(struct inode *inode, int dsync) i_size_read(inode) & ~PAGE_MASK)return false; -if (!timespec64_equal (F2FS_I (inode)->i_disk_time, &inode->i_atime)) -return false; -if (!timespec64_equal (F2FS_I (inode)->i_disk_time +1 , &inode->i_ctime)) -return false; -if (!timespec64_equal (F2FS_I (inode)->i_disk_time +2 , &inode->i_mtime)) -return false; -if (!timespec64_equal (F2FS_I (inode)->i_disk_time +3 , - &F2FS_I (inode)->i_crtime)) +if (!f2fs_is_time_consistent (inode))return false;down_read (&F2FS_I (inode)->i_sem);
fs/f2fs/inode.c +5 -1
@@ -614,7 +614,11 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc) inode->i_ino == F2FS_META_INO(sbi))return 0 ; -if (!is_inode_flag_set (inode,FI_DIRTY_INODE )) +/* +* atime could be updated without dirtying f2fs inode in lazytime mode +*/ +if (f2fs_is_time_consistent (inode) && + !is_inode_flag_set (inode,FI_DIRTY_INODE ))return 0 ;/*
fs/f2fs/namei.c +12 -3
@@ -948,7 +948,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (!old_dir_entry || whiteout)file_lost_pino (old_inode);else -F2FS_I (old_inode)->i_pino = new_dir->i_ino; +/* adjust dir's i_pino to pass fsck check */ +f2fs_i_pino_write (old_inode, new_dir->i_ino);up_write (&F2FS_I (old_inode)->i_sem); old_inode->i_ctime =current_time (old_inode);
@@ -1103,7 +1104,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,f2fs_set_link (old_dir, old_entry, old_page, new_inode);down_write (&F2FS_I (old_inode)->i_sem); -file_lost_pino (old_inode); +if (!old_dir_entry) +file_lost_pino (old_inode); +else +/* adjust dir's i_pino to pass fsck check */ +f2fs_i_pino_write (old_inode, new_dir->i_ino);up_write (&F2FS_I (old_inode)->i_sem); old_dir->i_ctime =current_time (old_dir);
@@ -1118,7 +1123,11 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,f2fs_set_link (new_dir, new_entry, new_page, old_inode);down_write (&F2FS_I (new_inode)->i_sem); -file_lost_pino (new_inode); +if (!new_dir_entry) +file_lost_pino (new_inode); +else +/* adjust dir's i_pino to pass fsck check */ +f2fs_i_pino_write (new_inode, old_dir->i_ino);up_write (&F2FS_I (new_inode)->i_sem); new_dir->i_ctime =current_time (new_dir);
fs/jbd2/commit.c +3 -1
@@ -724,7 +724,6 @@ void jbd2_journal_commit_transaction(journal_t *journal)submit_bh (REQ_OP_WRITE ,REQ_SYNC , bh); }cond_resched (); - stats.run.rs_blocks_logged += bufs;/* Force a new descriptor to be generated next time round the loop. */
@@ -811,6 +810,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)if (unlikely (!buffer_uptodate (bh))) err = -EIO ;jbd2_unfile_log_bh (bh); + stats.run.rs_blocks_logged++;/* * The list contains temporary buffer heads created by
@@ -856,6 +856,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)BUFFER_TRACE (bh,"ph5: control buffer writeout done: unfile" );clear_buffer_jwrite (bh);jbd2_unfile_log_bh (bh); + stats.run.rs_blocks_logged++;__brelse (bh);/* One for getblk */ /* AKPM: bforget here */ }
@@ -877,6 +878,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) }if (cbh) err =journal_wait_on_commit_record (journal, cbh); + stats.run.rs_blocks_logged++;if (jbd2_has_feature_async_commit (journal) && journal->j_flags &JBD2_BARRIER ) {blkdev_issue_flush (journal->j_dev,GFP_NOFS ,NULL );
fs/ocfs2/acl.c +2 -2
@@ -335,8 +335,8 @@ int ocfs2_acl_chmod(struct inode *inode, struct buffer_head *bh)down_read (&OCFS2_I (inode)->ip_xattr_sem); acl =ocfs2_get_acl_nolock (inode,ACL_TYPE_ACCESS , bh);up_read (&OCFS2_I (inode)->ip_xattr_sem); -if (IS_ERR (acl) || !acl) -return PTR_ERR (acl); +if (IS_ERR_OR_NULL (acl)) +return PTR_ERR_OR_ZERO (acl); ret =__posix_acl_chmod (&acl,GFP_KERNEL , inode->i_mode);if (ret)return ret;
fs/quota/dquot.c +17 -12
@@ -2853,68 +2853,73 @@ EXPORT_SYMBOL(dquot_quotactl_sysfile_ops);static int do_proc_dqstats (struct ctl_table *table,int write,void __user *buffer,size_t *lenp,loff_t *ppos) { -unsigned int type = (int *)table->data - dqstats.stat; +unsigned int type = (unsigned long *)table->data - dqstats.stat; +s64 value =percpu_counter_sum (&dqstats.counter[type]); + +/* Filter negative values for non-monotonic counters */ +if (value <0 && (type ==DQST_ALLOC_DQUOTS || + type ==DQST_FREE_DQUOTS )) + value =0 ;/* Update global table */ - dqstats.stat[type] = -percpu_counter_sum_positive (&dqstats.counter[type]); -return proc_dointvec (table, write, buffer, lenp, ppos); + dqstats.stat[type] = value; +return proc_doulongvec_minmax (table, write, buffer, lenp, ppos); }static struct ctl_table fs_dqstats_table[] = { { .procname ="lookups" , .data = &dqstats.stat[DQST_LOOKUPS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="drops" , .data = &dqstats.stat[DQST_DROPS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="reads" , .data = &dqstats.stat[DQST_READS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="writes" , .data = &dqstats.stat[DQST_WRITES ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="cache_hits" , .data = &dqstats.stat[DQST_CACHE_HITS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="allocated_dquots" , .data = &dqstats.stat[DQST_ALLOC_DQUOTS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="free_dquots" , .data = &dqstats.stat[DQST_FREE_DQUOTS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, }, { .procname ="syncs" , .data = &dqstats.stat[DQST_SYNCS ], - .maxlen =sizeof (int ), + .maxlen =sizeof (unsigned long ), .mode =0444 , .proc_handler = do_proc_dqstats, },
fs/readdir.c +40 -0
@@ -64,6 +64,40 @@ int iterate_dir(struct file *file, struct dir_context *ctx) }EXPORT_SYMBOL (iterate_dir); +/* +* POSIX says that a dirent name cannot contain NULL or a '/'. +* +* It's not 100% clear what we should really do in this case. +* The filesystem is clearly corrupted, but returning a hard +* error means that you now don't see any of the other names +* either, so that isn't a perfect alternative. +* +* And if you return an error, what error do you use? Several +* filesystems seem to have decided on EUCLEAN being the error +* code for EFSCORRUPTED, and that may be the error to use. Or +* just EIO, which is perhaps more obvious to users. +* +* In order to see the other file names in the directory, the +* caller might want to make this a "soft" error: skip the +* entry, and return the error at the end instead. +* +* Note that this should likely do a "memchr(name, 0, len)" +* check too, since that would be filesystem corruption as +* well. However, that case can't actually confuse user space, +* which has to do a strlen() on the name anyway to find the +* filename length, and the above "soft error" worry means +* that it's probably better left alone until we have that +* issue clarified. +*/ +static int verify_dirent_name (const char *name,int len) +{ +if (!len) +return -EIO ; +if (memchr (name,'/' , len)) +return -EIO ; +return 0 ; +} +/* * Traditional linux readdir() handling.. *
@@ -173,6 +207,9 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,int reclen =ALIGN (offsetof(struct linux_dirent , d_name) + namlen +2 ,sizeof (long )); + buf->error =verify_dirent_name (name, namlen); +if (unlikely (buf->error)) +return buf->error; buf->error = -EINVAL ;/* only used if we fail.. */ if (reclen > buf->count)return -EINVAL ;
@@ -259,6 +296,9 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,int reclen =ALIGN (offsetof(struct linux_dirent64 , d_name) + namlen +1 ,sizeof (u64)); + buf->error =verify_dirent_name (name, namlen); +if (unlikely (buf->error)) +return buf->error; buf->error = -EINVAL ;/* only used if we fail.. */ if (reclen > buf->count)return -EINVAL ;
fs/userfaultfd.c +11 -7
@@ -1833,13 +1833,12 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx,if (copy_from_user (&uffdio_api, buf,sizeof (uffdio_api))) goto out; features = uffdio_api.features; -if (uffdio_api.api !=UFFD_API || (features & ~UFFD_API_FEATURES )) { -memset (&uffdio_api,0 ,sizeof (uffdio_api)); -if (copy_to_user (buf, &uffdio_api,sizeof (uffdio_api))) - goto out; - ret = -EINVAL ; - goto out; - } + ret = -EINVAL ; +if (uffdio_api.api !=UFFD_API || (features & ~UFFD_API_FEATURES )) + goto err_out; + ret = -EPERM ; +if ((features &UFFD_FEATURE_EVENT_FORK ) && !capable (CAP_SYS_PTRACE )) + goto err_out;/* report all available features and ioctls to userland */ uffdio_api.features =UFFD_API_FEATURES ; uffdio_api.ioctls =UFFD_API_IOCTLS ;
@@ -1852,6 +1851,11 @@ static int userfaultfd_api(struct userfaultfd_ctx *ctx, ret =0 ; out:return ret; +err_out: +memset (&uffdio_api,0 ,sizeof (uffdio_api)); +if (copy_to_user (buf, &uffdio_api,sizeof (uffdio_api))) + ret = -EFAULT ; + goto out; } static long userfaultfd_ioctl(struct file *file, unsigned cmd,
include/linux/hrtimer.h +10 -4
@@ -430,12 +430,18 @@ extern u64 hrtimer_next_event_without(const struct hrtimer *exclude);extern bool hrtimer_active (const struct hrtimer *timer); -/* -* Helper function to check, whether the timer is on one of the queues +/** +* hrtimer_is_queued = check, whether the timer is on one of the queues +* @timer: Timer to check +* +* Returns: True if the timer is queued, false otherwise +* +* The function can be used lockless, but it gives only a current snapshot. */ -static inline int hrtimer_is_queued (struct hrtimer *timer) +static inline bool hrtimer_is_queued (struct hrtimer *timer) { -return timer->state &HRTIMER_STATE_ENQUEUED ; +/* The READ_ONCE pairs with the update functions of timer->state */ +return !!(READ_ONCE (timer->state) &HRTIMER_STATE_ENQUEUED ); }/*
include/linux/libfdt_env.h +3 -0
@@ -7,6 +7,9 @@#include <asm/byteorder.h> +#define INT32_MAX S32_MAX +#define UINT32_MAX U32_MAX +typedef __be16 fdt16_t ;typedef __be32 fdt32_t ;typedef __be64 fdt64_t ;
include/linux/posix-clock.h +11 -8
@@ -82,29 +82,32 @@ struct posix_clock_operations {* * @ops: Functional interface to the clock * @cdev: Character device instance for this clock -* @kref: Reference count. +* @dev: Pointer to the clock's device. * @rwsem: Protects the 'zombie' field from concurrent access. * @zombie: If 'zombie' is true, then the hardware has disappeared. -* @release: A function to free the structure when the reference count reaches -* zero. May be NULL if structure is statically allocated. * * Drivers should embed their struct posix_clock within a private * structure, obtaining a reference to it during callbacks using * container_of(). +* +* Drivers should supply an initialized but not exposed struct device +* to posix_clock_register(). It is used to manage lifetime of the +* driver's private structure. It's 'release' field should be set to +* a release function for this private structure. */ struct posix_clock {struct posix_clock_operations ops;struct cdev cdev; -struct kref kref; +struct device *dev;struct rw_semaphore rwsem;bool zombie; -void (*release)(struct posix_clock *clk); };/** * posix_clock_register() - register a new clock -* @clk: Pointer to the clock. Caller must provide 'ops' and 'release' -* @devid: Allocated device id +* @clk: Pointer to the clock. Caller must provide 'ops' field +* @dev: Pointer to the initialized device. Caller must provide +* 'release' field * * A clock driver calls this function to register itself with the * clock device subsystem. If 'clk' points to dynamically allocated
@@ -113,7 +116,7 @@ struct posix_clock {* * Returns zero on success, non-zero otherwise. */ -int posix_clock_register (struct posix_clock *clk,dev_t devid); +int posix_clock_register (struct posix_clock *clk,struct device *dev);/** * posix_clock_unregister() - unregister a clock
include/linux/quota.h +1 -1
@@ -263,7 +263,7 @@ enum { };struct dqstats { -int stat[_DQST_DQSTAT_LAST]; +unsigned long stat[_DQST_DQSTAT_LAST];struct percpu_counter counter[_DQST_DQSTAT_LAST]; };
include/linux/rculist_nulls.h +37 -0
@@ -100,6 +100,43 @@ static inline void hlist_nulls_add_head_rcu(struct hlist_nulls_node *n, first->pprev = &n->next; } +/** +* hlist_nulls_add_tail_rcu +* @n: the element to add to the hash list. +* @h: the list to add to. +* +* Description: +* Adds the specified element to the specified hlist_nulls, +* while permitting racing traversals. +* +* The caller must take whatever precautions are necessary +* (such as holding appropriate locks) to avoid racing +* with another list-mutation primitive, such as hlist_nulls_add_head_rcu() +* or hlist_nulls_del_rcu(), running on this same list. +* However, it is perfectly legal to run concurrently with +* the _rcu list-traversal primitives, such as +* hlist_nulls_for_each_entry_rcu(), used to prevent memory-consistency +* problems on Alpha CPUs. Regardless of the type of CPU, the +* list-traversal primitive must be guarded by rcu_read_lock(). +*/ +static inline void hlist_nulls_add_tail_rcu (struct hlist_nulls_node *n, +struct hlist_nulls_head *h) +{ +struct hlist_nulls_node *i, *last =NULL ; + +/* Note: write side code, so rcu accessors are not needed. */ +for (i = h->first; !is_a_nulls (i); i = i->next) + last = i; + +if (last) { + n->next = last->next; + n->pprev = &last->next; +rcu_assign_pointer (hlist_next_rcu (last), n); + }else { +hlist_nulls_add_head_rcu (n, h); + } +} +/** * hlist_nulls_for_each_entry_rcu - iterate over rcu list of given type * @tpos: the type * to use as a loop cursor.
include/linux/skbuff.h +4 -2
@@ -1669,7 +1669,7 @@ static inline struct sk_buff *skb_peek_next(struct sk_buff *skb,*/ static inline struct sk_buff *skb_peek_tail (const struct sk_buff_head *list_) { -struct sk_buff *skb = list_->prev; +struct sk_buff *skb =READ_ONCE (list_->prev);if (skb == (struct sk_buff *)list_) skb =NULL ;
@@ -1737,7 +1737,9 @@ static inline void __skb_insert(struct sk_buff *newsk, struct sk_buff *prev, struct sk_buff *next, struct sk_buff_head *list) { -/* see skb_queue_empty_lockless() for the opposite READ_ONCE() */ +/* See skb_queue_empty_lockless() and skb_peek_tail() +* for the opposite READ_ONCE() +*/ WRITE_ONCE(newsk->next, next);WRITE_ONCE (newsk->prev, prev);WRITE_ONCE (next->prev, newsk);
include/net/dst.h +11 -2
@@ -527,7 +527,16 @@ static inline void skb_dst_update_pmtu(struct sk_buff *skb, u32 mtu)struct dst_entry *dst =skb_dst (skb);if (dst && dst->ops->update_pmtu) - dst->ops->update_pmtu (dst,NULL , skb, mtu); + dst->ops->update_pmtu (dst,NULL , skb, mtu, true); +} + +/* update dst pmtu but not do neighbor confirm */ +static inline void skb_dst_update_pmtu_no_confirm (struct sk_buff *skb,u32 mtu) +{ +struct dst_entry *dst =skb_dst (skb); + +if (dst && dst->ops->update_pmtu) + dst->ops->update_pmtu (dst,NULL , skb, mtu, false); } static inline void skb_tunnel_check_pmtu(struct sk_buff *skb,
@@ -537,7 +546,7 @@ static inline void skb_tunnel_check_pmtu(struct sk_buff *skb,u32 encap_mtu =dst_mtu (encap_dst);if (skb->len > encap_mtu - headroom) - skb_dst_update_pmtu(skb, encap_mtu - headroom); + skb_dst_update_pmtu_no_confirm(skb, encap_mtu - headroom); }#endif /* _NET_DST_H */
include/net/dst_ops.h +2 -1
@@ -27,7 +27,8 @@ struct dst_ops {struct dst_entry * (*negative_advice)(struct dst_entry *);void (*link_failure)(struct sk_buff *);void (*update_pmtu)(struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu); +struct sk_buff *skb,u32 mtu, +bool confirm_neigh);void (*redirect)(struct dst_entry *dst,struct sock *sk,struct sk_buff *skb);int (*local_out)(struct net *net,struct sock *sk,struct sk_buff *skb);
include/net/inet_hashtables.h +9 -3
@@ -106,13 +106,19 @@ struct inet_bind_hashbucket {struct hlist_head chain; }; -/* -* Sockets can be hashed in established or listening table +/* Sockets can be hashed in established or listening table. +* We must use different 'nulls' end-of-chain value for all hash buckets : +* A socket might transition from ESTABLISH to LISTEN state without +* RCU grace period. A lookup in ehash table needs to handle this case. */ +#define LISTENING_NULLS_BASE (1U << 29)struct inet_listen_hashbucket {spinlock_t lock;unsigned int count; -struct hlist_head head; +union { +struct hlist_head head; +struct hlist_nulls_head nulls_head; + }; };/* This is for listening sockets, thus all sockets which possess wildcards. */
include/net/sock.h +5 -0
@@ -721,6 +721,11 @@ static inline void __sk_nulls_add_node_rcu(struct sock *sk, struct hlist_nulls_hhlist_nulls_add_head_rcu (&sk->sk_nulls_node, list); } +static inline void __sk_nulls_add_node_tail_rcu (struct sock *sk,struct hlist_nulls_head *list) +{ +hlist_nulls_add_tail_rcu (&sk->sk_nulls_node, list); +} +static inline void sk_nulls_add_node_rcu (struct sock *sk,struct hlist_nulls_head *list) {sock_hold (sk);
include/scsi/iscsi_proto.h +1 -0
@@ -638,6 +638,7 @@ struct iscsi_reject {#define ISCSI_REASON_BOOKMARK_INVALID 9#define ISCSI_REASON_BOOKMARK_NO_RESOURCES 10#define ISCSI_REASON_NEGOTIATION_RESET 11 +#define ISCSI_REASON_WAITING_FOR_LOGOUT 12/* Max. number of Key=Value pairs in a text message */ #define MAX_KEY_VALUE_PAIRS 8192
kernel/dma/debug.c +1 -0
@@ -442,6 +442,7 @@ void debug_dma_dump_mappings(struct device *dev) }spin_unlock_irqrestore (&bucket->lock, flags); +cond_resched (); } }
kernel/sysctl.c +1 -1
@@ -1411,7 +1411,7 @@ static struct ctl_table vm_table[] = { .procname = "drop_caches", .data = &sysctl_drop_caches, .maxlen = sizeof(int), - .mode = 0644, + .mode = 0200, .proc_handler = drop_caches_sysctl_handler, .extra1 = &one, .extra2 = &four,
kernel/time/hrtimer.c +7 -4
@@ -955,7 +955,8 @@ static int enqueue_hrtimer(struct hrtimer *timer, base->cpu_base->active_bases |=1 << base->index; - timer->state =HRTIMER_STATE_ENQUEUED ; +/* Pairs with the lockless read in hrtimer_is_queued() */ +WRITE_ONCE (timer->state,HRTIMER_STATE_ENQUEUED );return timerqueue_add (&base->active, &timer->node); }
@@ -977,7 +978,8 @@ static void __remove_hrtimer(struct hrtimer *timer,struct hrtimer_cpu_base *cpu_base = base->cpu_base;u8 state = timer->state; - timer->state = newstate; +/* Pairs with the lockless read in hrtimer_is_queued() */ +WRITE_ONCE (timer->state, newstate);if (!(state &HRTIMER_STATE_ENQUEUED ))return ;
@@ -1002,8 +1004,9 @@ static void __remove_hrtimer(struct hrtimer *timer,static inline int remove_hrtimer (struct hrtimer *timer,struct hrtimer_clock_base *base,bool restart) { -if (hrtimer_is_queued (timer)) { -u8 state = timer->state; +u8 state = timer->state; + +if (state &HRTIMER_STATE_ENQUEUED ) {int reprogram;/*
kernel/time/posix-clock.c +13 -18
@@ -27,8 +27,6 @@#include "posix-timers.h" -static void delete_clock (struct kref *kref); -/* * Returns NULL if the posix_clock instance attached to 'fp' is old and stale. */
@@ -138,7 +136,7 @@ static int posix_clock_open(struct inode *inode, struct file *fp) err =0 ;if (!err) { -kref_get (&clk->kref); +get_device (clk->dev); fp->private_data = clk; } out:
@@ -154,7 +152,7 @@ static int posix_clock_release(struct inode *inode, struct file *fp)if (clk->ops.release) err = clk->ops.release (clk); -kref_put (&clk->kref, delete_clock); +put_device (clk->dev); fp->private_data =NULL ;
@@ -174,38 +172,35 @@ static const struct file_operations posix_clock_file_operations = {#endif }; -int posix_clock_register (struct posix_clock *clk,dev_t devid) +int posix_clock_register (struct posix_clock *clk,struct device *dev) {int err; -kref_init (&clk->kref);init_rwsem (&clk->rwsem);cdev_init (&clk->cdev, &posix_clock_file_operations); + err =cdev_device_add (&clk->cdev, dev); +if (err) { +pr_err ("%s unable to add device %d:%d\n" , +dev_name (dev),MAJOR (dev->devt),MINOR (dev->devt)); +return err; + } clk->cdev.owner = clk->ops.owner; - err =cdev_add (&clk->cdev, devid,1 ); + clk->dev = dev; -return err; +return 0 ; }EXPORT_SYMBOL_GPL (posix_clock_register); -static void delete_clock (struct kref *kref) -{ - struct posix_clock *clk = container_of(kref, struct posix_clock, kref); - -if (clk->release) - clk->release (clk); -} -void posix_clock_unregister (struct posix_clock *clk) { -cdev_del (&clk->cdev); +cdev_device_del (&clk->cdev, clk->dev);down_write (&clk->rwsem); clk->zombie = true;up_write (&clk->rwsem); -kref_put (&clk->kref, delete_clock); +put_device (clk->dev); }EXPORT_SYMBOL_GPL (posix_clock_unregister);
net/bridge/br_netfilter_hooks.c +3 -0
@@ -646,6 +646,9 @@ static unsigned int br_nf_forward_arp(void *priv,nf_bridge_pull_encap_header (skb); } +if (unlikely (!pskb_may_pull (skb,sizeof (struct arphdr )))) +return NF_DROP ; +if (arp_hdr (skb)->ar_pln !=4 ) {if (IS_VLAN_ARP (skb))nf_bridge_push_encap_header (skb);
net/bridge/br_nf_core.c +2 -1
@@ -26,7 +26,8 @@#endif static void fake_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu) +struct sk_buff *skb,u32 mtu, +bool confirm_neigh) { }
net/bridge/netfilter/ebtables.c +16 -17
@@ -1876,7 +1876,7 @@ static int ebt_buf_count(struct ebt_entries_buf_state *state, unsigned int sz) }static int ebt_buf_add (struct ebt_entries_buf_state *state, -void *data,unsigned int sz) +const void *data,unsigned int sz) {if (state->buf_kern_start ==NULL ) goto count_only;
@@ -1910,7 +1910,7 @@ enum compat_mwt { EBT_COMPAT_TARGET, }; -static int compat_mtw_from_user (struct compat_ebt_entry_mwt *mwt, +static int compat_mtw_from_user (const struct compat_ebt_entry_mwt *mwt,enum compat_mwt compat_mwt,struct ebt_entries_buf_state *state,const unsigned char *base)
@@ -1988,22 +1988,23 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,/* return size of all matches, watchers or target, including necessary * alignment and padding. */ -static int ebt_size_mwt (struct compat_ebt_entry_mwt *match32, +static int ebt_size_mwt (const struct compat_ebt_entry_mwt *match32,unsigned int size_left,enum compat_mwt type,struct ebt_entries_buf_state *state,const void *base) { +const char *buf = (const char *)match32;int growth =0 ; -char *buf;if (size_left ==0 )return 0 ; - buf = (char *) match32; - -while (size_left >=sizeof (*match32)) { + do { struct ebt_entry_match *match_kern; int ret; + if (size_left < sizeof(*match32)) + return -EINVAL; + match_kern = (struct ebt_entry_match *) state->buf_kern_start; if (match_kern) { char *tmp;
@@ -2040,22 +2041,18 @@ static int ebt_size_mwt(struct compat_ebt_entry_mwt *match32,if (match_kern) match_kern->match_size = ret; -/* rule should have no remaining data after target */ -if (type ==EBT_COMPAT_TARGET && size_left) -return -EINVAL ; - match32 = (struct compat_ebt_entry_mwt *) buf; - } + }while (size_left);return growth; }/* called for all ebt_entry structures. */ -static int size_entry_mwt (struct ebt_entry *entry,const unsigned char *base, +static int size_entry_mwt (const struct ebt_entry *entry,const unsigned char *base,unsigned int *total,struct ebt_entries_buf_state *state) { -unsigned int i, j, startoff, new_offset =0 ; +unsigned int i, j, startoff, next_expected_off, new_offset =0 ;/* stores match/watchers/targets & offset of next struct ebt_entry: */ unsigned int offsets[4 ];unsigned int *offsets_update =NULL ;
@@ -2141,11 +2138,13 @@ static int size_entry_mwt(struct ebt_entry *entry, const unsigned char *base,return ret; } - startoff = state->buf_user_offset - startoff; + next_expected_off = state->buf_user_offset - startoff; +if (next_expected_off != entry->next_offset) +return -EINVAL ; -if (WARN_ON (*total < startoff)) +if (*total < entry->next_offset)return -EINVAL ; - *total -= startoff; + *total -= entry->next_offset;return 0 ; }
net/core/sysctl_net_core.c +2 -0
@@ -281,6 +281,7 @@ static int proc_dointvec_minmax_bpf_enable(struct ctl_table *table, int write,return ret; } +# ifdef CONFIG_HAVE_EBPF_JIT static int proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write, void __user *buffer, size_t *lenp,
@@ -291,6 +292,7 @@ proc_dointvec_minmax_bpf_restricted(struct ctl_table *table, int write,return proc_dointvec_minmax (table, write, buffer, lenp, ppos); } +# endif /* CONFIG_HAVE_EBPF_JIT */ static int proc_dolongvec_minmax_bpf_restricted(struct ctl_table *table, int write,
net/decnet/dn_route.c +4 -2
@@ -118,7 +118,8 @@ static void dn_dst_ifdown(struct dst_entry *, struct net_device *dev, int how);static struct dst_entry *dn_dst_negative_advice (struct dst_entry *);static void dn_dst_link_failure (struct sk_buff *);static void dn_dst_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb ,u32 mtu); +struct sk_buff *skb ,u32 mtu, +bool confirm_neigh);static void dn_dst_redirect (struct dst_entry *dst,struct sock *sk,struct sk_buff *skb); static struct neighbour *dn_dst_neigh_lookup(const struct dst_entry *dst,
@@ -259,7 +260,8 @@ static int dn_dst_gc(struct dst_ops *ops)* advertise to the other end). */ static void dn_dst_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu) +struct sk_buff *skb,u32 mtu, +bool confirm_neigh) {struct dn_route *rt = (struct dn_route *) dst;struct neighbour *n = rt->n;
net/ipv4/icmp.c +6 -5
@@ -254,10 +254,11 @@ bool icmp_global_allow(void)bool rc = false;/* Check if token bucket is empty and cannot be refilled -* without taking the spinlock. +* without taking the spinlock. The READ_ONCE() are paired +* with the following WRITE_ONCE() in this same function. */ -if (!icmp_global.credit) { - delta =min_t (u32, now - icmp_global.stamp,HZ ); +if (!READ_ONCE (icmp_global.credit)) { + delta =min_t (u32, now -READ_ONCE (icmp_global.stamp),HZ );if (delta <HZ /50 )return false; }
@@ -267,14 +268,14 @@ bool icmp_global_allow(void)if (delta >=HZ /50 ) { incr = sysctl_icmp_msgs_per_sec * delta /HZ ;if (incr) - icmp_global.stamp = now; +WRITE_ONCE (icmp_global.stamp, now); } credit =min_t (u32, icmp_global.credit + incr, sysctl_icmp_msgs_burst);if (credit) { credit--; rc = true; } - icmp_global.credit = credit; +WRITE_ONCE (icmp_global.credit, credit);spin_unlock (&icmp_global.lock);return rc; }
net/ipv4/inet_connection_sock.c +1 -1
@@ -1089,7 +1089,7 @@ struct dst_entry *inet_csk_update_pmtu(struct sock *sk, u32 mtu)if (!dst) goto out; } - dst->ops->update_pmtu (dst, sk,NULL , mtu); + dst->ops->update_pmtu (dst, sk,NULL , mtu, true); dst =__sk_dst_check (sk,0 );if (!dst)
net/ipv4/inet_diag.c +2 -1
@@ -918,11 +918,12 @@ void inet_diag_dump_icsk(struct inet_hashinfo *hashinfo, struct sk_buff *skb,for (i = s_i; i <INET_LHTABLE_SIZE ; i++) {struct inet_listen_hashbucket *ilb; +struct hlist_nulls_node *node; num =0 ; ilb = &hashinfo->listening_hash[i];spin_lock (&ilb->lock); -sk_for_each (sk, &ilb->head) { +sk_nulls_for_each (sk, node, &ilb->nulls_head) {struct inet_sock *inet =inet_sk (sk);if (!net_eq (sock_net (sk), net))
net/ipv4/inet_hashtables.c +10 -9
@@ -308,6 +308,7 @@ struct sock *__inet_lookup_listener(struct net *net,bool exact_dif =inet_exact_dif_match (net, skb);struct inet_listen_hashbucket *ilb2;struct sock *sk, *result =NULL ; +struct hlist_nulls_node *node;int score, hiscore =0 ;unsigned int hash2;u32 phash =0 ;
@@ -343,7 +344,7 @@ struct sock *__inet_lookup_listener(struct net *net, goto done; port_lookup: -sk_for_each_rcu (sk, &ilb->head) { +sk_nulls_for_each_rcu (sk, node, &ilb->nulls_head) { score =compute_score (sk, net, hnum, daddr, dif, sdif, exact_dif);if (score > hiscore) {
@@ -560,10 +561,11 @@ static int inet_reuseport_add_sock(struct sock *sk, struct inet_listen_hashbucket *ilb) {struct inet_bind_bucket *tb =inet_csk (sk)->icsk_bind_hash; +const struct hlist_nulls_node *node;struct sock *sk2;kuid_t uid =sock_i_uid (sk); -sk_for_each_rcu (sk2, &ilb->head) { +sk_nulls_for_each_rcu (sk2, node, &ilb->nulls_head) { if (sk2 != sk && sk2->sk_family == sk->sk_family && ipv6_only_sock(sk2) == ipv6_only_sock(sk) &&
@@ -599,9 +601,9 @@ int __inet_hash(struct sock *sk, struct sock *osk) }if (IS_ENABLED (CONFIG_IPV6 ) && sk->sk_reuseport && sk->sk_family ==AF_INET6 ) -hlist_add_tail_rcu (&sk->sk_node, &ilb->head); +__sk_nulls_add_node_tail_rcu (sk, &ilb->nulls_head);else -hlist_add_head_rcu (&sk->sk_node, &ilb->head); +__sk_nulls_add_node_rcu (sk, &ilb->nulls_head);inet_hash2 (hashinfo, sk); ilb->count++;sock_set_flag (sk,SOCK_RCU_FREE );
@@ -650,11 +652,9 @@ void inet_unhash(struct sock *sk)reuseport_detach_sock (sk);if (ilb) {inet_unhash2 (hashinfo, sk); -__sk_del_node_init (sk); - ilb->count--; - }else { -__sk_nulls_del_node_init_rcu (sk); + ilb->count--; } +__sk_nulls_del_node_init_rcu (sk);sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 ); unlock:spin_unlock_bh (lock);
@@ -790,7 +790,8 @@ void inet_hashinfo_init(struct inet_hashinfo *h)for (i =0 ; i <INET_LHTABLE_SIZE ; i++) {spin_lock_init (&h->listening_hash[i].lock); -INIT_HLIST_HEAD (&h->listening_hash[i].head); +INIT_HLIST_NULLS_HEAD (&h->listening_hash[i].nulls_head, + i +LISTENING_NULLS_BASE ); h->listening_hash[i].count =0 ; }
net/ipv4/inetpeer.c +10 -2
@@ -160,7 +160,12 @@ static void inet_peer_gc(struct inet_peer_base *base, base->total / inet_peer_threshold *HZ ;for (i =0 ; i < gc_cnt; i++) { p = gc_stack[i]; - delta = (__u32 )jiffies - p->dtime; + +/* The READ_ONCE() pairs with the WRITE_ONCE() +* in inet_putpeer() +*/ + delta = (__u32 )jiffies -READ_ONCE (p->dtime); +if (delta < ttl || !refcount_dec_if_one (&p->refcnt)) gc_stack[i] =NULL ; }
@@ -237,7 +242,10 @@ EXPORT_SYMBOL_GPL(inet_getpeer);void inet_putpeer (struct inet_peer *p) { - p->dtime = (__u32 )jiffies; +/* The WRITE_ONCE() pairs with itself (we run lockless) +* and the READ_ONCE() in inet_peer_gc() +*/ +WRITE_ONCE (p->dtime, (__u32 )jiffies);if (refcount_dec_and_test (&p->refcnt))call_rcu (&p->rcu, inetpeer_free_rcu);
net/ipv4/ip_tunnel.c +1 -1
@@ -513,7 +513,7 @@ static int tnl_update_pmtu(struct net_device *dev, struct sk_buff *skb,else mtu =skb_dst (skb) ?dst_mtu (skb_dst (skb)) : dev->mtu; -skb_dst_update_pmtu (skb, mtu); +skb_dst_update_pmtu_no_confirm (skb, mtu);if (skb->protocol ==htons (ETH_P_IP )) { if (!skb_is_gso(skb) &&
net/ipv4/ip_vti.c +1 -1
@@ -235,7 +235,7 @@ static netdev_tx_t vti_xmit(struct sk_buff *skb, struct net_device *dev, mtu =dst_mtu (dst);if (skb->len > mtu) { -skb_dst_update_pmtu (skb, mtu); +skb_dst_update_pmtu_no_confirm (skb, mtu);if (skb->protocol ==htons (ETH_P_IP )) {icmp_send (skb,ICMP_DEST_UNREACH ,ICMP_FRAG_NEEDED ,htonl (mtu));
net/ipv4/route.c +6 -3
@@ -142,7 +142,8 @@ static unsigned int ipv4_mtu(const struct dst_entry *dst);static struct dst_entry *ipv4_negative_advice (struct dst_entry *dst);static void ipv4_link_failure (struct sk_buff *skb);static void ip_rt_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu); +struct sk_buff *skb,u32 mtu, +bool confirm_neigh);static void ip_do_redirect (struct dst_entry *dst,struct sock *sk,struct sk_buff *skb);static void ipv4_dst_destroy (struct dst_entry *dst);
@@ -1035,7 +1036,8 @@ static void __ip_rt_update_pmtu(struct rtable *rt, struct flowi4 *fl4, u32 mtu) }static void ip_rt_update_pmtu (struct dst_entry *dst,struct sock *sk, -struct sk_buff *skb,u32 mtu) +struct sk_buff *skb,u32 mtu, +bool confirm_neigh) {struct rtable *rt = (struct rtable *) dst;struct flowi4 fl4;
@@ -2559,7 +2561,8 @@ static unsigned int ipv4_blackhole_mtu(const struct dst_entry *dst) } static void ipv4_rt_blackhole_update_pmtu(struct dst_entry *dst, struct sock *sk, -struct sk_buff *skb,u32 mtu)
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.