July 2019 - Linux-stable-mirror

RE: [PATCH v2 2/2] ARC: enable uboot support unconditionally

by Alexey Brodkin

Hi Greg, > -----Original Message----- > From: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> > Sent: Thursday, February 14, 2019 6:08 PM > To: linux-snps-arc(a)lists.infradead.org; Vineet Gupta <vgupta(a)synopsys.com> > Cc: linux-kernel(a)vger.kernel.org; Alexey Brodkin <abrodkin(a)synopsys.com>; Corentin Labbe > <clabbe(a)baylibre.com>; khilman(a)baylibre.com; Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> > Subject: [PATCH v2 2/2] ARC: enable uboot support unconditionally > > After reworking U-boot args handling code and adding paranoid > arguments check we can eliminate CONFIG_ARC_UBOOT_SUPPORT and > enable uboot support unconditionally. > > For JTAG case we can assume that core registers will come up > reset value of 0 or in worst case we rely on user passing > '-on=clear_regs' to Metaware debugger. > > Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> May we have this one back-ported to linux-4.19.y? It was initially applied to Linus' tree during 5.0 development cycle [1] but was never back-ported. Now w/o that patch in KernelCI we see boot failure on ARC HSDK board [2] as opposed to normally working later kernel versions. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?… [2] https://storage.kernelci.org/stable/linux-4.19.y/v4.19.59/arc/hsdk_defconfi… Below is that same patch but rebased on linux-4.19 as in its pristine form it won't apply due to offset of one of hunks. -Alexey ------------------------------------>8-------------------------------- >From 3e565355f6a2d1a82bc9ecd47a46d1fa3c0cd2c1 Mon Sep 17 00:00:00 2001 From: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Date: Thu, 14 Feb 2019 18:07:45 +0300 Subject: [PATCH] ARC: enable uboot support unconditionally After reworking U-boot args handling code and adding paranoid arguments check we can eliminate CONFIG_ARC_UBOOT_SUPPORT and enable uboot support unconditionally. For JTAG case we can assume that core registers will come up reset value of 0 or in worst case we rely on user passing '-on=clear_regs' to Metaware debugger. Cc: stable(a)vger.kernel.org Tested-by: Corentin LABBE <clabbe(a)baylibre.com> Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> Signed-off-by: Vineet Gupta <vgupta(a)synopsys.com> --- arch/arc/Kconfig | 13 ------------- arch/arc/configs/nps_defconfig | 1 - arch/arc/configs/vdk_hs38_defconfig | 1 - arch/arc/configs/vdk_hs38_smp_defconfig | 2 -- arch/arc/kernel/head.S | 2 -- arch/arc/kernel/setup.c | 2 -- 6 files changed, 21 deletions(-) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index 85eb7fc2e241..97b45fe8f0c2 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -199,7 +199,6 @@ config NR_CPUS config ARC_SMP_HALT_ON_RESET bool "Enable Halt-on-reset boot mode" - default y if ARC_UBOOT_SUPPORT help In SMP configuration cores can be configured as Halt-on-reset or they could all start at same time. For Halt-on-reset, non @@ -538,18 +537,6 @@ config ARC_DBG_TLB_PARANOIA endif -config ARC_UBOOT_SUPPORT - bool "Support uboot arg Handling" - default n - help - ARC Linux by default checks for uboot provided args as pointers to - external cmdline or DTB. This however breaks in absence of uboot, - when booting from Metaware debugger directly, as the registers are - not zeroed out on reset by mdb and/or ARCv2 based cores. The bogus - registers look like uboot args to kernel which then chokes. - So only enable the uboot arg checking/processing if users are sure - of uboot being in play. - config ARC_BUILTIN_DTB_NAME string "Built in DTB" help diff --git a/arch/arc/configs/nps_defconfig b/arch/arc/configs/nps_defconfig index 6e84060e7c90..621f59407d76 100644 --- a/arch/arc/configs/nps_defconfig +++ b/arch/arc/configs/nps_defconfig @@ -31,7 +31,6 @@ CONFIG_ARC_CACHE_LINE_SHIFT=5 # CONFIG_ARC_HAS_LLSC is not set CONFIG_ARC_KVADDR_SIZE=402 CONFIG_ARC_EMUL_UNALIGNED=y -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_PREEMPT=y CONFIG_NET=y CONFIG_UNIX=y diff --git a/arch/arc/configs/vdk_hs38_defconfig b/arch/arc/configs/vdk_hs38_defconfig index 1e59a2e9c602..e447ace6fa1c 100644 --- a/arch/arc/configs/vdk_hs38_defconfig +++ b/arch/arc/configs/vdk_hs38_defconfig @@ -13,7 +13,6 @@ CONFIG_PARTITION_ADVANCED=y CONFIG_ARC_PLAT_AXS10X=y CONFIG_AXS103=y CONFIG_ISA_ARCV2=y -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38" CONFIG_PREEMPT=y CONFIG_NET=y diff --git a/arch/arc/configs/vdk_hs38_smp_defconfig b/arch/arc/configs/vdk_hs38_smp_defconfig index b5c3f6c54b03..c82cdb10aaf4 100644 --- a/arch/arc/configs/vdk_hs38_smp_defconfig +++ b/arch/arc/configs/vdk_hs38_smp_defconfig @@ -15,8 +15,6 @@ CONFIG_AXS103=y CONFIG_ISA_ARCV2=y CONFIG_SMP=y # CONFIG_ARC_TIMERS_64BIT is not set -# CONFIG_ARC_SMP_HALT_ON_RESET is not set -CONFIG_ARC_UBOOT_SUPPORT=y CONFIG_ARC_BUILTIN_DTB_NAME="vdk_hs38_smp" CONFIG_PREEMPT=y CONFIG_NET=y diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S index 208bf2c9e7b0..a72bbda2f7aa 100644 --- a/arch/arc/kernel/head.S +++ b/arch/arc/kernel/head.S @@ -100,7 +100,6 @@ ENTRY(stext) st.ab 0, [r5, 4] 1: -#ifdef CONFIG_ARC_UBOOT_SUPPORT ; Uboot - kernel ABI ; r0 = [0] No uboot interaction, [1] cmdline in r2, [2] DTB in r2 ; r1 = magic number (always zero as of now) @@ -109,7 +108,6 @@ ENTRY(stext) st r0, [@uboot_tag] st r1, [@uboot_magic] st r2, [@uboot_arg] -#endif ; setup "current" tsk and optionally cache it in dedicated r25 mov r9, @init_task diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c index a1218937abd6..89c97dcfa360 100644 --- a/arch/arc/kernel/setup.c +++ b/arch/arc/kernel/setup.c @@ -493,7 +493,6 @@ void __init handle_uboot_args(void) bool use_embedded_dtb = true; bool append_cmdline = false; -#ifdef CONFIG_ARC_UBOOT_SUPPORT /* check that we know this tag */ if (uboot_tag != UBOOT_TAG_NONE && uboot_tag != UBOOT_TAG_CMDLINE && @@ -525,7 +524,6 @@ void __init handle_uboot_args(void) append_cmdline = true; ignore_uboot_args: -#endif if (use_embedded_dtb) { machine_desc = setup_machine_fdt(__dtb_start); -- 2.16.2

