- Linux-stable-mirror - lists.linaro.org

[PATCH 2/2] ata: ahci: mvebu: override ahci_stop_engine for mvebu AHCI

by xswang＠marvell.com

From: Evan Wang <xswang(a)marvell.com> There is an issue(Errata Ref#226) that the SATA can not be detected via SATA Port-MultiPlayer(PMP) with following error log: ata1.15: PMP product ID mismatch ata1.15: SATA link up 6.0 Gbps (SStatus 133 SControl 300) ata1.15: Port Multiplier vendor mismatch '0x1b4b'!='0x0' ata1.15: PMP revalidation failed (errno=-19) After debugging, the reason is found that the value Port-x FIS-based Switching Control(PxFBS@0x40) become wrong. According to design, the bits[11:8, 0] of register PxFBS are cleared when Port Command and Status (0x18) bit[0] changes its value from 1 to 0, i.e. falling edge of Port Command and Status bit[0] sends PULSE that resets PxFBS bits[11:8; 0]. So it needs a mvebu SATA WA to save the port PxFBS register before PxCMD ST write and restore it afterwards. This patch implements the WA in a separate function of ahci_mvebu_stop_engine to override ahci_stop_gngine. Signed-off-by: Evan Wang <xswang(a)marvell.com> Suggested-by: Ofer Heifetz <oferh(a)marvell.com> Cc: Tejun Heo <tj(a)kernel.org> Cc: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> Cc: stable(a)vger.kernel.org --- drivers/ata/ahci_mvebu.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/drivers/ata/ahci_mvebu.c b/drivers/ata/ahci_mvebu.c index de7128d..0045dac 100644 --- a/drivers/ata/ahci_mvebu.c +++ b/drivers/ata/ahci_mvebu.c @@ -62,6 +62,60 @@ static void ahci_mvebu_regret_option(struct ahci_host_priv *hpriv) writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA); } +/** + * ahci_mvebu_stop_engine + * + * @ap: Target ata port + * + * Errata Ref#226 - SATA Disk HOT swap issue when connected through + * Port Multiplier in FIS-based Switching mode. + * + * To avoid the issue, according to design, the bits[11:8, 0] of + * register PxFBS are cleared when Port Command and Status (0x18) bit[0] + * changes its value from 1 to 0, i.e. falling edge of Port + * Command and Status bit[0] sends PULSE that resets PxFBS + * bits[11:8; 0]. + * + * This function is used to override function of "ahci_stop_engine" + * from libahci.c by adding the mvebu work around(WA) to save PxFBS + * value before the PxCMD ST write of 0, then restore PxFBS value. + * + * Return: 0 on success; Error code otherwise. + */ +int ahci_mvebu_stop_engine(struct ata_port *ap) +{ + void __iomem *port_mmio = ahci_port_base(ap); + u32 tmp, port_fbs; + + tmp = readl(port_mmio + PORT_CMD); + + /* check if the HBA is idle */ + if ((tmp & (PORT_CMD_START | PORT_CMD_LIST_ON)) == 0) + return 0; + + /* save the port PxFBS register for later restore */ + port_fbs = readl(port_mmio + PORT_FBS); + + /* setting HBA to idle */ + tmp &= ~PORT_CMD_START; + writel(tmp, port_mmio + PORT_CMD); + + /* + * bit #15 PxCMD signal doesn't clear PxFBS, + * restore the PxFBS register right after clearing the PxCMD ST, + * no need to wait for the PxCMD bit #15. + */ + writel(port_fbs, port_mmio + PORT_FBS); + + /* wait for engine to stop. This could be as long as 500 msec */ + tmp = ata_wait_register(ap, port_mmio + PORT_CMD, + PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); + if (tmp & PORT_CMD_LIST_ON) + return -EIO; + + return 0; +} + #ifdef CONFIG_PM_SLEEP static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state) { @@ -112,6 +166,8 @@ static int ahci_mvebu_probe(struct platform_device *pdev) if (rc) return rc; + hpriv->stop_engine = ahci_mvebu_stop_engine; + if (of_device_is_compatible(pdev->dev.of_node, "marvell,armada-380-ahci")) { dram = mv_mbus_dram_info(); -- 1.9.1

7 years, 7 months

1
0
0 0

[PATCH 1/2] libahci: Allow drivers to override stop_engine

by xswang＠marvell.com

From: Evan Wang <xswang(a)marvell.com> Marvell armada37xx, armada7k and armada8k share the same AHCI sata controller IP, and currently there is an issue (Errata Ref#226)that the SATA can not be detected via SATA Port-MultiPlayer(PMP). After debugging, the reason is found that the value of Port-x FIS-based Switching Control (PxFBS@0x40) became wrong. According to design, the bits[11:8, 0] of register PxFBS are cleared when Port Command and Status (0x18) bit[0] changes its value from 1 to 0, i.e. falling edge of Port Command and Status bit[0] sends PULSE that resets PxFBS bits[11:8; 0]. So it needs save the port PxFBS register before PxCMD ST write and restore the port PxFBS register afterwards in ahci_stop_engine(). This commit allows drivers to override ahci_stop_engine behavior for use by the Marvell AHCI driver(and potentially other drivers in the future). Signed-off-by: Evan Wang <xswang(a)marvell.com> Suggested-by: Ofer Heifetz <oferh(a)marvell.com> Cc: Tejun Heo <tj(a)kernel.org> Cc: Thomas Petazzoni <thomas.petazzoni(a)bootlin.com> Cc: stable(a)vger.kernel.org --- drivers/ata/ahci.c | 6 +++--- drivers/ata/ahci.h | 7 +++++++ drivers/ata/ahci_qoriq.c | 2 +- drivers/ata/ahci_xgene.c | 4 ++-- drivers/ata/libahci.c | 20 ++++++++++++-------- drivers/ata/sata_highbank.c | 2 +- 6 files changed, 26 insertions(+), 15 deletions(-) diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 1ff1779..6389c88 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -698,7 +698,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); @@ -724,7 +724,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, bool online; int rc; - ahci_stop_engine(ap); + hpriv->stop_engine(ap); /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); @@ -788,7 +788,7 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); for (i = 0; i < 2; i++) { u16 val; diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 4356ef1..7d88ede 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -366,6 +366,13 @@ struct ahci_host_priv { * be overridden anytime before the host is activated. */ void (*start_engine)(struct ata_port *ap); + /* + * Optional ahci_stop_engine override, if not set this gets set to the + * default ahci_stop_engine during ahci_save_initial_config, this can + * be overridden anytime before the host is activated. + */ + int (*stop_engine)(struct ata_port *ap); + irqreturn_t (*irq_handler)(int irq, void *dev_instance); /* only required for per-port MSI(-X) support */ diff --git a/drivers/ata/ahci_qoriq.c b/drivers/ata/ahci_qoriq.c index 2685f28..cfdef4d 100644 --- a/drivers/ata/ahci_qoriq.c +++ b/drivers/ata/ahci_qoriq.c @@ -96,7 +96,7 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); /* * There is a errata on ls1021a Rev1.0 and Rev2.0 which is: diff --git a/drivers/ata/ahci_xgene.c b/drivers/ata/ahci_xgene.c index c2b5941..ad58da7 100644 --- a/drivers/ata/ahci_xgene.c +++ b/drivers/ata/ahci_xgene.c @@ -165,7 +165,7 @@ static int xgene_ahci_restart_engine(struct ata_port *ap) PORT_CMD_ISSUE, 0x0, 1, 100)) return -EBUSY; - ahci_stop_engine(ap); + hpriv->stop_engine(ap); ahci_start_fis_rx(ap); /* @@ -421,7 +421,7 @@ static int xgene_ahci_hardreset(struct ata_link *link, unsigned int *class, portrxfis_saved = readl(port_mmio + PORT_FIS_ADDR); portrxfishi_saved = readl(port_mmio + PORT_FIS_ADDR_HI); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); rc = xgene_ahci_do_hardreset(link, deadline, &online); diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 7adcf3c..e5d9097 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -560,6 +560,9 @@ void ahci_save_initial_config(struct device *dev, struct ahci_host_priv *hpriv) if (!hpriv->start_engine) hpriv->start_engine = ahci_start_engine; + if (!hpriv->stop_engine) + hpriv->stop_engine = ahci_stop_engine; + if (!hpriv->irq_handler) hpriv->irq_handler = ahci_single_level_irq_intr; } @@ -897,9 +900,10 @@ static void ahci_start_port(struct ata_port *ap) static int ahci_deinit_port(struct ata_port *ap, const char **emsg) { int rc; + struct ahci_host_priv *hpriv = ap->host->private_data; /* disable DMA */ - rc = ahci_stop_engine(ap); + rc = hpriv->stop_engine(ap); if (rc) { *emsg = "failed to stop engine"; return rc; @@ -1310,7 +1314,7 @@ int ahci_kick_engine(struct ata_port *ap) int busy, rc; /* stop engine */ - rc = ahci_stop_engine(ap); + rc = hpriv->stop_engine(ap); if (rc) goto out_restart; @@ -1549,7 +1553,7 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, DPRINTK("ENTER\n"); - ahci_stop_engine(ap); + hpriv->stop_engine(ap); /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); @@ -2075,14 +2079,14 @@ void ahci_error_handler(struct ata_port *ap) if (!(ap->pflags & ATA_PFLAG_FROZEN)) { /* restart engine */ - ahci_stop_engine(ap); + hpriv->stop_engine(ap); hpriv->start_engine(ap); } sata_pmp_error_handler(ap); if (!ata_dev_enabled(ap->link.device)) - ahci_stop_engine(ap); + hpriv->stop_engine(ap); } EXPORT_SYMBOL_GPL(ahci_error_handler); @@ -2129,7 +2133,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) return; /* set DITO, MDAT, DETO and enable DevSlp, need to stop engine first */ - rc = ahci_stop_engine(ap); + rc = hpriv->stop_engine(ap); if (rc) return; @@ -2189,7 +2193,7 @@ static void ahci_enable_fbs(struct ata_port *ap) return; } - rc = ahci_stop_engine(ap); + rc = hpriv->stop_engine(ap); if (rc) return; @@ -2222,7 +2226,7 @@ static void ahci_disable_fbs(struct ata_port *ap) return; } - rc = ahci_stop_engine(ap); + rc = hpriv->stop_engine(ap); if (rc) return; diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c index aafb8cc..e67815b 100644 --- a/drivers/ata/sata_highbank.c +++ b/drivers/ata/sata_highbank.c @@ -410,7 +410,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, int rc; int retry = 100; - ahci_stop_engine(ap); + hpriv->stop_engine(ap); /* clear D2H reception area to properly wait for D2H FIS */ ata_tf_init(link->device, &tf); -- 1.9.1

7 years, 7 months

1
0
0 0

v4.14.36 build: 0 failures 1 warnings (v4.14.36)

by Build bot for Mark Brown

Tree/Branch: v4.14.36 Git describe: v4.14.36 Commit: d6949f4809 Linux 4.14.36 Build Time: 98 min 14 sec Passed: 11 / 11 (100.00 %) Failed: 0 / 11 ( 0.00 %) Errors: 0 Warnings: 1 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 1 warnings 0 mismatches : x86_64-allmodconfig ------------------------------------------------------------------------------- Warnings Summary: 1 1 drivers/target/iscsi/.tmp_iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78f: sibling call from callable instruction with modified stack frame =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- x86_64-allmodconfig : PASS, 0 errors, 1 warnings, 0 section mismatches Warnings: drivers/target/iscsi/.tmp_iscsi_target.o: warning: objtool: iscsit_handle_task_mgt_cmd()+0x78f: sibling call from callable instruction with modified stack frame ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig x86_64-defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm-multi_v4t_defconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

7 years, 7 months

1
0
0 0

[PATCH] [v2] x86: ipc: fix x32 version of shmid64_ds and msqid64_ds

by Arnd Bergmann

A bugfix broke the x32 shmid64_ds and msqid64_ds data structure layout (as seen from user space) a few years ago: Originally, __BITS_PER_LONG was defined as 64 on x32, so we did not have padding after the 64-bit __kernel_time_t fields, After __BITS_PER_LONG got changed to 32, applications would observe extra padding. In other parts of the uapi headers we seem to have a mix of those expecting either 32 or 64 on x32 applications, so we can't easily revert the path that broke these two structures. Instead, this patch decouples x32 from the other architectures and moves it back into arch specific headers, partially reverting the even older commit 73a2d096fdf2 ("x86: remove all now-duplicate header files"). It's not clear whether this ever made any difference, since at least glibc carries its own (correct) copy of both of these header files, so possibly no application has ever observed the definitions here. Based on a suggestion from H.J. Lu, I tried out the tool from https://github.com/hjl-tools/linux-header to find other such bugs, which pointed out the same bug in statfs(), which also has a separate (correct) copy in glibc. Fixes: f4b4aae18288 ("x86/headers/uapi: Fix __BITS_PER_LONG value for x32 builds") Cc: stable(a)vger.kernel.org Cc: H.J. Lu <hjl.tools(a)gmail.com> Cc: Jeffrey Walton <noloader(a)gmail.com> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- This came out of the y2038 ipc syscall series but can be applied and backported independently. v2: fix typos. --- arch/x86/include/uapi/asm/msgbuf.h | 31 ++++++++++++++++++++++++++++ arch/x86/include/uapi/asm/shmbuf.h | 42 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/arch/x86/include/uapi/asm/msgbuf.h b/arch/x86/include/uapi/asm/msgbuf.h index 809134c644a6..90ab9a795b49 100644 --- a/arch/x86/include/uapi/asm/msgbuf.h +++ b/arch/x86/include/uapi/asm/msgbuf.h @@ -1 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __ASM_X64_MSGBUF_H +#define __ASM_X64_MSGBUF_H + +#if !defined(__x86_64__) || !defined(__ILP32__) #include <asm-generic/msgbuf.h> +#else +/* + * The msqid64_ds structure for x86 architecture with x32 ABI. + * + * On x86-32 and x86-64 we can just use the generic definition, but + * x32 uses the same binary layout as x86_64, which is differnet + * from other 32-bit architectures. + */ + +struct msqid64_ds { + struct ipc64_perm msg_perm; + __kernel_time_t msg_stime; /* last msgsnd time */ + __kernel_time_t msg_rtime; /* last msgrcv time */ + __kernel_time_t msg_ctime; /* last change time */ + __kernel_ulong_t msg_cbytes; /* current number of bytes on queue */ + __kernel_ulong_t msg_qnum; /* number of messages in queue */ + __kernel_ulong_t msg_qbytes; /* max number of bytes on queue */ + __kernel_pid_t msg_lspid; /* pid of last msgsnd */ + __kernel_pid_t msg_lrpid; /* last receive pid */ + __kernel_ulong_t __unused4; + __kernel_ulong_t __unused5; +}; + +#endif + +#endif /* __ASM_GENERIC_MSGBUF_H */ diff --git a/arch/x86/include/uapi/asm/shmbuf.h b/arch/x86/include/uapi/asm/shmbuf.h index 83c05fc2de38..644421f3823b 100644 --- a/arch/x86/include/uapi/asm/shmbuf.h +++ b/arch/x86/include/uapi/asm/shmbuf.h @@ -1 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __ASM_X86_SHMBUF_H +#define __ASM_X86_SHMBUF_H + +#if !defined(__x86_64__) || !defined(__ILP32__) #include <asm-generic/shmbuf.h> +#else +/* + * The shmid64_ds structure for x86 architecture with x32 ABI. + * + * On x86-32 and x86-64 we can just use the generic definition, but + * x32 uses the same binary layout as x86_64, which is differnet + * from other 32-bit architectures. + */ + +struct shmid64_ds { + struct ipc64_perm shm_perm; /* operation perms */ + size_t shm_segsz; /* size of segment (bytes) */ + __kernel_time_t shm_atime; /* last attach time */ + __kernel_time_t shm_dtime; /* last detach time */ + __kernel_time_t shm_ctime; /* last change time */ + __kernel_pid_t shm_cpid; /* pid of creator */ + __kernel_pid_t shm_lpid; /* pid of last operator */ + __kernel_ulong_t shm_nattch; /* no. of current attaches */ + __kernel_ulong_t __unused4; + __kernel_ulong_t __unused5; +}; + +struct shminfo64 { + __kernel_ulong_t shmmax; + __kernel_ulong_t shmmin; + __kernel_ulong_t shmmni; + __kernel_ulong_t shmseg; + __kernel_ulong_t shmall; + __kernel_ulong_t __unused1; + __kernel_ulong_t __unused2; + __kernel_ulong_t __unused3; + __kernel_ulong_t __unused4; +}; + +#endif + +#endif /* __ASM_X86_SHMBUF_H */ -- 2.9.0

7 years, 7 months

1
0
0 0

[PATCH] mac80211_hwsim: fix use-after-free bug in hwsim_exit_net

by Benjamin Beichler

commit 8cfd36a0b53aeb4ec21d81eb79706697b84dfc3d upstream. When destroying a net namespace, all hwsim interfaces, which are not created in default namespace are deleted. But the async deletion of the interfaces could last longer than the actual destruction of the namespace, which results to an use after free bug. Therefore use synchronous deletion in this case. Fixes: 100cb9ff40e0 ("mac80211_hwsim: Allow managing radios from non-initial namespaces") Reported-by: syzbot+70ce058e01259de7bb1d(a)syzkaller.appspotmail.com Signed-off-by: Benjamin Beichler <benjamin.beichler(a)uni-rostock.de> Signed-off-by: Johannes Berg <johannes.berg(a)intel.com> --- drivers/net/wireless/mac80211_hwsim.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 4182c3775a72..2681b5339810 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c @@ -3346,8 +3346,11 @@ static void __net_exit hwsim_exit_net(struct net *net) continue; list_del(&data->list); - INIT_WORK(&data->destroy_work, destroy_radio); - schedule_work(&data->destroy_work); + spin_unlock_bh(&hwsim_radio_lock); + mac80211_hwsim_del_radio(data, wiphy_name(data->hw->wiphy), + NULL); + spin_lock_bh(&hwsim_radio_lock); + } spin_unlock_bh(&hwsim_radio_lock); } -- 2.17.0

