mbox series

[GIT,PULL] arm64 fixes for -rc7

Message ID 20220923182800.GA14450@willie-the-truck
State New
Headers show
Series [GIT,PULL] arm64 fixes for -rc7 | expand

Pull-request

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

Message

Will Deacon Sept. 23, 2022, 6:28 p.m. UTC
Hi Linus,

Please pull these arm64 fixes for -rc7. They're all very simple and
self-contained, although the CFI jump-table fix touches the generic
linker script as that's where the problematic macro lives.

Summary in the tag.

Cheers,

Will

--->8

The following changes since commit 3fe3fd5f30720b4afd3345cc186808125e7f5848:

  arm64: mm: fix resume for 52-bit enabled builds (2022-09-10 14:46:28 +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 13b0566962914e167cb3238fbe29ced618f07a27:

  vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment (2022-09-23 13:39:01 +0100)

----------------------------------------------------------------
arm64 fixes for -rc7

- Fix false positive "sleeping while atomic" warning resulting from
  the kPTI rework taking a mutex too early.

- Fix possible overflow in AMU frequency calculation

- Fix incorrect shift in CMN PMU driver which causes problems with
  newer versions of the IP

- Reduce alignment of the CFI jump table to avoid huge kernel images
  and link errors with !4KiB page size configurations

----------------------------------------------------------------
Ilkka Koskinen (1):
      perf/arm-cmn: Add more bits to child node address offset field

Mark Rutland (1):
      arm64: mm: don't acquire mutex when rewriting swapper

Sergey Shtylyov (1):
      arm64: topology: fix possible overflow in amu_fie_setup()

Will Deacon (1):
      vmlinux.lds.h: CFI: Reduce alignment of jump-table to function alignment

 arch/arm64/kernel/topology.c      |  2 +-
 arch/arm64/mm/mmu.c               | 32 ++++++++++++++++++--------------
 drivers/perf/arm-cmn.c            |  2 +-
 include/asm-generic/vmlinux.lds.h |  3 +--
 4 files changed, 21 insertions(+), 18 deletions(-)

Comments

Linus Torvalds Sept. 23, 2022, 10:43 p.m. UTC | #1
On Fri, Sep 23, 2022 at 11:28 AM Will Deacon <will@kernel.org> wrote:
>
> Please pull these arm64 fixes for -rc7. They're all very simple and
> self-contained, although the CFI jump-table fix touches the generic
> linker script as that's where the problematic macro lives.

The commit message is a bit confusing. It talks about "hysterical
raisins on x86", but CONFIG_CFI_CLANG has always been arm64-only. No?

So I'm not seeing what the x86 comment is about?

Anyway, pulled. That alignment was obviously horrendous.

                Linus
pr-tracker-bot@kernel.org Sept. 23, 2022, 10:53 p.m. UTC | #2
The pull request you sent on Fri, 23 Sep 2022 19:28:00 +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/a63f2e7cb1107ab124f80407e5eb8579c04eb7a9

Thank you!
Mark Rutland Sept. 28, 2022, 10:46 a.m. UTC | #3
On Fri, Sep 23, 2022 at 03:43:05PM -0700, Linus Torvalds wrote:
> On Fri, Sep 23, 2022 at 11:28 AM Will Deacon <will@kernel.org> wrote:
> >
> > Please pull these arm64 fixes for -rc7. They're all very simple and
> > self-contained, although the CFI jump-table fix touches the generic
> > linker script as that's where the problematic macro lives.
> 
> The commit message is a bit confusing. It talks about "hysterical
> raisins on x86", but CONFIG_CFI_CLANG has always been arm64-only. No?
> 
> So I'm not seeing what the x86 comment is about?

It was a an accidental inclusion inthe ARM64 CFI series while x86 CFI support
was being developed; in the thread in the LINK tage, Sami says:

| This was a leftover from an old x86 series, which was included here by
| mistake. Will also asked me about this a couple of weeks ago, I think, and
| said he'd send a patch to remove it.

The relevant message being:

  https://lore.kernel.org/all/CABCJKufrRCb84fafhsR8_fftBLv0_pvufL_ZZieUSTJfhdT+fw@mail.gmail.com/

Thanks,
Mark.