5 years, 4 months

2
3
0 0

[PATCH V4 0/2] block/scsi/dm-rq: fix leak of request private data in dm-mpath

by Ming Lei

Hi, When one request is dispatched to LLD via dm-rq, if the result is BLK_STS_*RESOURCE, dm-rq will free the request. However, LLD may allocate private data for this request, so this way will cause memory leak. Add .cleanup_rq() callback and implement it in SCSI for fixing the issue, since SCSI is the only driver which allocates private requst data in .queue_rq() path. Another use case of this callback is to free the request and re-submit bios during cpu hotplug when the hctx is dead, see the following link: https://lore.kernel.org/linux-block/f122e8f2-5ede-2d83-9ca0-bc713ce66d01@hu… V4: - add more commit log on the new .cleanup_rq callback, as suggested by Mike V3: - run .cleanup_rq() from dm-rq because this issue is dm-rq specific, and even in future it should be still very unusual to free request in this way. If we call .cleanup_rq() in generic rq free code(fast path), cost will be introduced unnecessarily, also we have to consider related race. V2: - run .cleanup_rq() in blk_mq_free_request(), as suggested by Mike Ming Lei (2): blk-mq: add callback of .cleanup_rq scsi: implement .cleanup_rq callback drivers/md/dm-rq.c | 1 + drivers/scsi/scsi_lib.c | 13 +++++++++++++ include/linux/blk-mq.h | 13 +++++++++++++ 3 files changed, 27 insertions(+) Cc: Ewan D. Milne <emilne(a)redhat.com> Cc: Bart Van Assche <bvanassche(a)acm.org> Cc: Hannes Reinecke <hare(a)suse.com> Cc: Christoph Hellwig <hch(a)lst.de> Cc: Mike Snitzer <snitzer(a)redhat.com> Cc: dm-devel(a)redhat.com Cc: <stable(a)vger.kernel.org> Fixes: 396eaf21ee17 ("blk-mq: improve DM's blk-mq IO merging via blk_insert_cloned_request feedback") -- 2.20.1

5 years, 4 months

2
5
0 0

[PATCH] kconfig: fix missing choice values in auto.conf

by Masahiro Yamada

Since commit 00c864f8903d ("kconfig: allow all config targets to write auto.conf if missing"), Kconfig creates include/config/auto.conf in the defconfig stage when it is missing. Joonas Kylmälä reported incorrect auto.conf generation under some circumstances. Apply the following diff: | --- a/arch/arm/configs/imx_v6_v7_defconfig | +++ b/arch/arm/configs/imx_v6_v7_defconfig | @@ -345,14 +345,7 @@ CONFIG_USB_CONFIGFS_F_MIDI=y | CONFIG_USB_CONFIGFS_F_HID=y | CONFIG_USB_CONFIGFS_F_UVC=y | CONFIG_USB_CONFIGFS_F_PRINTER=y | -CONFIG_USB_ZERO=m | -CONFIG_USB_AUDIO=m | -CONFIG_USB_ETH=m | -CONFIG_USB_G_NCM=m | -CONFIG_USB_GADGETFS=m | -CONFIG_USB_FUNCTIONFS=m | -CONFIG_USB_MASS_STORAGE=m | -CONFIG_USB_G_SERIAL=m | +CONFIG_USB_FUNCTIONFS=y | CONFIG_MMC=y | CONFIG_MMC_SDHCI=y | CONFIG_MMC_SDHCI_PLTFM=y And then, run: $ make ARCH=arm mrproper imx_v6_v7_defconfig CONFIG_USB_FUNCTIONFS=y is correctly contained in the .config, but not in the auto.conf. Please note drivers/usb/gadget/legacy/Kconfig is included from a choice block in drivers/usb/gadget/Kconfig. So USB_FUNCTIONFS is a choice value. This is probably a similar situation described in commit beaaddb62540 ("kconfig: tests: test defconfig when two choices interact"). When sym_calc_choice() is called, the choice symbol forgets the SYMBOL_DEF_USER unless all of its choice values are explicitly set by the user. The choice symbol is given just one chance to recall it because set_all_choice_values() is called if SYMBOL_NEED_SET_CHOICE_VALUES is set. When sym_calc_choice() is called again, the choice symbol forgets it forever, since SYMBOL_NEED_SET_CHOICE_VALUES is a one-time aid. Hence, we cannot call sym_clear_all_valid() again and again. It is crazy to set and clear internal flags. However, we cannot simply get rid of "sym->flags &= flags | ~SYMBOL_DEF_USER;" Doing so would re-introduce the problem solved by commit 5d09598d488f ("kconfig: fix new choices being skipped upon config update"). To work around the issue, conf_write_autoconf() stopped calling sym_clear_all_valid(). conf_write() must be changed accordingly. Currently, it clears SYMBOL_WRITE after the symbol is written into the .config file. This is needed to prevent it from writing the same symbol multiple times in case the symbol is declared in two or more locations. I added the new flag SYMBOL_WRITTEN, to track the symbols that have been written. Anyway, this is a cheesy workaround in order to suppress the issue as far as defconfig is concerned. Handling of choices is totally broken. sym_clear_all_valid() is called every time a user touches a symbol from the GUI interface. To reproduce it, just add a new symbol drivers/usb/gadget/legacy/Kconfig, then touch around unrelated symbols from menuconfig. USB_FUNCTIONFS will disappear from the .config file. I added the Fixes tag since it is more fatal than before. But, this has been broken since long long time before, and still it is. We should take a closer look to fix this correctly somehow. Fixes: 00c864f8903d ("kconfig: allow all config targets to write auto.conf if missing") Cc: linux-stable <stable(a)vger.kernel.org> # 4.19+ Reported-by: Joonas Kylmälä <joonas.kylmala(a)iki.fi> Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- scripts/kconfig/confdata.c | 7 +++---- scripts/kconfig/expr.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index cbb6efa4a5a6..e0972b255aac 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c @@ -895,7 +895,8 @@ int conf_write(const char *name) "# %s\n" "#\n", str); need_newline = false; - } else if (!(sym->flags & SYMBOL_CHOICE)) { + } else if (!(sym->flags & SYMBOL_CHOICE) && + !(sym->flags & SYMBOL_WRITTEN)) { sym_calc_value(sym); if (!(sym->flags & SYMBOL_WRITE)) goto next; @@ -903,7 +904,7 @@ int conf_write(const char *name) fprintf(out, "\n"); need_newline = false; } - sym->flags &= ~SYMBOL_WRITE; + sym->flags |= SYMBOL_WRITTEN; conf_write_symbol(out, sym, &kconfig_printer_cb, NULL); } @@ -1063,8 +1064,6 @@ int conf_write_autoconf(int overwrite) if (!overwrite && is_present(autoconf_name)) return 0; - sym_clear_all_valid(); - conf_write_dep("include/config/auto.conf.cmd"); if (conf_touch_deps()) diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index 8dde65bc3165..017843c9a4f4 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -141,6 +141,7 @@ struct symbol { #define SYMBOL_OPTIONAL 0x0100 /* choice is optional - values can be 'n' */ #define SYMBOL_WRITE 0x0200 /* write symbol to file (KCONFIG_CONFIG) */ #define SYMBOL_CHANGED 0x0400 /* ? */ +#define SYMBOL_WRITTEN 0x0800 /* track info to avoid double-write to .config */ #define SYMBOL_NO_WRITE 0x1000 /* Symbol for internal use only; it will not be written */ #define SYMBOL_CHECKED 0x2000 /* used during dependency checking */ #define SYMBOL_WARNED 0x8000 /* warning has been issued */ -- 2.17.1