7 years, 7 months

1
0
0 0

v3.18.106 build: 0 failures 1 warnings (v3.18.106)

by Build bot for Mark Brown

Tree/Branch: v3.18.106 Git describe: v3.18.106 Commit: 915b8f498b Linux 3.18.106 Build Time: 45 min 10 sec Passed: 10 / 10 (100.00 %) Failed: 0 / 10 ( 0.00 %) Errors: 0 Warnings: 1 Section Mismatches: 0 ------------------------------------------------------------------------------- defconfigs with issues (other than build errors): 7 warnings 0 mismatches : x86_64-allmodconfig 2 warnings 0 mismatches : x86_64-defconfig ------------------------------------------------------------------------------- Warnings Summary: 1 9 ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] =============================================================================== Detailed per-defconfig build reports below: ------------------------------------------------------------------------------- x86_64-allmodconfig : PASS, 0 errors, 7 warnings, 0 section mismatches Warnings: ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ------------------------------------------------------------------------------- x86_64-defconfig : PASS, 0 errors, 2 warnings, 0 section mismatches Warnings: ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ../include/linux/ftrace.h:632:36: warning: calling '__builtin_return_address' with a nonzero argument is unsafe [-Wframe-address] ------------------------------------------------------------------------------- Passed with no errors, warnings or mismatches: arm64-allnoconfig arm64-allmodconfig arm-multi_v5_defconfig arm-multi_v7_defconfig arm-allmodconfig arm-allnoconfig x86_64-allnoconfig arm64-defconfig close failed in file object destructor: sys.excepthook is missing lost sys.stderr

7 years, 7 months

