Linux 4.14.25
Greg KH
maintainerI'm announcing the release of the 4.14.25 kernel.
All users of the 4.14 kernel series must upgrade.
The updated 4.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Documentation/networking/ip-sysctl.txt | 4 Makefile | 2 arch/arm/boot/dts/logicpd-som-lv.dtsi | 9 - arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 8 arch/arm/boot/dts/rk3288-phycore-som.dtsi | 20 -- arch/arm/kvm/hyp/Makefile | 5 arch/arm/kvm/hyp/banked-sr.c | 4 arch/arm/mach-mvebu/Kconfig | 4 arch/arm/plat-orion/common.c | 23 +- arch/parisc/include/asm/cacheflush.h | 1 arch/parisc/include/asm/processor.h | 2 arch/parisc/kernel/cache.c | 57 +++--- arch/parisc/kernel/pacache.S | 22 ++ arch/parisc/kernel/time.c | 11 - arch/s390/kvm/interrupt.c | 25 ++- arch/s390/kvm/kvm-s390.c | 79 +++++---- arch/s390/kvm/kvm-s390.h | 5 arch/s390/kvm/priv.c | 9 - arch/x86/include/asm/pgtable.h | 8 arch/x86/include/asm/pgtable_32.h | 1 arch/x86/include/asm/pgtable_64.h | 1 arch/x86/include/asm/pgtable_types.h | 10 + arch/x86/kernel/setup.c | 17 -- arch/x86/kernel/setup_percpu.c | 17 -- arch/x86/kvm/lapic.c | 11 - arch/x86/kvm/mmu.c | 97 +++++------ arch/x86/kvm/paging_tmpl.h | 18 +- arch/x86/kvm/svm.c | 9 - arch/x86/kvm/vmx.c | 9 - arch/x86/kvm/x86.c | 12 - arch/x86/mm/cpu_entry_area.c | 6 arch/x86/mm/init_32.c | 15 + arch/x86/platform/intel-mid/intel-mid.c | 2 arch/x86/xen/suspend.c | 16 + block/blk-core.c | 2 block/blk-mq.c | 4 block/kyber-iosched.c | 1 drivers/acpi/bus.c | 38 +++- drivers/bluetooth/btusb.c | 25 ++- drivers/char/tpm/st33zp24/st33zp24.c | 4 drivers/char/tpm/tpm-interface.c | 4 drivers/char/tpm/tpm2-cmd.c | 4 drivers/char/tpm/tpm_i2c_infineon.c | 5 drivers/char/tpm/tpm_i2c_nuvoton.c | 8 drivers/char/tpm/tpm_tis.c | 2 drivers/char/tpm/tpm_tis_core.c | 9 - drivers/char/tpm/tpm_tis_core.h | 4 drivers/char/tpm/tpm_tis_spi.c | 48 +++-- drivers/cpufreq/s3c24xx-cpufreq.c | 8 drivers/edac/sb_edac.c | 2 drivers/md/md.c | 4 drivers/media/dvb-frontends/m88ds3103.c | 7 drivers/mmc/host/dw_mmc-exynos.c | 1 drivers/mmc/host/dw_mmc-k3.c | 4 drivers/mmc/host/dw_mmc-rockchip.c | 1 drivers/mmc/host/dw_mmc-zx.c | 1 drivers/mmc/host/dw_mmc.c | 84 ++++++---- drivers/mmc/host/dw_mmc.h | 2 drivers/mmc/host/sdhci-pci-core.c | 35 +++- drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 10 - drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 49 ++++- drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c | 22 +- drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c | 29 +++ drivers/net/ethernet/ti/cpsw.c | 16 + drivers/net/phy/phy.c | 2 drivers/net/ppp/ppp_generic.c | 9 + drivers/net/tun.c | 7 drivers/net/virtio_net.c | 8 drivers/net/wan/hdlc_ppp.c | 5 drivers/nvme/host/rdma.c | 54 +----- drivers/pci/pcie/aspm.c | 8 drivers/s390/net/qeth_core.h | 7 drivers/s390/net/qeth_core_main.c | 43 ++--- drivers/s390/net/qeth_l3.h | 34 ++++ drivers/s390/net/qeth_l3_main.c | 123 ++++++--------- drivers/vfio/vfio_iommu_type1.c | 18 +- fs/btrfs/sysfs.c | 8 fs/btrfs/transaction.c | 20 +- fs/direct-io.c | 3 include/linux/fs.h | 2 include/linux/nospec.h | 3 include/net/udplite.h | 1 kernel/time/timer.c | 6 net/bridge/br_sysfs_if.c | 3 net/bridge/br_vlan.c | 2 net/core/dev.c | 11 + net/core/gen_estimator.c | 1 net/ipv4/fib_semantics.c | 5 net/ipv4/route.c | 10 - net/ipv4/tcp_input.c | 24 -- net/ipv4/tcp_output.c | 33 +++- net/ipv4/udp.c | 5 net/ipv6/ip6_checksum.c | 5 net/ipv6/sit.c | 2 net/netlink/af_netlink.c | 4 net/netlink/genetlink.c | 12 + net/rxrpc/output.c | 2 net/sched/cls_api.c | 7 net/sched/cls_u32.c | 24 +- net/sctp/input.c | 5 net/sctp/ipv6.c | 10 - net/sctp/protocol.c | 10 - net/sctp/sm_make_chunk.c | 7 sound/core/control.c | 2 sound/pci/hda/hda_intel.c | 38 ++++ sound/pci/hda/patch_realtek.c | 3 sound/usb/quirks-table.h | 47 +++++ sound/x86/intel_hdmi_audio.c | 2 virt/kvm/kvm_main.c | 3 114 files changed, 1064 insertions(+), 563 deletions(-)
Adam Ford (2):
ARM: dts: LogicPD SOM-LV: Fix I2C1 pinmux
ARM: dts: LogicPD Torpedo: Fix I2C1 pinmux
Adrian Hunter (1):
mmc: sdhci-pci: Fix S0i3 for Intel BYT-based controllers
Alexander Steffen (1):
tpm_tis_spi: Use DMA-safe memory for SPI transfers
Alexey Kodanev (3):
sctp: verify size of a new chunk in _sctp_make_chunk()
udplite: fix partial checksum initialization
sctp: fix dst refcnt leak in sctp_v6_get_dst()
Anand Jain (1):
btrfs: use proper endianness accessors for super_copy
Anna Karbownik (1):
EDAC, sb_edac: Fix out of bound writes during DIMM configuration on KNL
Ard Biesheuvel (1):
PCI/ASPM: Deal with missing root ports in link state handling
Arnd Bergmann (4):
tpm: constify transmit data pointers
ipv6 sit: work around bogus gcc-8 -Wrestrict warning
ARM: orion: fix orion_ge00_switch_board_info initialization
ARM: kvm: fix building with gcc-8
Dan Williams (2):
vfio: disable filesystem-dax page pinning
dax: fix vma_is_fsdax() helper
Daniel Schultz (1):
ARM: dts: rockchip: Remove 1.8 GHz operation point from phycore som
David Ahern (1):
net: ipv4: Set addr_type in hash_keys for forwarded case
David Hildenbrand (4):
KVM: s390: take care of clock-comparator sign control
KVM: s390: provide only a single function for setting the tod (fix SCK)
KVM: s390: consider epoch index on hotplugged CPUs
KVM: s390: consider epoch index on TOD clock syncs
David Howells (1):
rxrpc: Fix send in rxrpc_send_data_packet()
Denis Du (1):
hdlc_ppp: carrier detect ok, don't turn off negotiation
Emil Tantilov (1):
ixgbe: fix crash in build_skb Rx code path
Eran Ben Elisha (1):
net/mlx5e: Verify inline header size do not exceed SKB linear size
Eric Biggers (1):
KVM/x86: remove WARN_ON() for when vm_munmap() fails
Eric Dumazet (2):
tcp_bbr: better deal with suboptimal GSO
net_sched: gen_estimator: fix broken estimators based on percpu stats
Erik Veijola (1):
ALSA: usb-audio: Add a quirck for B&W PX headphones
Gal Pressman (2):
net/mlx5e: Fix TCP checksum in LRO buffers net/mlx5e: Specify numa node when allocating drop rq
Geert Uytterhoeven (1):
mmc: dw_mmc-k3: Fix out-of-bounds access through DT alias
Greg Kroah-Hartman (1):
Linux 4.14.25
Grygorii Strashko (1):
net: ethernet: ti: cpsw: fix net watchdog timeout
Guillaume Nault (1):
ppp: prevent unregistered channels from connecting to PPP units
Hans de Goede (2):
Bluetooth: btusb: Use DMI matching for QCA reset_resume quirking
ALSA: hda: Add a power_save blacklist
Heiner Kallweit (1):
net: phy: fix phy_start to consider PHY_IGNORE_INTERRUPT
Helge Deller (2):
parisc: Use cr16 interval timers unconditionally on qemu
parisc: Reduce irq overhead when run in qemu
Ido Schimmel (2):
bridge: Fix VLAN reference count problem
mlxsw: spectrum_router: Do not unconditionally clear route offload indication
Ilya Lesokhin (1):
tcp: Honor the eor bit in tcp_mtu_probe
Inbar Karmy (1):
net/mlx5e: Fix loopback self test when GRO is off
Ivan Vecera (1):
net/sched: cls_u32: fix cls_u32 on filter replace
Jakub Kicinski (1):
net: fix race on decreasing number of TX queues
Jan Beulich (1):
x86/mm: Fix {pmd,pud}_{set,clear}_flags()Jan Kara (1):
direct-io: Fix sleep in atomic due to sync AIO
Jason A. Donenfeld (1):
netlink: put module reference if dump start fails
Jason Wang (3):
tuntap: correctly add the missing XDP flush
tuntap: disable preemption during XDP processing
virtio-net: disable NAPI only when enabled during XDP set
Jeremy Boone (5):
tpm: st33zp24: fix potential buffer overruns caused by bit glitches on the bus
tpm: fix potential buffer overruns caused by bit glitches on the bus
tpm_i2c_infineon: fix potential buffer overruns caused by bit glitches on the bus
tpm_i2c_nuvoton: fix potential buffer overruns caused by bit glitches on the bus
tpm_tis: fix potential buffer overruns caused by bit glitches on the bus
Jiri Pirko (1):
mlxsw: spectrum_router: Fix error path in mlxsw_sp_vr_create
Jiufei Xue (1):
block: fix the count of PGPGOUT for WRITE_SAME
John David Anglin (1):
parisc: Fix ordering of cache and TLB flushes
Juergen Gross (1):
x86/xen: Zero MSR_IA32_SPEC_CTRL before suspend
Julian Wiedmann (7):
s390/qeth: fix SETIP command handling
s390/qeth: fix overestimated count of buffer elements s390/qeth: fix IP removal on offline cards s390/qeth: fix double-free on IP add/remove race Revert "s390/qeth: fix using of ref counter for rxip addresses" s390/qeth: fix IP address lookup for L3 devices s390/qeth: fix IPA command submission race
Kai Heng Feng (1):
ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530
Lingutla Chandrasekhar (1):
timers: Forward timer base before migrating timers
Mauro Carvalho Chehab (1):
media: m88ds3103: don't call a non-initalized function
Ming Lei (2):
block: kyber: fix domain token leak during requeue
blk-mq: don't call io sched's .requeue_request when requeueing rq to ->dispatch
NeilBrown (1):
md: only allow remove_and_add_spares when no sync_thread running.
Nicolas Dichtel (1):
netlink: ensure to loop over all netns in genlmsg_multicast_allns()
Paolo Abeni (1):
cls_u32: fix use after free in u32_destroy_key()
Paolo Bonzini (4):
KVM: x86: extend usage of RET_MMIO_PF_* constants
KVM/x86: Remove indirect MSR op calls from SPEC_CTRL
KVM: x86: move LAPIC initialization after VMCS creation
KVM/VMX: Optimize vmx_vcpu_run() and svm_vcpu_run() by marking the RDMSR path as unlikely()
Radim Krčmář (1):
KVM: x86: fix vcpu initialization with userspace lapic
Rasmus Villemoes (1):
nospec: Allow index argument to have const-qualified type
Richard Fitzgerald (1):
ALSA: control: Fix memory corruption risk in snd_ctl_elem_read
Roman Kapl (1):
net: sched: report if filter is too large to dump
Sabrina Dubroca (1):
net: ipv4: don't allow setting net.ipv4.route.min_pmtu below 68
Sagi Grimberg (1):
nvme-rdma: don't suppress send completions
Sebastian Panceac (1):
x86/platform/intel-mid: Handle Intel Edison reboot correctly
Shalom Toledo (1):
mlxsw: spectrum_switchdev: Check success of FDB add operation
Shawn Lin (3):
mmc: dw_mmc: Avoid accessing registers in runtime suspended state
mmc: dw_mmc: Factor out dw_mci_init_slot_caps
mmc: dw_mmc: Fix out-of-bounds access for slot's caps
Soheil Hassas Yeganeh (1):
tcp: purge write queue upon RST
Stefano Brivio (1):
fib_semantics: Don't match route with mismatching tclassid
Takashi Iwai (2):
ALSA: x86: Fix missing spinlock and mutex initializations
ALSA: hda - Fix pincfg at resume on Lenovo T470 dock
Thomas Gleixner (1):
x86/cpu_entry_area: Sync cpu_entry_area to initial_page_table
Tianyu Lan (1):
KVM/x86: Fix wrong macro references of X86_CR0_PG_BIT and X86_CR4_PAE_BIT in kvm_valid_sregs()
Tom Lendacky (1):
amd-xgbe: Restore PCI interrupt enablement setting on resume
Tommi Rantala (1):
sctp: fix dst refcnt leak in sctp_v4_get_dst
Tonghao Zhang (1):
doc: Change the min default value of tcp_wmem/tcp_rmem.
Ulf Magnusson (1):
ARM: mvebu: Fix broken PL310_ERRATA_753970 selects
Ursula Braun (1):
s390/qeth: fix underestimated count of buffer elements
Viresh Kumar (1):
cpufreq: s3c24xx: Fix broken s3c_cpufreq_init()
Wanpeng Li (2):
KVM: X86: Fix SMRAM accessing even if VM is shutdown
KVM: mmu: Fix overlap between public and private memslots
Wolfram Sang (1):
net: amd-xgbe: fix comparison to bitshift when dealing with a mask
Xin Long (2):
bridge: check brport attr show in brport_show
sctp: do not pr_err for the duplicated node in transport rhlist
Yuchung Cheng (2):
tcp: revert F-RTO middle-box workaround
tcp: revert F-RTO extension to detect more spurious timeouts
Greg KH
maintainerDocumentation/networking/ip-sysctl.txt +2 -2
@@ -508,7 +508,7 @@ tcp_rmem - vector of 3 INTEGERs: min, default, max min: Minimal size of receive buffer used by TCP sockets. It is guaranteed to each TCP socket, even under moderate memory pressure. - Default: 1 page + Default: 4K default: initial size of receive buffer used by TCP sockets. This value overrides net.core.rmem_default used by other protocols.
@@ -666,7 +666,7 @@ tcp_window_scaling - BOOLEAN tcp_wmem - vector of 3 INTEGERs: min, default, max min: Amount of memory reserved for send buffers for TCP sockets. Each TCP socket has rights to use it due to fact of its birth. - Default: 1 page + Default: 4K default: initial size of send buffer used by TCP sockets. This value overrides net.core.wmem_default used by other protocols.
Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 4 PATCHLEVEL = 14 -SUBLEVEL = 24 +SUBLEVEL = 25 EXTRAVERSION = NAME = Petit Gorille
arch/arm/boot/dts/logicpd-som-lv.dtsi +8 -1
@@ -97,6 +97,8 @@ }; &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; clock-frequency = <2600000>; twl: twl@48 {
@@ -215,7 +217,12 @@ >; }; - + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */ + OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */ + >; + }; }; &omap3_pmx_wkup {
arch/arm/boot/dts/logicpd-torpedo-som.dtsi +8 -0
@@ -104,6 +104,8 @@ }; &i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; clock-frequency = <2600000>; twl: twl@48 {
@@ -211,6 +213,12 @@ OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */ >; }; + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = < + OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */ + OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */ + >; + }; }; &uart2 {
arch/arm/boot/dts/rk3288-phycore-som.dtsi +0 -20
@@ -110,26 +110,6 @@ }; }; -&cpu0 { - cpu0-supply = <&vdd_cpu>; - operating-points = < - /* KHz uV */ - 1800000 1400000 - 1608000 1350000 - 1512000 1300000 - 1416000 1200000 - 1200000 1100000 - 1008000 1050000 - 816000 1000000 - 696000 950000 - 600000 900000 - 408000 900000 - 312000 900000 - 216000 900000 - 126000 900000 - >; -}; - &emmc { status = "okay"; bus-width = <8>;
arch/arm/kvm/hyp/Makefile +5 -0
@@ -7,6 +7,8 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING KVM=../../../../virt/kvm +CFLAGS_ARMV7VE :=$(call cc-option, -march=armv7ve) + obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
@@ -15,7 +17,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o obj-$(CONFIG_KVM_ARM_HOST) += vfp.o obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o +CFLAGS_banked-sr.o += $(CFLAGS_ARMV7VE) + obj-$(CONFIG_KVM_ARM_HOST) += entry.o obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o obj-$(CONFIG_KVM_ARM_HOST) += switch.o +CFLAGS_switch.o += $(CFLAGS_ARMV7VE) obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o
arch/arm/kvm/hyp/banked-sr.c +4 -0
@@ -20,6 +20,10 @@#include <asm/kvm_hyp.h> +/* +* gcc before 4.9 doesn't understand -march=armv7ve, so we have to +* trick the assembler. +*/ __asm__(".arch_extension virt" ); void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)
arch/arm/mach-mvebu/Kconfig +2 -2
@@ -42,7 +42,7 @@ config MACH_ARMADA_375 depends on ARCH_MULTI_V7 select ARMADA_370_XP_IRQ select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARMADA_375_CLK select HAVE_ARM_SCU
@@ -58,7 +58,7 @@ config MACH_ARMADA_38X bool "Marvell Armada 380/385 boards" depends on ARCH_MULTI_V7 select ARM_ERRATA_720789 - select ARM_ERRATA_753970 + select PL310_ERRATA_753970 select ARM_GIC select ARM_GLOBAL_TIMER select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
arch/arm/plat-orion/common.c +11 -12
@@ -472,28 +472,27 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,/***************************************************************************** * Ethernet switch ****************************************************************************/ -static __initconst const char *orion_ge00_mvmdio_bus_name ="orion-mii" ; -static __initdata struct mdio_board_info - orion_ge00_switch_board_info; +static __initdata struct mdio_board_info orion_ge00_switch_board_info = { + .bus_id ="orion-mii" , + .modalias ="mv88e6085" , +};void __init orion_ge00_switch_init (struct dsa_chip_data *d) { -struct mdio_board_info *bd;unsigned int i;if (!IS_BUILTIN (CONFIG_PHYLIB ))return ; -for (i =0 ; i <ARRAY_SIZE (d->port_names); i++) -if (!strcmp (d->port_names[i],"cpu" )) +for (i =0 ; i <ARRAY_SIZE (d->port_names); i++) { +if (!strcmp (d->port_names[i],"cpu" )) { + d->netdev[i] = &orion_ge00.dev;break ; + } + } - bd = &orion_ge00_switch_board_info; - bd->bus_id = orion_ge00_mvmdio_bus_name; - bd->mdio_addr = d->sw_addr; - d->netdev[i] = &orion_ge00.dev; -strcpy (bd->modalias,"mv88e6085" ); - bd->platform_data = d; + orion_ge00_switch_board_info.mdio_addr = d->sw_addr; + orion_ge00_switch_board_info.platform_data = d;mdiobus_register_board_info (&orion_ge00_switch_board_info,1 ); }
arch/parisc/include/asm/cacheflush.h +1 -0
@@ -26,6 +26,7 @@ void flush_user_icache_range_asm(unsigned long, unsigned long);void flush_kernel_icache_range_asm (unsigned long ,unsigned long );void flush_user_dcache_range_asm (unsigned long ,unsigned long );void flush_kernel_dcache_range_asm (unsigned long ,unsigned long ); +void purge_kernel_dcache_range_asm (unsigned long ,unsigned long );void flush_kernel_dcache_page_asm (void *);void flush_kernel_icache_page (void *);
arch/parisc/include/asm/processor.h +2 -0
@@ -316,6 +316,8 @@ extern int _parisc_requires_coherency;#define parisc_requires_coherency () (0)#endif +extern int running_on_qemu; +#endif /* __ASSEMBLY__ */ #endif /* __ASM_PARISC_PROCESSOR_H */
arch/parisc/kernel/cache.c +31 -26
112 lines not on this page · raw message
arch/parisc/kernel/pacache.S +22 -0
@@ -1110,6 +1110,28 @@ ENTRY_CFI(flush_kernel_dcache_range_asm) .procend ENDPROC_CFI(flush_kernel_dcache_range_asm) +ENTRY_CFI(purge_kernel_dcache_range_asm) + .proc + .callinfo NO_CALLS + .entry + + ldil L%dcache_stride, %r1 + ldw R%dcache_stride(%r1), %r23 + ldo -1(%r23), %r21 + ANDCM %r26, %r21, %r26 + +1: cmpb,COND(<<),n %r26, %r25,1b + pdc,m %r23(%r26) + + sync + syncdma + bv %r0(%r2) + nop + .exit + + .procend +ENDPROC_CFI(purge_kernel_dcache_range_asm) + ENTRY_CFI(flush_user_icache_range_asm) .proc .callinfo NO_CALLS
arch/parisc/kernel/time.c +6 -5
@@ -76,10 +76,10 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id) next_tick = cpuinfo->it_value;/* Calculate how many ticks have elapsed. */ + now =mfctl (16 );do { ++ticks_elapsed; next_tick += cpt; - now =mfctl (16 ); }while (next_tick - now > cpt);/* Store (in CR16 cycles) up to when we are accounting right now. */
@@ -103,16 +103,17 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)* if one or the other wrapped. If "now" is "bigger" we'll end up * with a very large unsigned number. */ -while (next_tick -mfctl (16 ) > cpt) + now =mfctl (16 ); +while (next_tick - now > cpt) next_tick += cpt;/* Program the IT when to deliver the next interrupt. * Only bottom 32-bits of next_tick are writable in CR16! * Timer interrupt will be delivered at least a few hundred cycles -* after the IT fires, so if we are too close (<= 500 cycles) to the +* after the IT fires, so if we are too close (<= 8000 cycles) to the * next cycle, simply skip it. */ -if (next_tick -mfctl (16 ) <=500 ) +if (next_tick - now <=8000 ) next_tick += cpt;mtctl (next_tick,16 );
@@ -248,7 +249,7 @@ static int __init init_cr16_clocksource(void)* different sockets, so mark them unstable and lower rating on * multi-socket SMP systems. */ -if (num_online_cpus () >1 ) { +if (num_online_cpus () >1 && !running_on_qemu) {int cpu;unsigned long cpu0_loc; cpu0_loc =per_cpu (cpu_data,0 ).cpu_loc;
arch/s390/kvm/interrupt.c +19 -6
@@ -173,8 +173,15 @@ static int ckc_interrupts_enabled(struct kvm_vcpu *vcpu)static int ckc_irq_pending (struct kvm_vcpu *vcpu) { -if (vcpu->arch.sie_block->ckc >=kvm_s390_get_tod_clock_fast (vcpu->kvm)) +const u64 now =kvm_s390_get_tod_clock_fast (vcpu->kvm); +const u64 ckc = vcpu->arch.sie_block->ckc; + +if (vcpu->arch.sie_block->gcr[0 ] &0x0020000000000000ul ) { +if ((s64 )ckc >= (s64 )now) +return 0 ; + }else if (ckc >= now) {return 0 ; + }return ckc_interrupts_enabled (vcpu); }
@@ -1004,13 +1011,19 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)static u64 __calculate_sltime (struct kvm_vcpu *vcpu) { -u64 now, cputm, sltime =0 ; +const u64 now =kvm_s390_get_tod_clock_fast (vcpu->kvm); +const u64 ckc = vcpu->arch.sie_block->ckc; +u64 cputm, sltime =0 ;if (ckc_interrupts_enabled (vcpu)) { - now =kvm_s390_get_tod_clock_fast (vcpu->kvm); - sltime =tod_to_ns (vcpu->arch.sie_block->ckc - now); -/* already expired or overflow? */ -if (!sltime || vcpu->arch.sie_block->ckc <= now) +if (vcpu->arch.sie_block->gcr[0 ] &0x0020000000000000ul ) { +if ((s64 )now < (s64 )ckc) + sltime =tod_to_ns ((s64 )ckc - (s64 )now); + }else if (now < ckc) { + sltime =tod_to_ns (ckc - now); + } +/* already expired */ +if (!sltime)return 0 ;if (cpu_timer_interrupts_enabled (vcpu)) { cputm =kvm_s390_get_cpu_timer (vcpu);
arch/s390/kvm/kvm-s390.c +45 -34
135 lines not on this page · raw message
arch/s390/kvm/kvm-s390.h +2 -3
@@ -272,9 +272,8 @@ int kvm_s390_handle_sigp_pei(struct kvm_vcpu *vcpu);int handle_sthyi (struct kvm_vcpu *vcpu);/* implemented in kvm-s390.c */ -void kvm_s390_set_tod_clock_ext (struct kvm *kvm, -const struct kvm_s390_vm_tod_clock *gtod); -void kvm_s390_set_tod_clock (struct kvm *kvm,u64 tod); +void kvm_s390_set_tod_clock (struct kvm *kvm, +const struct kvm_s390_vm_tod_clock *gtod);long kvm_arch_fault_in_page (struct kvm_vcpu *vcpu,gpa_t gpa,int writable);int kvm_s390_store_status_unloaded (struct kvm_vcpu *vcpu,unsigned long addr);int kvm_s390_vcpu_store_status (struct kvm_vcpu *vcpu,unsigned long addr);
arch/s390/kvm/priv.c +5 -4
@@ -84,9 +84,10 @@ int kvm_s390_handle_e3(struct kvm_vcpu *vcpu)/* Handle SCK (SET CLOCK) interception */ static int handle_set_clock (struct kvm_vcpu *vcpu) { +struct kvm_s390_vm_tod_clock gtod = {0 };int rc;u8 ar; -u64 op2, val; +u64 op2;if (vcpu->arch.sie_block->gpsw.mask &PSW_MASK_PSTATE )return kvm_s390_inject_program_int (vcpu,PGM_PRIVILEGED_OP );
@@ -94,12 +95,12 @@ static int handle_set_clock(struct kvm_vcpu *vcpu) op2 =kvm_s390_get_base_disp_s (vcpu, &ar);if (op2 &7 )/* Operand must be on a doubleword boundary */ return kvm_s390_inject_program_int (vcpu,PGM_SPECIFICATION ); - rc =read_guest (vcpu, op2, ar, &val,sizeof (val)); + rc =read_guest (vcpu, op2, ar, >od.tod,sizeof (gtod.tod));if (rc)return kvm_s390_inject_prog_cond (vcpu, rc); -VCPU_EVENT (vcpu,3 ,"SCK: setting guest TOD to 0x%llx" , val); -kvm_s390_set_tod_clock (vcpu->kvm, val); +VCPU_EVENT (vcpu,3 ,"SCK: setting guest TOD to 0x%llx" , gtod.tod); +kvm_s390_set_tod_clock (vcpu->kvm, >od);kvm_s390_set_psw_cc (vcpu,0 );return 0 ;
arch/x86/include/asm/pgtable.h +4 -4
@@ -350,14 +350,14 @@ static inline pmd_t pmd_set_flags(pmd_t pmd, pmdval_t set) {pmdval_t v =native_pmd_val (pmd); -return __pmd (v | set); +return native_make_pmd (v | set); }static inline pmd_t pmd_clear_flags (pmd_t pmd,pmdval_t clear) {pmdval_t v =native_pmd_val (pmd); -return __pmd (v & ~clear); +return native_make_pmd (v & ~clear); }static inline pmd_t pmd_mkold (pmd_t pmd)
@@ -409,14 +409,14 @@ static inline pud_t pud_set_flags(pud_t pud, pudval_t set) {pudval_t v =native_pud_val (pud); -return __pud (v | set); +return native_make_pud (v | set); }static inline pud_t pud_clear_flags (pud_t pud,pudval_t clear) {pudval_t v =native_pud_val (pud); -return __pud (v & ~clear); +return native_make_pud (v & ~clear); }static inline pud_t pud_mkold (pud_t pud)
arch/x86/include/asm/pgtable_32.h +1 -0
@@ -32,6 +32,7 @@ extern pmd_t initial_pg_pmd[];static inline void pgtable_cache_init (void ) { }static inline void check_pgt_cache (void ) { }void paging_init (void ); +void sync_initial_page_table (void );/* * Define this if things work differently on an i386 and an i486:
arch/x86/include/asm/pgtable_64.h +1 -0
@@ -28,6 +28,7 @@ extern pgd_t init_top_pgt[];#define swapper_pg_dir init_top_pgtextern void paging_init (void ); +static inline void sync_initial_page_table (void ) { }#define pte_ERROR (e) \ pr_err("%s:%d: bad pte %p(%016lx)\n", \
arch/x86/include/asm/pgtable_types.h +10 -0
@@ -323,6 +323,11 @@ static inline pudval_t native_pud_val(pud_t pud)#else #include <asm-generic/pgtable-nopud.h> +static inline pud_t native_make_pud (pudval_t val) +{ +return (pud_t ) { .p4d.pgd =native_make_pgd (val) }; +} +static inline pudval_t native_pud_val (pud_t pud) {return native_pgd_val (pud.p4d.pgd);
@@ -344,6 +349,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)#else #include <asm-generic/pgtable-nopmd.h> +static inline pmd_t native_make_pmd (pmdval_t val) +{ +return (pmd_t ) { .pud.p4d.pgd =native_make_pgd (val) }; +} +static inline pmdval_t native_pmd_val (pmd_t pmd) {return native_pgd_val (pmd.pud.p4d.pgd);
arch/x86/kernel/setup.c +5 -12
@@ -1238,20 +1238,13 @@ void __init setup_arch(char **cmdline_p)kasan_init (); -#ifdef CONFIG_X86_32 -/* sync back kernel address range */ -clone_pgd_range (initial_page_table +KERNEL_PGD_BOUNDARY , - swapper_pg_dir +KERNEL_PGD_BOUNDARY , -KERNEL_PGD_PTRS ); -/* -* sync back low identity map too. It is used for example -* in the 32-bit EFI stub. +* Sync back kernel address range. +* +* FIXME: Can the later sync in setup_cpu_entry_areas() replace +* this call? */ -clone_pgd_range (initial_page_table, - swapper_pg_dir +KERNEL_PGD_BOUNDARY , -min (KERNEL_PGD_PTRS ,KERNEL_PGD_BOUNDARY )); -#endif +sync_initial_page_table ();tboot_probe ();
arch/x86/kernel/setup_percpu.c +4 -13
@@ -287,24 +287,15 @@ void __init setup_per_cpu_areas(void)/* Setup cpu initialized, callin, callout masks */ setup_cpu_local_masks (); -#ifdef CONFIG_X86_32 /* * Sync back kernel address range again. We already did this in * setup_arch(), but percpu data also needs to be available in * the smpboot asm. We can't reliably pick up percpu mappings * using vmalloc_fault(), because exception dispatch needs * percpu data. +* +* FIXME: Can the later sync in setup_cpu_entry_areas() replace +* this call? */ -clone_pgd_range (initial_page_table +KERNEL_PGD_BOUNDARY , - swapper_pg_dir +KERNEL_PGD_BOUNDARY , -KERNEL_PGD_PTRS ); - -/* -* sync back low identity map too. It is used for example -* in the 32-bit EFI stub. -*/ -clone_pgd_range (initial_page_table, - swapper_pg_dir +KERNEL_PGD_BOUNDARY , -min (KERNEL_PGD_PTRS ,KERNEL_PGD_BOUNDARY )); -#endif +sync_initial_page_table (); }
arch/x86/kvm/lapic.c +4 -7
@@ -1944,14 +1944,13 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)void kvm_lapic_reset (struct kvm_vcpu *vcpu,bool init_event) { -struct kvm_lapic *apic; +struct kvm_lapic *apic = vcpu->arch.apic;int i; -apic_debug ("%s\n" , __func__); +if (!apic) +return ; -ASSERT (vcpu); - apic = vcpu->arch.apic; -ASSERT (apic !=NULL ); +apic_debug ("%s\n" , __func__);/* Stop the timer in case it's a reset to an active apic */ hrtimer_cancel (&apic->lapic_timer.timer);
@@ -2107,7 +2106,6 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)*/ vcpu->arch.apic_base =MSR_IA32_APICBASE_ENABLE ;static_key_slow_inc (&apic_sw_disabled.key);/* sw disabled at reset */ -kvm_lapic_reset (vcpu, false);kvm_iodevice_init (&apic->dev, &apic_mmio_ops);return 0 ;
@@ -2511,7 +2509,6 @@ void kvm_apic_accept_events(struct kvm_vcpu *vcpu) pe =xchg (&apic->pending_events,0 );if (test_bit (KVM_APIC_INIT , &pe)) { -kvm_lapic_reset (vcpu, true);kvm_vcpu_reset (vcpu, true);if (kvm_vcpu_is_bsp (apic->vcpu)) vcpu->arch.mp_state =KVM_MP_STATE_RUNNABLE ;
arch/x86/kvm/mmu.c +47 -50
235 lines not on this page · raw message
arch/x86/kvm/paging_tmpl.h +9 -9
@@ -593,7 +593,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,struct kvm_mmu_page *sp =NULL ;struct kvm_shadow_walk_iterator it;unsigned direct_access, access = gw->pt_access; -int top_level, emulate; +int top_level, ret; direct_access = gw->pte_access;
@@ -659,15 +659,15 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr, }clear_sp_write_flooding_count (it.sptep); - emulate =mmu_set_spte (vcpu, it.sptep, gw->pte_access, write_fault, - it.level, gw->gfn, pfn, prefault, map_writable); + ret =mmu_set_spte (vcpu, it.sptep, gw->pte_access, write_fault, + it.level, gw->gfn, pfn, prefault, map_writable);FNAME (pte_prefetch)(vcpu, gw, it.sptep); -return emulate; +return ret; out_gpte_changed:kvm_release_pfn_clean (pfn); -return 0 ; +return RET_PF_RETRY ; }/*
@@ -762,12 +762,12 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,if (!prefault)inject_page_fault (vcpu, &walker.fault); -return 0 ; +return RET_PF_RETRY ; }if (page_fault_handle_page_track (vcpu, error_code, walker.gfn)) {shadow_page_table_clear_flood (vcpu, addr); -return 1 ; +return RET_PF_EMULATE ; } vcpu->arch.write_fault_to_shadow_pgtable = false;
@@ -789,7 +789,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code,if (try_async_pf (vcpu, prefault, walker.gfn, addr, &pfn, write_fault, &map_writable)) -return 0 ; +return RET_PF_RETRY ;if (handle_abnormal_pfn (vcpu, addr, walker.gfn, pfn, walker.pte_access, &r))return r;
@@ -834,7 +834,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, out_unlock:spin_unlock (&vcpu->kvm->mmu_lock);kvm_release_pfn_clean (pfn); -return 0 ; +return RET_PF_RETRY ; }static gpa_t FNAME (get_level1_sp_gpa )(struct kvm_mmu_page *sp)
arch/x86/kvm/svm.c +5 -4
@@ -45,6 +45,7 @@#include <asm/debugreg.h> #include <asm/kvm_para.h> #include <asm/irq_remapping.h> +#include <asm/microcode.h> #include <asm/nospec-branch.h> #include <asm/virtext.h>
@@ -5015,7 +5016,7 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)* being speculatively taken. */ if (svm->spec_ctrl) -wrmsrl (MSR_IA32_SPEC_CTRL , svm->spec_ctrl); +native_wrmsrl (MSR_IA32_SPEC_CTRL , svm->spec_ctrl); asmvolatile ( "push %%" _ASM_BP "; \n\t"
@@ -5124,11 +5125,11 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)* If the L02 MSR bitmap does not intercept the MSR, then we need to * save it. */ -if (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL )) -rdmsrl (MSR_IA32_SPEC_CTRL , svm->spec_ctrl); +if (unlikely (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL ))) + svm->spec_ctrl =native_read_msr (MSR_IA32_SPEC_CTRL );if (svm->spec_ctrl) -wrmsrl (MSR_IA32_SPEC_CTRL ,0 ); +native_wrmsrl (MSR_IA32_SPEC_CTRL ,0 );/* Eliminate branch target predictions from guest mode */ vmexit_fill_RSB ();
arch/x86/kvm/vmx.c +5 -4
@@ -51,6 +51,7 @@#include <asm/apic.h> #include <asm/irq_remapping.h> #include <asm/mmu_context.h> +#include <asm/microcode.h> #include <asm/nospec-branch.h> #include "trace.h"
@@ -9431,7 +9432,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)* being speculatively taken. */ if (vmx->spec_ctrl) -wrmsrl (MSR_IA32_SPEC_CTRL , vmx->spec_ctrl); +native_wrmsrl (MSR_IA32_SPEC_CTRL , vmx->spec_ctrl); vmx->__launched = vmx->loaded_vmcs->launched; asm(
@@ -9566,11 +9567,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)* If the L02 MSR bitmap does not intercept the MSR, then we need to * save it. */ -if (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL )) -rdmsrl (MSR_IA32_SPEC_CTRL , vmx->spec_ctrl); +if (unlikely (!msr_write_intercepted (vcpu,MSR_IA32_SPEC_CTRL ))) + vmx->spec_ctrl =native_read_msr (MSR_IA32_SPEC_CTRL );if (vmx->spec_ctrl) -wrmsrl (MSR_IA32_SPEC_CTRL ,0 ); +native_wrmsrl (MSR_IA32_SPEC_CTRL ,0 );/* Eliminate branch target predictions from guest mode */ vmexit_fill_RSB ();
arch/x86/kvm/x86.c +6 -6
@@ -7482,13 +7482,13 @@ EXPORT_SYMBOL_GPL(kvm_task_switch);int kvm_valid_sregs (struct kvm_vcpu *vcpu,struct kvm_sregs *sregs) { -if ((sregs->efer &EFER_LME ) && (sregs->cr0 &X86_CR0_PG_BIT )) { +if ((sregs->efer &EFER_LME ) && (sregs->cr0 &X86_CR0_PG )) {/* * When EFER.LME and CR0.PG are set, the processor is in * 64-bit mode (though maybe in a 32-bit code segment). * CR4.PAE and EFER.LMA must be set. */ -if (!(sregs->cr4 &X86_CR4_PAE_BIT ) +if (!(sregs->cr4 &X86_CR4_PAE ) || !(sregs->efer &EFER_LMA ))return -EINVAL ; }else {
@@ -7821,6 +7821,8 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)void kvm_vcpu_reset (struct kvm_vcpu *vcpu,bool init_event) { +kvm_lapic_reset (vcpu, init_event); + vcpu->arch.hflags =0 ; vcpu->arch.smi_pending =0 ;
@@ -8249,10 +8251,8 @@ int __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa, u32 size)return r; } -if (!size) { - r =vm_munmap (old.userspace_addr, old.npages *PAGE_SIZE ); -WARN_ON (r <0 ); - } +if (!size) +vm_munmap (old.userspace_addr, old.npages *PAGE_SIZE );return 0 ; }
arch/x86/mm/cpu_entry_area.c +6 -0
@@ -163,4 +163,10 @@ void __init setup_cpu_entry_areas(void)for_each_possible_cpu (cpu)setup_cpu_entry_area (cpu); + +/* +* This is the last essential update to swapper_pgdir which needs +* to be synchronized to initial_page_table on 32bit. +*/ +sync_initial_page_table (); }
arch/x86/mm/init_32.c +15 -0
@@ -453,6 +453,21 @@ static inline void permanent_kmaps_init(pgd_t *pgd_base) }#endif /* CONFIG_HIGHMEM */ +void __init sync_initial_page_table (void ) +{ +clone_pgd_range (initial_page_table +KERNEL_PGD_BOUNDARY , + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +KERNEL_PGD_PTRS ); + +/* +* sync back low identity map too. It is used for example +* in the 32-bit EFI stub. +*/ +clone_pgd_range (initial_page_table, + swapper_pg_dir +KERNEL_PGD_BOUNDARY , +min (KERNEL_PGD_PTRS ,KERNEL_PGD_BOUNDARY )); +} +void __init native_pagetable_init (void ) {unsigned long pfn, va;
arch/x86/platform/intel-mid/intel-mid.c +1 -1
@@ -79,7 +79,7 @@ static void intel_mid_power_off(void)static void intel_mid_reboot (void ) { -intel_scu_ipc_simple_command (IPCMSG_COLD_BOOT ,0 ); +intel_scu_ipc_simple_command (IPCMSG_COLD_RESET ,0 ); }static unsigned long __init intel_mid_calibrate_tsc (void )
arch/x86/xen/suspend.c +16 -0
@@ -1,12 +1,15 @@// SPDX-License-Identifier: GPL-2.0 #include <linux/types.h> #include <linux/tick.h> +#include <linux/percpu-defs.h> #include <xen/xen.h> #include <xen/interface/xen.h> #include <xen/grant_table.h> #include <xen/events.h> +#include <asm/cpufeatures.h> +#include <asm/msr-index.h> #include <asm/xen/hypercall.h> #include <asm/xen/page.h> #include <asm/fixmap.h>
@@ -15,6 +18,8 @@#include "mmu.h" #include "pmu.h" +static DEFINE_PER_CPU(u64, spec_ctrl); +void xen_arch_pre_suspend (void ) {if (xen_pv_domain ())
@@ -31,6 +36,9 @@ void xen_arch_post_suspend(int cancelled)static void xen_vcpu_notify_restore (void *data) { +if (xen_pv_domain () &&boot_cpu_has (X86_FEATURE_SPEC_CTRL )) +wrmsrl (MSR_IA32_SPEC_CTRL ,this_cpu_read (spec_ctrl)); +/* Boot processor notified via generic timekeeping_resume() */ if (smp_processor_id () ==0 )return ;
@@ -40,7 +48,15 @@ static void xen_vcpu_notify_restore(void *data)static void xen_vcpu_notify_suspend (void *data) { +u64 tmp; +tick_suspend_local (); + +if (xen_pv_domain () &&boot_cpu_has (X86_FEATURE_SPEC_CTRL )) { +rdmsrl (MSR_IA32_SPEC_CTRL , tmp); +this_cpu_write (spec_ctrl, tmp); +wrmsrl (MSR_IA32_SPEC_CTRL ,0 ); + } }void xen_arch_resume (void )
block/blk-core.c +1 -1
@@ -2277,7 +2277,7 @@ blk_qc_t submit_bio(struct bio *bio)unsigned int count;if (unlikely (bio_op (bio) ==REQ_OP_WRITE_SAME )) - count =queue_logical_block_size (bio->bi_disk->queue); + count =queue_logical_block_size (bio->bi_disk->queue) >>9 ;else count =bio_sectors (bio);
block/blk-mq.c +3 -1
@@ -638,7 +638,6 @@ static void __blk_mq_requeue_request(struct request *rq)trace_block_rq_requeue (q, rq);wbt_requeue (q->rq_wb, &rq->issue_stat); -blk_mq_sched_requeue_request (rq);if (test_and_clear_bit (REQ_ATOM_STARTED , &rq->atomic_flags)) {if (q->dma_drain_size &&blk_rq_bytes (rq))
@@ -650,6 +649,9 @@ void blk_mq_requeue_request(struct request *rq, bool kick_requeue_list) {__blk_mq_requeue_request (rq); +/* this request will be re-inserted to io scheduler queue */ +blk_mq_sched_requeue_request (rq); +BUG_ON (blk_queued_rq (rq));blk_mq_add_to_requeue_list (rq, true, kick_requeue_list); }
block/kyber-iosched.c +1 -0
@@ -814,6 +814,7 @@ static struct elevator_type kyber_sched = { .limit_depth = kyber_limit_depth, .prepare_request = kyber_prepare_request, .finish_request = kyber_finish_request, + .requeue_request = kyber_finish_request, .completed_request = kyber_completed_request, .dispatch_request = kyber_dispatch_request, .has_work = kyber_has_work,
drivers/acpi/bus.c +31 -7
@@ -66,10 +66,37 @@ static int set_copy_dsdt(const struct dmi_system_id *id)return 0 ; }#endif +static int set_gbl_term_list (const struct dmi_system_id *id) +{ + acpi_gbl_parse_table_as_term_list =1 ; +return 0 ; +} -static const struct dmi_system_id dsdt_dmi_table[]__initconst = { +static const struct dmi_system_id acpi_quirks_dmi_table[]__initconst = { +/* +* Touchpad on Dell XPS 9570/Precision M5530 doesn't work under I2C +* mode. +* https://bugzilla.kernel.org/show_bug.cgi?id=198515 +*/ + { + .callback = set_gbl_term_list, + .ident ="Dell Precision M5530" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"Precision M5530" ), + }, + }, + { + .callback = set_gbl_term_list, + .ident ="Dell XPS 15 9570" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Dell Inc." ), +DMI_MATCH (DMI_PRODUCT_NAME ,"XPS 15 9570" ), + }, + },/* * Invoke DSDT corruption work-around on all Toshiba Satellite. +* DSDT will be copied to memory. * https://bugzilla.kernel.org/show_bug.cgi?id=14679 */ {
@@ -83,7 +110,7 @@ static const struct dmi_system_id dsdt_dmi_table[] __initconst = { {} };#else -static const struct dmi_system_id dsdt_dmi_table[]__initconst = { +static const struct dmi_system_id acpi_quirks_dmi_table[]__initconst = { {} };#endif
@@ -1001,11 +1028,8 @@ void __init acpi_early_init(void) acpi_permanent_mmap = true; -/* -* If the machine falls into the DMI check table, -* DSDT will be copied to memory -*/ -dmi_check_system (dsdt_dmi_table); +/* Check machine-specific quirks */ +dmi_check_system (acpi_quirks_dmi_table); status =acpi_reallocate_root_table ();if (ACPI_FAILURE (status)) {
drivers/bluetooth/btusb.c +19 -6
@@ -21,6 +21,7 @@* */ +#include <linux/dmi.h> #include <linux/module.h> #include <linux/usb.h> #include <linux/usb/quirks.h>
@@ -381,6 +382,21 @@ static const struct usb_device_id blacklist_table[] = { { }/* Terminating entry */ }; +/* The Bluetooth USB module build into some devices needs to be reset on resume, +* this is a problem with the platform (likely shutting off all power) not with +* the module itself. So we use a DMI list to match known broken platforms. +*/ +static const struct dmi_system_id btusb_needs_reset_resume_table[] = { + { +/* Lenovo Yoga 920 (QCA Rome device 0cf3:e300) */ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"LENOVO" ), +DMI_MATCH (DMI_PRODUCT_VERSION ,"Lenovo YOGA 920" ), + }, + }, + {} +}; +#define BTUSB_MAX_ISOC_FRAMES 10#define BTUSB_INTR_RUNNING 0
@@ -3013,6 +3029,9 @@ static int btusb_probe(struct usb_interface *intf, hdev->send = btusb_send_frame; hdev->notify = btusb_notify; +if (dmi_check_system (btusb_needs_reset_resume_table)) +interface_to_usbdev (intf)->quirks |=USB_QUIRK_RESET_RESUME ; +#ifdef CONFIG_PM err =btusb_config_oob_wake (hdev);if (err)
@@ -3099,12 +3118,6 @@ static int btusb_probe(struct usb_interface *intf,if (id->driver_info &BTUSB_QCA_ROME ) { data->setup_on_usb = btusb_setup_qca; hdev->set_bdaddr = btusb_set_bdaddr_ath3012; - -/* QCA Rome devices lose their updated firmware over suspend, -* but the USB hub doesn't notice any status change. -* explicitly request a device reset on resume. -*/ -interface_to_usbdev (intf)->quirks |=USB_QUIRK_RESET_RESUME ; }#ifdef CONFIG_BT_HCIBTUSB_RTL
drivers/char/tpm/st33zp24/st33zp24.c +2 -2
@@ -457,7 +457,7 @@ static int st33zp24_recv(struct tpm_chip *chip, unsigned char *buf, size_t count) {int size =0 ; -int expected; +u32 expected;if (!chip)return -EBUSY ;
@@ -474,7 +474,7 @@ static int st33zp24_recv(struct tpm_chip *chip, unsigned char *buf, } expected =be32_to_cpu (*(__be32 *)(buf +2 )); -if (expected > count) { +if (expected > count || expected <TPM_HEADER_SIZE ) { size = -EIO ; goto out; }
drivers/char/tpm/tpm-interface.c +4 -0
@@ -1228,6 +1228,10 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)break ; recd =be32_to_cpu (tpm_cmd.params.getrandom_out.rng_data_len); +if (recd > num_bytes) { + total = -EFAULT ; +break ; + } rlength =be32_to_cpu (tpm_cmd.header.out.length); if (rlength < offsetof(struct tpm_getrandom_out, rng_data) +
drivers/char/tpm/tpm2-cmd.c +4 -0
@@ -683,6 +683,10 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,if (!rc) { data_len =be16_to_cpup ( (__be16 *) &buf.data[TPM_HEADER_SIZE +4 ]); +if (data_len <MIN_KEY_SIZE || data_len >MAX_KEY_SIZE +1 ) { + rc = -EFAULT ; + goto out; + } rlength =be32_to_cpu (((struct tpm2_cmd *)&buf) ->header.out.length);
drivers/char/tpm/tpm_i2c_infineon.c +3 -2
@@ -473,7 +473,8 @@ static int recv_data(struct tpm_chip *chip, u8 *buf, size_t count)static int tpm_tis_i2c_recv (struct tpm_chip *chip,u8 *buf,size_t count) {int size =0 ; -int expected, status; +int status; +u32 expected;if (count <TPM_HEADER_SIZE ) { size = -EIO ;
@@ -488,7 +489,7 @@ static int tpm_tis_i2c_recv(struct tpm_chip *chip, u8 *buf, size_t count) } expected =be32_to_cpu (*(__be32 *)(buf +2 )); -if ((size_t ) expected > count) { +if (((size_t ) expected > count) || (expected <TPM_HEADER_SIZE )) { size = -EIO ; goto out; }
drivers/char/tpm/tpm_i2c_nuvoton.c +6 -2
@@ -281,7 +281,11 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)struct device *dev = chip->dev.parent;struct i2c_client *client =to_i2c_client (dev);s32 rc; -int expected, status, burst_count, retries, size =0 ; +int status; +int burst_count; +int retries; +int size =0 ; +u32 expected;if (count <TPM_HEADER_SIZE ) {i2c_nuvoton_ready (chip);/* return to idle */
@@ -323,7 +327,7 @@ static int i2c_nuvoton_recv(struct tpm_chip *chip, u8 *buf, size_t count)* to machine native */ expected =be32_to_cpu (*(__be32 *) (buf +2 )); -if (expected > count) { +if (expected > count || expected < size) {dev_err (dev,"%s() expected > count\n" , __func__); size = -EIO ;continue ;
drivers/char/tpm/tpm_tis.c +1 -1
@@ -223,7 +223,7 @@ static int tpm_tcg_read_bytes(struct tpm_tis_data *data, u32 addr, u16 len, }static int tpm_tcg_write_bytes (struct tpm_tis_data *data,u32 addr,u16 len, -u8 *value) +const u8 *value) {struct tpm_tis_tcg_phy *phy =to_tpm_tis_tcg_phy (data);
drivers/char/tpm/tpm_tis_core.c +5 -4
@@ -202,7 +202,8 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int size =0 ; -int expected, status; +int status; +u32 expected;if (count <TPM_HEADER_SIZE ) { size = -EIO ;
@@ -217,7 +218,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count) } expected =be32_to_cpu (*(__be32 *) (buf +2 )); -if (expected > count) { +if (expected > count || expected <TPM_HEADER_SIZE ) { size = -EIO ; goto out; }
@@ -252,7 +253,7 @@ static int tpm_tis_recv(struct tpm_chip *chip, u8 *buf, size_t count)* tpm.c can skip polling for the data to be available as the interrupt is * waited for here */ -static int tpm_tis_send_data (struct tpm_chip *chip,u8 *buf,size_t len) +static int tpm_tis_send_data (struct tpm_chip *chip,const u8 *buf,size_t len) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int rc, status, burstcnt;
@@ -343,7 +344,7 @@ static void disable_interrupts(struct tpm_chip *chip)* tpm.c can skip polling for the data to be available as the interrupt is * waited for here */ -static int tpm_tis_send_main (struct tpm_chip *chip,u8 *buf,size_t len) +static int tpm_tis_send_main (struct tpm_chip *chip,const u8 *buf,size_t len) {struct tpm_tis_data *priv =dev_get_drvdata (&chip->dev);int rc;
drivers/char/tpm/tpm_tis_core.h +2 -2
@@ -98,7 +98,7 @@ struct tpm_tis_phy_ops {int (*read_bytes)(struct tpm_tis_data *data,u32 addr,u16 len,u8 *result);int (*write_bytes)(struct tpm_tis_data *data,u32 addr,u16 len, -u8 *value); +const u8 *value);int (*read16)(struct tpm_tis_data *data,u32 addr,u16 *result);int (*read32)(struct tpm_tis_data *data,u32 addr,u32 *result);int (*write32)(struct tpm_tis_data *data,u32 addr,u32 src);
@@ -128,7 +128,7 @@ static inline int tpm_tis_read32(struct tpm_tis_data *data, u32 addr, }static inline int tpm_tis_write_bytes (struct tpm_tis_data *data,u32 addr, -u16 len,u8 *value) +u16 len,const u8 *value) {return data->phy_ops->write_bytes (data, addr, len, value); }
drivers/char/tpm/tpm_tis_spi.c +27 -21
112 lines not on this page · raw message
drivers/cpufreq/s3c24xx-cpufreq.c +7 -1
@@ -351,7 +351,13 @@ struct clk *s3c_cpufreq_clk_get(struct device *dev, const char *name)static int s3c_cpufreq_init (struct cpufreq_policy *policy) { policy->clk = clk_arm; -return cpufreq_generic_init (policy, ftab, cpu_cur.info->latency); + + policy->cpuinfo.transition_latency = cpu_cur.info->latency; + +if (ftab) +return cpufreq_table_validate_and_show (policy, ftab); + +return 0 ; }static int __init s3c_cpufreq_initclks (void )
drivers/edac/sb_edac.c +1 -1
@@ -279,7 +279,7 @@ static const u32 correrrthrsld[] = {* sbridge structs */ -#define NUM_CHANNELS 4/* Max channels per MC */ +#define NUM_CHANNELS 6/* Max channels per MC */ #define MAX_DIMMS 3/* Max DIMMS per channel */ #define KNL_MAX_CHAS 38/* KNL max num. of Cache Home Agents */ #define KNL_MAX_CHANNELS 6/* KNL max num. of PCI channels */
drivers/md/md.c +4 -0
@@ -8522,6 +8522,10 @@ static int remove_and_add_spares(struct mddev *mddev,int removed =0 ;bool remove_some = false; +if (this &&test_bit (MD_RECOVERY_RUNNING , &mddev->recovery)) +/* Mustn't remove devices when resync thread is running */ +return 0 ; +rdev_for_each (rdev, mddev) { if ((this == NULL || rdev == this) && rdev->raid_disk >= 0 &&
drivers/media/dvb-frontends/m88ds3103.c +5 -2
@@ -1262,11 +1262,12 @@ static int m88ds3103_select(struct i2c_mux_core *muxc, u32 chan)* New users must use I2C client binding directly! */ struct dvb_frontend *m88ds3103_attach (const struct m88ds3103_config *cfg, -struct i2c_adapter *i2c,struct i2c_adapter **tuner_i2c_adapter) +struct i2c_adapter *i2c, +struct i2c_adapter **tuner_i2c_adapter) {struct i2c_client *client;struct i2c_board_info board_info; -struct m88ds3103_platform_data pdata; +struct m88ds3103_platform_data pdata = {}; pdata.clk = cfg->clock; pdata.i2c_wr_max = cfg->i2c_wr_max;
@@ -1409,6 +1410,8 @@ static int m88ds3103_probe(struct i2c_client *client,case M88DS3103_CHIP_ID :break ;default : + ret = -ENODEV ; +dev_err (&client->dev,"Unknown device. Chip_id=%02x\n" , dev->chip_id); goto err_kfree; }
drivers/mmc/host/dw_mmc-exynos.c +1 -0
@@ -487,6 +487,7 @@ static unsigned long exynos_dwmmc_caps[4] = {static const struct dw_mci_drv_data exynos_drv_data = { .caps = exynos_dwmmc_caps, + .num_caps =ARRAY_SIZE (exynos_dwmmc_caps), .init = dw_mci_exynos_priv_init, .set_ios = dw_mci_exynos_set_ios, .parse_dt = dw_mci_exynos_parse_dt,
drivers/mmc/host/dw_mmc-k3.c +4 -0
@@ -135,6 +135,9 @@ static int dw_mci_hi6220_parse_dt(struct dw_mci *host)if (priv->ctrl_id <0 ) priv->ctrl_id =0 ; +if (priv->ctrl_id >=TIMING_MODE ) +return -EINVAL ; + host->priv = priv;return 0 ; }
@@ -207,6 +210,7 @@ static int dw_mci_hi6220_execute_tuning(struct dw_mci_slot *slot, u32 opcode)static const struct dw_mci_drv_data hi6220_data = { .caps = dw_mci_hi6220_caps, + .num_caps =ARRAY_SIZE (dw_mci_hi6220_caps), .switch_voltage = dw_mci_hi6220_switch_voltage, .set_ios = dw_mci_hi6220_set_ios, .parse_dt = dw_mci_hi6220_parse_dt,
drivers/mmc/host/dw_mmc-rockchip.c +1 -0
@@ -319,6 +319,7 @@ static const struct dw_mci_drv_data rk2928_drv_data = {static const struct dw_mci_drv_data rk3288_drv_data = { .caps = dw_mci_rk3288_dwmmc_caps, + .num_caps =ARRAY_SIZE (dw_mci_rk3288_dwmmc_caps), .set_ios = dw_mci_rk3288_set_ios, .execute_tuning = dw_mci_rk3288_execute_tuning, .parse_dt = dw_mci_rk3288_parse_dt,
drivers/mmc/host/dw_mmc-zx.c +1 -0
@@ -195,6 +195,7 @@ static unsigned long zx_dwmmc_caps[3] = {static const struct dw_mci_drv_data zx_drv_data = { .caps = zx_dwmmc_caps, + .num_caps =ARRAY_SIZE (zx_dwmmc_caps), .execute_tuning = dw_mci_zx_execute_tuning, .prepare_hs400_tuning = dw_mci_zx_prepare_hs400_tuning, .parse_dt = dw_mci_zx_parse_dt,
drivers/mmc/host/dw_mmc.c +54 -30
116 lines not on this page · raw message
drivers/mmc/host/dw_mmc.h +2 -0
@@ -542,6 +542,7 @@ struct dw_mci_slot {/** * dw_mci driver data - dw-mshc implementation specific driver data. * @caps: mmc subsystem specified capabilities of the controller(s). +* @num_caps: number of capabilities specified by @caps. * @init: early implementation specific initialization. * @set_ios: handle bus specific extensions. * @parse_dt: parse implementation specific device tree properties.
@@ -553,6 +554,7 @@ struct dw_mci_slot {*/ struct dw_mci_drv_data {unsigned long *caps; +u32 num_caps;int (*init)(struct dw_mci *host);void (*set_ios)(struct dw_mci *host,struct mmc_ios *ios);int (*parse_dt)(struct dw_mci *host);
drivers/mmc/host/sdhci-pci-core.c +31 -4
@@ -594,9 +594,36 @@ static void byt_read_dsm(struct sdhci_pci_slot *slot) slot->chip->rpm_retune = intel_host->d3_retune; } -static int byt_emmc_probe_slot (struct sdhci_pci_slot *slot) +static int intel_execute_tuning (struct mmc_host *mmc,u32 opcode) +{ +int err =sdhci_execute_tuning (mmc, opcode); +struct sdhci_host *host =mmc_priv (mmc); + +if (err) +return err; + +/* +* Tuning can leave the IP in an active state (Buffer Read Enable bit +* set) which prevents the entry to low power states (i.e. S0i3). Data +* reset will clear it. +*/ +sdhci_reset (host,SDHCI_RESET_DATA ); + +return 0 ; +} + +static void byt_probe_slot (struct sdhci_pci_slot *slot) { +struct mmc_host_ops *ops = &slot->host->mmc_host_ops; +byt_read_dsm (slot); + + ops->execute_tuning = intel_execute_tuning; +} + +static int byt_emmc_probe_slot (struct sdhci_pci_slot *slot) +{ +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_8_BIT_DATA |MMC_CAP_NONREMOVABLE |MMC_CAP_HW_RESET |MMC_CAP_1_8V_DDR | MMC_CAP_CMD_DURING_TFR |
@@ -651,7 +678,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot) {int err; -byt_read_dsm (slot); +byt_probe_slot (slot); err =ni_set_max_freq (slot);if (err)
@@ -664,7 +691,7 @@ static int ni_byt_sdio_probe_slot(struct sdhci_pci_slot *slot)static int byt_sdio_probe_slot (struct sdhci_pci_slot *slot) { -byt_read_dsm (slot); +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_POWER_OFF_CARD |MMC_CAP_NONREMOVABLE |MMC_CAP_WAIT_WHILE_BUSY ;return 0 ;
@@ -672,7 +699,7 @@ static int byt_sdio_probe_slot(struct sdhci_pci_slot *slot)static int byt_sd_probe_slot (struct sdhci_pci_slot *slot) { -byt_read_dsm (slot); +byt_probe_slot (slot); slot->host->mmc->caps |=MMC_CAP_WAIT_WHILE_BUSY |MMC_CAP_AGGRESSIVE_PM |MMC_CAP_CD_WAKE ; slot->cd_idx =0 ;
drivers/net/ethernet/amd/xgbe/xgbe-drv.c +1 -1
@@ -595,7 +595,7 @@ static void xgbe_isr_task(unsigned long data) reissue_mask =1 <<0 ;if (!pdata->per_channel_irq) - reissue_mask |=0xffff <4 ; + reissue_mask |=0xffff <<4 ;XP_IOWRITE (pdata,XP_INT_REISSUE_EN , reissue_mask); }
drivers/net/ethernet/amd/xgbe/xgbe-pci.c +2 -0
@@ -426,6 +426,8 @@ static int xgbe_pci_resume(struct pci_dev *pdev)struct net_device *netdev = pdata->netdev;int ret =0 ; +XP_IOWRITE (pdata,XP_INT_EN ,0x1fffff ); + pdata->lpm_ctrl &= ~MDIO_CTRL1_LPOWER ;XMDIO_WRITE (pdata,MDIO_MMD_PCS ,MDIO_CTRL1 , pdata->lpm_ctrl);
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8 -0
@@ -1877,6 +1877,14 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,ixgbe_rx_pg_size (rx_ring),DMA_FROM_DEVICE , IXGBE_RX_DMA_ATTR); + }else if (ring_uses_build_skb (rx_ring)) { +unsigned long offset = (unsigned long )(skb->data) & ~PAGE_MASK ; + +dma_sync_single_range_for_cpu (rx_ring->dev, +IXGBE_CB (skb)->dma, + offset, +skb_headlen (skb), +DMA_FROM_DEVICE ); }else {struct skb_frag_struct *frag = &skb_shinfo (skb)->frags[0 ];
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +8 -2
@@ -1918,13 +1918,16 @@ static void mlx5e_build_rq_param(struct mlx5e_priv *priv, param->wq.linear =1 ; } -static void mlx5e_build_drop_rq_param (struct mlx5e_rq_param *param) +static void mlx5e_build_drop_rq_param (struct mlx5_core_dev *mdev, +struct mlx5e_rq_param *param) {void *rqc = param->rqc;void *wq =MLX5_ADDR_OF (rqc, rqc, wq);MLX5_SET (wq, wq, wq_type,MLX5_WQ_TYPE_LINKED_LIST );MLX5_SET (wq, wq, log_wq_stride,ilog2 (sizeof (struct mlx5e_rx_wqe ))); + + param->wq.buf_numa_node =dev_to_node (&mdev->pdev->dev); } static void mlx5e_build_sq_param_common(struct mlx5e_priv *priv,
@@ -2778,6 +2781,9 @@ static int mlx5e_alloc_drop_cq(struct mlx5_core_dev *mdev,struct mlx5e_cq *cq, struct mlx5e_cq_param *param) { + param->wq.buf_numa_node = dev_to_node(&mdev->pdev->dev); + param->wq.db_numa_node =dev_to_node (&mdev->pdev->dev); +return mlx5e_alloc_cq_common (mdev, param, cq); }
@@ -2789,7 +2795,7 @@ static int mlx5e_open_drop_rq(struct mlx5_core_dev *mdev,struct mlx5e_cq *cq = &drop_rq->cq;int err; -mlx5e_build_drop_rq_param (&rq_param); +mlx5e_build_drop_rq_param (mdev, &rq_param); err =mlx5e_alloc_drop_cq (mdev, cq, &cq_param);if (err)
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +35 -14
84 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +2 -1
@@ -216,7 +216,8 @@ mlx5e_test_loopback_validate(struct sk_buff *skb,if (iph->protocol !=IPPROTO_UDP ) goto out; - udph =udp_hdr (skb); +/* Don't assume skb_transport_header() was set */ + udph = (struct udphdr *)((u8 *)iph +4 * iph->ihl);if (udph->dest !=htons (9 )) goto out;
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +1 -1
@@ -155,7 +155,7 @@ static inline u16 mlx5e_calc_min_inline(enum mlx5_inline_modes mode,default : hlen =mlx5e_skb_l2_header_offset (skb); } -return min_t (u16, hlen, skb->len); +return min_t (u16, hlen,skb_headlen (skb)); } static inline void mlx5e_tx_skb_pull_inline(unsigned char **skb_data,
drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +14 -8
@@ -729,26 +729,29 @@ static struct mlxsw_sp_fib *mlxsw_sp_vr_fib(const struct mlxsw_sp_vr *vr,static struct mlxsw_sp_vr *mlxsw_sp_vr_create (struct mlxsw_sp *mlxsw_sp,u32 tb_id) { +struct mlxsw_sp_fib *fib4; +struct mlxsw_sp_fib *fib6;struct mlxsw_sp_vr *vr;int err; vr =mlxsw_sp_vr_find_unused (mlxsw_sp);if (!vr)return ERR_PTR (-EBUSY ); - vr->fib4 =mlxsw_sp_fib_create (vr,MLXSW_SP_L3_PROTO_IPV4 ); -if (IS_ERR (vr->fib4)) -return ERR_CAST (vr->fib4); - vr->fib6 =mlxsw_sp_fib_create (vr,MLXSW_SP_L3_PROTO_IPV6 ); -if (IS_ERR (vr->fib6)) { - err =PTR_ERR (vr->fib6); + fib4 =mlxsw_sp_fib_create (vr,MLXSW_SP_L3_PROTO_IPV4 ); +if (IS_ERR (fib4)) +return ERR_CAST (fib4); + fib6 =mlxsw_sp_fib_create (vr,MLXSW_SP_L3_PROTO_IPV6 ); +if (IS_ERR (fib6)) { + err =PTR_ERR (fib6); goto err_fib6_create; } + vr->fib4 = fib4; + vr->fib6 = fib6; vr->tb_id = tb_id;return vr; err_fib6_create: -mlxsw_sp_fib_destroy (vr->fib4); - vr->fib4 =NULL ; +mlxsw_sp_fib_destroy (fib4);return ERR_PTR (err); }
@@ -3029,6 +3032,9 @@ mlxsw_sp_fib4_entry_offload_unset(struct mlxsw_sp_fib_entry *fib_entry)struct mlxsw_sp_nexthop_group *nh_grp = fib_entry->nh_group;int i; +if (!list_is_singular (&nh_grp->fib_list)) +return ; +for (i =0 ; i < nh_grp->count; i++) {struct mlxsw_sp_nexthop *nh = &nh_grp->nexthops[i];
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c +27 -2
@@ -1098,6 +1098,7 @@ static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port, bool dynamic) {char *sfd_pl; +u8 num_rec;int err; sfd_pl =kmalloc (MLXSW_REG_SFD_LEN ,GFP_KERNEL );
@@ -1107,9 +1108,16 @@ static int __mlxsw_sp_port_fdb_uc_op(struct mlxsw_sp *mlxsw_sp, u8 local_port,mlxsw_reg_sfd_pack (sfd_pl,mlxsw_sp_sfd_op (adding),0 );mlxsw_reg_sfd_uc_pack (sfd_pl,0 ,mlxsw_sp_sfd_rec_policy (dynamic), mac, fid, action, local_port); + num_rec =mlxsw_reg_sfd_num_rec_get (sfd_pl); err =mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (sfd), sfd_pl); -kfree (sfd_pl); +if (err) + goto out; + +if (num_rec !=mlxsw_reg_sfd_num_rec_get (sfd_pl)) + err = -EBUSY ; +out: +kfree (sfd_pl);return err; }
@@ -1134,6 +1142,7 @@ static int mlxsw_sp_port_fdb_uc_lag_op(struct mlxsw_sp *mlxsw_sp, u16 lag_id, bool adding, bool dynamic) {char *sfd_pl; +u8 num_rec;int err; sfd_pl =kmalloc (MLXSW_REG_SFD_LEN ,GFP_KERNEL );
@@ -1144,9 +1153,16 @@ static int mlxsw_sp_port_fdb_uc_lag_op(struct mlxsw_sp *mlxsw_sp, u16 lag_id,mlxsw_reg_sfd_uc_lag_pack (sfd_pl,0 ,mlxsw_sp_sfd_rec_policy (dynamic), mac, fid,MLXSW_REG_SFD_REC_ACTION_NOP , lag_vid, lag_id); + num_rec =mlxsw_reg_sfd_num_rec_get (sfd_pl); err =mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (sfd), sfd_pl); -kfree (sfd_pl); +if (err) + goto out; + +if (num_rec !=mlxsw_reg_sfd_num_rec_get (sfd_pl)) + err = -EBUSY ; +out: +kfree (sfd_pl);return err; }
@@ -1191,6 +1207,7 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr, u16 fid, u16 mid, bool adding) { char *sfd_pl; +u8 num_rec;int err; sfd_pl =kmalloc (MLXSW_REG_SFD_LEN ,GFP_KERNEL );
@@ -1200,7 +1217,15 @@ static int mlxsw_sp_port_mdb_op(struct mlxsw_sp *mlxsw_sp, const char *addr,mlxsw_reg_sfd_pack (sfd_pl,mlxsw_sp_sfd_op (adding),0 );mlxsw_reg_sfd_mc_pack (sfd_pl,0 , addr, fid,MLXSW_REG_SFD_REC_ACTION_NOP , mid); + num_rec =mlxsw_reg_sfd_num_rec_get (sfd_pl); err =mlxsw_reg_write (mlxsw_sp->core,MLXSW_REG (sfd), sfd_pl); +if (err) + goto out; + +if (num_rec !=mlxsw_reg_sfd_num_rec_get (sfd_pl)) + err = -EBUSY ; + +out:kfree (sfd_pl);return err; }
drivers/net/ethernet/ti/cpsw.c +14 -2
@@ -1618,6 +1618,7 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb, q_idx = q_idx % cpsw->tx_ch_num; txch = cpsw->txv[q_idx].ch; + txq =netdev_get_tx_queue (ndev, q_idx); ret =cpsw_tx_packet_submit (priv, skb, txch);if (unlikely (ret !=0 )) {cpsw_err (priv, tx_err,"desc submit failed\n" );
@@ -1628,15 +1629,26 @@ static netdev_tx_t cpsw_ndo_start_xmit(struct sk_buff *skb,* tell the kernel to stop sending us tx frames. */ if (unlikely (!cpdma_check_free_tx_desc (txch))) { - txq =netdev_get_tx_queue (ndev, q_idx);netif_tx_stop_queue (txq); + +/* Barrier, so that stop_queue visible to other cpus */ +smp_mb__after_atomic (); + +if (cpdma_check_free_tx_desc (txch)) +netif_tx_wake_queue (txq); }return NETDEV_TX_OK ; fail: ndev->stats.tx_dropped++; - txq =netdev_get_tx_queue (ndev,skb_get_queue_mapping (skb));netif_tx_stop_queue (txq); + +/* Barrier, so that stop_queue visible to other cpus */ +smp_mb__after_atomic (); + +if (cpdma_check_free_tx_desc (txch)) +netif_tx_wake_queue (txq); +return NETDEV_TX_BUSY ; }
drivers/net/phy/phy.c +1 -1
@@ -842,7 +842,7 @@ void phy_start(struct phy_device *phydev)break ;case PHY_HALTED :/* make sure interrupts are re-enabled for the PHY */ -if (phydev->irq !=PHY_POLL ) { +if (phy_interrupt_is_valid (phydev)) { err =phy_enable_interrupts (phydev);if (err <0 )break ;
drivers/net/ppp/ppp_generic.c +9 -0
@@ -3158,6 +3158,15 @@ ppp_connect_channel(struct channel *pch, int unit) goto outl;ppp_lock (ppp); +spin_lock_bh (&pch->downl); +if (!pch->chan) { +/* Don't connect unregistered channels */ +spin_unlock_bh (&pch->downl); +ppp_unlock (ppp); + ret = -ENOTCONN ; + goto outl; + } +spin_unlock_bh (&pch->downl);if (pch->file.hdrlen > ppp->file.hdrlen) ppp->file.hdrlen = pch->file.hdrlen; hdrlen = pch->file.hdrlen +2 ;/* for protocol bytes */
drivers/net/tun.c +7 -0
@@ -1315,6 +1315,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,else *skb_xdp =0 ; +preempt_disable ();rcu_read_lock (); xdp_prog =rcu_dereference (tun->xdp_prog);if (xdp_prog && !*skb_xdp) {
@@ -1333,9 +1334,11 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,get_page (alloc_frag->page); alloc_frag->offset += buflen; err =xdp_do_redirect (tun->dev, &xdp, xdp_prog); +xdp_do_flush_map ();if (err) goto err_redirect;rcu_read_unlock (); +preempt_enable ();return NULL ;case XDP_TX : xdp_xmit = true;
@@ -1357,6 +1360,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, skb =build_skb (buf, buflen);if (!skb) {rcu_read_unlock (); +preempt_enable ();return ERR_PTR (-ENOMEM ); }
@@ -1369,10 +1373,12 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun, skb->dev = tun->dev;generic_xdp_tx (skb, xdp_prog);rcu_read_unlock (); +preempt_enable ();return NULL ; }rcu_read_unlock (); +preempt_enable ();return skb;
@@ -1380,6 +1386,7 @@ static struct sk_buff *tun_build_skb(struct tun_struct *tun,put_page (alloc_frag->page); err_xdp:rcu_read_unlock (); +preempt_enable ();this_cpu_inc (tun->pcpu_stats->rx_dropped);return NULL ; }
drivers/net/virtio_net.c +5 -3
@@ -1995,8 +1995,9 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, }/* Make sure NAPI is not using any XDP TX queues for RX. */ -for (i =0 ; i < vi->max_queue_pairs; i++) -napi_disable (&vi->rq[i].napi); +if (netif_running (dev)) +for (i =0 ; i < vi->max_queue_pairs; i++) +napi_disable (&vi->rq[i].napi);netif_set_real_num_rx_queues (dev, curr_qp + xdp_qp); err =_virtnet_set_queues (vi, curr_qp + xdp_qp);
@@ -2015,7 +2016,8 @@ static int virtnet_xdp_set(struct net_device *dev, struct bpf_prog *prog, }if (old_prog)bpf_prog_put (old_prog); -virtnet_napi_enable (vi->rq[i].vq, &vi->rq[i].napi); +if (netif_running (dev)) +virtnet_napi_enable (vi->rq[i].vq, &vi->rq[i].napi); }return 0 ;
drivers/net/wan/hdlc_ppp.c +4 -1
@@ -574,7 +574,10 @@ static void ppp_timer(unsigned long arg)ppp_cp_event (proto->dev, proto->pid,TO_GOOD ,0 ,0 ,0 ,NULL ); proto->restart_counter--; - }else + }else if (netif_carrier_ok (proto->dev)) +ppp_cp_event (proto->dev, proto->pid,TO_GOOD ,0 ,0 , +0 ,NULL ); +else ppp_cp_event (proto->dev, proto->pid,TO_BAD ,0 ,0 ,0 ,NULL );break ;
drivers/nvme/host/rdma.c +14 -40
116 lines not on this page · raw message
drivers/pci/pcie/aspm.c +6 -2
@@ -803,10 +803,14 @@ static struct pcie_link_state *alloc_pcie_link_state(struct pci_dev *pdev)/* * Root Ports and PCI/PCI-X to PCIe Bridges are roots of PCIe -* hierarchies. +* hierarchies. Note that some PCIe host implementations omit +* the root ports entirely, in which case a downstream port on +* a switch may become the root of the link state chain for all +* its subordinate endpoints. */ if (pci_pcie_type (pdev) ==PCI_EXP_TYPE_ROOT_PORT || -pci_pcie_type (pdev) ==PCI_EXP_TYPE_PCIE_BRIDGE ) { +pci_pcie_type (pdev) ==PCI_EXP_TYPE_PCIE_BRIDGE || + !pdev->bus->parent->self) { link->root = link; }else {struct pcie_link_state *parent;
drivers/s390/net/qeth_core.h +6 -1
@@ -580,6 +580,11 @@ struct qeth_cmd_buffer {void (*callback) (struct qeth_channel *,struct qeth_cmd_buffer *); }; +static inline struct qeth_ipa_cmd *__ipa_cmd (struct qeth_cmd_buffer *iob) +{ +return (struct qeth_ipa_cmd *)(iob->data +IPA_PDU_HEADER_SIZE ); +} +/** * definition of a qeth channel, used for read and write */
@@ -834,7 +839,7 @@ struct qeth_trap_id {*/ static inline int qeth_get_elements_for_range (addr_t start,addr_t end) { -return PFN_UP (end -1 ) -PFN_DOWN (start); +return PFN_UP (end) -PFN_DOWN (start); }static inline int qeth_get_micros (void )
drivers/s390/net/qeth_core_main.c +24 -19
80 lines not on this page · raw message
drivers/s390/net/qeth_l3.h +33 -1
@@ -40,8 +40,40 @@ struct qeth_ipaddr {unsigned int pfxlen; } a6; } u; - }; + +static inline bool qeth_l3_addr_match_ip (struct qeth_ipaddr *a1, +struct qeth_ipaddr *a2) +{ +if (a1->proto != a2->proto) +return false; +if (a1->proto ==QETH_PROT_IPV6 ) +return ipv6_addr_equal (&a1->u.a6.addr, &a2->u.a6.addr); +return a1->u.a4.addr == a2->u.a4.addr; +} + +static inline bool qeth_l3_addr_match_all (struct qeth_ipaddr *a1, +struct qeth_ipaddr *a2) +{ +/* Assumes that the pair was obtained via qeth_l3_addr_find_by_ip(), +* so 'proto' and 'addr' match for sure. +* +* For ucast: +* - 'mac' is always 0. +* - 'mask'/'pfxlen' for RXIP/VIPA is always 0. For NORMAL, matching +* values are required to avoid mixups in takeover eligibility. +* +* For mcast, +* - 'mac' is mapped from the IP, and thus always matches. +* - 'mask'/'pfxlen' is always 0. +*/ +if (a1->type != a2->type) +return false; +if (a1->proto ==QETH_PROT_IPV6 ) +return a1->u.a6.pfxlen == a2->u.a6.pfxlen; +return a1->u.a4.mask == a2->u.a4.mask; +} +static inline u64 qeth_l3_ipaddr_hash (struct qeth_ipaddr *addr) {u64 ret =0 ;
drivers/s390/net/qeth_l3_main.c +53 -70
211 lines not on this page · raw message
drivers/vfio/vfio_iommu_type1.c +15 -3
@@ -338,11 +338,12 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr, {struct page *page[1 ];struct vm_area_struct *vma; +struct vm_area_struct *vmas[1 ];int ret;if (mm == current->mm) { - ret =get_user_pages_fast (vaddr,1 , !!(prot &IOMMU_WRITE ), - page); + ret =get_user_pages_longterm (vaddr,1 , !!(prot &IOMMU_WRITE ), + page, vmas); }else {unsigned int flags =0 ;
@@ -351,7 +352,18 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,down_read (&mm->mmap_sem); ret =get_user_pages_remote (NULL , mm, vaddr,1 , flags, page, -NULL ,NULL ); + vmas,NULL ); +/* +* The lifetime of a vaddr_get_pfn() page pin is +* userspace-controlled. In the fs-dax case this could +* lead to indefinite stalls in filesystem operations. +* Disallow attempts to pin fs-dax pages via this +* interface. +*/ +if (ret >0 &&vma_is_fsdax (vmas[0 ])) { + ret = -EOPNOTSUPP ; +put_page (page[0 ]); + }up_read (&mm->mmap_sem); }
fs/btrfs/sysfs.c +3 -5
@@ -422,7 +422,7 @@ static ssize_t btrfs_nodesize_show(struct kobject *kobj, {struct btrfs_fs_info *fs_info =to_fs_info (kobj); -return snprintf (buf,PAGE_SIZE ,"%u\n" , fs_info->super_copy->nodesize); +return snprintf (buf,PAGE_SIZE ,"%u\n" , fs_info->nodesize); }BTRFS_ATTR (nodesize, btrfs_nodesize_show);
@@ -432,8 +432,7 @@ static ssize_t btrfs_sectorsize_show(struct kobject *kobj, {struct btrfs_fs_info *fs_info =to_fs_info (kobj); -return snprintf (buf,PAGE_SIZE ,"%u\n" , - fs_info->super_copy->sectorsize); +return snprintf (buf,PAGE_SIZE ,"%u\n" , fs_info->sectorsize); }BTRFS_ATTR (sectorsize, btrfs_sectorsize_show);
@@ -443,8 +442,7 @@ static ssize_t btrfs_clone_alignment_show(struct kobject *kobj, {struct btrfs_fs_info *fs_info =to_fs_info (kobj); -return snprintf (buf,PAGE_SIZE ,"%u\n" , - fs_info->super_copy->sectorsize); +return snprintf (buf,PAGE_SIZE ,"%u\n" , fs_info->sectorsize); }BTRFS_ATTR (clone_alignment, btrfs_clone_alignment_show);
fs/btrfs/transaction.c +12 -8
@@ -1722,19 +1722,23 @@ static void update_super_roots(struct btrfs_fs_info *fs_info) super = fs_info->super_copy; +/* update latest btrfs_super_block::chunk_root refs */ root_item = &fs_info->chunk_root->root_item; - super->chunk_root = root_item->bytenr; - super->chunk_root_generation = root_item->generation; - super->chunk_root_level = root_item->level; +btrfs_set_super_chunk_root (super, root_item->bytenr); +btrfs_set_super_chunk_root_generation (super, root_item->generation); +btrfs_set_super_chunk_root_level (super, root_item->level); +/* update latest btrfs_super_block::root refs */ root_item = &fs_info->tree_root->root_item; - super->root = root_item->bytenr; - super->generation = root_item->generation; - super->root_level = root_item->level; +btrfs_set_super_root (super, root_item->bytenr); +btrfs_set_super_generation (super, root_item->generation); +btrfs_set_super_root_level (super, root_item->level); +if (btrfs_test_opt (fs_info,SPACE_CACHE )) - super->cache_generation = root_item->generation; +btrfs_set_super_cache_generation (super, root_item->generation);if (test_bit (BTRFS_FS_UPDATE_UUID_TREE_GEN , &fs_info->flags)) - super->uuid_tree_generation = root_item->generation; +btrfs_set_super_uuid_tree_generation (super, + root_item->generation); }int btrfs_transaction_in_commit (struct btrfs_fs_info *info)
fs/direct-io.c +1 -2
@@ -1252,8 +1252,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,*/ if (dio->is_async &&iov_iter_rw (iter) ==WRITE ) { retval =0 ; -if ((iocb->ki_filp->f_flags &O_DSYNC ) || -IS_SYNC (iocb->ki_filp->f_mapping->host)) +if (iocb->ki_flags &IOCB_DSYNC ) retval =dio_set_defer_completion (dio);else if (!dio->inode->i_sb->s_dio_done_wq) {/*
include/linux/fs.h +1 -1
@@ -3185,7 +3185,7 @@ static inline bool vma_is_fsdax(struct vm_area_struct *vma)if (!vma_is_dax (vma))return false; inode =file_inode (vma->vm_file); -if (inode->i_mode ==S_IFCHR ) +if (S_ISCHR (inode->i_mode))return false;/* device-dax */ return true; }
include/linux/nospec.h +1 -2
@@ -72,7 +72,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index,BUILD_BUG_ON (sizeof (_i) >sizeof (long )); \BUILD_BUG_ON (sizeof (_s) >sizeof (long )); \ \ - _i &= _mask; \ - _i; \ + (typeof (_i)) (_i & _mask); \ })#endif /* _LINUX_NOSPEC_H */
include/net/udplite.h +1 -0
@@ -64,6 +64,7 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh)UDP_SKB_CB (skb)->cscov = cscov;if (skb->ip_summed ==CHECKSUM_COMPLETE ) skb->ip_summed =CHECKSUM_NONE ; + skb->csum_valid =0 ; }return 0 ;
kernel/time/timer.c +6 -0
@@ -1834,6 +1834,12 @@ int timers_dead_cpu(unsigned int cpu)raw_spin_lock_irq (&new_base->lock);raw_spin_lock_nested (&old_base->lock,SINGLE_DEPTH_NESTING ); +/* +* The current CPUs base clock might be stale. Update it +* before moving the timers over. +*/ +forward_timer_base (new_base); +BUG_ON (old_base->running_timer);for (i =0 ; i <WHEEL_SIZE ; i++)
net/bridge/br_sysfs_if.c +3 -0
@@ -235,6 +235,9 @@ static ssize_t brport_show(struct kobject *kobj,struct brport_attribute *brport_attr =to_brport_attr (attr);struct net_bridge_port *p =to_brport (kobj); +if (!brport_attr->show) +return -EINVAL ; +return brport_attr->show (p, buf); }
net/bridge/br_vlan.c +2 -0
@@ -157,6 +157,8 @@ static struct net_bridge_vlan *br_vlan_get_master(struct net_bridge *br, u16 vid masterv =br_vlan_find (vg, vid);if (WARN_ON (!masterv))return NULL ; +refcount_set (&masterv->refcnt,1 ); +return masterv; }refcount_inc (&masterv->refcnt);
net/core/dev.c +9 -2
@@ -2343,8 +2343,11 @@ EXPORT_SYMBOL(netdev_set_num_tc);*/ int netif_set_real_num_tx_queues (struct net_device *dev,unsigned int txq) { +bool disabling;int rc; + disabling = txq < dev->real_num_tx_queues; +if (txq <1 || txq > dev->num_tx_queues)return -EINVAL ;
@@ -2360,15 +2363,19 @@ int netif_set_real_num_tx_queues(struct net_device *dev, unsigned int txq)if (dev->num_tc)netif_setup_tc (dev, txq); -if (txq < dev->real_num_tx_queues) { + dev->real_num_tx_queues = txq; + +if (disabling) { +synchronize_net ();qdisc_reset_all_tx_gt (dev, txq);#ifdef CONFIG_XPS netif_reset_xps_queues_gt (dev, txq);#endif } + }else { + dev->real_num_tx_queues = txq; } - dev->real_num_tx_queues = txq;return 0 ; }EXPORT_SYMBOL (netif_set_real_num_tx_queues);
net/core/gen_estimator.c +1 -0
@@ -66,6 +66,7 @@ struct net_rate_estimator {static void est_fetch_counters (struct net_rate_estimator *e,struct gnet_stats_basic_packed *b) { +memset (b,0 ,sizeof (*b));if (e->stats_lock)spin_lock (e->stats_lock);
net/ipv4/fib_semantics.c +5 -0
@@ -654,6 +654,11 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi, fi->fib_nh, cfg, extack))return 1 ; } +#ifdef CONFIG_IP_ROUTE_CLASSID +if (cfg->fc_flow && + cfg->fc_flow != fi->fib_nh->nh_tclassid) +return 1 ; +#endif if ((!cfg->fc_oif || cfg->fc_oif == fi->fib_nh->nh_oif) && (!cfg->fc_gw || cfg->fc_gw == fi->fib_nh->nh_gw))return 0 ;
net/ipv4/route.c +8 -2
@@ -128,10 +128,13 @@ static int ip_rt_redirect_silence __read_mostly = ((HZ / 50) << (9 + 1));static int ip_rt_error_cost__read_mostly =HZ ;static int ip_rt_error_burst__read_mostly =5 *HZ ;static int ip_rt_mtu_expires__read_mostly =10 *60 *HZ ; -static int ip_rt_min_pmtu__read_mostly =512 +20 +20 ; +static u32 ip_rt_min_pmtu__read_mostly =512 +20 +20 ;static int ip_rt_min_advmss__read_mostly =256 ;static int ip_rt_gc_timeout__read_mostly =RT_GC_TIMEOUT ; + +static int ip_min_valid_pmtu__read_mostly =IPV4_MIN_MTU ; +/* * Interface to generic destination cache. */
@@ -1829,6 +1832,8 @@ int fib_multipath_hash(const struct fib_info *fi, const struct flowi4 *fl4,return skb_get_hash_raw (skb) >>1 ;memset (&hash_keys,0 ,sizeof (hash_keys));skb_flow_dissect_flow_keys (skb, &keys, flag); + + hash_keys.control.addr_type =FLOW_DISSECTOR_KEY_IPV4_ADDRS ; hash_keys.addrs.v4addrs.src = keys.addrs.v4addrs.src; hash_keys.addrs.v4addrs.dst = keys.addrs.v4addrs.dst; hash_keys.ports.src = keys.ports.src;
@@ -2934,7 +2939,8 @@ static struct ctl_table ipv4_route_table[] = { .data = &ip_rt_min_pmtu, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dointvec_minmax, + .extra1 = &ip_min_valid_pmtu, }, { .procname = "min_adv_mss",
net/ipv4/tcp_input.c +8 -16
@@ -2013,11 +2013,6 @@ void tcp_enter_loss(struct sock *sk)/* F-RTO RFC5682 sec 3.1 step 1: retransmit SND.UNA if no previous * loss recovery is underway except recurring timeout(s) on * the same SND.UNA (sec 3.2). Disable F-RTO on path MTU probing -*
Lines of this file are not shown. View the raw message.
sound/usb/quirks-table.h +47 -0
47 lines not on this page · 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.