5 years, 4 months

5
9
0 0

[PATCH 4.14 00/43] 4.14.132-stable review

by Greg Kroah-Hartman

This is the start of the stable review cycle for the 4.14.132 release. There are 43 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know. Responses should be made by Thu 04 Jul 2019 07:59:45 AM UTC. Anything received after that time might be too late. The whole patch series can be found in one patch at: https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.14.132-r… or in the git tree and branch at: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-4.14.y and the diffstat can be found below. thanks, greg k-h ------------- Pseudo-Shortlog of commits: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> Linux 4.14.132-rc1 Xin Long <lucien.xin(a)gmail.com> tipc: pass tunnel dev as NULL to udp_tunnel(6)_xmit_skb Will Deacon <will.deacon(a)arm.com> futex: Update comments and docs about return values of arch futex code Daniel Borkmann <daniel(a)iogearbox.net> bpf, arm64: use more scalable stadd over ldxr / stxr loop in xadd Will Deacon <will.deacon(a)arm.com> arm64: futex: Avoid copying out uninitialised stack in failed cmpxchg() Martin KaFai Lau <kafai(a)fb.com> bpf: udp: ipv6: Avoid running reuseport's bpf_prog from __udp6_lib_err Martin KaFai Lau <kafai(a)fb.com> bpf: udp: Avoid calling reuseport's bpf_prog from udp_gro YueHaibing <yuehaibing(a)huawei.com> bonding: Always enable vlan tx offload YueHaibing <yuehaibing(a)huawei.com> team: Always enable vlan tx offload Fei Li <lifei.shirley(a)bytedance.com> tun: wake up waitqueues after IFF_UP is set Xin Long <lucien.xin(a)gmail.com> tipc: check msg->req data len in tipc_nl_compat_bearer_disable Xin Long <lucien.xin(a)gmail.com> tipc: change to use register_pernet_device Xin Long <lucien.xin(a)gmail.com> sctp: change to hold sk after auth shkey is created successfully Roland Hii <roland.king.guan.hii(a)intel.com> net: stmmac: fixed new system time seconds value calculation JingYi Hou <houjingyi647(a)gmail.com> net: remove duplicate fetch in sock_getsockopt Eric Dumazet <edumazet(a)google.com> net/packet: fix memory leak in packet_set_ring() Stephen Suryaputra <ssuryaextr(a)gmail.com> ipv4: Use return value of inet_iif() for __raw_v4_lookup in the while loop Neil Horman <nhorman(a)tuxdriver.com> af_packet: Block execution of tasks waiting for transmit to complete in AF_PACKET Wang Xin <xin.wang7(a)cn.bosch.com> eeprom: at24: fix unexpected timeout under high load Geert Uytterhoeven <geert(a)linux-m68k.org> cpu/speculation: Warn on unsupported mitigations= parameter Trond Myklebust <trondmy(a)gmail.com> NFS/flexfiles: Use the correct TCP timeout for flexfiles I/O Thomas Gleixner <tglx(a)linutronix.de> x86/microcode: Fix the microcode load on CPU hotplug for real Alejandro Jimenez <alejandro.j.jimenez(a)oracle.com> x86/speculation: Allow guests to use SSBD even if host does not Jan Kara <jack(a)suse.cz> scsi: vmw_pscsi: Fix use-after-free in pvscsi_queue_lck() zhangyi (F) <yi.zhang(a)huawei.com> dm log writes: make sure super sector log updates are written in order Colin Ian King <colin.king(a)canonical.com> mm/page_idle.c: fix oops because end_pfn is larger than max_pfn Jann Horn <jannh(a)google.com> fs/binfmt_flat.c: make load_flat_shared_library() work zhong jiang <zhongjiang(a)huawei.com> mm/mempolicy.c: fix an incorrect rebind node in mpol_rebind_nodemask John Ogness <john.ogness(a)linutronix.de> fs/proc/array.c: allow reporting eip/esp for all coredumping threads Sasha Levin <sashal(a)kernel.org> Revert "compiler.h: update definition of unreachable()" Kristian Evensen <kristian.evensen(a)gmail.com> qmi_wwan: Fix out-of-bounds read Adeodato Simó <dato(a)net.com.org.es> net/9p: include trans_common.h to fix missing prototype warning. Dominique Martinet <dominique.martinet(a)cea.fr> 9p: p9dirent_read: check network-provided name length Dominique Martinet <dominique.martinet(a)cea.fr> 9p/rdma: remove useless check in cm_event_handler Dominique Martinet <dominique.martinet(a)cea.fr> 9p: acl: fix uninitialized iattr access Dominique Martinet <dominique.martinet(a)cea.fr> 9p/rdma: do not disconnect on down_interruptible EAGAIN Dominique Martinet <dominique.martinet(a)cea.fr> 9p/xen: fix check for xenbus_read error in front_probe Martin Wilck <mwilck(a)suse.com> block: bio_iov_iter_get_pages: pin more pages for multi-segment IOs Christoph Hellwig <hch(a)lst.de> block: add a lower-level bio_add_page interface Mike Marciniszyn <mike.marciniszyn(a)intel.com> IB/hfi1: Close PSM sdma_progress sleep window Sasha Levin <sashal(a)kernel.org> Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP" Arnaldo Carvalho de Melo <acme(a)redhat.com> perf header: Fix unchecked usage of strncpy() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf help: Remove needless use of strncpy() Arnaldo Carvalho de Melo <acme(a)redhat.com> perf ui helpline: Use strlcpy() as a shorter form of strncpy() + explicit set nul ------------- Diffstat: Documentation/robust-futexes.txt | 3 +- Makefile | 4 +- arch/arm64/include/asm/futex.h | 4 +- arch/arm64/include/asm/insn.h | 8 ++ arch/arm64/kernel/insn.c | 40 +++++++ arch/arm64/net/bpf_jit.h | 4 + arch/arm64/net/bpf_jit_comp.c | 28 +++-- arch/x86/kernel/cpu/bugs.c | 11 +- arch/x86/kernel/cpu/microcode/core.c | 15 ++- block/bio.c | 131 +++++++++++++++------ drivers/infiniband/hw/hfi1/user_sdma.c | 12 +- drivers/infiniband/hw/hfi1/user_sdma.h | 1 - drivers/md/dm-log-writes.c | 23 +++- drivers/misc/eeprom/at24.c | 107 ++++++++++++----- drivers/net/bonding/bond_main.c | 2 +- .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 2 +- drivers/net/team/team.c | 2 +- drivers/net/tun.c | 19 ++- drivers/net/usb/qmi_wwan.c | 4 +- drivers/scsi/vmw_pvscsi.c | 6 +- fs/9p/acl.c | 2 +- fs/binfmt_flat.c | 23 ++-- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 2 +- fs/proc/array.c | 2 +- include/asm-generic/futex.h | 8 +- include/linux/bio.h | 9 ++ include/linux/compiler.h | 5 +- kernel/cpu.c | 3 + kernel/trace/trace_branch.c | 4 - mm/mempolicy.c | 2 +- mm/page_idle.c | 4 +- net/9p/protocol.c | 12 +- net/9p/trans_common.c | 1 + net/9p/trans_rdma.c | 7 +- net/9p/trans_xen.c | 4 +- net/core/sock.c | 3 - net/ipv4/raw.c | 2 +- net/ipv4/udp.c | 6 +- net/ipv6/udp.c | 4 +- net/packet/af_packet.c | 23 +++- net/packet/internal.h | 1 + net/sctp/endpointola.c | 8 +- net/tipc/core.c | 12 +- net/tipc/netlink_compat.c | 18 ++- net/tipc/udp_media.c | 8 +- tools/perf/builtin-help.c | 2 +- tools/perf/ui/tui/helpline.c | 2 +- tools/perf/util/header.c | 2 +- 48 files changed, 418 insertions(+), 187 deletions(-)

5 years, 4 months

11
56
0 0

[PATCH v3] mtd: rawnand: micron: handle on-die "ECC-off" devices correctly

by Marco Felsch

Some devices are not supposed to support on-die ECC but experience shows that internal ECC machinery can actually be enabled through the "SET FEATURE (EFh)" command, even if a read of the "READ ID Parameter Tables" returns that it is not. Currently, the driver checks the "READ ID Parameter" field directly after having enabled the feature. If the check fails it returns immediately but leaves the ECC on. When using buggy chips like MT29F2G08ABAGA and MT29F2G08ABBGA, all future read/program cycles will go through the on-die ECC, confusing the host controller which is supposed to be the one handling correction. To address this in a common way we need to turn off the on-die ECC directly after reading the "READ ID Parameter" and before checking the "ECC status". Cc: stable(a)vger.kernel.org Fixes: dbc44edbf833 ("mtd: rawnand: micron: Fix on-die ECC detection logic") Signed-off-by: Marco Felsch <m.felsch(a)pengutronix.de> Reviewed-by: Boris Brezillon <boris.brezillon(a)collabora.com> --- drivers/mtd/nand/raw/nand_micron.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/raw/nand_micron.c b/drivers/mtd/nand/raw/nand_micron.c index 1622d3145587..8ca9fad6e6ad 100644 --- a/drivers/mtd/nand/raw/nand_micron.c +++ b/drivers/mtd/nand/raw/nand_micron.c @@ -390,6 +390,14 @@ static int micron_supports_on_die_ecc(struct nand_chip *chip) (chip->id.data[4] & MICRON_ID_INTERNAL_ECC_MASK) != 0x2) return MICRON_ON_DIE_UNSUPPORTED; + /* + * It seems that there are devices which do not support ECC officially. + * At least the MT29F2G08ABAGA / MT29F2G08ABBGA devices supports + * enabling the ECC feature but don't reflect that to the READ_ID table. + * So we have to guarantee that we disable the ECC feature directly + * after we did the READ_ID table command. Later we can evaluate the + * ECC_ENABLE support. + */ ret = micron_nand_on_die_ecc_setup(chip, true); if (ret) return MICRON_ON_DIE_UNSUPPORTED; @@ -398,13 +406,13 @@ static int micron_supports_on_die_ecc(struct nand_chip *chip) if (ret) return MICRON_ON_DIE_UNSUPPORTED; - if (!(id[4] & MICRON_ID_ECC_ENABLED)) - return MICRON_ON_DIE_UNSUPPORTED; - ret = micron_nand_on_die_ecc_setup(chip, false); if (ret) return MICRON_ON_DIE_UNSUPPORTED; + if (!(id[4] & MICRON_ID_ECC_ENABLED)) + return MICRON_ON_DIE_UNSUPPORTED; + ret = nand_readid_op(chip, 0, id, sizeof(id)); if (ret) return MICRON_ON_DIE_UNSUPPORTED; -- 2.20.1

5 years, 4 months

2
2
0 0

[PATCH v3 2/3] mm/hmm: fix ZONE_DEVICE anon page mapping reuse

by Ralph Campbell

When a ZONE_DEVICE private page is freed, the page->mapping field can be set. If this page is reused as an anonymous page, the previous value can prevent the page from being inserted into the CPU's anon rmap table. For example, when migrating a pte_none() page to device memory: migrate_vma(ops, vma, start, end, src, dst, private) migrate_vma_collect() src[] = MIGRATE_PFN_MIGRATE migrate_vma_prepare() /* no page to lock or isolate so OK */ migrate_vma_unmap() /* no page to unmap so OK */ ops->alloc_and_copy() /* driver allocates ZONE_DEVICE page for dst[] */ migrate_vma_pages() migrate_vma_insert_page() page_add_new_anon_rmap() __page_set_anon_rmap() /* This check sees the page's stale mapping field */ if (PageAnon(page)) return /* page->mapping is not updated */ The result is that the migration appears to succeed but a subsequent CPU fault will be unable to migrate the page back to system memory or worse. Clear the page->mapping field when freeing the ZONE_DEVICE page so stale pointer data doesn't affect future page use. Fixes: b7a523109fb5c9d2d6dd ("mm: don't clear ->mapping in hmm_devmem_free") Cc: stable(a)vger.kernel.org Signed-off-by: Ralph Campbell <rcampbell(a)nvidia.com> Reviewed-by: John Hubbard <jhubbard(a)nvidia.com> Reviewed-by: Christoph Hellwig <hch(a)lst.de> Cc: Dan Williams <dan.j.williams(a)intel.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> Cc: Jason Gunthorpe <jgg(a)mellanox.com> Cc: Logan Gunthorpe <logang(a)deltatee.com> Cc: Ira Weiny <ira.weiny(a)intel.com> Cc: Matthew Wilcox <willy(a)infradead.org> Cc: Mel Gorman <mgorman(a)techsingularity.net> Cc: Jan Kara <jack(a)suse.cz> Cc: "Kirill A. Shutemov" <kirill.shutemov(a)linux.intel.com> Cc: Michal Hocko <mhocko(a)suse.com> Cc: Andrea Arcangeli <aarcange(a)redhat.com> Cc: Mike Kravetz <mike.kravetz(a)oracle.com> Cc: "Jérôme Glisse" <jglisse(a)redhat.com> --- kernel/memremap.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/kernel/memremap.c b/kernel/memremap.c index 6ee03a816d67..289a086e1467 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -397,6 +397,30 @@ void __put_devmap_managed_page(struct page *page) mem_cgroup_uncharge(page); + /* + * When a device_private page is freed, the page->mapping field + * may still contain a (stale) mapping value. For example, the + * lower bits of page->mapping may still identify the page as + * an anonymous page. Ultimately, this entire field is just + * stale and wrong, and it will cause errors if not cleared. + * One example is: + * + * migrate_vma_pages() + * migrate_vma_insert_page() + * page_add_new_anon_rmap() + * __page_set_anon_rmap() + * ...checks page->mapping, via PageAnon(page) call, + * and incorrectly concludes that the page is an + * anonymous page. Therefore, it incorrectly, + * silently fails to set up the new anon rmap. + * + * For other types of ZONE_DEVICE pages, migration is either + * handled differently or not done at all, so there is no need + * to clear page->mapping. + */ + if (is_device_private_page(page)) + page->mapping = NULL; + page->pgmap->ops->page_free(page); } else if (!count) __put_page(page); -- 2.20.1