1
0
0 0

[GIT PULL] commits for Linux 4.15

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Greg, Pleae pull commits for Linux 4.15 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit ae0a11b2bd3317491d88d809dea044b4a7fa12a8: Linux 4.15.15 (2018-03-31 18:05:46 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.15-15042018 for you to fetch changes up to 13ea41f6164d93112af4969e300fa91122e6ae90: RDMA/core: Reduce poll batch for direct cq polling (2018-04-15 10:45:27 -0400) - ---------------------------------------------------------------- for-greg-4.15-15042018 - ---------------------------------------------------------------- Aaron Sierra (1): tty: serial: exar: Relocate sleep wake-up handling Alan Brady (1): i40evf: ignore link up if not running Alex Estrin (3): IB/hfi1: Fix for early release of sdma context IB/hfi1: Fix for potential refcount leak in hfi1_open_file() IB/ipoib: Fix for potential no-carrier state Alex Williamson (1): PCI: Add function 1 DMA alias quirk for Marvell 9128 Alexei Starovoitov (1): selftests/bpf: fix test_dev_cgroup Alexey Dobriyan (1): proc: fix /proc/*/map_files lookup Amritha Nambiar (1): i40e: Fix channel addition in reset flow Anand Jain (1): btrfs: fail mount when sb flag is not in BTRFS_SUPER_FLAG_SUPP Andi Shyti (1): Input: stmfts - set IRQ_NOAUTOEN to the irq flag Andy Shevchenko (1): device property: Define type of PROPERTY_ENRTY_*() macros Andy Spencer (1): gianfar: prevent integer wrapping in the rx handler Aneesh Kumar K.V (1): powerpc/mm/hash64: Zero PGD pages on allocation Anna-Maria Gleixner (1): tracing/hrtimer: Fix tracing bugs by taking all clock bases and modes into account Arnaldo Carvalho de Melo (2): perf unwind: Do not look just at the global callchain_param.record_mode perf callchain: Fix attr.sample_max_stack setting Arnd Bergmann (4): scsi: fas216: fix sense buffer initialization x86/power: Fix swsusp_arch_resume prototype x86/dumpstack: Avoid uninitlized variable cifs: silence compiler warnings showing up with gcc-8.0.0 Avinash Dayanand (1): i40evf: Don't schedule reset_task when device is being removed Chao Yu (1): f2fs: fix to update last_disk_size correctly Chen Yu (2): ACPI: processor_perflib: Do not send _PPC change notification if not ready cpufreq: intel_pstate: Enable HWP during system resume on CPU0 Christian Borntraeger (1): KVM: s390: use created_vcpus in more places Christoph Hellwig (1): riscv: disable SUM in the exception handler Chuck Lever (3): xprtrdma: Fix backchannel allocation of extra rpcrdma_reps xprtrdma: Eliminate unnecessary lock cycle in xprt_rdma_send_request svcrdma: Fix Read chunk round-up Coly Li (1): bcache: properly set task state in bch_writeback_thread() Corentin LABBE (1): crypto: artpec6 - remove select on non-existing CRYPTO_SHA384 Corinna Vinschen (1): igb: Allow to remove administratively set MAC on VFs Dan Carpenter (2): ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() HID: roccat: prevent an out of bounds read in kovaplus_profile_activated() Daniel Borkmann (1): bpf: fix rlimit in reuseport net selftest Daniel Hua (1): igb: Clear TXSTMP when ptp_tx_work() is timeout David Herrmann (1): platform/x86: thinkpad_acpi: suppress warning about palm detection David Hildenbrand (2): KVM: s390: vsie: use READ_ONCE to access some SCB fields KVM: s390: vsie: store guest addresses of satellite blocks in vsie_page David Howells (2): rxrpc: Fix received abort handling rxrpc: Don't put crypto buffers on the stack Desnes Augusto Nunes do Rosario (1): ibmvnic: fix firmware version when no firmware level has been provided by the VIOS server Dmitry Torokhov (2): Input: psmouse - fix Synaptics detection when protocol is disabled Input: edt-ft5x06 - fix error handling for factory mode on non-M06 Dmitry Vyukov (1): netfilter: x_tables: fix pointer leaks to userspace Don Hiatt (1): IB/core: Map iWarp AH type to undefined in rdma_ah_find_type Doug Meyer (1): NTB: ntb_hw_switchtec: Fix peer BAR bug in switchtec_ntb_init_shared_mw Ed Swierk (1): openvswitch: Remove padding from packet before L3+ conntrack processing Emil Tantilov (1): ixgbe: don't set RXDCTL.RLPML for 82599 Eryu Guan (1): blk-mq-debugfs: don't allow write on attributes with seq_operations set Geert Uytterhoeven (1): ubifs: Fix uninitialized variable in search_dh_cookie() Goldwyn Rodrigues (1): block: Set BIO_TRACE_COMPLETION on new bio during split Guanglei Li (1): RDS: IB: Fix null pointer issue Guenter Roeck (1): watchdog: sp5100_tco: Fix watchdog disable bit Gustavo A. R. Silva (1): tcp_nv: fix potential integer overflow in tcpnv_acked Gustavo Romero (1): powerpc/tm: Fix endianness flip on trap Hans de Goede (4): ACPI / LPSS: Do not instiate platform_dev for devs without MMIO resources platform/x86: dell-laptop: Filter out spurious keyboard backlight change events ACPI / bus: Do not call _STA on battery devices with unmet dependencies ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs Hector Martin (1): firewire-ohci: work around oversized DMA reads on JMicron controllers Hoang Le (1): tipc: fix skb truesize/datasize ratio control Ivan Delalande (1): lkdtm: fix handle_irq_event symbol for INT_HW_IRQ_EN Jacob Keller (2): i40e: program fragmented IPv4 filter input set i40e: fix reported mask for ntuple filters Jake Daryll Obina (1): jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path James Hogan (2): MIPS: Fix clean of vmlinuz.{32,ecoff,bin,srec} MIPS: generic: Fix machine compatible matching James Smart (1): nvme-fc: fix rogue admin cmds stalling teardown Jan Chochol (1): nfs: Do not convert nfs_idmap_cache_timeout to jiffies Jan H. SchÃ¶nherr (1): fs/dax.c: release PMD lock even when there is no PMD support in DAX Jason Gunthorpe (1): RDMA/uverbs: Use an unambiguous errno for method not supported Jean Delvare (1): firmware: dmi_scan: Fix handling of empty DMI strings Jeffy Chen (1): ASoC: rockchip: Use dummy_dai for rt5514 dsp dailink Jens Axboe (1): blk-mq: fix discard merge with scheduler attached Jesper Dangaard Brouer (2): libbpf: Makefile set specified permission mode tools/libbpf: handle issues with bpf ELF objects containing .eh_frames Jia Zhang (1): vfs/proc/kcore, x86/mm/kcore: Fix SMAP fault when dumping vsyscall user page Jiri Olsa (2): perf record: Fix period option handling perf evsel: Fix period/freq terms setup John Fastabend (1): bpf: sockmap, fix leaking maps with attached but not detached progs Jon Maloy (1): tipc: fix a potental access after delete in tipc_sk_join() KarimAllah Ahmed (1): kvm: Map PFN-type memory regions as writable (if possible) Karol Herbst (1): drm/nouveau/pmu/fuc: don't use movw directly anymore Kirill A. Shutemov (1): asm-generic: provide generic_pmdp_establish() Leon Romanovsky (1): RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure Liu Bo (4): Btrfs: set plug for fsync Btrfs: fix scrub to repair raid6 corruption Btrfs: fix unexpected EEXIST from btrfs_get_extent Btrfs: raid56: fix race between merge_bio and rbio_orig_end_io Logan Gunthorpe (2): ntb_transport: Fix bug with max_mw_size parameter ntb_hw_switchtec: Check for alignment of the buffer in mw_set_trans() Marek Szyprowski (1): hwmon: (ina2xx) Fix access to uninitialized mutex Mark Salter (1): irqchip/gic-v3: Change pr_debug message to pr_devel Martin Blumenstingl (2): net: stmmac: dwmac-meson8b: fix setting the RGMII TX clock on Meson8b net: stmmac: dwmac-meson8b: propagate rate changes to the parent clock Masami Hiramatsu (1): selftest: ftrace: Fix to pick text symbols for kprobes Mathieu Malaterre (1): net: Extra '_get' in declaration of arch_get_platform_mac_address Matt Redfearn (2): MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS MIPS: Generic: Support GIC in EIC mode Max Gurtovoy (1): RDMA/core: Reduce poll batch for direct cq polling Maxime Chevallier (1): spi: a3700: Clear DATA_OUT when performing a read Md. Islam (1): sch_netem: Bug fixing in calculating Netem interval Mel Gorman (1): mm: pin address_space before dereferencing it while isolating an LRU page Michael Bringmann (2): powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes powerpc/numa: Ensure nodes initialized for hotplug Michael J. Ruhl (1): IB/hfi1: Re-order IRQ cleanup to address driver cleanup race Michael Kelley (1): cpumask: Make for_each_cpu_wrap() available on UP as well Michal Hocko (1): netfilter: x_tables: make allocation less aggressive MickaÃ«l SalaÃ¼n (1): samples/bpf: Partially fixes the bpf.o build Ming Lei (2): dm mpath: return DM_MAPIO_REQUEUE on blk-mq rq allocation failure blk-mq: turn WARN_ON in __blk_mq_run_hw_queue into printk Mitko Haralanov (1): IB/hfi1: Show fault stats in both TX and RX directions Mustafa Ismail (1): i40iw: Free IEQ resources NeilBrown (1): NFSv4: always set NFS_LOCK_LOST when a lock is lost. Ngai-Mint Kwan (1): fm10k: fix "failed to kill vid" message for VF Nicholas Piggin (3): powerpc: System reset avoid interleaving oops using die synchronisation powerpc/pseries, ps3: panic flush kernel messages before halting system powerpc/powernv: IMC fix out of bounds memory access at shutdown Niklas Cassel (2): PCI: Add dummy pci_irqd_intx_xlate() for CONFIG_PCI=n build net: stmmac: discard disabled flags in interrupt status register Nikolay Borisov (2): btrfs: Fix out of bounds access in btrfs_search_slot btrfs: Ignore errors from btrfs_qgroup_trace_extent_post Nitin Gupta (1): sparc64: update pmdp_invalidate() to return old pmd value Paolo Bonzini (1): kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl Parav Pandit (2): RDMA/core: Clarify rdma_ah_find_type RDMA/cma: Check existence of netdevice during port validation Paul Mackerras (2): KVM: PPC: Book3S HV: Enable migration of decrementer register KVM: PPC: Book3S HV: Fix handling of secondary HPTEG in HPT resizing code Peter Hutterer (1): Input: synaptics - reset the ABS_X/Y fuzz after initializing MT axes Peter Xu (1): iommu/vt-d: Use domain instead of cache fetching Peter Zijlstra (1): x86/tsc: Allow TSC calibration without PIT Prashant Bhole (1): bpf: test_maps: cleanup sockmaps when test ends Rafael J. Wysocki (1): ACPI / EC: Restore polling during noirq suspend/resume phases Robin Murphy (1): iommu/exynos: Don't unconditionally steal bus ops Ross Lagerwall (2): xen-netfront: Fix race between device setup and open xen/grant-table: Use put_page instead of free_page Roy Shterman (1): nvme: host delete_work and reset_work on separate workqueues Sagi Grimberg (1): IB/cq: Don't force IB_POLL_DIRECT poll context for ib_process_cq_direct Sebastian Ott (1): s390/eadm: fix CONFIG_BLOCK include dependency Sheng Yong (1): f2fs: avoid hungtask when GC encrypted block if io_bits is set Shiraz Saleem (1): i40iw: Zero-out consumer key on allocate stag for FMR Stephen Boyd (1): irqchip/gic-v3: Ignore disabled ITS nodes Steven Rostedt (VMware) (3): tools lib traceevent: Simplify pointer print logic and fix %pF tools lib traceevent: Fix get_field_str() for dynamic strings selftests/ftrace: Add some missing glob checks Subash Abhinov Kasiviswanathan (2): netfilter: ipv6: nf_defrag: Pass on packets to stack per RFC2460 netfilter: ipv6: nf_defrag: Kill frag queue on RFC2460 failure Takashi Iwai (1): ALSA: hda - Use IS_REACHABLE() for dependency on input Tang Junhui (3): bcache: fix for allocator and register thread race bcache: fix for data collapse after re-attaching an attached device bcache: return attach error when no cache set exist Thomas Falcon (2): ibmvnic: Wait for device response when changing MAC ibmvnic: Reset long term map ID counter Thomas Richter (2): perf record: Fix failed memory allocation for get_cpuid_str perf test: Fix test trace+probe_libc_inet_pton.sh for s390x Tony Lindgren (1): PM / wakeirq: Fix unbalanced IRQ enable for wakeirq Trond Myklebust (1): SUNRPC: Don't call __UDPX_INC_STATS() from a preemptible context Ulf Hansson (1): PM / domains: Fix up domain-idle-states OF parsing Ulf Magnusson (3): kconfig: Don't leak main menus during parsing kconfig: Fix automatic menu creation mem leak kconfig: Fix expr_free() E_NOT leak Vitaly Kuznetsov (3): x86/hyperv: Stop suppressing X86_FEATURE_PCID x86/hyperv: Check for required priviliges in hyperv_init() x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested Vladimir Murzin (2): ARM: 8738/1: Disable CONFIG_DEBUG_VIRTUAL for NOMMU ARM: 8740/1: NOMMU: Make sure we do not hold stale data in mem[] array Wei Yongjun (2): ipmi/powernv: Fix error return code in ipmi_powernv_probe() nfp: fix error return code in nfp_pci_probe() Will Deacon (2): arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics locking/qspinlock: Ensure node->count is updated before initialising node Xose Vazquez Perez (1): scsi: devinfo: fix format of the device list Yang Shi (1): mm: thp: use down_read_trylock() in khugepaged to avoid long block Yisheng Xie (2): mm/mempolicy: fix the check of nodemask from user mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Yonghong Song (1): bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y himanshu.madhani(a)cavium.com (1): scsi: qla2xxx: Fix warning in qla2x00_async_iocb_timeout() mike.travis(a)hpe.com (1): x86/platform/UV: Fix GAM Range Table entries less than 1GB mulhern (1): dm thin: fix documentation relative to low water mark threshold piaojun (3): ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid ocfs2/acl: use 'ip_xattr_sem' to protect getting extended attribute ocfs2: return error when we attempt to access a dirty bh in jbd2 shidao.ytt (1): mm/fadvise: discard partial page if endbyte is also EOF weiyongjun (A) (1): mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() Documentation/device-mapper/thin-provisioning.txt | 8 +- Documentation/virtual/kvm/api.txt | 1 + arch/arm/Kconfig | 2 +- arch/arm/mm/pmsa-v7.c | 2 + arch/arm64/include/asm/spinlock.h | 4 +- arch/mips/boot/compressed/Makefile | 6 +- arch/mips/generic/irq.c | 18 +- arch/mips/include/asm/machine.h | 2 +- arch/mips/txx9/rbtx4939/setup.c | 4 +- arch/powerpc/include/asm/book3s/64/pgalloc.h | 10 +- arch/powerpc/include/asm/bug.h | 3 +- arch/powerpc/include/uapi/asm/kvm.h | 2 + arch/powerpc/kernel/signal_64.c | 8 +- arch/powerpc/kernel/traps.c | 26 +- arch/powerpc/kvm/book3s_64_mmu_hv.c | 8 +- arch/powerpc/kvm/book3s_hv.c | 8 + arch/powerpc/kvm/powerpc.c | 2 +- arch/powerpc/mm/numa.c | 78 +- arch/powerpc/platforms/powernv/opal-imc.c | 6 +- arch/powerpc/platforms/powernv/opal.c | 18 +- arch/powerpc/platforms/ps3/setup.c | 1 + arch/powerpc/platforms/pseries/setup.c | 8 +- arch/riscv/kernel/entry.S | 9 +- arch/s390/include/asm/eadm.h | 2 +- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/kvm/vsie.c | 87 +- arch/sparc/include/asm/pgtable_64.h | 2 +- arch/sparc/mm/tlb.c | 23 +- arch/x86/hyperv/hv_init.c | 9 +- arch/x86/hyperv/mmu.c | 12 +- arch/x86/include/asm/i8259.h | 5 + arch/x86/kernel/apic/x2apic_uv_x.c | 15 +- arch/x86/kernel/dumpstack.c | 2 +- arch/x86/kernel/tsc.c | 18 + arch/x86/kvm/vmx.c | 16 +- arch/x86/kvm/x86.c | 10 +- arch/x86/mm/init_64.c | 3 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- block/bio.c | 2 +- block/blk-core.c | 2 + block/blk-merge.c | 29 +- block/blk-mq-debugfs.c | 6 +- block/blk-mq.c | 22 +- drivers/acpi/acpi_lpss.c | 2 + drivers/acpi/bus.c | 6 + drivers/acpi/ec.c | 6 + drivers/acpi/processor_perflib.c | 2 +- drivers/acpi/scan.c | 20 +- drivers/base/power/domain.c | 76 +- drivers/base/power/wakeirq.c | 6 +- drivers/char/ipmi/ipmi_powernv.c | 5 +- drivers/cpufreq/intel_pstate.c | 5 + drivers/crypto/Kconfig | 1 - drivers/firewire/ohci.c | 8 +- drivers/firmware/dmi_scan.c | 22 +- .../drm/nouveau/nvkm/subdev/pmu/fuc/gf100.fuc3.h | 746 +++++++-------- .../drm/nouveau/nvkm/subdev/pmu/fuc/gk208.fuc5.h | 802 ++++++++-------- .../drm/nouveau/nvkm/subdev/pmu/fuc/gt215.fuc3.h | 1006 ++++++++++---------- .../gpu/drm/nouveau/nvkm/subdev/pmu/fuc/memx.fuc | 30 +- drivers/hid/hid-roccat-kovaplus.c | 2 + drivers/hwmon/ina2xx.c | 3 +- drivers/infiniband/core/cma.c | 8 +- drivers/infiniband/core/cq.c | 30 +- drivers/infiniband/core/uverbs_ioctl.c | 19 +- drivers/infiniband/hw/hfi1/chip.c | 18 +- drivers/infiniband/hw/hfi1/debugfs.c | 9 +- drivers/infiniband/hw/hfi1/file_ops.c | 4 +- drivers/infiniband/hw/hfi1/hfi.h | 1 + drivers/infiniband/hw/hfi1/init.c | 5 +- drivers/infiniband/hw/hfi1/sdma.c | 13 +- drivers/infiniband/hw/hfi1/sdma.h | 1 + drivers/infiniband/hw/i40iw/i40iw_puda.c | 3 +- drivers/infiniband/hw/i40iw/i40iw_puda.h | 1 + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 2 + drivers/infiniband/hw/mlx5/qp.c | 5 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 + drivers/input/mouse/psmouse-base.c | 34 +- drivers/input/mouse/synaptics.c | 10 + drivers/input/touchscreen/edt-ft5x06.c | 14 +- drivers/input/touchscreen/stmfts.c | 11 +- drivers/iommu/exynos-iommu.c | 7 + drivers/iommu/intel-iommu.c | 3 +- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 + drivers/irqchip/irq-gic-v3-its-platform-msi.c | 2 + drivers/irqchip/irq-gic-v3-its.c | 2 + drivers/irqchip/irq-gic-v3.c | 2 +- drivers/md/bcache/alloc.c | 4 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 9 +- drivers/md/bcache/super.c | 23 +- drivers/md/bcache/sysfs.c | 11 +- drivers/md/bcache/writeback.c | 7 +- drivers/md/dm-mpath.c | 14 +- drivers/misc/lkdtm_core.c | 2 +- drivers/net/ethernet/freescale/gianfar.c | 9 +- drivers/net/ethernet/ibm/ibmvnic.c | 28 +- drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 14 +- drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 18 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 14 + drivers/net/ethernet/intel/i40evf/i40evf.h | 1 + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 9 +- .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 35 +- drivers/net/ethernet/intel/igb/igb_main.c | 42 +- drivers/net/ethernet/intel/igb/igb_ptp.c | 9 + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +- drivers/net/ethernet/netronome/nfp/nfp_main.c | 1 + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 6 +- drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 6 +- drivers/net/wireless/mac80211_hwsim.c | 4 +- drivers/net/xen-netfront.c | 46 +- drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 22 +- drivers/ntb/ntb_transport.c | 3 + drivers/nvme/host/core.c | 44 +- drivers/nvme/host/fc.c | 3 + drivers/nvme/host/nvme.h | 2 + drivers/nvme/host/rdma.c | 2 +- drivers/nvme/target/loop.c | 2 +- drivers/pci/quirks.c | 2 + drivers/platform/x86/dell-laptop.c | 24 +- drivers/platform/x86/thinkpad_acpi.c | 10 + drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/qla2xxx/qla_init.c | 4 + drivers/scsi/scsi_devinfo.c | 7 +- drivers/spi/spi-armada-3700.c | 5 + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 2 + drivers/tty/serial/8250/8250_exar.c | 34 +- drivers/tty/serial/8250/8250_port.c | 26 - drivers/watchdog/sp5100_tco.h | 2 +- drivers/xen/grant-table.c | 4 +- fs/btrfs/ctree.c | 12 +- fs/btrfs/delayed-ref.c | 3 +- fs/btrfs/disk-io.c | 6 +- fs/btrfs/file.c | 9 + fs/btrfs/inode.c | 17 +- fs/btrfs/qgroup.c | 9 +- fs/btrfs/raid56.c | 55 +- fs/btrfs/volumes.c | 9 +- fs/cifs/cifssmb.c | 4 +- fs/dax.c | 2 +- fs/f2fs/data.c | 12 +- fs/f2fs/gc.c | 7 +- fs/jffs2/fs.c | 1 - fs/nfs/nfs4proc.c | 12 +- fs/nfs/nfs4state.c | 5 +- fs/nfs/nfs4sysctl.c | 2 +- fs/ocfs2/acl.c | 6 + fs/ocfs2/journal.c | 23 +- fs/ocfs2/super.c | 5 +- fs/ocfs2/xattr.c | 2 + fs/proc/base.c | 29 +- fs/proc/kcore.c | 4 + fs/ubifs/tnc.c | 21 +- include/asm-generic/pgtable.h | 15 + include/linux/cpumask.h | 2 + include/linux/etherdevice.h | 2 +- include/linux/kcore.h | 1 + include/linux/pci.h | 7 + include/linux/property.h | 10 +- include/linux/suspend.h | 2 + include/rdma/ib_verbs.h | 23 +- include/trace/events/timer.h | 20 +- kernel/bpf/sockmap.c | 19 +- kernel/locking/qspinlock.c | 8 + kernel/power/power.h | 3 - lib/test_bpf.c | 31 +- mm/fadvise.c | 10 +- mm/khugepaged.c | 12 +- mm/mempolicy.c | 33 +- mm/vmscan.c | 14 +- net/ipv4/tcp_nv.c | 2 +- net/ipv6/netfilter/nf_conntrack_reasm.c | 16 +- net/netfilter/x_tables.c | 7 +- net/netfilter/xt_IDLETIMER.c | 1 + net/netfilter/xt_LED.c | 1 + net/netfilter/xt_limit.c | 3 +- net/netfilter/xt_nfacct.c | 1 + net/netfilter/xt_statistic.c | 1 + net/openvswitch/conntrack.c | 34 + net/rds/ib.c | 3 +- net/rxrpc/conn_client.c | 3 +- net/rxrpc/conn_event.c | 1 + net/rxrpc/conn_object.c | 16 +- net/rxrpc/rxkad.c | 92 +- net/sched/sch_netem.c | 2 +- net/sunrpc/xprtrdma/backchannel.c | 12 +- net/sunrpc/xprtrdma/svc_rdma_rw.c | 12 +- net/sunrpc/xprtrdma/transport.c | 2 +- net/sunrpc/xprtrdma/verbs.c | 32 +- net/sunrpc/xprtrdma/xprt_rdma.h | 2 +- net/sunrpc/xprtsock.c | 4 +- net/tipc/msg.c | 4 +- net/tipc/socket.c | 1 + samples/bpf/Makefile | 5 +- scripts/kconfig/expr.c | 2 +- scripts/kconfig/menu.c | 1 + scripts/kconfig/zconf.y | 33 +- sound/pci/hda/Kconfig | 1 - sound/pci/hda/patch_realtek.c | 5 + sound/soc/au1x/ac97c.c | 6 +- sound/soc/rockchip/rk3399_gru_sound.c | 19 +- tools/lib/bpf/Makefile | 2 +- tools/lib/bpf/libbpf.c | 26 + tools/lib/traceevent/event-parse.c | 17 +- tools/lib/traceevent/parse-filter.c | 10 +- tools/perf/arch/x86/util/header.c | 2 +- tools/perf/builtin-c2c.c | 5 +- tools/perf/builtin-record.c | 3 +- tools/perf/builtin-report.c | 5 +- tools/perf/builtin-script.c | 5 +- tools/perf/perf.h | 1 + tools/perf/tests/dwarf-unwind.c | 1 + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 23 +- tools/perf/util/callchain.c | 10 + tools/perf/util/callchain.h | 2 + tools/perf/util/evsel.c | 21 +- tools/perf/util/unwind-libunwind-local.c | 9 +- tools/testing/selftests/bpf/test_dev_cgroup.c | 2 +- tools/testing/selftests/bpf/test_maps.c | 16 +- .../ftrace/test.d/ftrace/func-filter-glob.tc | 6 + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 4 +- tools/testing/selftests/net/reuseport_bpf.c | 21 +- virt/kvm/kvm_main.c | 7 +- 223 files changed, 3008 insertions(+), 1967 deletions(-) -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAlrTxiQACgkQ3qZv95d3 LNyZAQ/+Mv/na96NO6D2EXUka3ltw7+THNp7Mp41NP7OVa2tlkNAQ8v8lGhrKFbH RVeXwO2V9srafidzQr7sobyq0nsws11pvJMVIrZ8ABqfC6Y5EMnEIsyw2lQ4lwuf 032B8nDAyWwLIHEuiQtBr65/6mvXURUswN+QACtNEah69Ujave4n5RsNP3GNkz0y 2G8h7UpemJUGJkiHndz+Yqu2XTyrlz9tG2W0MaFLfEHSdZFnu6fp9fGnS/5BDNFI RAyWKQYiksMpWNlr2J+1hH6+phtM4Of98490mbQixlYeszXIMJmc18n7e4tNffmg ult/dzbnSM/ZbE4Up+MU6ZHvKPqLLMOt0BNl2Mm/daUjZPueiZE28QmtJmneYBsa XdkM6XPWO/9z9PP+MmNcbU5iNV7Ha4WUUOAsO+pcyuRHybnVzshq0nBv/wmpEYFh bE4/cGP77Tyh9rXoKC4hzl7IDE9oqo/LKk8Fodv2BIQV9zDN7bQxKzcOjpdv75Sr vWL2UG7AVUfXzEHz3DIB9Au/kenGu6FsT661mD+5dZoMKvxrvS9R2/0EDgstAbdv 6vEvkIXzNQoY6zR0mAU7ltxqqZ5FqiooQVhkw3JBc7UDdd1fEiOBaFJ1hO9WTxM1 GY0V0ZcaVP9jLWl/3MpYU8+VoA8m5+PXIxFZVUj+VHjqHqOB/B8= =V4pE -----END PGP SIGNATURE-----

7 years, 7 months

2
1
0 0

[GIT PULL] commits for Linux 4.4

by Sasha Levin

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi Greg, Pleae pull commits for Linux 4.4 . I've sent a review request for all commits over a week ago and all comments were addressed. Thanks, Sasha ===== The following changes since commit 8ff8cb8ec27effc5a0b04fee2c383b231a19f691: Linux 4.4.126 (2018-03-31 18:12:35 +0200) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.4-15042018 for you to fetch changes up to 84aff9e3d20833c9a71d96c3d8128ae6b8479c68: irqchip/gic-v3: Change pr_debug message to pr_devel (2018-04-15 11:02:45 -0400) - ---------------------------------------------------------------- for-greg-4.4-15042018 - ---------------------------------------------------------------- Adrian Hunter (1): perf intel-pt: Do not use TSC packets for calculating CPU cycles to TSC Alex Estrin (1): IB/ipoib: Fix for potential no-carrier state Alex Williamson (1): PCI: Add function 1 DMA alias quirk for Marvell 9128 Alexey Dobriyan (1): proc: fix /proc/*/map_files lookup Alexey Khoroshilov (1): vmlfb: Fix error handling in cr_pll_init() Anna-Maria Gleixner (1): tracing/hrtimer: Fix tracing bugs by taking all clock bases and modes into account Arnaldo Carvalho de Melo (1): perf callchain: Fix attr.sample_max_stack setting Arnd Bergmann (4): xen: avoid type warning in xchg_xen_ulong scsi: fas216: fix sense buffer initialization x86/power: Fix swsusp_arch_resume prototype cifs: silence compiler warnings showing up with gcc-8.0.0 BenoÃ®t ThÃ©baudeau (1): mmc: sdhci-esdhc: Add SDHCI_QUIRK_32BIT_DMA_ADDR Bjorn Helgaas (2): PCI: Correct PCI_STD_RESOURCE_END usage PCI: Enable ECRC only if device supports it Bob Moore (1): ACPICA: Disassembler: Abort on an invalid/unknown AML opcode Boris Brezillon (1): drm/vc4: Send a VBLANK event when disabling a CRTC Chen Yu (1): ACPI: processor_perflib: Do not send _PPC change notification if not ready Chris Packham (1): mtd: handle partitioning on devices with 0 erasesize Chris Wilson (1): e1000e: Undo e1000e_pm_freeze if __e1000_shutdown fails Christian Lamparter (1): net: emac: fix reset timeout with AR8035 phy Christoph Hellwig (1): PCI: Protect pci_error_handlers->reset_notify() usage with device_lock() Christophe Jaillet (1): cpuidle: dt: Add missing 'of_node_put()' Chuck Lever (1): sunrpc: Disable splice for krb5i Coly Li (1): bcache: properly set task state in bch_writeback_thread() Dan Carpenter (5): x86/nmi: Fix timeout test in test_nmi_ipi() scsi: bnx2i: missing error code in bnx2i_ep_connect() libertas: Fix lbs_prb_rsp_limit_set() ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() HID: roccat: prevent an out of bounds read in kovaplus_profile_activated() Dave Martin (3): arm64: ptrace: Fix VFP register dumping in compat coredumps arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set() Dinh Nguyen (1): clk: socfpga: Fix the smplsel on Arria10 and Stratix10 Edward Cree (1): sfc: remove duplicate up_write on VF filter_sem Eric Biggers (1): KEYS: put keyring if install_session_keyring_to_cred() fails Eric Ren (1): ocfs2: fix deadlock caused by recursive locking in xattr Gal Pressman (1): net/mlx5: Fix driver load error flow when firmware is stuck Goran Ferenc (3): MIPS: VDSO: Fix conversions in do_monotonic()/do_monotonic_coarse() MIPS: VDSO: Add implementation of clock_gettime() fallback MIPS: VDSO: Add implementation of gettimeofday() fallback Guanglei Li (1): RDS: IB: Fix null pointer issue Guenter Roeck (1): watchdog: sp5100_tco: Fix watchdog disable bit Haishuang Yan (1): ip_tunnel: fix potential issue in ip_tunnel_rcv Hari Bathini (1): powerpc/fadump: avoid duplicates in crash memory ranges Hector Martin (1): firewire-ohci: work around oversized DMA reads on JMicron controllers Jacob Keller (1): ixgbe: avoid permanent lock of *_PTP_TX_IN_PROGRESS Jag Raman (1): sparc64: ldc abort during vds iso boot Jake Daryll Obina (1): jffs2: Fix use-after-free bug in jffs2_iget()'s error handling path James Smart (2): scsi: lpfc: Fix return value of board_mode store routine in case of online failure scsi: lpfc: Fix crash after firmware flash when IO is running. James Wang (1): Fix loop device flush before configure v3 Jan Chochol (1): nfs: Do not convert nfs_idmap_cache_timeout to jiffies Jan HÃ¶ppner (1): s390/dasd: Display read-only attribute correctly Jean Delvare (3): firmware: dmi_scan: Look for SMBIOS 3 entry point first firmware: dmi_scan: Check DMI structure length firmware: dmi_scan: Fix handling of empty DMI strings Jeff Mahoney (1): ixgbe: pci_set_drvdata must be called before register_netdev Jesper Dangaard Brouer (1): tools/libbpf: handle issues with bpf ELF objects containing .eh_frames Jia-Ju Bai (1): scsi: megaraid: Fix a sleep-in-atomic bug Johan Hovold (2): NFC: nfcmrvl_uart: fix device-node leak during probe scsi: sun_esp: fix device reference leaks Jonas Gorski (1): leds: bcm6328: fix signal source assignment for leds 4 to 7 JoÃ£o Paulo Rechi Vita (1): platform/x86: acer-wmi: Detect RF Button capability Kai Heng Feng (1): platform/x86: dell-laptop: Fix bogus keyboard backlight sysfs interface Kees Cook (2): scsi: csiostor: Avoid content leaks and casts seccomp: Adjust selftests to avoid double-join Kirill A. Shutemov (1): asm-generic: provide generic_pmdp_establish() Leon Romanovsky (1): RDMA/mlx5: Avoid memory leak in case of XRCD dealloc failure Liu Bo (4): Btrfs: skip commit transaction if we don't have enough pinned bytes Btrfs: tolerate errors if we have retried successfully Btrfs: set plug for fsync Btrfs: fix scrub to repair raid6 corruption Liwei Song (1): i2c: ismt: fix wrong device address when unmap the data buffer Logan Gunthorpe (1): ntb_transport: Fix bug with max_mw_size parameter Lorenzo Bianconi (1): iio: magnetometer: st_magn_spi: fix spi_device_id table Luc Van Oostenryck (2): arm64: pass machine size to sparse arm64: pass endianness info to sparse Luis R. Rodriguez (1): fs: warn in case userspace lied about modprobe return Lv Zheng (2): ACPICA: Events: Add runtime stub support for event APIs ACPI: EC: Fix EC command visibility for dynamic debug Marcel Holtmann (1): Bluetooth: Send HCI Set Event Mask Page 2 command only when needed Marcelo Ricardo Leitner (1): sctp: adjust ssthresh when transport is idle Marcin Nowakowski (2): MIPS: mm: fixed mappings: correct initialisation MIPS: kprobes: flush_insn_slot should flush only if probe initialised Mark Salter (1): irqchip/gic-v3: Change pr_debug message to pr_devel Mateusz Jurczyk (2): caif: Add sockaddr length check before accessing sa_family in connect handler af_iucv: Move sockaddr length checks to before accessing sa_family in bind and connect handlers Mathieu Larouche (1): drm/mgag200: Fix to always set HiPri for G200e4 V2 Matt Redfearn (1): MIPS: TXx9: use IS_BUILTIN() for CONFIG_LEDS_CLASS Matt Weber (1): i2c: cadance: fix ctrl/addr reg write order Mel Gorman (1): mm: pin address_space before dereferencing it while isolating an LRU page Michael Bringmann (2): powerpc/numa: Use ibm,max-associativity-domains to discover possible nodes powerpc/numa: Ensure nodes initialized for hotplug Michael Grzeschik (1): arcnet: change irq handler to lock irqsave Michael Neuling (1): powerpc: Fix /proc/cpuinfo revision for POWER9 DD2 Michail Georgios Etairidis (1): i2c: imx: Use correct function to write to register Mintz, Yuval (1): bnx2x: Allow vfs to disable txvlan offload Miroslav Lichvar (1): kselftests: timers: Fix inconsistency-check to not ignore first timestamp Namhyung Kim (1): perf tests: Decompress kernel module before objdump NeilBrown (1): NFSv4: always set NFS_LOCK_LOST when a lock is lost. Nikolay Aleksandrov (1): bridge: allow ext learned entries to change ports Nikolay Borisov (1): btrfs: Fix out of bounds access in btrfs_search_slot Omar Sandoval (1): Btrfs: always account pinned bytes when dropping a tree block ref Paolo Bonzini (1): kvm: x86: fix KVM_XEN_HVM_CONFIG ioctl Paul Burton (2): MIPS: CPS: Prevent multi-core with dcache aliasing MIPS: Handle tlbex-tlbp race condition Paul E. McKenney (1): rcu: Make synchronize_rcu_mult() check for duplicates Peter Xu (1): iommu/vt-d: Use domain instead of cache fetching Peter Zijlstra (1): perf/core: Correct event creation with PERF_FORMAT_GROUP Phong LE (1): mmc: mediatek: Fixed size in dma_free_coherent Ping-Ke Shih (1): rtlwifi: btcoex: rtl8723be: fix ant_sel not work Robin Murphy (1): irqchip/gic-v3-its: Fix MSI alias accounting Roopa Prabhu (1): vxlan: dont migrate permanent fdb entries during learn Ross Lagerwall (2): xen-netfront: Fix race between device setup and open xen/grant-table: Use put_page instead of free_page Sebastian Ott (2): s390/pci: improve error handling during interrupt deregistration s390/pci: improve unreg_ioat error handling Serhey Popovych (2): fib_rules: Resolve goto rules target on delete veth: Be more robust on network device creation when no attributes Stefan Haberland (1): s390/dasd: fix hanging safe offline Steven Rostedt (VMware) (2): tools lib traceevent: Simplify pointer print logic and fix %pF tools lib traceevent: Fix get_field_str() for dynamic strings Sujith Pandel (1): PCI: Add domain number check to find_smbios_instance_string() Suzuki K Poulose (3): irqchip/gic-v2: Report failures in gic_irq_domain_alloc irqchip/gic-v3: Report failures in gic_irq_domain_alloc irqchip/gic-v3: Honor forced affinity setting Tahsin Erdogan (1): ext4: change fast symlink test to not rely on i_blocks Takashi Iwai (3): ALSA: timer: Wrap with spinlock for queue access ALSA: hda: Fix potential race at unregistration and unsol events ALSA: hda - Use IS_REACHABLE() for dependency on input Tang Junhui (3): bcache: fix for allocator and register thread race bcache: fix for data collapse after re-attaching an attached device bcache: return attach error when no cache set exist Thiago Jung Bauermann (2): powerpc/perf/hv-24x7: Fix passing of catalog version number powerpc/perf/hv-24x7: Fix off-by-one error in request_buffer check Ulf Magnusson (3): kconfig: Don't leak main menus during parsing kconfig: Fix automatic menu creation mem leak kconfig: Fix expr_free() E_NOT leak Vlad Yasevich (1): macvlan: Do not return error when setting the same mac address WANG Cong (1): net_sched: move tcf_lock down after gen_replace_estimator() Wei Yongjun (1): ipmi/powernv: Fix error return code in ipmi_powernv_probe() Will Deacon (2): arm64: spinlock: Fix theoretical trylock() A-B-A with LSE atomics locking/qspinlock: Ensure node->count is updated before initialising node Xin Long (2): sctp: fix recursive locking warning in sctp_do_peeloff dccp: call inet_add_protocol after register_pernet_subsys in dccp_v4_init Xose Vazquez Perez (1): scsi: devinfo: fix format of the device list Yazen Ghannam (1): x86/mce: Don't disable MCA banks when offlining a CPU on AMD Yisheng Xie (2): mm/mempolicy: fix the check of nodemask from user mm/mempolicy: add nodes_empty check in SYSC_migrate_pages Yonghong Song (1): bpf: fix selftests/bpf test_kmod.sh failure when CONFIG_BPF_JIT_ALWAYS_ON=y Yuyang Du (2): usb: usbip tool: Check the return of get_nports() usb: usbip tool: Fix refresh_imported_device_list() hayeswang (1): r8152: add byte_enable for ocp_read_word function mulhern (1): dm thin: fix documentation relative to low water mark threshold piaojun (3): ocfs2: return -EROFS to mount.ocfs2 if inode block is invalid ocfs2/acl: use 'ip_xattr_sem' to protect getting extended attribute ocfs2: return error when we attempt to access a dirty bh in jbd2 weiyongjun (A) (1): mac80211_hwsim: fix possible memory leak in hwsim_new_radio_nl() Documentation/device-mapper/thin-provisioning.txt | 8 ++- arch/arm/include/asm/xen/events.h | 2 +- arch/arm64/Makefile | 4 +- arch/arm64/include/asm/spinlock.h | 4 +- arch/arm64/kernel/ptrace.c | 25 ++++--- arch/mips/include/asm/kprobes.h | 3 +- arch/mips/include/asm/vdso.h | 4 +- arch/mips/kernel/smp-cps.c | 8 ++- arch/mips/mm/pgtable-32.c | 6 +- arch/mips/mm/tlbex.c | 38 ++++++++++- arch/mips/txx9/rbtx4939/setup.c | 4 +- arch/mips/vdso/gettimeofday.c | 57 +++++++++++++--- arch/powerpc/kernel/fadump.c | 15 ++++- arch/powerpc/kernel/setup-common.c | 4 ++ arch/powerpc/mm/numa.c | 78 +++++++++++++++++++--- arch/powerpc/perf/hv-24x7.c | 16 +++-- arch/s390/include/asm/pci_insn.h | 2 +- arch/s390/pci/pci.c | 48 ++++++++----- arch/s390/pci/pci_dma.c | 4 +- arch/s390/pci/pci_insn.c | 10 +-- arch/sparc/kernel/ldc.c | 7 +- arch/x86/kernel/cpu/mcheck/mce.c | 5 +- arch/x86/kernel/nmi_selftest.c | 2 +- arch/x86/kvm/x86.c | 7 +- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- drivers/acpi/acpica/evxfevnt.c | 18 +++++ drivers/acpi/acpica/psobject.c | 14 ++++ drivers/acpi/ec.c | 2 +- drivers/acpi/processor_perflib.c | 2 +- drivers/block/loop.c | 3 + drivers/char/ipmi/ipmi_powernv.c | 5 +- drivers/clk/socfpga/clk-gate-a10.c | 2 +- drivers/clk/socfpga/clk.h | 3 + drivers/cpuidle/dt_idle_states.c | 4 +- drivers/firewire/ohci.c | 8 ++- drivers/firmware/dmi_scan.c | 62 +++++++++++------ drivers/gpu/drm/mgag200/mgag200_mode.c | 9 ++- drivers/gpu/drm/vc4/vc4_crtc.c | 13 ++++ drivers/hid/hid-roccat-kovaplus.c | 2 + drivers/i2c/busses/i2c-cadence.c | 6 +- drivers/i2c/busses/i2c-imx.c | 8 +-- drivers/i2c/busses/i2c-ismt.c | 2 +- drivers/iio/magnetometer/st_magn_spi.c | 2 - drivers/infiniband/hw/mlx5/qp.c | 5 +- drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 + drivers/iommu/intel-iommu.c | 3 +- drivers/irqchip/irq-gic-v3-its-pci-msi.c | 35 +++++----- drivers/irqchip/irq-gic-v3.c | 16 +++-- drivers/irqchip/irq-gic.c | 7 +- drivers/leds/leds-bcm6328.c | 4 +- drivers/md/bcache/alloc.c | 4 +- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/btree.c | 9 ++- drivers/md/bcache/super.c | 23 +++++-- drivers/md/bcache/sysfs.c | 11 +-- drivers/md/bcache/writeback.c | 7 +- drivers/mmc/host/mtk-sd.c | 2 +- drivers/mmc/host/sdhci-esdhc.h | 1 + drivers/mtd/mtdpart.c | 26 +++++--- drivers/net/arcnet/arcnet.c | 7 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 19 ++++-- drivers/net/ethernet/ibm/emac/core.c | 26 ++++++-- drivers/net/ethernet/intel/e1000e/netdev.c | 7 +- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 22 ++++-- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- drivers/net/ethernet/sfc/ef10_sriov.c | 2 - drivers/net/macvlan.c | 4 ++ drivers/net/usb/r8152.c | 4 +- drivers/net/veth.c | 4 +- drivers/net/vxlan.c | 2 +- drivers/net/wireless/libertas/mesh.c | 5 +- drivers/net/wireless/mac80211_hwsim.c | 4 +- .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 3 + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + drivers/net/xen-netfront.c | 46 +++++++------ drivers/nfc/nfcmrvl/uart.c | 3 + drivers/ntb/ntb_transport.c | 3 + drivers/pci/pci-label.c | 7 +- drivers/pci/pci.c | 26 +++++--- drivers/pci/probe.c | 5 ++ drivers/pci/quirks.c | 4 +- drivers/platform/x86/acer-wmi.c | 7 ++ drivers/platform/x86/dell-laptop.c | 6 +- drivers/s390/block/dasd.c | 8 ++- drivers/s390/block/dasd_devmap.c | 19 ++++-- drivers/scsi/arm/fas216.c | 2 +- drivers/scsi/bnx2i/bnx2i_iscsi.c | 3 +- drivers/scsi/csiostor/csio_lnode.c | 43 +++++++----- drivers/scsi/lpfc/lpfc_attr.c | 2 + drivers/scsi/lpfc/lpfc_sli.c | 2 +- drivers/scsi/megaraid/megaraid_mm.c | 2 +- drivers/scsi/scsi_devinfo.c | 7 +- drivers/scsi/sun_esp.c | 9 ++- drivers/video/fbdev/vermilion/cr_pll.c | 1 + drivers/watchdog/sp5100_tco.h | 2 +- drivers/xen/grant-table.c | 4 +- fs/btrfs/ctree.c | 12 +++- fs/btrfs/extent-tree.c | 19 +++--- fs/btrfs/file.c | 9 +++ fs/btrfs/inode.c | 5 +- fs/btrfs/raid56.c | 18 +++-- fs/btrfs/volumes.c | 9 ++- fs/cifs/cifssmb.c | 4 +- fs/ext4/inode.c | 20 ++++-- fs/filesystems.c | 4 +- fs/jffs2/fs.c | 1 - fs/nfs/nfs4proc.c | 12 ++-- fs/nfs/nfs4state.c | 5 +- fs/nfs/nfs4sysctl.c | 2 +- fs/ocfs2/acl.c | 6 ++ fs/ocfs2/dlmglue.c | 4 ++ fs/ocfs2/journal.c | 23 ++++--- fs/ocfs2/super.c | 5 +- fs/ocfs2/xattr.c | 25 ++++--- fs/proc/base.c | 29 +++++++- include/asm-generic/pgtable.h | 15 +++++ include/linux/suspend.h | 2 + include/trace/events/timer.h | 20 ++++-- kernel/events/core.c | 15 +++-- kernel/locking/qspinlock.c | 8 +++ kernel/power/power.h | 3 - kernel/rcu/update.c | 13 +++- lib/test_bpf.c | 31 +++++++-- mm/mempolicy.c | 33 +++++++-- mm/vmscan.c | 14 +++- net/bluetooth/hci_core.c | 17 ++++- net/bridge/br_fdb.c | 28 +++++--- net/caif/caif_socket.c | 4 ++ net/core/fib_rules.c | 21 ++++-- net/dccp/ipv4.c | 17 ++--- net/ipv4/ip_tunnel.c | 2 + net/iucv/af_iucv.c | 8 +-- net/rds/ib.c | 3 +- net/sched/act_police.c | 8 +-- net/sctp/socket.c | 4 +- net/sctp/transport.c | 2 + net/sunrpc/auth_gss/svcauth_gss.c | 8 +++ net/sunrpc/svc.c | 2 +- scripts/kconfig/expr.c | 2 +- scripts/kconfig/menu.c | 1 + scripts/kconfig/zconf.y | 33 ++++++--- security/keys/process_keys.c | 7 +- sound/core/timer.c | 4 ++ sound/hda/hdac_bus.c | 1 + sound/hda/hdac_device.c | 1 + sound/pci/hda/Kconfig | 1 - sound/pci/hda/patch_realtek.c | 5 ++ sound/soc/au1x/ac97c.c | 6 +- tools/lib/bpf/libbpf.c | 26 ++++++++ tools/lib/traceevent/event-parse.c | 17 ++--- tools/lib/traceevent/parse-filter.c | 10 ++- tools/perf/tests/code-reading.c | 20 +++++- tools/perf/util/evsel.c | 8 +-- .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 14 ++++ tools/testing/selftests/seccomp/seccomp_bpf.c | 51 +++++++++----- .../testing/selftests/timers/inconsistency-check.c | 4 +- tools/usb/usbip/libsrc/vhci_driver.c | 36 ++++++++-- 158 files changed, 1283 insertions(+), 465 deletions(-) -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEE4n5dijQDou9mhzu83qZv95d3LNwFAlrTxjwACgkQ3qZv95d3 LNy3Pw/6Ayf3h+PAR/UEbwLstRAmJiuftJPYwc7y5ll/RhAFpG16a4A/fJzP+0T5 WRc9P5frTG1lSqPMbkIjs76vpZDE/oVQ9zhjstpMXbdioUZE00W7sGWgrBnC4/zd 25ICrFNuQ+RkO3iDJbPBABh//EsYtfE0sNrYf1Zf6exBvcqeg9yRfj20Iq+vyuaf y2vlSTl6JleCxPEIhygntV9iNrvveEvy8CkkBuUC9YDPIYZHJYIKaXnGLDpTF4Uz Y+NOJsvRtvXJYTgvYvzEzK/SP/VZPQc/2/bw9jhft6mZrrP/jETQzbAb/lNI9viZ ZAdJQlraSwj7e+bqw6kVx0qea2soi3VsM2Qr3LWVGlS4UTRF8TnRPnUsaW5HQctr wYG3OuVT47r2lGUSDRcAqh+FoZ8pQcDaC7K5z05vQZ/PcR0wNnyE9Zf1uzHP6EJd p6l57/uIREB31PVYXVYmw2dv8fSTIQR6jNJgsDbHnDpDUUnvA9FBoowGQQBmemY2 rBeId++SvxEPIY2WVmOe0REVQ6o7iv3tFTOPuDyBByy+/db/q84WHuRBUe2ysIBQ 858njbvzDr9twPX24foKLG1pFGFRklJ38c1svpVT+lgN435ezuxy2bFznjbJCzye sTNZQha8i4jmVVtFkqnxWZ9aihXm+nW6suLqtC9OfnPdyuS/3Qg= =o9dM -----END PGP SIGNATURE-----

7 years, 7 months

2
1
0 0

[PATCH] drm/i915/bxt, glk: Increase PCODE timeouts during CDCLK freq changing

by Imre Deak

commit 5e1df40f40ee45a97bb1066c3d71f0ae920a9672 upstream. Currently we see sporadic timeouts during CDCLK changing both on BXT and GLK as reported by the Bugzilla: ticket. It's easy to reproduce this by changing the frequency in a tight loop after blanking the display. The upper bound for the completion time is 800us based on my tests, so increase it from the current 500us to 2ms; with that I couldn't trigger the problem either on BXT or GLK. Note that timeouts happened during both the change notification and the voltage level setting PCODE request. (For the latter one BSpec doesn't require us to wait for completion before further HW programming.) This issue is similar to commit 2c7d0602c815 ("drm/i915/gen9: Fix PCODE polling during CDCLK change notification") but there the PCODE request does complete (as shown by the mbox busy flag), only the reply we get from PCODE indicates a failure. So there we keep resending the request until a success reply, here we just have to increase the timeout for the one PCODE request we send. v2: - s/snb_pcode_request/sandybridge_pcode_write_timeout/ (Ville) Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> # v4.9 Acked-by: Chris Wilson <chris(a)chris-wilson.co.uk> (v1) Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103326 Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Imre Deak <imre.deak(a)intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180130142939.17983-1-imre.d… (cherry picked from commit e76019a81921e87a4d9e7b3d86102bc708a6c227) Signed-off-by: Rodrigo Vivi <rodrigo.vivi(a)intel.com> (Rebased for v4.9 stable tree due to upstream intel_cdclk.c, cdclk_state and pcu_lock change) Signed-off-by: Imre Deak <imre.deak(a)intel.com> --- drivers/gpu/drm/i915/i915_drv.h | 6 +++++- drivers/gpu/drm/i915/intel_display.c | 9 +++++---- drivers/gpu/drm/i915/intel_pm.c | 6 +++--- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 36a665f0e5c9..e23748cca0c0 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3681,7 +3681,11 @@ extern void intel_display_print_error_state(struct drm_i915_error_state_buf *e, struct intel_display_error_state *error); int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u32 mbox, u32 *val); -int sandybridge_pcode_write(struct drm_i915_private *dev_priv, u32 mbox, u32 val); +int sandybridge_pcode_write_timeout(struct drm_i915_private *dev_priv, u32 mbox, + u32 val, int timeout_us); +#define sandybridge_pcode_write(dev_priv, mbox, val) \ + sandybridge_pcode_write_timeout(dev_priv, mbox, val, 500) + int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request, u32 reply_mask, u32 reply, int timeout_base_ms); diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ce32303b3013..c185625d67f2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -6012,8 +6012,8 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, int cdclk) /* Inform power controller of upcoming frequency change */ mutex_lock(&dev_priv->rps.hw_lock); - ret = sandybridge_pcode_write(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ, - 0x80000000); + ret = sandybridge_pcode_write_timeout(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ, + 0x80000000, 2000); mutex_unlock(&dev_priv->rps.hw_lock); if (ret) { @@ -6044,8 +6044,9 @@ static void bxt_set_cdclk(struct drm_i915_private *dev_priv, int cdclk) I915_WRITE(CDCLK_CTL, val); mutex_lock(&dev_priv->rps.hw_lock); - ret = sandybridge_pcode_write(dev_priv, HSW_PCODE_DE_WRITE_FREQ_REQ, - DIV_ROUND_UP(cdclk, 25000)); + ret = sandybridge_pcode_write_timeout(dev_priv, + HSW_PCODE_DE_WRITE_FREQ_REQ, + DIV_ROUND_UP(cdclk, 25000), 2000); mutex_unlock(&dev_priv->rps.hw_lock); if (ret) { diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 49de4760cc16..05427d292457 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -7913,8 +7913,8 @@ int sandybridge_pcode_read(struct drm_i915_private *dev_priv, u32 mbox, u32 *val return 0; } -int sandybridge_pcode_write(struct drm_i915_private *dev_priv, - u32 mbox, u32 val) +int sandybridge_pcode_write_timeout(struct drm_i915_private *dev_priv, + u32 mbox, u32 val, int timeout_us) { int status; @@ -7935,7 +7935,7 @@ int sandybridge_pcode_write(struct drm_i915_private *dev_priv, if (intel_wait_for_register_fw(dev_priv, GEN6_PCODE_MAILBOX, GEN6_PCODE_READY, 0, - 500)) { + timeout_us)) { DRM_ERROR("timeout waiting for pcode write (%d) to finish\n", mbox); return -ETIMEDOUT; } -- 2.13.2

7 years, 7 months

2
1
0 0

[PATCHv3] mtd: spi-nor: Fix Cadence QSPI page fault kernel panic

by thor.thayer＠linux.intel.com

From: Thor Thayer <thor.thayer(a)linux.intel.com> The current Cadence QSPI driver caused a kernel panic when loading a Root Filesystem from QSPI. The problem was caused by reading more bytes than needed because the QSPI operated on 4 bytes at a time. <snip> [ 7.947754] spi_nor_read[1048]:from 0x037cad74, len 1 [bfe07fff] [ 7.956247] cqspi_read[910]:offset 0x58502516, buffer=bfe07fff [ 7.956247] [ 7.966046] Unable to handle kernel paging request at virtual address bfe08002 [ 7.973239] pgd = eebfc000 [ 7.975931] [bfe08002] *pgd=2fffb811, *pte=00000000, *ppte=00000000 </snip> Notice above how only 1 byte needed to be read but by reading 4 bytes into the end of a mapped page, an unrecoverable page fault occurred. This patch uses a temporary buffer to hold the 4 bytes read and then copies only the bytes required into the buffer. A min() function is used to limit the length to prevent buffer overflows. Request testing of this patch on other platforms. This was tested on the Intel Arria10 SoCFPGA DevKit. Fixes: 0cf1725676a97fc8 ("mtd: spi-nor: cqspi: Fix build on arches missing readsl/writesl") Signed-off-by: Thor Thayer <thor.thayer(a)linux.intel.com> Cc: <stable(a)vger.kernel.org> Reviewed-by: Marek Vasut <marek.vasut(a)gmail.com> --- v2 Changes to only write dangling bytes at end of transfer since previous patch may have multiple dangling byte transfers. Remove write patch since no errors reported and write timeout needs more investigation. v3 Add Fixes tag Cc-stable tag. --- drivers/mtd/spi-nor/cadence-quadspi.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/cadence-quadspi.c b/drivers/mtd/spi-nor/cadence-quadspi.c index 2f3a4d4232b3..c3f7aaa5d18f 100644 --- a/drivers/mtd/spi-nor/cadence-quadspi.c +++ b/drivers/mtd/spi-nor/cadence-quadspi.c @@ -507,7 +507,9 @@ static int cqspi_indirect_read_execute(struct spi_nor *nor, u8 *rxbuf, void __iomem *reg_base = cqspi->iobase; void __iomem *ahb_base = cqspi->ahb_base; unsigned int remaining = n_rx; + unsigned int mod_bytes = n_rx % 4; unsigned int bytes_to_read = 0; + u8 *rxbuf_end = rxbuf + n_rx; int ret = 0; writel(from_addr, reg_base + CQSPI_REG_INDIRECTRDSTARTADDR); @@ -536,11 +538,24 @@ static int cqspi_indirect_read_execute(struct spi_nor *nor, u8 *rxbuf, } while (bytes_to_read != 0) { + unsigned int word_remain = round_down(remaining, 4); + bytes_to_read *= cqspi->fifo_width; bytes_to_read = bytes_to_read > remaining ? remaining : bytes_to_read; - ioread32_rep(ahb_base, rxbuf, - DIV_ROUND_UP(bytes_to_read, 4)); + bytes_to_read = round_down(bytes_to_read, 4); + /* Read 4 byte word chunks then single bytes */ + if (bytes_to_read) { + ioread32_rep(ahb_base, rxbuf, + (bytes_to_read / 4)); + } else if (!word_remain && mod_bytes) { + unsigned int temp = ioread32(ahb_base); + + bytes_to_read = mod_bytes; + memcpy(rxbuf, &temp, min((unsigned int) + (rxbuf_end - rxbuf), + bytes_to_read)); + } rxbuf += bytes_to_read; remaining -= bytes_to_read; bytes_to_read = cqspi_get_rd_sram_level(cqspi); -- 2.7.4

7 years, 7 months

2
1
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror