linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] arm64 fixes for -rc4
@ 2020-07-04 13:05 Will Deacon
  2020-07-05 17:35 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2020-07-04 13:05 UTC (permalink / raw)
  To: torvalds; +Cc: linux-arm-kernel, linux-kernel, catalin.marinas, kernel-team

Hi Linus,

Please pull these arm64 fixes for -rc4. Nothing Earth-shattering, really;
some CPU errata workarounds (one day they'll get it right, ha!) and a
fix for a boot failure with very large kernel images where the alternative
patching gets confused when patching relative branches using veneers.

There are some vDSO and ptrace fixes floating about, but they need more
review and testing if I'm going to send them for 5.8.

Thanks,

Will

--->8

The following changes since commit 108447fd0d1a34b0929cd26dc637c917a734ebab:

  arm64: Add KRYO{3,4}XX silver CPU cores to SSB safelist (2020-06-25 20:18:57 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 9b23d95c539ebc5d6d6b5d6f20d2d7922384e76e:

  arm64: Add KRYO4XX silver CPU cores to erratum list 1530923 and 1024718 (2020-07-03 16:39:16 +0100)

----------------------------------------------------------------
arm64 fixes for -rc4

- Fix alternative patching for very large kernel images and modules

- Hook up existing CPU errata workarounds for Qualcomm Kryo CPUs

----------------------------------------------------------------
Ard Biesheuvel (1):
      arm64/alternatives: use subsections for replacement sequences

Sai Prakash Ranjan (3):
      arm64: Add MIDR value for KRYO4XX gold CPU cores
      arm64: Add KRYO4XX gold CPU cores to erratum list 1463225 and 1418040
      arm64: Add KRYO4XX silver CPU cores to erratum list 1530923 and 1024718

 Documentation/arm64/silicon-errata.rst |  8 ++++++++
 arch/arm64/include/asm/alternative.h   | 16 ++++++++--------
 arch/arm64/include/asm/cputype.h       |  2 ++
 arch/arm64/kernel/cpu_errata.c         | 21 +++++++++++++++------
 arch/arm64/kernel/cpufeature.c         |  2 ++
 arch/arm64/kernel/vmlinux.lds.S        |  3 ---
 6 files changed, 35 insertions(+), 17 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2020-07-04 13:05 [GIT PULL] arm64 fixes for -rc4 Will Deacon
@ 2020-07-05 17:35 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2020-07-05 17:35 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, linux-arm-kernel, linux-kernel, catalin.marinas, kernel-team

The pull request you sent on Sat, 4 Jul 2020 14:05:05 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/ec84c3f6ef710661c8d14e3f63e540b795dc0a51

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2023-01-13 10:29 Will Deacon
@ 2023-01-13 13:58 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2023-01-13 13:58 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

The pull request you sent on Fri, 13 Jan 2023 10:29:37 +0000:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/d45b832d6f41b003c1dee953096cfd4c6e5233b0

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64 fixes for -rc4
@ 2023-01-13 10:29 Will Deacon
  2023-01-13 13:58 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2023-01-13 10:29 UTC (permalink / raw)
  To: torvalds; +Cc: catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

Hi Linus,

Here's a sizeable batch of Friday the 13th arm64 fixes for -rc4.
What could possibly go wrong?

The obvious reason we have so much here is because of the holiday season
right after the merge window, but we've also brought back an erratum
workaround that was previously dropped at the last minute and there's an
MTE coredumping fix that strays outside of the arch/arm64 directory.

Anyway, it's all been in -next, the CI robots seem happy enough and
there's the usual summary in the tag.

Please pull.

Cheers,

Will

--->8

The following changes since commit 1b929c02afd37871d5afb9d498426f83432e71c2:

  Linux 6.2-rc1 (2022-12-25 13:41:39 -0800)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 68a63a412d18bd2e2577c8928139f92541afa7a6:

  arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y (2023-01-09 15:59:42 +0000)

----------------------------------------------------------------
arm64 fixes for -rc4

- Fix PAGE_TABLE_CHECK failures on hugepage splitting path

- Fix PSCI encoding of MEM_PROTECT_RANGE function in UAPI header

- Fix NULL deref when accessing debugfs node if PSCI is not present

- Fix MTE core dumping when VMA list is being updated concurrently

- Fix SME signal frame handling when SVE is not implemented by the CPU

- Fix asm constraints for cmpxchg_double() to hazard both words

- Fix build failure with stack tracer and older versions of Clang

- Bring back workaround for Cortex-A715 erratum 2645198

----------------------------------------------------------------
Anshuman Khandual (1):
      arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption

Catalin Marinas (3):
      arm64: mte: Fix double-freeing of the temporary tag storage during coredump
      elfcore: Add a cprm parameter to elf_core_extra_{phdrs,data_size}
      arm64: mte: Avoid the racy walk of the vma list during core dump

James Clark (1):
      arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y

Liu Shixin (2):
      arm64/mm: fix incorrect file_map_count for invalid pmd
      arm64/mm: add pud_user_exec() check in pud_user_accessible_page()

Marc Zyngier (1):
      firmware/psci: Don't register with debugfs if PSCI isn't available

Mark Brown (3):
      arm64/sme: Fix context switch for SME only systems
      arm64/signal: Always accept SVE signal frames on SME only systems
      arm64/signal: Always allocate SVE signal frames on SME only systems

Mark Rutland (1):
      arm64: cmpxchg_double*: hazard against entire exchange variable

Will Deacon (2):
      firmware/psci: Fix MEM_PROTECT_RANGE function numbers
      arm64/mm: Define dummy pud_user_exec() when using 2-level page-table

Zenghui Yu (1):
      arm64: ptrace: Use ARM64_SME to guard the SME register enumerations

junhua huang (1):
      arm64/uprobes: change the uprobe_opcode_t typedef to fix the sparse warning

 Documentation/arm64/silicon-errata.rst |  2 ++
 arch/arm64/Kconfig                     | 18 ++++++++--
 arch/arm64/include/asm/atomic_ll_sc.h  |  2 +-
 arch/arm64/include/asm/atomic_lse.h    |  2 +-
 arch/arm64/include/asm/hugetlb.h       |  9 +++++
 arch/arm64/include/asm/pgtable.h       | 16 +++++++--
 arch/arm64/include/asm/uprobes.h       |  2 +-
 arch/arm64/kernel/cpu_errata.c         |  7 ++++
 arch/arm64/kernel/elfcore.c            | 61 ++++++++++++++++------------------
 arch/arm64/kernel/fpsimd.c             |  2 +-
 arch/arm64/kernel/ptrace.c             |  2 +-
 arch/arm64/kernel/signal.c             |  9 +++--
 arch/arm64/mm/hugetlbpage.c            | 21 ++++++++++++
 arch/arm64/mm/mmu.c                    | 21 ++++++++++++
 arch/arm64/tools/cpucaps               |  1 +
 arch/ia64/kernel/elfcore.c             |  4 +--
 arch/x86/um/elfcore.c                  |  4 +--
 drivers/firmware/psci/psci.c           |  3 ++
 fs/binfmt_elf.c                        |  4 +--
 fs/binfmt_elf_fdpic.c                  |  4 +--
 include/linux/elfcore.h                |  8 ++---
 include/uapi/linux/psci.h              |  4 +--
 22 files changed, 147 insertions(+), 59 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2022-09-02 11:12 Will Deacon
@ 2022-09-02 18:30 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2022-09-02 18:30 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

The pull request you sent on Fri, 2 Sep 2022 12:12:05 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/cf3488fa25cdfdd220dcc927ca30ea7256b037e0

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64 fixes for -rc4
@ 2022-09-02 11:12 Will Deacon
  2022-09-02 18:30 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2022-09-02 11:12 UTC (permalink / raw)
  To: torvalds; +Cc: catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

Hi Linus,

Please pull these arm64 fixes for -rc4.

It's a lot smaller than last week, with the star of the show being a
couple of fixes to head.S addressing a boot regression introduced by the
recent overhaul of that code in non-default configurations (i.e. KASLR
disabled). The first of those two resolves the issue reported (and
bisected) by Mikulus in the wait_on_bit() thread.

Cheers,

Will

--->8

The following changes since commit 714f3cbd70a4db9f9b7fe5b8a032896ed33fb824:

  arm64/sme: Don't flush SVE register state when handling SME traps (2022-08-23 11:29:12 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 5fbc49cef91916140a305f22f7430e9a7ea0c6b4:

  arm64: mm: Reserve enough pages for the initial ID map (2022-09-01 12:02:39 +0100)

----------------------------------------------------------------
arm64 fixes for -rc4

- Fix two boot issues caused by the recent head.S rework when !KASLR

- Fix calculation of crashkernel memory reservation

- Fix bogus error check in PMU IRQ probing code

----------------------------------------------------------------
Ard Biesheuvel (2):
      arm64: head: Ignore bogus KASLR displacement on non-relocatable kernels
      arm64: mm: Reserve enough pages for the initial ID map

Levi Yun (1):
      arm64/kexec: Fix missing extra range for crashkres_low.

Yu Zhe (1):
      perf/arm_pmu_platform: fix tests for platform_get_irq() failure

 arch/arm64/include/asm/kernel-pgtable.h | 26 +++++++++++++-------------
 arch/arm64/kernel/head.S                |  2 ++
 arch/arm64/kernel/machine_kexec_file.c  |  2 +-
 drivers/perf/arm_pmu_platform.c         |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2022-04-22 11:20 Will Deacon
@ 2022-04-22 21:19 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2022-04-22 21:19 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

The pull request you sent on Fri, 22 Apr 2022 12:20:29 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/7200095feadfb9792b744a5a6e20249ce77bc6d7

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64 fixes for -rc4
@ 2022-04-22 11:20 Will Deacon
  2022-04-22 21:19 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2022-04-22 11:20 UTC (permalink / raw)
  To: torvalds; +Cc: catalin.marinas, linux-arm-kernel, linux-kernel, kernel-team

Hi Linus,

Please pull these arm64 fixes for -rc4. There's no real pattern to them, but
the main one fixes our pmd_leaf() definition to resolve a NULL dereference
on the migration path.

Cheers,

Will

--->8

The following changes since commit d02b4dd84e1a90f7f1444d027c0289bf355b0d5a:

  perf/imx_ddr: Fix undefined behavior due to shift overflowing the constant (2022-04-08 14:17:57 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 23bc8f69f0eceecbb87c3801d2e48827d2dca92b:

  arm64: mm: fix p?d_leaf() (2022-04-22 11:28:36 +0100)

----------------------------------------------------------------
arm64 fixes for -rc4

- Fix PMU event validation in the absence of any event counters

- Fix allmodconfig build using clang in conjunction with binutils

- Fix definitions of pXd_leaf() to handle PROT_NONE entries

- More typo fixes

----------------------------------------------------------------
Ken Kurematsu (1):
      arm64: fix typos in comments

Muchun Song (1):
      arm64: mm: fix p?d_leaf()

Nathan Chancellor (1):
      arm64: Improve HAVE_DYNAMIC_FTRACE_WITH_REGS selection for clang

Rob Herring (1):
      arm_pmu: Validate single/group leader events

 arch/arm64/Kconfig               | 15 ++++++++++++---
 arch/arm64/include/asm/pgtable.h |  4 ++--
 drivers/perf/arm_pmu.c           | 10 ++++------
 3 files changed, 18 insertions(+), 11 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2021-12-03 13:19 Will Deacon
@ 2021-12-03 18:53 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2021-12-03 18:53 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, mark.rutland, linux-arm-kernel,
	linux-kernel, kernel-team

The pull request you sent on Fri, 3 Dec 2021 13:19:38 +0000:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a2aeaeabbc9a1fbfb22d23539ae315cf52f09a0a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64 fixes for -rc4
@ 2021-12-03 13:19 Will Deacon
  2021-12-03 18:53 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2021-12-03 13:19 UTC (permalink / raw)
  To: torvalds
  Cc: catalin.marinas, mark.rutland, linux-arm-kernel, linux-kernel,
	kernel-team

Hi Linus,

Please pull these three arm64 fixes for -rc4. One of them is just a
trivial documentation fix, whereas the other two address a warning in
the kexec code and a crash in ftrace on systems implementing BTI. The
latter patch has a couple of ugly ifdefs which Mark plans to clean up
separately, but as-is the patch is straightforward for backporting to
stable kernels.

Cheers,

Will

--->8

The following changes since commit 94902d849e85093aafcdbea2be8e2beff47233e6:

  arm64: uaccess: avoid blocking within critical sections (2021-11-24 09:16:26 +0000)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 35b6b28e69985eafb20b3b2c7bd6eca452b56b53:

  arm64: ftrace: add missing BTIs (2021-12-02 10:18:32 +0000)

----------------------------------------------------------------
arm64 fixes for -rc4

- Add missing BTI landing instructions to the ftrace*_caller trampolines

- Fix kexec() WARN when DEBUG_VIRTUAL is enabled

- Fix PAC documentation by removing stale references to compiler flags

----------------------------------------------------------------
Kuan-Ying Lee (1):
      arm64: update PAC description for kernel

Mark Rutland (2):
      arm64: kexec: use __pa_symbol(empty_zero_page)
      arm64: ftrace: add missing BTIs

 Documentation/arm64/pointer-authentication.rst | 9 ++++-----
 arch/arm64/kernel/entry-ftrace.S               | 6 ++++++
 arch/arm64/kernel/machine_kexec.c              | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2020-11-13 12:44 ` [GIT " Will Deacon
@ 2020-11-13 17:25   ` Linus Torvalds
  0 siblings, 0 replies; 31+ messages in thread
From: Linus Torvalds @ 2020-11-13 17:25 UTC (permalink / raw)
  To: Will Deacon
  Cc: Catalin Marinas, Mark Rutland, Peter Zijlstra, Linux ARM,
	Linux Kernel Mailing List, Android Kernel Team

On Fri, Nov 13, 2020 at 4:44 AM Will Deacon <will@kernel.org> wrote:
>
> Looks like I managed to munge the subject for this (somehow dropped the
> leading '['); I've fixed it here in the hope that it gets past whatever
> filters you may have, but I'll resend if I haven't heard anything by
> tomorrow afternoon.

It doesn't affect *my* workflow (my filters aren't that exact), but
you may find that the pr-tracker-bot might be ignoring your pull
request.

Anyway, it's pulled in my tree, but I'll do a few more before I push out,

              Linus

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2020-11-13 12:39 GIT " Will Deacon
@ 2020-11-13 12:44 ` Will Deacon
  2020-11-13 17:25   ` Linus Torvalds
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2020-11-13 12:44 UTC (permalink / raw)
  To: torvalds
  Cc: catalin.marinas, mark.rutland, peterz, linux-arm-kernel,
	linux-kernel, kernel-team

On Fri, Nov 13, 2020 at 12:39:34PM +0000, Will Deacon wrote:
> Hi Linus,
> 
> Please can you pull these arm64 fixes for -rc4? It's all fairly simple
> and there's a summary in the tag; Paul has reviewed the trivial RCU change.
> 
> The main issue remaining at this stage is the ongoing irqtracing problem
> [1]. People are working on it, but no patches yet.

Looks like I managed to munge the subject for this (somehow dropped the
leading '['); I've fixed it here in the hope that it gets past whatever
filters you may have, but I'll resend if I haven't heard anything by
tomorrow afternoon.

Ta,

Will

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-21  6:46       ` Ingo Molnar
  2019-10-21 11:45         ` Linus Torvalds
@ 2019-10-22  8:16         ` Uwe Kleine-König
  1 sibling, 0 replies; 31+ messages in thread
From: Uwe Kleine-König @ 2019-10-22  8:16 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Linus Torvalds, Catalin Marinas, Will Deacon,
	Linux Kernel Mailing List, Linux ARM Kernel Mailing List, git

Hello,

I added the git list to Cc:. For the new readers: The context of this
thread can be found at
https://lwn.net/ml/linux-kernel/20191017234348.wcbbo2njexn7ixpk@willie-the-truck/

On Mon, Oct 21, 2019 at 08:46:58AM +0200, Ingo Molnar wrote:
> Anyway, a small Git feature request: it would be super useful if "git 
> request-pull" output was a bit more dependable and at least warned about 
> this and didn't include what is, from the viewpoint of the person doing 
> the merge, a bogus diffstat. (Generating the correct diffstat is probably 
> beyond request-pull's abilities: it would require changing the working 
> tree to actually perform the merge - while request-pull is a read-only 
> operation right now. But detecting the condition and warning about it 
> should be possible?)

I think Will's case is still an easy one compared with what could
actually happen.

The related history looks as follows:

             ,-.     ,-.              ,-.    ,-.    ,-.
  v5.4-rc1 --| |-...-| |-- v5.4-rc2 --| |-..-| |-..-| |-- v5.4-rc3
      \      `-'     `-'       \      `-'    /-'    `-'
       \   ,-.     ,-.          \         ,-/    ,-.     ,-.
        `--| |-...-| |--------------------|*|----| |-...-|H|
           `-'     `-'            \       `-'    `-'     /-'
                                   \   ,-.     ,-.      /
                                    `--| |-...-| |-----'
                                       `-'     `-'

Will asked Linus to merge the Commit marked 'H', the two merge bases are
v5.4-rc2 and '*'.

(FTR:
  * = 3e7c93bd04edfb0cae7dad1215544c9350254b8f
  H = 777d062e5bee0e3c0751cdcbce116a76ee2310ec
, they can be found in
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)

The formally correct way to create the diffstat is to merge v5.4-rc2 and
'*' (in general: all merge bases) and calculate the diff between this
merge and the to-be-merged-commit. Compared to what Will did (i.e. merge
Linus' HEAD and this branch and then diff @~ with @) doing it the way I
described has the advantage(?) that commits that conflict with this
merge request in Linus' tree since the merge bases are not in the way.

In this case this can be done automatically:

	$ git read-tree --index-output=tralala v5.4-rc2 3e7c93bd04edfb0cae7dad1215544c9350254b8f
	$ GIT_INDEX=tralala git write-tree
	6a2acfd1870d9da3c330ea9b648a7e858b5ee39f
	$ git diff --stat 6a2acfd1870d9da3c330ea9b648a7e858b5ee39f 777d062e5bee0e3c0751cdcbce116a76ee2310ec
	 Documentation/arm64/silicon-errata.rst |  2 ++
	 arch/arm64/Kconfig                     | 17 ++++++++++++++
	 arch/arm64/include/asm/asm-uaccess.h   |  7 +++---
	 arch/arm64/include/asm/cpucaps.h       |  4 +++-
	 arch/arm64/include/asm/memory.h        | 10 ++++++--
	 arch/arm64/include/asm/pgtable.h       |  3 ---
	 arch/arm64/include/asm/sysreg.h        |  2 +-
	 arch/arm64/kernel/cpu_errata.c         | 38 +++++++++++++++++++++++++++++++
	 arch/arm64/kernel/cpufeature.c         | 15 ++++++++----
	 arch/arm64/kernel/entry.S              |  8 ++++---
	 arch/arm64/kernel/hibernate.c          |  9 +++++++-
	 arch/arm64/kernel/process.c            | 18 +++++++++++++++
	 arch/arm64/kvm/hyp/switch.c            | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
	 arch/arm64/mm/fault.c                  |  6 ++++-
	 include/linux/sched.h                  |  1 +
	 15 files changed, 186 insertions(+), 23 deletions(-)

Would be great if git-request-pull learned to do that.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-21  6:46       ` Ingo Molnar
@ 2019-10-21 11:45         ` Linus Torvalds
  2019-10-22  8:16         ` Uwe Kleine-König
  1 sibling, 0 replies; 31+ messages in thread
From: Linus Torvalds @ 2019-10-21 11:45 UTC (permalink / raw)
  To: Ingo Molnar
  Cc: Will Deacon, Catalin Marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

On Mon, Oct 21, 2019 at 2:47 AM Ingo Molnar <mingo@kernel.org> wrote:
>
> I think at least once I ran into that and sent you a 'slightly wrong'
> diffstat - and maybe there's also been a few cases where you noticed
> diffstats that didn't match your merge result, double checked it yourself
> and didn't complain about it because you knew that this is a "git
> request-pull" artifact?

Right. If I see a diffstat that doesn't match, I just look at what a
non-merged diffstat would have looked like, and if that matches I know
what happened.

There are other reasons why diffstats won't match, of course. Like me
just having merged part of the same commits from another source (or
multiple trees applying the same patch). So it's not _just_ due to
multiple merge bases that the mis-match can happen.

> Most of the time I notice it like Will did because the diffstat is
> obviously weird and it's good to check pull requests a second (and a
> third :-) time as well, but it's possible to have relatively small
> distances between the merge bases where the diffstat doesn't look
> 'obviously' bogus and mistakes can slip through.

Yup.

> Anyway, a small Git feature request: it would be super useful if "git
> request-pull" output was a bit more dependable and at least warned about
> this and didn't include what is, from the viewpoint of the person doing
> the merge, a bogus diffstat.

Well, warning for it would be fairly simple. Giving the "right" result
isn't simple, though, since the merge might need manual fixup to
succeed.

The warning you can check yourself: just do

    git merge-base --all upstream mybranch

and if you get more than one result, you know you are in the situation
where a diff from the merge base might not work (it *might* work, but
probably won't).

You can play around with it yourself, of course. Look at the
git-request-puill.sh script, it says something like this:

  merge_base=$(git merge-base $baserev $headrev) ||
  die "fatal: No commits in common between $base and $head"

and you could add something like

  all_merge_bases="$(git merge-base --all $baserev $headrev)"

and then add a warning if "all_merge_bases" doesn't match "merge_base".

                Linus

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-18 19:17     ` Linus Torvalds
@ 2019-10-21  6:46       ` Ingo Molnar
  2019-10-21 11:45         ` Linus Torvalds
  2019-10-22  8:16         ` Uwe Kleine-König
  0 siblings, 2 replies; 31+ messages in thread
From: Ingo Molnar @ 2019-10-21  6:46 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Will Deacon, Catalin Marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List


* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> What you doing the merge does is to turn the multiple merge bases into
> just one point: the thing you merged against now becomes the common
> merge point, and now you have a "two endpoints" for the diffstat: the
> thing you merged against, and your end result are now the two points
> that you can diff against.
> 
> But the shortlog is always correct, because it just doesn't even care
> about that whole issue.

FWIW I regularly ran into this problem too and resolved it manually by 
'emulating' your merge. (Once every 20-30 pull requests or so. Finally 
ended up scripting around request-pull altogether.)

I think at least once I ran into that and sent you a 'slightly wrong' 
diffstat - and maybe there's also been a few cases where you noticed 
diffstats that didn't match your merge result, double checked it yourself 
and didn't complain about it because you knew that this is a "git 
request-pull" artifact?

Most of the time I notice it like Will did because the diffstat is 
obviously weird and it's good to check pull requests a second (and a 
third :-) time as well, but it's possible to have relatively small 
distances between the merge bases where the diffstat doesn't look 
'obviously' bogus and mistakes can slip through.

Anyway, a small Git feature request: it would be super useful if "git 
request-pull" output was a bit more dependable and at least warned about 
this and didn't include what is, from the viewpoint of the person doing 
the merge, a bogus diffstat. (Generating the correct diffstat is probably 
beyond request-pull's abilities: it would require changing the working 
tree to actually perform the merge - while request-pull is a read-only 
operation right now. But detecting the condition and warning about it 
should be possible?)

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-17 23:43 [GIT PULL] arm64: Fixes " Will Deacon
  2019-10-18  0:06 ` Linus Torvalds
  2019-10-18  0:15 ` pr-tracker-bot
@ 2019-10-18 20:09 ` Jayachandran Chandrasekharan Nair
  2 siblings, 0 replies; 31+ messages in thread
From: Jayachandran Chandrasekharan Nair @ 2019-10-18 20:09 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

On Fri, Oct 18, 2019 at 12:43:49AM +0100, Will Deacon wrote:
> Hi Linus,
> 
> Please pull these arm64 fixes for -rc4. The main thing here is a
> long-awaited workaround for a CPU erratum on ThunderX2 which we have
> developed in conjunction with engineers from Cavium/Marvell. At the moment,
> the workaround is unconditionally enabled for affected CPUs at runtime
> but we may add a command-line option to disable it in future if performance
> numbers show up indicating a significant cost for real workloads.

As the Cavium/Marvell engineer who was involved in this, I will note
that I had suggested a patch providing a runtime override[1] while
providing safe defaults.

Marc's patchset adds a trap to hypervisor in the system call path when
KPTI is enabled, and KPTI is generally enabled on stock VM images. So
normal users will see some performance regression (e.g I see something
in the range of 3-4% on guest kernel compile).

As a policy, I don't agree with having errata workarounds that can be
left to the discretion of the admin to be forced at compile time.
Since most of these workarounds use run-time code patching with
alternatives, there is no need to do this at all.

But given that this is already merged and cc:ed to stable, I will see
if I can come up with enough data to convince Will.

JC
[1]
https://lore.kernel.org/linux-arm-kernel/20191011232031.GA29752@dc5-eodlnx05.marvell.com/T/

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-18 17:41   ` Will Deacon
@ 2019-10-18 19:17     ` Linus Torvalds
  2019-10-21  6:46       ` Ingo Molnar
  0 siblings, 1 reply; 31+ messages in thread
From: Linus Torvalds @ 2019-10-18 19:17 UTC (permalink / raw)
  To: Will Deacon
  Cc: Catalin Marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

On Fri, Oct 18, 2019 at 10:42 AM Will Deacon <will@kernel.org> wrote:
>
> Thanks, that's helpful to know for next time. I guess I'm most surprised by
> the discrepancy between the shortlog and the diffstat, whereas I intuitively
> expected them to be generated in the same way.

So logs and diffs are fundamentally different.

A log is an operation on a _set_ of commits (that's the whole point -
you don't list the beginning and the end, you list all the commits in
between), while a diff is fundamentally an operation on two end-points
and shows the code difference between those two points.

And the summary versions of those operations (shortlog and diffstat)
are no different.

So as a set operation, "shortlog" has no issues with multiple merge
bases. Doing a shortlog is still just a set difference between your
commits and the upstream commits, and the number of merge bases is
irrelevant. "List all commits that I have, but upstream doesn't have"
is a very straightforward and natural set operation.

But as a "two endpoints" operation, diffstat has real problems any
time you have more than two endpoints - when you have multiple merge
bases, you fundamentally have more than two endpoints: you have all of
the merge bases, and then you have your end result.

What you doing the merge does is to turn the multiple merge bases into
just one point: the thing you merged against now becomes the common
merge point, and now you have a "two endpoints" for the diffstat: the
thing you merged against, and your end result are now the two points
that you can diff against.

But the shortlog is always correct, because it just doesn't even care
about that whole issue.

                Linus

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-18  0:06 ` Linus Torvalds
@ 2019-10-18 17:41   ` Will Deacon
  2019-10-18 19:17     ` Linus Torvalds
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2019-10-18 17:41 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Catalin Marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

On Thu, Oct 17, 2019 at 05:06:54PM -0700, Linus Torvalds wrote:
> On Thu, Oct 17, 2019 at 4:43 PM Will Deacon <will@kernel.org> wrote:
> >
> > Note that the workaround code ended up being based on -rc2, so I had a
> > bit of a faff trying to generate the right diffstat for this pull request
> > after merging that branch into our fixes branch based on -rc1. In the end
> > I had to emulate the pull locally because I couldn't figure out how to
> > drive request-pull correctly despite the shortlog being correct. I'd love
> > to know what I should've done instead.
> 
> You did the right thing.
> 
> When there are multiple merge bases, a regular "git diff" doesn't work
> since it's fundamentally about two end-points (well, it _can_ work
> almost by mistake, but doesn't work in the general case). So the only
> way to get a "proper" diff is to do a merge and then diff the result.
> 
> That said, I also accept the output of "git diff" which will then have
> a lot of noise from all the _other_ work done between the two merge
> bases. I can figure out what happened, and do my own two-endpoint diff
> and see what happened, and still se that "yes, that's what the pull
> request meant, and that's why the diffstat is garbage".
> 
> What you did is the "good quality" pull request, though.

Thanks, that's helpful to know for next time. I guess I'm most surprised by
the discrepancy between the shortlog and the diffstat, whereas I intuitively
expected them to be generated in the same way.

Will

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-17 23:43 [GIT PULL] arm64: Fixes " Will Deacon
  2019-10-18  0:06 ` Linus Torvalds
@ 2019-10-18  0:15 ` pr-tracker-bot
  2019-10-18 20:09 ` Jayachandran Chandrasekharan Nair
  2 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2019-10-18  0:15 UTC (permalink / raw)
  To: Will Deacon
  Cc: torvalds, catalin.marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

The pull request you sent on Fri, 18 Oct 2019 00:43:49 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/0e2adab6cf285c41e825b6c74a3aa61324d1132c

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: Fixes for -rc4
  2019-10-17 23:43 [GIT PULL] arm64: Fixes " Will Deacon
@ 2019-10-18  0:06 ` Linus Torvalds
  2019-10-18 17:41   ` Will Deacon
  2019-10-18  0:15 ` pr-tracker-bot
  2019-10-18 20:09 ` Jayachandran Chandrasekharan Nair
  2 siblings, 1 reply; 31+ messages in thread
From: Linus Torvalds @ 2019-10-18  0:06 UTC (permalink / raw)
  To: Will Deacon
  Cc: Catalin Marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

On Thu, Oct 17, 2019 at 4:43 PM Will Deacon <will@kernel.org> wrote:
>
> Note that the workaround code ended up being based on -rc2, so I had a
> bit of a faff trying to generate the right diffstat for this pull request
> after merging that branch into our fixes branch based on -rc1. In the end
> I had to emulate the pull locally because I couldn't figure out how to
> drive request-pull correctly despite the shortlog being correct. I'd love
> to know what I should've done instead.

You did the right thing.

When there are multiple merge bases, a regular "git diff" doesn't work
since it's fundamentally about two end-points (well, it _can_ work
almost by mistake, but doesn't work in the general case). So the only
way to get a "proper" diff is to do a merge and then diff the result.

That said, I also accept the output of "git diff" which will then have
a lot of noise from all the _other_ work done between the two merge
bases. I can figure out what happened, and do my own two-endpoint diff
and see what happened, and still se that "yes, that's what the pull
request meant, and that's why the diffstat is garbage".

What you did is the "good quality" pull request, though.

In general, people who aren't doing fancy things with git should never
get to the "multiple merge bases" situation, and then the regular pull
request logic works fine.

And people likme you who are doing multiple branches and know what
they are doing are also able to them handle the "uhhuh, I need to do a
merge to get a good diffstat" situation.

            Linus

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: Fixes for -rc4
@ 2019-10-17 23:43 Will Deacon
  2019-10-18  0:06 ` Linus Torvalds
                   ` (2 more replies)
  0 siblings, 3 replies; 31+ messages in thread
From: Will Deacon @ 2019-10-17 23:43 UTC (permalink / raw)
  To: torvalds
  Cc: catalin.marinas, Linux Kernel Mailing List,
	Linux ARM Kernel Mailing List

Hi Linus,

Please pull these arm64 fixes for -rc4. The main thing here is a
long-awaited workaround for a CPU erratum on ThunderX2 which we have
developed in conjunction with engineers from Cavium/Marvell. At the moment,
the workaround is unconditionally enabled for affected CPUs at runtime
but we may add a command-line option to disable it in future if performance
numbers show up indicating a significant cost for real workloads.

The other fixes are summarised in the tag.

Note that the workaround code ended up being based on -rc2, so I had a
bit of a faff trying to generate the right diffstat for this pull request
after merging that branch into our fixes branch based on -rc1. In the end
I had to emulate the pull locally because I couldn't figure out how to
drive request-pull correctly despite the shortlog being correct. I'd love
to know what I should've done instead.

Thanks,

Will

--->8

The following changes since commit 3e7c93bd04edfb0cae7dad1215544c9350254b8f:

  arm64: armv8_deprecated: Checking return value for memory allocation (2019-10-08 13:34:04 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 777d062e5bee0e3c0751cdcbce116a76ee2310ec:

  Merge branch 'errata/tx2-219' into for-next/fixes (2019-10-17 13:42:42 -0700)

----------------------------------------------------------------
arm64 fixes for -rc4

- Work around Cavium/Marvell ThunderX2 erratum #219

- Fix regression in mlock() ABI caused by sign-extension of TTBR1 addresses

- More fixes to the spurious kernel fault detection logic

- Fix pathological preemption race when enabling some CPU features at boot

- Drop broken kcore macros in favour of generic implementations

- Fix userspace view of ID_AA64ZFR0_EL1 when SVE is disabled

- Avoid NULL dereference on allocation failure during hibernation

----------------------------------------------------------------
Chris von Recklinghausen (1):
      arm64: Fix kcore macros after 52-bit virtual addressing fallout

Julien Grall (1):
      arm64: cpufeature: Treat ID_AA64ZFR0_EL1 as RAZ when SVE is not enabled

Julien Thierry (1):
      arm64: entry.S: Do not preempt from IRQ before all cpufeatures are enabled

Marc Zyngier (4):
      arm64: KVM: Trap VM ops when ARM64_WORKAROUND_CAVIUM_TX2_219_TVM is set
      arm64: Enable workaround for Cavium TX2 erratum 219 when running SMT
      arm64: Avoid Cavium TX2 erratum 219 when switching TTBR
      arm64: Allow CAVIUM_TX2_ERRATUM_219 to be selected

Mark Rutland (1):
      arm64: mm: fix inverted PAR_EL1.F check

Pavel Tatashin (1):
      arm64: hibernate: check pgd table allocation

Will Deacon (2):
      arm64: tags: Preserve tags for addresses translated via TTBR1
      Merge branch 'errata/tx2-219' into for-next/fixes

Yang Yingliang (1):
      arm64: sysreg: fix incorrect definition of SYS_PAR_EL1_F

 Documentation/arm64/silicon-errata.rst |  2 +
 arch/arm64/Kconfig                     | 17 +++++++++
 arch/arm64/include/asm/asm-uaccess.h   |  7 ++--
 arch/arm64/include/asm/cpucaps.h       |  4 +-
 arch/arm64/include/asm/memory.h        | 10 ++++-
 arch/arm64/include/asm/pgtable.h       |  3 --
 arch/arm64/include/asm/sysreg.h        |  2 +-
 arch/arm64/kernel/cpu_errata.c         | 38 +++++++++++++++++++
 arch/arm64/kernel/cpufeature.c         | 15 +++++---
 arch/arm64/kernel/entry.S              |  8 ++--
 arch/arm64/kernel/hibernate.c          |  9 ++++-
 arch/arm64/kernel/process.c            | 18 +++++++++
 arch/arm64/kvm/hyp/switch.c            | 69 +++++++++++++++++++++++++++++++++-
 arch/arm64/mm/fault.c                  |  6 ++-
 include/linux/sched.h                  |  1 +
 15 files changed, 186 insertions(+), 23 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64: fixes for -rc4
  2019-06-07 15:13 [GIT PULL] arm64: fixes " Will Deacon
@ 2019-06-07 16:45 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2019-06-07 16:45 UTC (permalink / raw)
  To: Will Deacon; +Cc: torvalds, linux-kernel, linux-arm-kernel, catalin.marinas

The pull request you sent on Fri, 7 Jun 2019 16:13:16 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a02a532c2a6c79a898cd6c430fe3ad011d9aece3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2019-06-07 15:13 Will Deacon
  2019-06-07 16:45 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Will Deacon @ 2019-06-07 15:13 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, linux-arm-kernel, catalin.marinas

Hi Linus,

Another round of mostly-benign fixes, the exception being a boot crash on
SVE2-capable CPUs (although I don't know where you'd find such a thing, so
maybe it's benign too). We're in the process of resolving some big-endian
ptrace breakage, so I'll probably have some more for you next week.

Please pull.

Cheers,

Will

--->8

The following changes since commit 1e29ab3186e33c77dbb2d7566172a205b59fa390:

  arm64: use the correct function type for __arm64_sys_ni_syscall (2019-05-29 13:46:00 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to ebcc5928c5d925b1c8d968d9c89cdb0d0186db17:

  arm64: Silence gcc warnings about arch ABI drift (2019-06-06 13:28:45 +0100)

----------------------------------------------------------------
arm64 fixes for -rc4

- Fix boot crash on platforms with SVE2 due to missing register encoding

- Fix architected timer accessors when CONFIG_OPTIMIZE_INLINING=y

- Move cpu_logical_map into smp.h for use by upcoming irqchip drivers

- Trivial typo fix in comment

- Disable some useless, noisy warnings from GCC 9

----------------------------------------------------------------
Anders Roxell (1):
      arm64: arch_timer: mark functions as __always_inline

Dave Martin (2):
      arm64: cpufeature: Fix missing ZFR0 in __read_sysreg_by_encoding()
      arm64: Silence gcc warnings about arch ABI drift

Florian Fainelli (1):
      arm64: smp: Moved cpu_logical_map[] to smp.h

George G. Davis (1):
      ARM64: trivial: s/TIF_SECOMP/TIF_SECCOMP/ comment typo fix

 arch/arm64/Makefile                  | 1 +
 arch/arm64/include/asm/arch_timer.h  | 8 ++++----
 arch/arm64/include/asm/smp.h         | 6 ++++++
 arch/arm64/include/asm/smp_plat.h    | 5 -----
 arch/arm64/include/asm/thread_info.h | 2 +-
 arch/arm64/kernel/cpufeature.c       | 1 +
 6 files changed, 13 insertions(+), 10 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* Re: [GIT PULL] arm64 fixes for -rc4
  2019-04-05 17:17 [GIT PULL] arm64 " Catalin Marinas
@ 2019-04-05 23:50 ` pr-tracker-bot
  0 siblings, 0 replies; 31+ messages in thread
From: pr-tracker-bot @ 2019-04-05 23:50 UTC (permalink / raw)
  To: Catalin Marinas
  Cc: Linus Torvalds, Will Deacon, linux-arm-kernel, linux-kernel

The pull request you sent on Fri, 5 Apr 2019 18:17:21 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/2f9e10acfa1243a7d0ad323873f4a193144a25c3

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64 fixes for -rc4
@ 2019-04-05 17:17 Catalin Marinas
  2019-04-05 23:50 ` pr-tracker-bot
  0 siblings, 1 reply; 31+ messages in thread
From: Catalin Marinas @ 2019-04-05 17:17 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Will Deacon, linux-arm-kernel, linux-kernel

Hi Linus,

Please pull the arm64 fix below.

The following changes since commit 79a3aaa7b82e3106be97842dedfd8429248896e6:

  Linux 5.1-rc3 (2019-03-31 14:39:29 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux tags/arm64-fixes

for you to fetch changes up to 1c41860864c8ae0387ef7d44f0000e99cbb2e06d:

  arm64: fix wrong check of on_sdei_stack in nmi context (2019-04-04 16:02:25 +0100)

----------------------------------------------------------------
Fix unwind_frame() in the context of pseudo NMI.

----------------------------------------------------------------
Wei Li (1):
      arm64: fix wrong check of on_sdei_stack in nmi context

 arch/arm64/kernel/sdei.c | 6 ++++++
 1 file changed, 6 insertions(+)

-- 
Catalin

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2018-09-14 16:19 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2018-09-14 16:19 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, linux-arm-kernel, catalin.marinas

Hi Linus,

The trickle of arm64 fixes continues to come in. Nothing that's the end
of the world, but we've got a fix for PCI IO port accesses, an accidental
naked "asm goto" and a fix to the vmcoreinfo PT_NOTE merged this time
around which we'd like to get sorted before it becomes ABI.

Details in the tag, but please pull.

Thanks,

Will

--->8

The following changes since commit 11da3a7f84f19c26da6f86af878298694ede0804:

  Linux 4.19-rc3 (2018-09-09 17:26:43 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 500dd232449e7c07500e713dc6970aa713f8e4f1:

  asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO (2018-09-14 09:49:21 +0100)

----------------------------------------------------------------
arm64 fixes

- Fix ioport_map() mapping the wrong physical address for some I/O BARs

- Remove direct use of "asm goto", since some compilers don't like that

- Ensure kimage_voffset is always present in vmcoreinfo PT_NOTE

----------------------------------------------------------------
Andrew Murray (1):
      asm-generic: io: Fix ioport_map() for !CONFIG_GENERIC_IOMAP && CONFIG_INDIRECT_PIO

James Morse (1):
      arm64: kernel: arch_crash_save_vmcoreinfo() should depend on CONFIG_CRASH_CORE

Miguel Ojeda (1):
      arm64: jump_label.h: use asm_volatile_goto macro instead of "asm goto"

 arch/arm64/include/asm/jump_label.h |  4 ++--
 arch/arm64/kernel/Makefile          |  1 +
 arch/arm64/kernel/crash_core.c      | 19 +++++++++++++++++++
 arch/arm64/kernel/machine_kexec.c   | 11 -----------
 include/asm-generic/io.h            |  3 ++-
 5 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 arch/arm64/kernel/crash_core.c

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2017-12-15 18:31 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2017-12-15 18:31 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, linux-arm-kernel, catalin.marinas

Hi Linus,

Please pull the following arm64 fixes for 4.15-rc4.

I've included the usual summary in the tag, but there are some significant
fixes in here for FP state corruption, hardware access/dirty PTE corruption
and an erratum workaround for the Falkor CPU. I'm hoping that things
finally settle down now, but never say never...

Cheers,

Will

--->8

The following changes since commit 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36:

  Linux 4.15-rc3 (2017-12-10 17:56:26 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to a4544831370618cb3627e27ffcc27d1cc857868f:

  arm64: fpsimd: Fix copying of FP state from signal frame into task struct (2017-12-15 16:12:35 +0000)

----------------------------------------------------------------
arm64 fixes:

- Fix FPSIMD context switch regression introduced in -rc2

- Fix ABI break with SVE CPUID register reporting

- Fix use of uninitialised variable

- Fixes to hardware access/dirty management and sanity checking

- CPU erratum workaround for Falkor CPUs

- Fix reporting of writeable+executable mappings

- Fix signal reporting for RAS errors

----------------------------------------------------------------
Dave Martin (1):
      arm64/sve: Report SVE to userspace via CPUID only if supported

Dongjiu Geng (1):
      arm64: fault: avoid send SIGBUS two times

Mark Rutland (1):
      arm64: fix CONFIG_DEBUG_WX address reporting

Shanker Donthineni (2):
      arm64: Define cputype macros for Falkor CPU
      arm64: Add software workaround for Falkor erratum 1041

Steve Capper (2):
      arm64: Initialise high_memory global variable earlier
      arm64: mm: Fix pte_mkclean, pte_mkdirty semantics

Will Deacon (3):
      arm64: mm: Fix false positives in set_pte_at access/dirty race detection
      arm64: hw_breakpoint: Use linux/uaccess.h instead of asm/uaccess.h
      arm64: fpsimd: Fix copying of FP state from signal frame into task struct

 Documentation/arm64/silicon-errata.txt |  1 +
 arch/arm64/Kconfig                     | 12 +++++++++-
 arch/arm64/include/asm/assembler.h     | 10 +++++++++
 arch/arm64/include/asm/cpufeature.h    |  3 +++
 arch/arm64/include/asm/cputype.h       |  2 ++
 arch/arm64/include/asm/pgtable.h       | 41 ++++++++++++++++++----------------
 arch/arm64/kernel/cpu-reset.S          |  1 +
 arch/arm64/kernel/cpufeature.c         |  3 ++-
 arch/arm64/kernel/efi-entry.S          |  2 ++
 arch/arm64/kernel/fpsimd.c             |  2 +-
 arch/arm64/kernel/head.S               |  1 +
 arch/arm64/kernel/hw_breakpoint.c      |  2 +-
 arch/arm64/kernel/relocate_kernel.S    |  1 +
 arch/arm64/kvm/hyp-init.S              |  1 +
 arch/arm64/mm/dump.c                   |  2 +-
 arch/arm64/mm/fault.c                  |  5 ++---
 arch/arm64/mm/init.c                   |  3 ++-
 17 files changed, 64 insertions(+), 28 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2017-08-04 18:32 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2017-08-04 18:32 UTC (permalink / raw)
  To: torvalds; +Cc: linux-arm-kernel, linux-kernel, catalin.marinas

Hi Linus,

Here are some more arm64 fixes for 4.13. The main one is the PTE race
with the hardware walker, but there are a couple of other things too.

Please pull,

Will

--->8

The following changes since commit 16f73eb02d7e1765ccab3d2018e0bd98eb93d973:

  Linux 4.13-rc3 (2017-07-30 12:40:36 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 82cd588052815eb4146f9f7c5347ca5e32c56360:

  arm64: avoid overflow in VA_START and PAGE_OFFSET (2017-08-04 15:06:35 +0100)

----------------------------------------------------------------
arm64 fixes:

- Report correct timer frequency to userspace when trapping CNTFRQ_EL0

- Fix race with hardware page table updates when updating access flags

- Silence clang overflow warning in VA_START and PAGE_OFFSET calculations

----------------------------------------------------------------
Catalin Marinas (1):
      arm64: Fix potential race with hardware DBM in ptep_set_access_flags()

Marc Zyngier (1):
      arm64: Use arch_timer_get_rate when trapping CNTFRQ_EL0

Nick Desaulniers (1):
      arm64: avoid overflow in VA_START and PAGE_OFFSET

 arch/arm64/include/asm/memory.h |  6 ++++--
 arch/arm64/kernel/traps.c       |  2 +-
 arch/arm64/mm/fault.c           | 15 ++++++++-------
 3 files changed, 13 insertions(+), 10 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2016-06-17 17:07 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2016-06-17 17:07 UTC (permalink / raw)
  To: torvalds; +Cc: linux-kernel, linux-arm-kernel, catalin.marinas

Hi Linus,

Please pull these fixes for arm64. The main things are getting kgdb up
and running with upstream GDB after a protocol change was reverted and
fixing our spin_unlock_wait/spin_is_locked implementations after doing
some similar work with PeterZ on the qspinlock code last week. Whilst we
haven't seen any failures in practice, it's still worth getting this
fixed.

Thanks,

Will

--->8

The following changes since commit 5edb56491d4812c42175980759da53388e5d86f5:

  Linux 4.7-rc3 (2016-06-12 07:20:35 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 0d15ef677839dab8313fbb86c007c3175b638d03:

  arm64: kgdb: Match pstate size with gdbserver protocol (2016-06-16 19:20:51 +0100)

----------------------------------------------------------------
arm64 fixes:

- Plug the ongoing spin_unlock_wait/spin_is_locked mess
- KGDB protocol fix to sync w/ GDB
- Fix MIDR-based PMU probing for old 32-bit SMP systems (OMAP4/Realview)
- Minor tweaks to the fault handling path

----------------------------------------------------------------
Daniel Thompson (1):
      arm64: kgdb: Match pstate size with gdbserver protocol

Mark Rutland (2):
      arm64: fix dump_instr when PAN and UAO are in use
      arm64: mm: mark fault_info table const

Mark Salter (1):
      arm: pmu: Fix non-devicetree probing

Will Deacon (3):
      arm64: spinlock: order spin_{is_locked,unlock_wait} against local locks
      arm64: spinlock: fix spin_unlock_wait for LSE atomics
      arm64: spinlock: Ensure forward-progress in spin_unlock_wait

 arch/arm64/include/asm/kgdb.h     | 45 ++++++++++++++++++++++++++++++++-------
 arch/arm64/include/asm/spinlock.h | 42 +++++++++++++++++++++++++++++++-----
 arch/arm64/kernel/kgdb.c          | 14 +++++++++++-
 arch/arm64/kernel/traps.c         | 26 +++++++++++-----------
 arch/arm64/mm/fault.c             |  2 +-
 drivers/perf/arm_pmu.c            |  2 +-
 6 files changed, 102 insertions(+), 29 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2015-05-14 15:48 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2015-05-14 15:48 UTC (permalink / raw)
  To: torvalds
  Cc: linux-kernel, linux-arm-kernel, catalin.marinas, marc.zyngier,
	xi.wang, js07.lee

Hi Linus,

Please pull the following arm64 fixes for 4.1. The main change is actually
a revert, after some (currently unused) branch patching code introduced
during the merge window was found to have some problems.

Cheers,

Will

--->8

The following changes since commit 5ebe6afaf0057ac3eaeb98defd5456894b446d22:

  Linux 4.1-rc2 (2015-05-03 19:22:23 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 4801ba338acad2e69e905e0c537e8ba2682c4e65:

  arm64: perf: fix memory leak when probing PMU PPIs (2015-05-12 16:50:21 +0100)

----------------------------------------------------------------
arm64 fixes:
- Fix potential memory leak in perf PMU probing
- BPF sign extension fix for 64-bit immediates
- Fix build failure with unusual configuration
- Revert unused and broken branch patching from alternative code

----------------------------------------------------------------
Jungseung Lee (1):
      arm64: mm: Fix build error with CONFIG_SPARSEMEM_VMEMMAP disabled

Will Deacon (2):
      Revert "arm64: alternative: Allow immediate branch as alternative instruction"
      arm64: perf: fix memory leak when probing PMU PPIs

Xi Wang (1):
      arm64: bpf: fix signedness bug in loading 64-bit immediate

 arch/arm64/kernel/alternative.c | 53 +----------------------------------------
 arch/arm64/kernel/perf_event.c  |  8 +++----
 arch/arm64/mm/dump.c            |  2 ++
 arch/arm64/net/bpf_jit_comp.c   |  2 +-
 4 files changed, 8 insertions(+), 57 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

* [GIT PULL] arm64: fixes for -rc4
@ 2015-01-09 15:22 Will Deacon
  0 siblings, 0 replies; 31+ messages in thread
From: Will Deacon @ 2015-01-09 15:22 UTC (permalink / raw)
  To: torvalds
  Cc: linux-kernel, linux-arm-kernel, catalin.marinas, ard.biesheuvel,
	pwalmsley, mark.rutland, tklauser

Hi Linus,

Here is a handful of minor arm64 fixes discovered and fixed over the
Christmas break. The main part is adding some missing #includes that we
seem to be getting transitively but have started causing problems in
-next. Please pull.

Thanks,

Will

--->8

The following changes since commit b1940cd21c0f4abdce101253e860feff547291b0:

  Linux 3.19-rc3 (2015-01-05 17:05:20 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git tags/arm64-fixes

for you to fetch changes up to 0e63ea48b4d8035dd0e91a3fa6fb79458b47adfb:

  arm64/efi: add missing call to early_ioremap_reset() (2015-01-08 11:57:04 +0000)

----------------------------------------------------------------
arm64 fixes:
- Fix early mapping fixmap corruption by EFI runtime services
- Fix __NR_compat_syscalls off-by-one
- Add missing sanity checks for some 32-bit registers
- Add some missing #includes which we get transitively
- Remove unused prepare_to_copy() macro

----------------------------------------------------------------
Ard Biesheuvel (1):
      arm64/efi: add missing call to early_ioremap_reset()

Mark Rutland (2):
      arm64: Correct __NR_compat_syscalls for bpf
      arm64: sanity checks: add missing AArch32 registers

Paul Walmsley (4):
      arm64: fix missing asm/pgtable-hwdef.h include in asm/processor.h
      arm64: fix missing linux/bug.h include in asm/arch_timer.h
      arm64: fix missing asm/alternative.h include in kernel/module.c
      arm64: fix missing asm/io.h include in kernel/smp_spin_table.c

Tobias Klauser (1):
      arm64: Remove unused prepare_to_copy()

 arch/arm64/include/asm/arch_timer.h |  1 +
 arch/arm64/include/asm/cpu.h        |  5 +++++
 arch/arm64/include/asm/processor.h  |  4 +---
 arch/arm64/include/asm/unistd.h     |  2 +-
 arch/arm64/kernel/cpuinfo.c         | 10 ++++++++++
 arch/arm64/kernel/efi.c             |  2 +-
 arch/arm64/kernel/module.c          |  1 +
 arch/arm64/kernel/setup.c           |  1 +
 arch/arm64/kernel/smp_spin_table.c  |  1 +
 9 files changed, 22 insertions(+), 5 deletions(-)

^ permalink raw reply	[flat|nested] 31+ messages in thread

end of thread, other threads:[~2023-01-13 14:02 UTC | newest]

Thread overview: 31+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-04 13:05 [GIT PULL] arm64 fixes for -rc4 Will Deacon
2020-07-05 17:35 ` pr-tracker-bot
  -- strict thread matches above, loose matches on Subject: below --
2023-01-13 10:29 Will Deacon
2023-01-13 13:58 ` pr-tracker-bot
2022-09-02 11:12 Will Deacon
2022-09-02 18:30 ` pr-tracker-bot
2022-04-22 11:20 Will Deacon
2022-04-22 21:19 ` pr-tracker-bot
2021-12-03 13:19 Will Deacon
2021-12-03 18:53 ` pr-tracker-bot
2020-11-13 12:39 GIT " Will Deacon
2020-11-13 12:44 ` [GIT " Will Deacon
2020-11-13 17:25   ` Linus Torvalds
2019-10-17 23:43 [GIT PULL] arm64: Fixes " Will Deacon
2019-10-18  0:06 ` Linus Torvalds
2019-10-18 17:41   ` Will Deacon
2019-10-18 19:17     ` Linus Torvalds
2019-10-21  6:46       ` Ingo Molnar
2019-10-21 11:45         ` Linus Torvalds
2019-10-22  8:16         ` Uwe Kleine-König
2019-10-18  0:15 ` pr-tracker-bot
2019-10-18 20:09 ` Jayachandran Chandrasekharan Nair
2019-06-07 15:13 [GIT PULL] arm64: fixes " Will Deacon
2019-06-07 16:45 ` pr-tracker-bot
2019-04-05 17:17 [GIT PULL] arm64 " Catalin Marinas
2019-04-05 23:50 ` pr-tracker-bot
2018-09-14 16:19 [GIT PULL] arm64: " Will Deacon
2017-12-15 18:31 Will Deacon
2017-08-04 18:32 Will Deacon
2016-06-17 17:07 Will Deacon
2015-05-14 15:48 Will Deacon
2015-01-09 15:22 Will Deacon

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).