5 years, 4 months

3
2
0 0

[PATCH v4 3/9] arm: perf: save/resore pmsel

by Julien Thierry

The callback pmu->read() can be called with interrupts enabled. Currently, on ARM, this can cause the following callchain: armpmu_read() -> armpmu_event_update() -> armv7pmu_read_counter() The last function might modify the counter selector register and then read the target counter, without taking any lock. With interrupts enabled, a PMU interrupt could occur and modify the selector register as well, between the selection and read of the interrupted context. Save and restore the value of the selector register in the PMU interrupt handler, ensuring the interrupted context is left with the correct PMU registers selected. Signed-off-by: Julien Thierry <julien.thierry(a)arm.com> Cc: Will Deacon <will.deacon(a)arm.com> Cc: Mark Rutland <mark.rutland(a)arm.com> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)redhat.com> Cc: Arnaldo Carvalho de Melo <acme(a)kernel.org> Cc: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> Cc: Jiri Olsa <jolsa(a)redhat.com> Cc: Namhyung Kim <namhyung(a)kernel.org> Cc: Russell King <linux(a)armlinux.org.uk> Cc: stable(a)vger.kernel.org --- arch/arm/kernel/perf_event_v7.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/arch/arm/kernel/perf_event_v7.c b/arch/arm/kernel/perf_event_v7.c index a4fb0f8..b7be2a3 100644 --- a/arch/arm/kernel/perf_event_v7.c +++ b/arch/arm/kernel/perf_event_v7.c @@ -736,10 +736,22 @@ static inline int armv7_pmnc_counter_has_overflowed(u32 pmnc, int idx) return pmnc & BIT(ARMV7_IDX_TO_COUNTER(idx)); } -static inline void armv7_pmnc_select_counter(int idx) +static inline u32 armv7_pmsel_read(void) +{ + u32 pmsel; + + asm volatile("mrc p15, 0, %0, c9, c12, 5" : "=&r" (pmsel)); + return pmsel; +} + +static inline void armv7_pmsel_write(u32 counter) { - u32 counter = ARMV7_IDX_TO_COUNTER(idx); asm volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (counter)); +} + +static inline void armv7_pmnc_select_counter(int idx) +{ + armv7_pmsel_write(ARMV7_IDX_TO_COUNTER(idx)); isb(); } @@ -952,8 +964,15 @@ static irqreturn_t armv7pmu_handle_irq(struct arm_pmu *cpu_pmu) struct perf_sample_data data; struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events); struct pt_regs *regs; + u32 pmsel; int idx; + + /* + * Save pmsel in case the interrupted context was using it. + */ + pmsel = armv7_pmsel_read(); + /* * Get and reset the IRQ flags */ @@ -1004,6 +1023,8 @@ static irqreturn_t armv7pmu_handle_irq(struct arm_pmu *cpu_pmu) */ irq_work_run(); + armv7_pmsel_write(pmsel); + return IRQ_HANDLED; } -- 1.9.1

