* [PATCH 5.7 000/121] 5.7.13-rc2 review
@ 2020-08-04 7:33 Greg Kroah-Hartman
2020-08-04 8:16 ` Naresh Kamboju
0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-04 7:33 UTC (permalink / raw)
To: linux-kernel
Cc: Greg Kroah-Hartman, torvalds, akpm, linux, shuah, patches,
ben.hutchings, lkft-triage, stable
This is the start of the stable review cycle for the 5.7.13 release.
There are 121 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, 06 Aug 2020 07:23:45 +0000.
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/v5.x/stable-review/patch-5.7.13-rc2.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.7.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Linux 5.7.13-rc2
Linus Torvalds <torvalds@linux-foundation.org>
random32: move the pseudo-random 32-bit definitions to prandom.h
Thomas Gleixner <tglx@linutronix.de>
x86/i8259: Use printk_deferred() to prevent deadlock
Wanpeng Li <wanpengli@tencent.com>
KVM: SVM: Fix disable pause loop exit/pause filtering capability on SVM
Wanpeng Li <wanpengli@tencent.com>
KVM: LAPIC: Prevent setting the tscdeadline timer if the lapic is hw disabled
Will Deacon <will@kernel.org>
KVM: arm64: Don't inherit exec permission across page-table levels
Atish Patra <atish.patra@wdc.com>
riscv: Parse all memory blocks to remove unusable memory
Xie He <xie.he.0141@gmail.com>
drivers/net/wan: lapb: Corrected the usage of skb_cow
Atish Patra <atish.patra@wdc.com>
RISC-V: Set maximum number of mapped pages correctly
Andrea Righi <andrea.righi@canonical.com>
xen-netfront: fix potential deadlock in xennet_remove()
Navid Emamdoost <navid.emamdoost@gmail.com>
cxgb4: add missing release on skb in uld_send()
Josh Poimboeuf <jpoimboe@redhat.com>
x86/stacktrace: Fix reliable check for empty user task stacks
Josh Poimboeuf <jpoimboe@redhat.com>
x86/unwind/orc: Fix ORC for newly forked tasks
Raviteja Narayanam <raviteja.narayanam@xilinx.com>
i2c: cadence: Clear HOLD bit at correct time in Rx path
Raviteja Narayanam <raviteja.narayanam@xilinx.com>
Revert "i2c: cadence: Fix the hold bit setting"
Paolo Pisati <paolo.pisati@canonical.com>
selftest: txtimestamp: fix net ns entry logic
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
net: ethernet: ravb: exit if re-initialization fails in tx timeout
Liam Beguin <liambeguin@gmail.com>
parisc: add support for cmpxchg on u8 pointers
Vincent Chen <vincent.chen@sifive.com>
riscv: kasan: use local_tlb_flush_all() to avoid uninitialized __sbi_rfence
Ming Lei <ming.lei@redhat.com>
scsi: core: Run queue in case of I/O resource contention failure
Navid Emamdoost <navid.emamdoost@gmail.com>
nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frame
Oded Gabbay <oded.gabbay@gmail.com>
habanalabs: prevent possible out-of-bounds array access
Daniele Albano <d.albano@gmail.com>
io_uring: always allow drain/link/hardlink/async sqe flags
Paolo Pisati <paolo.pisati@canonical.com>
selftests: net: ip_defrag: modprobe missing nf_defrag_ipv6 support
Laurence Oberman <loberman@redhat.com>
qed: Disable "MFW indication via attention" SPAM every 5 minutes
Paolo Pisati <paolo.pisati@canonical.com>
selftests: fib_nexthop_multiprefix: fix cleanup() netns deletion
Geert Uytterhoeven <geert@linux-m68k.org>
usb: hso: Fix debug compile warning on sparc32
Jiri Slaby <jslaby@suse.cz>
iwlwifi: fix crash in iwl_dbg_tlv_alloc_trigger
Lorenzo Bianconi <lorenzo@kernel.org>
mt76: mt7615: fix lmac queue debugsfs entry
Taehee Yoo <ap420073@gmail.com>
vxlan: fix memleak of fdb
Wei Li <liwei391@huawei.com>
perf tools: Fix record failure when mixed with ARM SPE event
Xin Xiong <xiongx18@fudan.edu.cn>
net/mlx5e: fix bpf_prog reference count leaks in mlx5e_alloc_rq
Jianbo Liu <jianbol@mellanox.com>
net/mlx5e: E-Switch, Add misc bit when misc fields changed for mirroring
Wang Hai <wanghai38@huawei.com>
net: gemini: Fix missing clk_disable_unprepare() in error path of gemini_ethernet_port_probe()
Shannon Nelson <snelson@pensando.io>
ionic: unlock queue mutex in error path
Landen Chao <landen.chao@mediatek.com>
net: ethernet: mtk_eth_soc: fix MTU warnings
Lu Wei <luwei32@huawei.com>
net: nixge: fix potential memory leak in nixge_probe()
Hangbin Liu <liuhangbin@gmail.com>
selftests/bpf: fix netdevsim trap_flow_action_cookie read
Alain Michaud <alainm@chromium.org>
Bluetooth: fix kernel oops in store_pending_adv_report
Robin Murphy <robin.murphy@arm.com>
arm64: csum: Fix handling of bad packets
Sami Tolvanen <samitolvanen@google.com>
arm64/alternatives: move length validation inside the subsection
Leon Romanovsky <leon@kernel.org>
RDMA/core: Free DIM memory in error unwind
Leon Romanovsky <leon@kernel.org>
RDMA/core: Stop DIM before destroying CQ
Remi Pommarel <repk@triplefau.lt>
mac80211: mesh: Free pending skb when destroying a mpath
Remi Pommarel <repk@triplefau.lt>
mac80211: mesh: Free ie data when leaving mesh
Sabrina Dubroca <sd@queasysnail.net>
espintcp: handle short messages instead of breaking the encap socket
Andrii Nakryiko <andriin@fb.com>
bpf: Fix map leak in HASH_OF_MAPS map
Thomas Falcon <tlfalcon@linux.ibm.com>
ibmvnic: Fix IRQ mapping disposal in error path
Amit Cohen <amitc@mellanox.com>
selftests: ethtool: Fix test when only two speeds are supported
Ido Schimmel <idosch@mellanox.com>
mlxsw: spectrum_router: Fix use-after-free in router init / de-init
Ido Schimmel <idosch@mellanox.com>
mlxsw: core: Free EMAD transactions using kfree_rcu()
Ido Schimmel <idosch@mellanox.com>
mlxsw: core: Increase scope of RCU read-side critical section
Christoph Hellwig <hch@lst.de>
nvme: add a Identify Namespace Identification Descriptor list quirk
Guillaume Nault <gnault@redhat.com>
bareudp: forbid mixing IP and MPLS in multiproto mode
Subbaraya Sundeep <sbhatta@marvell.com>
octeontx2-pf: Unregister netdev at driver remove
Subbaraya Sundeep <sbhatta@marvell.com>
octeontx2-pf: cancel reset_task work
Subbaraya Sundeep <sbhatta@marvell.com>
octeontx2-pf: Fix reset_task bugs
Jakub Kicinski <kuba@kernel.org>
mlx4: disable device on shutdown
Herbert Xu <herbert@gondor.apana.org.au>
rhashtable: Fix unprotected RCU dereference in __rht_ptr
Johan Hovold <johan@kernel.org>
net: lan78xx: fix transfer-buffer memory leak
Johan Hovold <johan@kernel.org>
net: lan78xx: add missing endpoint sanity check
Alaa Hleihel <alaa@mellanox.com>
net/mlx5e: Fix kernel crash when setting vf VLANID on a VF dev
Ron Diskin <rondi@mellanox.com>
net/mlx5e: Modify uplink state on interface up/down
Eran Ben Elisha <eranbe@mellanox.com>
net/mlx5: Query PPS pin operational status before registering it
Eran Ben Elisha <eranbe@mellanox.com>
net/mlx5: Verify Hardware supports requested ptp function on a given pin
Eran Ben Elisha <eranbe@mellanox.com>
net/mlx5: Fix a bug of using ptp channel index as pin index
Aya Levin <ayal@mellanox.com>
net/mlx5e: Fix error path of device attach
Parav Pandit <parav@mellanox.com>
net/mlx5: E-switch, Destroy TSAR after reload interface
Parav Pandit <parav@mellanox.com>
net/mlx5: E-switch, Destroy TSAR when fail to enable the mode
Guojia Liao <liaoguojia@huawei.com>
net: hns3: fix for VLAN config when reset failed
Guojia Liao <liaoguojia@huawei.com>
net: hns3: fix aRFS FD rules leftover after add a user FD rule
Jian Shen <shenjian15@huawei.com>
net: hns3: add reset check for VF updating port based VLAN
Yonglong Liu <liuyonglong@huawei.com>
net: hns3: fix a TX timeout issue
Yunsheng Lin <linyunsheng@huawei.com>
net: hns3: fix desc filling bug when skb is expanded or lineared
Michael Karcher <kernel@mkarcher.dialup.fu-berlin.de>
sh: Fix validation of system call number
Peter Zijlstra <peterz@infradead.org>
sh/tlb: Fix PGTABLE_LEVELS > 2
Tanner Love <tannerlove@google.com>
selftests/net: tcp_mmap: fix clang warning for target arch PowerPC
Tanner Love <tannerlove@google.com>
selftests/net: so_txtime: fix clang issues for target arch PowerPC
Tanner Love <tannerlove@google.com>
selftests/net: psock_fanout: fix clang issues for target arch PowerPC
Tanner Love <tannerlove@google.com>
selftests/net: rxtimestamp: fix clang issues for target arch PowerPC
Sagi Grimberg <sagi@grimberg.me>
nvme-tcp: fix possible hang waiting for icresp response
Russell King <rmk+kernel@armlinux.org.uk>
ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
Steffen Klassert <steffen.klassert@secunet.com>
xfrm: Fix crash when the hold queue is used.
Sabrina Dubroca <sd@queasysnail.net>
espintcp: recv() should return 0 when the peer socket is closed
Douglas Anderson <dianders@chromium.org>
pinctrl: qcom: Handle broken/missing PDC dual edge IRQs on sc7180
Maxime Ripard <maxime@cerno.tech>
ARM: dts sunxi: Relax a bit the CMA pool allocation range
Xin Long <lucien.xin@gmail.com>
xfrm: policy: match with both mark and mask on user interfaces
YueHaibing <yuehaibing@huawei.com>
net/x25: Fix null-ptr-deref in x25_disconnect
Xiyu Yang <xiyuyang19@fudan.edu.cn>
net/x25: Fix x25_neigh refcnt leak when x25 disconnect
Ben Hutchings <ben@decadent.org.uk>
libtraceevent: Fix build with binutils 2.35
Peilin Ye <yepeilin.cs@gmail.com>
rds: Prevent kernel-infoleak in rds_notify_queue_get()
Linus Torvalds <torvalds@linux-foundation.org>
random32: remove net_rand_state from the latent entropy gcc plugin
Willy Tarreau <w@1wt.eu>
random: fix circular include dependency on arm64 after addition of percpu.h
Biju Das <biju.das.jz@bp.renesas.com>
drm: of: Fix double-free bug
Steve Cohen <cohens@codeaurora.org>
drm: hold gem reference until object is no longer accessed
Linus Walleij <linus.walleij@linaro.org>
drm/mcde: Fix stability issue
Paul Cercueil <paul@crapouillou.net>
drm/dbi: Fix SPI Type 1 (9-bit) transfer
Peilin Ye <yepeilin.cs@gmail.com>
drm/amdgpu: Prevent kernel-infoleak in amdgpu_info_ioctl()
Mazin Rezk <mnrzk@protonmail.com>
drm/amd/display: Clear dm_state for fast updates
Alex Deucher <alexander.deucher@amd.com>
Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"
Grygorii Strashko <grygorii.strashko@ti.com>
ARM: percpu.h: fix build error
Willy Tarreau <w@1wt.eu>
random32: update the net random state on interrupt and activity
Michael S. Tsirkin <mst@redhat.com>
virtio_balloon: fix up endian-ness for free cmd id
Michael Trimarchi <michael@amarulasolutions.com>
ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect
Fabio Estevam <festevam@gmail.com>
ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2
Fabio Estevam <festevam@gmail.com>
ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2
Jaedon Shin <jaedon.shin@gmail.com>
ARM: 8987/1: VDSO: Fix incorrect clock_gettime64
Will Deacon <will@kernel.org>
ARM: 8986/1: hw_breakpoint: Don't invoke overflow handler on uaccess watchpoints
Paul Moore <paul@paul-moore.com>
revert: 1320a4052ea1 ("audit: trigger accompanying records when no rules present")
Wang Hai <wanghai38@huawei.com>
9p/trans_fd: Fix concurrency del of req_list in p9_fd_cancelled/p9_read_work
Michael S. Tsirkin <mst@redhat.com>
vhost/scsi: fix up req type endian-ness
Mike Marciniszyn <mike.marciniszyn@intel.com>
IB/rdmavt: Fix RQ counting issues causing use of an invalid RWQE
Jason Gunthorpe <jgg@nvidia.com>
RDMA/mlx5: Fix prefetch memory leak if get_prefetchable_mr fails
Takashi Iwai <tiwai@suse.de>
ALSA: hda/hdmi: Fix keep_power assignment for non-component devices
Takashi Iwai <tiwai@suse.de>
ALSA: hda: Workaround for spurious wakeups on some Intel platforms
Kailang Yang <kailang@realtek.com>
ALSA: hda/realtek - Fixed HP right speaker no sound
PeiSen Hou <pshou@realtek.com>
ALSA: hda/realtek: Fix add a "ultra_low_power" function for intel reference board (alc256)
Armas Spann <zappel@retarded.farm>
ALSA: hda/realtek: typo_fix: enable headset mic of ASUS ROG Zephyrus G14(GA401) series with ALC289
Armas Spann <zappel@retarded.farm>
ALSA: hda/realtek: enable headset mic of ASUS ROG Zephyrus G15(GA502) series with ALC289
Laurence Tratt <laurie@tratt.net>
ALSA: usb-audio: Add implicit feedback quirk for SSL2
Robert Hancock <hancockrwd@gmail.com>
PCI/ASPM: Disable ASPM on ASMedia ASM1083/1085 PCIe-to-PCI bridge
NeilBrown <neilb@suse.de>
sunrpc: check that domain table is empty at module unload.
-------------
Diffstat:
Makefile | 4 +-
arch/arm/boot/dts/armada-38x.dtsi | 3 +-
arch/arm/boot/dts/imx6qdl-icore.dtsi | 3 +-
arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +-
arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +-
arch/arm/boot/dts/sun4i-a10.dtsi | 2 +-
arch/arm/boot/dts/sun5i.dtsi | 2 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 2 +-
arch/arm/include/asm/percpu.h | 2 +
arch/arm/kernel/hw_breakpoint.c | 27 ++++++--
arch/arm/kernel/vdso.c | 1 +
arch/arm64/include/asm/alternative.h | 4 +-
arch/arm64/include/asm/checksum.h | 5 +-
arch/parisc/include/asm/cmpxchg.h | 2 +
arch/parisc/lib/bitops.c | 12 ++++
arch/riscv/mm/init.c | 33 ++++-----
arch/riscv/mm/kasan_init.c | 4 +-
arch/sh/include/asm/pgalloc.h | 10 +--
arch/sh/kernel/entry-common.S | 6 +-
arch/x86/kernel/i8259.c | 2 +-
arch/x86/kernel/stacktrace.c | 5 --
arch/x86/kernel/unwind_orc.c | 8 ++-
arch/x86/kvm/lapic.c | 2 +-
arch/x86/kvm/svm/svm.c | 9 ++-
drivers/char/random.c | 1 +
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +-
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 ++-
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 36 +++++++---
drivers/gpu/drm/drm_gem.c | 10 ++-
drivers/gpu/drm/drm_mipi_dbi.c | 2 +-
drivers/gpu/drm/drm_of.c | 4 +-
drivers/gpu/drm/mcde/mcde_display.c | 11 ++-
drivers/i2c/busses/i2c-cadence.c | 28 ++++----
drivers/infiniband/core/cq.c | 14 +++-
drivers/infiniband/hw/mlx5/odp.c | 5 +-
drivers/infiniband/sw/rdmavt/qp.c | 33 ++-------
drivers/infiniband/sw/rdmavt/rc.c | 4 +-
drivers/misc/habanalabs/command_submission.c | 14 +++-
drivers/net/bareudp.c | 29 ++++++--
drivers/net/ethernet/chelsio/cxgb4/sge.c | 1 +
drivers/net/ethernet/cortina/gemini.c | 5 +-
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 18 ++---
.../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 35 +++++-----
.../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 38 +++++++----
drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
.../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 3 +
.../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +
drivers/net/ethernet/mellanox/mlx4/main.c | 2 +
.../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 2 +
.../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 2 +
.../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 +
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 31 +++++++--
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 1 +
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 27 +++++---
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +-
.../net/ethernet/mellanox/mlx5/core/lib/clock.c | 78 ++++++++++++++++++----
drivers/net/ethernet/mellanox/mlxsw/core.c | 8 ++-
.../net/ethernet/mellanox/mlxsw/spectrum_router.c | 50 +++++++-------
drivers/net/ethernet/ni/nixge.c | 8 ++-
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +-
drivers/net/ethernet/qlogic/qed/qed_int.c | 3 +-
drivers/net/ethernet/renesas/ravb_main.c | 26 +++++++-
drivers/net/usb/hso.c | 5 +-
drivers/net/usb/lan78xx.c | 6 ++
drivers/net/vxlan.c | 6 +-
drivers/net/wan/hdlc_x25.c | 4 +-
drivers/net/wan/lapbether.c | 8 ++-
drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 16 ++++-
.../net/wireless/mediatek/mt76/mt7615/debugfs.c | 9 +--
drivers/net/xen-netfront.c | 64 ++++++++++++------
drivers/nfc/s3fwrn5/core.c | 1 +
drivers/nvme/host/core.c | 15 +----
drivers/nvme/host/nvme.h | 7 ++
drivers/nvme/host/pci.c | 2 +
drivers/nvme/host/tcp.c | 3 +
drivers/pci/quirks.c | 13 ++++
drivers/pinctrl/qcom/Kconfig | 2 +
drivers/pinctrl/qcom/pinctrl-msm.c | 74 +++++++++++++++++++-
drivers/pinctrl/qcom/pinctrl-msm.h | 4 ++
drivers/pinctrl/qcom/pinctrl-sc7180.c | 1 +
drivers/scsi/scsi_lib.c | 16 +++--
drivers/vhost/scsi.c | 2 +-
drivers/virtio/virtio_balloon.c | 6 +-
fs/io_uring.c | 13 ++--
include/linux/mlx5/mlx5_ifc.h | 1 +
include/linux/prandom.h | 78 ++++++++++++++++++++++
include/linux/random.h | 63 ++---------------
include/linux/rhashtable.h | 25 +++----
include/net/xfrm.h | 15 +++--
include/rdma/rdmavt_qp.h | 19 ++++++
kernel/audit.c | 1 -
kernel/audit.h | 8 ---
kernel/auditsc.c | 3 +
kernel/bpf/hashtab.c | 12 +++-
kernel/time/timer.c | 8 +++
lib/random32.c | 2 +-
net/9p/trans_fd.c | 15 ++++-
net/bluetooth/hci_event.c | 26 ++++++--
net/key/af_key.c | 4 +-
net/mac80211/cfg.c | 1 +
net/mac80211/mesh_pathtbl.c | 1 +
net/rds/recv.c | 3 +-
net/sunrpc/sunrpc.h | 1 +
net/sunrpc/sunrpc_syms.c | 2 +
net/sunrpc/svcauth.c | 25 +++++++
net/x25/x25_subr.c | 6 ++
net/xfrm/espintcp.c | 30 ++++++++-
net/xfrm/xfrm_policy.c | 39 +++++------
net/xfrm/xfrm_user.c | 18 +++--
sound/pci/hda/hda_controller.h | 2 +-
sound/pci/hda/hda_intel.c | 17 ++++-
sound/pci/hda/patch_hdmi.c | 2 +-
sound/pci/hda/patch_realtek.c | 36 ++++++++--
sound/usb/pcm.c | 1 +
tools/lib/traceevent/plugins/Makefile | 2 +-
tools/perf/arch/arm/util/auxtrace.c | 8 +--
tools/testing/selftests/bpf/test_offload.py | 3 +
.../selftests/net/fib_nexthop_multiprefix.sh | 2 +-
tools/testing/selftests/net/forwarding/ethtool.sh | 2 -
tools/testing/selftests/net/ip_defrag.sh | 2 +
tools/testing/selftests/net/psock_fanout.c | 3 +-
tools/testing/selftests/net/rxtimestamp.c | 3 +-
tools/testing/selftests/net/so_txtime.c | 2 +-
tools/testing/selftests/net/tcp_mmap.c | 6 +-
tools/testing/selftests/net/txtimestamp.sh | 2 +-
virt/kvm/arm/mmu.c | 11 +--
129 files changed, 1021 insertions(+), 481 deletions(-)
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 7:33 [PATCH 5.7 000/121] 5.7.13-rc2 review Greg Kroah-Hartman
@ 2020-08-04 8:16 ` Naresh Kamboju
2020-08-04 8:21 ` Greg Kroah-Hartman
2020-08-04 16:49 ` Guenter Roeck
0 siblings, 2 replies; 11+ messages in thread
From: Naresh Kamboju @ 2020-08-04 8:16 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: open list, Linus Torvalds, Andrew Morton, Guenter Roeck,
Shuah Khan, patches, Ben Hutchings, lkft-triage, linux- stable,
Arnd Bergmann, Will Deacon, Marc Zyngier, Catalin Marinas
On Tue, 4 Aug 2020 at 13:03, Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> This is the start of the stable review cycle for the 5.7.13 release.
> There are 121 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, 06 Aug 2020 07:23:45 +0000.
> 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/v5.x/stable-review/patch-5.7.13-rc2.gz
> or in the git tree and branch at:
> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.7.y
> and the diffstat can be found below.
>
> thanks,
>
> greg k-h
arm64 build broken.
make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
aarch64-linux-gnu-gcc" O=build Image
#
In file included from ../include/linux/smp.h:67,
from ../include/linux/percpu.h:7,
from ../include/linux/prandom.h:12,
from ../include/linux/random.h:118,
from ../arch/arm64/include/asm/pointer_auth.h:6,
from ../arch/arm64/include/asm/processor.h:39,
from ../include/linux/mutex.h:19,
from ../include/linux/kernfs.h:12,
from ../include/linux/sysfs.h:16,
from ../include/linux/kobject.h:20,
from ../include/linux/of.h:17,
from ../include/linux/irqdomain.h:35,
from ../include/linux/acpi.h:13,
from ../include/acpi/apei.h:9,
from ../include/acpi/ghes.h:5,
from ../include/linux/arm_sdei.h:8,
from ../arch/arm64/kernel/asm-offsets.c:10:
../arch/arm64/include/asm/smp.h:100:29: error: field ‘ptrauth_key’ has
incomplete type
100 | struct ptrauth_keys_kernel ptrauth_key;
| ^~~~~~~~~~~
make[2]: *** [../scripts/Makefile.build:100:
arch/arm64/kernel/asm-offsets.s] Error 1
--
Linaro LKFT
https://lkft.linaro.org
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 8:16 ` Naresh Kamboju
@ 2020-08-04 8:21 ` Greg Kroah-Hartman
2020-08-04 9:00 ` Greg Kroah-Hartman
2020-08-04 18:33 ` Linus Torvalds
2020-08-04 16:49 ` Guenter Roeck
1 sibling, 2 replies; 11+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-04 8:21 UTC (permalink / raw)
To: Naresh Kamboju
Cc: open list, Linus Torvalds, Andrew Morton, Guenter Roeck,
Shuah Khan, patches, Ben Hutchings, lkft-triage, linux- stable,
Arnd Bergmann, Will Deacon, Marc Zyngier, Catalin Marinas
On Tue, Aug 04, 2020 at 01:46:31PM +0530, Naresh Kamboju wrote:
> On Tue, 4 Aug 2020 at 13:03, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
> >
> > This is the start of the stable review cycle for the 5.7.13 release.
> > There are 121 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, 06 Aug 2020 07:23:45 +0000.
> > 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/v5.x/stable-review/patch-5.7.13-rc2.gz
> > or in the git tree and branch at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.7.y
> > and the diffstat can be found below.
> >
> > thanks,
> >
> > greg k-h
>
> arm64 build broken.
>
> make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
> CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
> aarch64-linux-gnu-gcc" O=build Image
> #
> In file included from ../include/linux/smp.h:67,
> from ../include/linux/percpu.h:7,
> from ../include/linux/prandom.h:12,
> from ../include/linux/random.h:118,
> from ../arch/arm64/include/asm/pointer_auth.h:6,
> from ../arch/arm64/include/asm/processor.h:39,
> from ../include/linux/mutex.h:19,
> from ../include/linux/kernfs.h:12,
> from ../include/linux/sysfs.h:16,
> from ../include/linux/kobject.h:20,
> from ../include/linux/of.h:17,
> from ../include/linux/irqdomain.h:35,
> from ../include/linux/acpi.h:13,
> from ../include/acpi/apei.h:9,
> from ../include/acpi/ghes.h:5,
> from ../include/linux/arm_sdei.h:8,
> from ../arch/arm64/kernel/asm-offsets.c:10:
> ../arch/arm64/include/asm/smp.h:100:29: error: field ‘ptrauth_key’ has
> incomplete type
> 100 | struct ptrauth_keys_kernel ptrauth_key;
> | ^~~~~~~~~~~
> make[2]: *** [../scripts/Makefile.build:100:
> arch/arm64/kernel/asm-offsets.s] Error 1
Wow that was fast :(
So Linus's tree is also broken here. I think it's time I just removed
all of these patches from now until we get this all fixed up properly...
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 8:21 ` Greg Kroah-Hartman
@ 2020-08-04 9:00 ` Greg Kroah-Hartman
2020-08-04 18:33 ` Linus Torvalds
1 sibling, 0 replies; 11+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-04 9:00 UTC (permalink / raw)
To: Naresh Kamboju
Cc: open list, Linus Torvalds, Andrew Morton, Guenter Roeck,
Shuah Khan, patches, Ben Hutchings, lkft-triage, linux- stable,
Arnd Bergmann, Will Deacon, Marc Zyngier, Catalin Marinas
On Tue, Aug 04, 2020 at 10:21:30AM +0200, Greg Kroah-Hartman wrote:
> On Tue, Aug 04, 2020 at 01:46:31PM +0530, Naresh Kamboju wrote:
> > On Tue, 4 Aug 2020 at 13:03, Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > This is the start of the stable review cycle for the 5.7.13 release.
> > > There are 121 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, 06 Aug 2020 07:23:45 +0000.
> > > 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/v5.x/stable-review/patch-5.7.13-rc2.gz
> > > or in the git tree and branch at:
> > > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.7.y
> > > and the diffstat can be found below.
> > >
> > > thanks,
> > >
> > > greg k-h
> >
> > arm64 build broken.
> >
> > make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
> > CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
> > aarch64-linux-gnu-gcc" O=build Image
> > #
> > In file included from ../include/linux/smp.h:67,
> > from ../include/linux/percpu.h:7,
> > from ../include/linux/prandom.h:12,
> > from ../include/linux/random.h:118,
> > from ../arch/arm64/include/asm/pointer_auth.h:6,
> > from ../arch/arm64/include/asm/processor.h:39,
> > from ../include/linux/mutex.h:19,
> > from ../include/linux/kernfs.h:12,
> > from ../include/linux/sysfs.h:16,
> > from ../include/linux/kobject.h:20,
> > from ../include/linux/of.h:17,
> > from ../include/linux/irqdomain.h:35,
> > from ../include/linux/acpi.h:13,
> > from ../include/acpi/apei.h:9,
> > from ../include/acpi/ghes.h:5,
> > from ../include/linux/arm_sdei.h:8,
> > from ../arch/arm64/kernel/asm-offsets.c:10:
> > ../arch/arm64/include/asm/smp.h:100:29: error: field ‘ptrauth_key’ has
> > incomplete type
> > 100 | struct ptrauth_keys_kernel ptrauth_key;
> > | ^~~~~~~~~~~
> > make[2]: *** [../scripts/Makefile.build:100:
> > arch/arm64/kernel/asm-offsets.s] Error 1
>
> Wow that was fast :(
>
> So Linus's tree is also broken here. I think it's time I just removed
> all of these patches from now until we get this all fixed up properly...
Ok, -rc3s are now out, with all of the random patches removed, and
hopefully everything builds properly.
Ah, the joys of messing with .h files after -rc7 :)
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 8:16 ` Naresh Kamboju
2020-08-04 8:21 ` Greg Kroah-Hartman
@ 2020-08-04 16:49 ` Guenter Roeck
1 sibling, 0 replies; 11+ messages in thread
From: Guenter Roeck @ 2020-08-04 16:49 UTC (permalink / raw)
To: Naresh Kamboju, Greg Kroah-Hartman
Cc: open list, Linus Torvalds, Andrew Morton, Shuah Khan, patches,
Ben Hutchings, lkft-triage, linux- stable, Arnd Bergmann,
Will Deacon, Marc Zyngier, Catalin Marinas
On 8/4/20 1:16 AM, Naresh Kamboju wrote:
> On Tue, 4 Aug 2020 at 13:03, Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>>
>> This is the start of the stable review cycle for the 5.7.13 release.
>> There are 121 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, 06 Aug 2020 07:23:45 +0000.
>> 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/v5.x/stable-review/patch-5.7.13-rc2.gz
>> or in the git tree and branch at:
>> git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.7.y
>> and the diffstat can be found below.
>>
>> thanks,
>>
>> greg k-h
>
> arm64 build broken.
>
> make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
> CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
> aarch64-linux-gnu-gcc" O=build Image
> #
> In file included from ../include/linux/smp.h:67,
> from ../include/linux/percpu.h:7,
> from ../include/linux/prandom.h:12,
> from ../include/linux/random.h:118,
> from ../arch/arm64/include/asm/pointer_auth.h:6,
> from ../arch/arm64/include/asm/processor.h:39,
> from ../include/linux/mutex.h:19,
> from ../include/linux/kernfs.h:12,
> from ../include/linux/sysfs.h:16,
> from ../include/linux/kobject.h:20,
> from ../include/linux/of.h:17,
> from ../include/linux/irqdomain.h:35,
> from ../include/linux/acpi.h:13,
> from ../include/acpi/apei.h:9,
> from ../include/acpi/ghes.h:5,
> from ../include/linux/arm_sdei.h:8,
> from ../arch/arm64/kernel/asm-offsets.c:10:
> ../arch/arm64/include/asm/smp.h:100:29: error: field ‘ptrauth_key’ has
> incomplete type
> 100 | struct ptrauth_keys_kernel ptrauth_key;
> | ^~~~~~~~~~~
> make[2]: *** [../scripts/Makefile.build:100:
> arch/arm64/kernel/asm-offsets.s] Error 1
>
I didn't see that error after I applied Linus' patch on top of v5.8.
On current mainline, I get the following error when trying to build
sparc64:allmodconfig:
include/linux/seqlock.h: In function 'write_seqcount_begin_nested':
arch/sparc/include/asm/percpu_64.h:19:25: error: '__local_per_cpu_offset' undeclared
This is caused by by commit 859247d39fb00 ("seqlock: lockdep assert non-preemptibility
on seqcount_t write").
When trying to build arm64:defconfig, I get this error:
Building arm64:defconfig ... failed
--------------
Error log:
Error: arch/arm64/boot/dts/intel/socfpga_agilex.dtsi:313.15-16 syntax error
This is caused by commit d4ae4dd346cd493 ("arm64: dts: agilex: add nand clocks").
Sigh. Anyway, after reverting those two commits on mainline (v5.8-2483-gc0842fbc1b18),
both arm64:defconfig and arm64:allmodconfig build for me (with gcc-9.3.0). Given that,
I don't think this compile problem is seen in the upstream kernel.
Guenter
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 8:21 ` Greg Kroah-Hartman
2020-08-04 9:00 ` Greg Kroah-Hartman
@ 2020-08-04 18:33 ` Linus Torvalds
2020-08-04 21:23 ` Marc Zyngier
1 sibling, 1 reply; 11+ messages in thread
From: Linus Torvalds @ 2020-08-04 18:33 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Naresh Kamboju, open list, Andrew Morton, Guenter Roeck,
Shuah Khan, patches, Ben Hutchings, lkft-triage, linux- stable,
Arnd Bergmann, Will Deacon, Marc Zyngier, Catalin Marinas
On Tue, Aug 4, 2020 at 1:21 AM Greg Kroah-Hartman
<gregkh@linuxfoundation.org> wrote:
>
> So Linus's tree is also broken here.
No, there's 835d1c3a9879 ("arm64: Drop unnecessary include from
asm/smp.h") upstream.
But as Guenther points out, I have a few other build errors, but they
are (finally!) entirely unrelated.
Linus
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 18:33 ` Linus Torvalds
@ 2020-08-04 21:23 ` Marc Zyngier
2020-08-05 9:54 ` Greg Kroah-Hartman
0 siblings, 1 reply; 11+ messages in thread
From: Marc Zyngier @ 2020-08-04 21:23 UTC (permalink / raw)
To: Linus Torvalds
Cc: Greg Kroah-Hartman, Naresh Kamboju, open list, Andrew Morton,
Guenter Roeck, Shuah Khan, patches, Ben Hutchings, lkft-triage,
linux- stable, Arnd Bergmann, Will Deacon, Catalin Marinas
On 2020-08-04 19:33, Linus Torvalds wrote:
> On Tue, Aug 4, 2020 at 1:21 AM Greg Kroah-Hartman
> <gregkh@linuxfoundation.org> wrote:
>>
>> So Linus's tree is also broken here.
>
> No, there's 835d1c3a9879 ("arm64: Drop unnecessary include from
> asm/smp.h") upstream.
My bet is that Greg ended up with this patch backported to
5.7, but doesn't have 62a679cb2825 ("arm64: simplify ptrauth
initialization") as the latter isn't a fix.
I don't think any of these two patches are worth backporting,
to be honest.
M.
--
Jazz is not dead. It just smells funny...
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-04 21:23 ` Marc Zyngier
@ 2020-08-05 9:54 ` Greg Kroah-Hartman
2020-08-05 11:19 ` Marc Zyngier
0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-05 9:54 UTC (permalink / raw)
To: Marc Zyngier
Cc: Linus Torvalds, Naresh Kamboju, open list, Andrew Morton,
Guenter Roeck, Shuah Khan, patches, Ben Hutchings, lkft-triage,
linux- stable, Arnd Bergmann, Will Deacon, Catalin Marinas
On Tue, Aug 04, 2020 at 10:23:06PM +0100, Marc Zyngier wrote:
> On 2020-08-04 19:33, Linus Torvalds wrote:
> > On Tue, Aug 4, 2020 at 1:21 AM Greg Kroah-Hartman
> > <gregkh@linuxfoundation.org> wrote:
> > >
> > > So Linus's tree is also broken here.
> >
> > No, there's 835d1c3a9879 ("arm64: Drop unnecessary include from
> > asm/smp.h") upstream.
>
> My bet is that Greg ended up with this patch backported to
> 5.7, but doesn't have 62a679cb2825 ("arm64: simplify ptrauth
> initialization") as the latter isn't a fix.
>
> I don't think any of these two patches are worth backporting,
> to be honest.
I didn't have either of those patches, so I can try applying them to see
if the build errors go away. But if you don't think they should be
applied, what should I do?
Here's what I did have queued up:
f227e3ec3b5c ("random32: update the net random state on interrupt and activity")
aa54ea903abb ("ARM: percpu.h: fix build error")
1c9df907da83 ("random: fix circular include dependency on arm64 after addition of percpu.h")
83bdc7275e62 ("random32: remove net_rand_state from the latent entropy gcc plugin")
c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to prandom.h")
And that caused the builds to blow up.
So, what should I do here?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-05 9:54 ` Greg Kroah-Hartman
@ 2020-08-05 11:19 ` Marc Zyngier
2020-08-05 13:20 ` Greg Kroah-Hartman
2020-08-05 16:51 ` Linus Torvalds
0 siblings, 2 replies; 11+ messages in thread
From: Marc Zyngier @ 2020-08-05 11:19 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Linus Torvalds, Naresh Kamboju, open list, Andrew Morton,
Guenter Roeck, Shuah Khan, patches, Ben Hutchings, lkft-triage,
linux- stable, Arnd Bergmann, Will Deacon, Catalin Marinas
On 2020-08-05 10:54, Greg Kroah-Hartman wrote:
> On Tue, Aug 04, 2020 at 10:23:06PM +0100, Marc Zyngier wrote:
>> On 2020-08-04 19:33, Linus Torvalds wrote:
>> > On Tue, Aug 4, 2020 at 1:21 AM Greg Kroah-Hartman
>> > <gregkh@linuxfoundation.org> wrote:
>> > >
>> > > So Linus's tree is also broken here.
>> >
>> > No, there's 835d1c3a9879 ("arm64: Drop unnecessary include from
>> > asm/smp.h") upstream.
>>
>> My bet is that Greg ended up with this patch backported to
>> 5.7, but doesn't have 62a679cb2825 ("arm64: simplify ptrauth
>> initialization") as the latter isn't a fix.
>>
>> I don't think any of these two patches are worth backporting,
>> to be honest.
>
> I didn't have either of those patches, so I can try applying them to
> see
> if the build errors go away. But if you don't think they should be
> applied, what should I do?
>
> Here's what I did have queued up:
>
> f227e3ec3b5c ("random32: update the net random state on interrupt and
> activity")
> aa54ea903abb ("ARM: percpu.h: fix build error")
> 1c9df907da83 ("random: fix circular include dependency on arm64 after
> addition of percpu.h")
> 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy
> gcc plugin")
> c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to
> prandom.h")
Not what I expected, then. I stand corrected.
> And that caused the builds to blow up.
>
> So, what should I do here?
OK, this is getting hairy. I solved it by grabbing:
d0055da5266a ("arm64: remove ptrauth_keys_install_kernel sync arg")
62a679cb2825 ("arm64: simplify ptrauth initialization")
and at which point you might as well take 835d1c3a9879 despite
everything I said earlier. And backporting that further down the
line is fraught with danger.
I came up with yet another "quality" hack, which gets the job done,
see below. It is obviously much simpler, but also terribly ugly.
M.
From 34ee193a4a84718689cffd13f976b7f31e4c5ad4 Mon Sep 17 00:00:00 2001
From: Marc Zyngier <maz@kernel.org>
Date: Wed, 5 Aug 2020 12:10:44 +0100
Subject: [PATCH] arm64: Workaround circular dependency in pointer_auth.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
With the backport of f227e3ec3b5c ("random32: update the net random
state on interrupt and activity") and its associated fixes, the
arm64 build explodes early:
In file included from ../include/linux/smp.h:67,
from ../include/linux/percpu.h:7,
from ../include/linux/prandom.h:12,
from ../include/linux/random.h:118,
from ../arch/arm64/include/asm/pointer_auth.h:6,
from ../arch/arm64/include/asm/processor.h:39,
from ../include/linux/mutex.h:19,
from ../include/linux/kernfs.h:12,
from ../include/linux/sysfs.h:16,
from ../include/linux/kobject.h:20,
from ../include/linux/of.h:17,
from ../include/linux/irqdomain.h:35,
from ../include/linux/acpi.h:13,
from ../include/acpi/apei.h:9,
from ../include/acpi/ghes.h:5,
from ../include/linux/arm_sdei.h:8,
from ../arch/arm64/kernel/asm-offsets.c:10:
../arch/arm64/include/asm/smp.h:100:29: error: field ‘ptrauth_key’ has
incomplete type
This is due to struct ptrauth_keys_kernel not being defined before
we transitively include asm/smp.h from linux/random.h.
Paper over it by moving the inclusion of linux/random.h *after* the
type has been defined.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/include/asm/pointer_auth.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/pointer_auth.h
b/arch/arm64/include/asm/pointer_auth.h
index c6b4f0603024..be7f853738e6 100644
--- a/arch/arm64/include/asm/pointer_auth.h
+++ b/arch/arm64/include/asm/pointer_auth.h
@@ -3,7 +3,6 @@
#define __ASM_POINTER_AUTH_H
#include <linux/bitops.h>
-#include <linux/random.h>
#include <asm/cpufeature.h>
#include <asm/memory.h>
@@ -34,6 +33,13 @@ struct ptrauth_keys_kernel {
struct ptrauth_key apia;
};
+/*
+ * Only include random.h once ptrauth_keys_* structures are defined
+ * to avoid yet another circular include hell (random.h * ends up
+ * including asm/smp.h, which requires ptrauth_keys_kernel).
+ */
+#include <linux/random.h>
+
static inline void ptrauth_keys_init_user(struct ptrauth_keys_user
*keys)
{
if (system_supports_address_auth()) {
--
2.27.0
--
Jazz is not dead. It just smells funny...
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-05 11:19 ` Marc Zyngier
@ 2020-08-05 13:20 ` Greg Kroah-Hartman
2020-08-05 16:51 ` Linus Torvalds
1 sibling, 0 replies; 11+ messages in thread
From: Greg Kroah-Hartman @ 2020-08-05 13:20 UTC (permalink / raw)
To: Marc Zyngier
Cc: Linus Torvalds, Naresh Kamboju, open list, Andrew Morton,
Guenter Roeck, Shuah Khan, patches, Ben Hutchings, lkft-triage,
linux- stable, Arnd Bergmann, Will Deacon, Catalin Marinas
On Wed, Aug 05, 2020 at 12:19:58PM +0100, Marc Zyngier wrote:
> On 2020-08-05 10:54, Greg Kroah-Hartman wrote:
> > On Tue, Aug 04, 2020 at 10:23:06PM +0100, Marc Zyngier wrote:
> > > On 2020-08-04 19:33, Linus Torvalds wrote:
> > > > On Tue, Aug 4, 2020 at 1:21 AM Greg Kroah-Hartman
> > > > <gregkh@linuxfoundation.org> wrote:
> > > > >
> > > > > So Linus's tree is also broken here.
> > > >
> > > > No, there's 835d1c3a9879 ("arm64: Drop unnecessary include from
> > > > asm/smp.h") upstream.
> > >
> > > My bet is that Greg ended up with this patch backported to
> > > 5.7, but doesn't have 62a679cb2825 ("arm64: simplify ptrauth
> > > initialization") as the latter isn't a fix.
> > >
> > > I don't think any of these two patches are worth backporting,
> > > to be honest.
> >
> > I didn't have either of those patches, so I can try applying them to see
> > if the build errors go away. But if you don't think they should be
> > applied, what should I do?
> >
> > Here's what I did have queued up:
> >
> > f227e3ec3b5c ("random32: update the net random state on interrupt and
> > activity")
> > aa54ea903abb ("ARM: percpu.h: fix build error")
> > 1c9df907da83 ("random: fix circular include dependency on arm64 after
> > addition of percpu.h")
> > 83bdc7275e62 ("random32: remove net_rand_state from the latent entropy
> > gcc plugin")
> > c0842fbc1b18 ("random32: move the pseudo-random 32-bit definitions to
> > prandom.h")
>
> Not what I expected, then. I stand corrected.
>
> > And that caused the builds to blow up.
> >
> > So, what should I do here?
>
> OK, this is getting hairy. I solved it by grabbing:
>
> d0055da5266a ("arm64: remove ptrauth_keys_install_kernel sync arg")
> 62a679cb2825 ("arm64: simplify ptrauth initialization")
>
> and at which point you might as well take 835d1c3a9879 despite
> everything I said earlier. And backporting that further down the
> line is fraught with danger.
>
> I came up with yet another "quality" hack, which gets the job done,
> see below. It is obviously much simpler, but also terribly ugly.
I like it :)
I've taken it for 5.7.y, and modified it a bit for 5.4.y, and don't
think it's needed on anything older, but let's see what blows up...
thanks!
greg k-h
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 5.7 000/121] 5.7.13-rc2 review
2020-08-05 11:19 ` Marc Zyngier
2020-08-05 13:20 ` Greg Kroah-Hartman
@ 2020-08-05 16:51 ` Linus Torvalds
1 sibling, 0 replies; 11+ messages in thread
From: Linus Torvalds @ 2020-08-05 16:51 UTC (permalink / raw)
To: Marc Zyngier
Cc: Greg Kroah-Hartman, Naresh Kamboju, open list, Andrew Morton,
Guenter Roeck, Shuah Khan, patches, Ben Hutchings, lkft-triage,
linux- stable, Arnd Bergmann, Will Deacon, Catalin Marinas
On Wed, Aug 5, 2020 at 4:20 AM Marc Zyngier <maz@kernel.org> wrote:
>
> I came up with yet another "quality" hack, which gets the job done,
> see below. It is obviously much simpler, but also terribly ugly.
This is effectively what the approach of commit c0842fbc1b18
("random32: move the pseudo-random 32-bit definitions to prandom.h")
was too. It has the prandom include in the middle of random.h - which
makes sense in the context of that patch (because it's where all the
prandom stuff used to live there), but the real secret is that as it
does that, it basically moves the percpu.h include down there too.
This mess has caused me to seriously look at making sparse generate a
"defined here, used here" list, and do a topo-sort on it all, and warn
about unused includes but also about stupidities like this.
But I won't have time to do that until after the merge window, and it
may turn out nastier than expected. But I did add all the include
chaining information to the sparse position logic recently in a fairly
easy to digest form, so my gut feel is that something that doesn't try
to actually optimize or solve the problem - just point out the obvious
errors - might be more reasonably doable than doing something that is
theoretically the RightThing(tm) to do.
IOW, a tool only to help find and figure these things out, rather than
a tool to do all the minimization for you automatically.
We'll see. No promises. And if somebody else beats me to it, I won't complain.
Linus
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-08-05 19:22 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 7:33 [PATCH 5.7 000/121] 5.7.13-rc2 review Greg Kroah-Hartman
2020-08-04 8:16 ` Naresh Kamboju
2020-08-04 8:21 ` Greg Kroah-Hartman
2020-08-04 9:00 ` Greg Kroah-Hartman
2020-08-04 18:33 ` Linus Torvalds
2020-08-04 21:23 ` Marc Zyngier
2020-08-05 9:54 ` Greg Kroah-Hartman
2020-08-05 11:19 ` Marc Zyngier
2020-08-05 13:20 ` Greg Kroah-Hartman
2020-08-05 16:51 ` Linus Torvalds
2020-08-04 16:49 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).