5 years, 4 months

2
2
0 0

[PATCH 0/8] i915 fixes that missed v5.2

by Joonas Lahtinen

Backports of fixes for v5.2. Chris Wilson (3): drm/i915: Make the semaphore saturation mask global drm/i915/userptr: Acquire the page lock around set_page_dirty() drm/i915: Don't dereference request if it may have been retired when printing John Harrison (1): drm/i915: Support flags in whitlist WAs Kenneth Graunke (1): drm/i915: Disable SAMPLER_STATE prefetching on all Gen11 steppings. Lionel Landwerlin (3): drm/i915/perf: fix ICL perf register offsets drm/i915: whitelist PS_(DEPTH|INVOCATION)_COUNT drm/i915/icl: whitelist PS_(DEPTH|INVOCATION)_COUNT drivers/gpu/drm/i915/i915_gem_userptr.c | 10 ++++- drivers/gpu/drm/i915/i915_perf.c | 10 +++-- drivers/gpu/drm/i915/i915_reg.h | 7 ++++ drivers/gpu/drm/i915/i915_request.c | 4 +- drivers/gpu/drm/i915/intel_context.c | 1 - drivers/gpu/drm/i915/intel_context_types.h | 2 - drivers/gpu/drm/i915/intel_engine_cs.c | 17 +++++---- drivers/gpu/drm/i915/intel_engine_types.h | 2 + drivers/gpu/drm/i915/intel_workarounds.c | 43 ++++++++++++++++++++-- 9 files changed, 77 insertions(+), 19 deletions(-) -- 2.20.1

5 years, 4 months

3
11
0 0

Building arm64 EFI stub with -fpie breaks build of 4.9.x (undefined reference to `__efistub__GLOBAL_OFFSET_TABLE_')

by Rolf Eike Beer

I decided to dig out a toy project which uses a DragonBoard 410c. This has been "running" with kernel 4.9, which I would keep this way for unrelated reasons. The vanilla 4.9 kernel wasn't bootable back then, but it was buildable, which was good enough. Upgrading the kernel to 4.9.180 caused the boot to suddenly fail: aarch64-unknown-linux-gnueabi-ld: ./drivers/firmware/efi/libstub/lib.a(arm64- stub.stub.o): in function `handle_kernel_image': /tmp/e2/build/linux-4.9.139/drivers/firmware/efi/libstub/arm64-stub.c:63: undefined reference to `__efistub__GLOBAL_OFFSET_TABLE_' aarch64-unknown-linux-gnueabi-ld: ./drivers/firmware/efi/libstub/lib.a(arm64- stub.stub.o): relocation R_AARCH64_ADR_PREL_PG_HI21 against symbol `__efistub__GLOBAL_OFFSET_TABLE_' which may bind externally can not be used when making a shared object; recompile with -fPIC /tmp/e2/build/linux-4.9.139/drivers/firmware/efi/libstub/arm64-stub.c:63: (.init.text+0xc): dangerous relocation: unsupported relocation /tmp/e2/build/linux-4.9.139/Makefile:1001: recipe for target 'vmlinux' failed -make[1]: *** [vmlinux] Error 1 This is caused by commit 27b5ebf61818749b3568354c64a8ec2d9cd5ecca from linux-4.9.y (which is 91ee5b21ee026c49e4e7483de69b55b8b47042be), reverting this commit fixes the build. This happens with vanilla binutils 2.32 and gcc 8.3.0 as well as 9.1.0. See the attached .config for reference. If you have questions or patches just ping me. Greetings, Eike -- Rolf Eike Beer, emlix GmbH, http://www.emlix.com Fon +49 551 30664-0, Fax +49 551 30664-11 Gothaer Platz 3, 37083 Göttingen, Germany Sitz der Gesellschaft: Göttingen, Amtsgericht Göttingen HR B 3160 Geschäftsführung: Heike Jordan, Dr. Uwe Kracke – Ust-IdNr.: DE 205 198 055 emlix - smart embedded open source

5 years, 4 months

5
20
0 0

missing patch

by Evalds Iodzevics

Hi back in the December of 2016 there was commit "1c52d859cb2d417e7216d3e56bb7fea88444cec9" witch was followed shortly by "c198b121b1a1d7a7171770c634cd49191bac4477" Unfortunately only the first commit was later included in long-term kernel branches such as 4.4 and 4.9 witch left some of microcode functionality broken on 32 bit systems I guess it should be easily fixed by including "c198b121b1a1d7a7171770c634cd49191bac4477" in those branches

5 years, 4 months

3
4
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-stable-mirror July 2019