This is the start of the stable review cycle for the 6.1.49 release.
There are 4 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 Mon, 28 Aug 2023 15:46:14 +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/v6.x/stable-review/patch-6.1.49-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.1.49-rc1
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "f2fs: fix to do sanity check on direct node in truncate_dnode()"
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "f2fs: fix to set flush_merge opt and show noflush_merge"
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Revert "f2fs: don't reset unchangable mount option in f2fs_remount()"
Peter Zijlstra <peterz(a)infradead.org>
objtool/x86: Fix SRSO mess
-------------
Diffstat:
Makefile | 4 ++--
fs/f2fs/f2fs.h | 1 +
fs/f2fs/file.c | 5 +++++
fs/f2fs/node.c | 14 ++----------
fs/f2fs/super.c | 43 ++++++++++++------------------------
include/linux/f2fs_fs.h | 1 -
tools/objtool/arch/x86/decode.c | 11 +++++----
tools/objtool/check.c | 22 +++++++++++++++++-
tools/objtool/include/objtool/arch.h | 1 +
tools/objtool/include/objtool/elf.h | 1 +
10 files changed, 54 insertions(+), 49 deletions(-)
Total jobs: 55
Total errors: 18 (32.73%)
LAVA errors: 0 (0.00%)
Test errors: 16 (29.09%)
Job errors: 0 (0.00%)
Infra errors: 2 (3.64%)
Canceled jobs: 0 (0.00%)
Device type: hi6220-hikey-r2
Total jobs: 11
Total errors: 2 (18.18%)
Error type: Test
Error count: 2 (18.18%)
Error: No match for error type 'Test', message 'lava-test-interactive timed out after 600 seconds'
Count: 1 (9.09%)
IDs:
hikey-6220-r2-15:
6695130
Error: No match for error type 'Test', message 'tradefed - adb device lost[3F939C43003B7553]'
Count: 1 (9.09%)
IDs:
hikey-6220-r2-14:
6695053
Device type: qrb5165-rb5
Total jobs: 44
Total errors: 16 (36.36%)
Error type: Test
Error count: 14 (31.82%)
Error: No match for error type 'Test', message 'tradefed - adb device lost[d8a1879f]'
Count: 3 (6.82%)
IDs:
rb5-07:
6694265 6694287 6694289
Error: No match for error type 'Test', message 'tradefed - adb device lost[74d67c95]'
Count: 2 (4.55%)
IDs:
rb5-03:
6694264 6694280
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 2 (4.55%)
IDs:
rb5-03:
6692584
rb5-06:
6694275
Error: No match for error type 'Test', message 'tradefed - adb device lost[4fc7b22]'
Count: 1 (2.27%)
IDs:
rb5-06:
6694269
Error: No match for error type 'Test', message 'tradefed - adb device lost[9496f60d]'
Count: 5 (11.36%)
IDs:
rb5-01:
6690918 6691029 6692575 6692577 6693933
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 597 seconds'
Count: 1 (2.27%)
IDs:
rb5-01:
6690942
Error type: Infrastructure
Error count: 2 (4.55%)
Error: Connection closed
Count: 2 (4.55%)
IDs:
rb5-03:
6690919 6693535
This is the start of the stable review cycle for the 6.1.48 release.
There are 15 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 Sat, 26 Aug 2023 14:14:28 +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/v6.x/stable-review/patch-6.1.48-rc1…
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.1.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <gregkh(a)linuxfoundation.org>
Linux 6.1.48-rc1
Borislav Petkov (AMD) <bp(a)alien8.de>
x86/srso: Correct the mitigation status when SMT is disabled
Peter Zijlstra <peterz(a)infradead.org>
objtool/x86: Fixup frame-pointer vs rethunk
Petr Pavlu <petr.pavlu(a)suse.com>
x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG
Borislav Petkov (AMD) <bp(a)alien8.de>
x86/srso: Disable the mitigation on unaffected configurations
Borislav Petkov (AMD) <bp(a)alien8.de>
x86/CPU/AMD: Fix the DIV(0) initial fix attempt
Sean Christopherson <seanjc(a)google.com>
x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
Peter Zijlstra <peterz(a)infradead.org>
x86/static_call: Fix __static_call_fixup()
Borislav Petkov (AMD) <bp(a)alien8.de>
x86/srso: Explain the untraining sequences a bit more
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Cleanup the untrain mess
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Rename srso_(.*)_alias to srso_alias_\1
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Rename original retbleed methods
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Clean up SRSO return thunk mess
Peter Zijlstra <peterz(a)infradead.org>
x86/alternative: Make custom return thunk unconditional
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
Peter Zijlstra <peterz(a)infradead.org>
x86/cpu: Fix __x86_return_thunk symbol type
-------------
Diffstat:
Documentation/admin-guide/hw-vuln/srso.rst | 4 +-
Makefile | 4 +-
arch/x86/include/asm/entry-common.h | 1 +
arch/x86/include/asm/nospec-branch.h | 28 +++---
arch/x86/kernel/cpu/amd.c | 1 +
arch/x86/kernel/cpu/bugs.c | 28 +++++-
arch/x86/kernel/static_call.c | 13 +++
arch/x86/kernel/traps.c | 2 -
arch/x86/kernel/vmlinux.lds.S | 20 ++--
arch/x86/kvm/svm/svm.c | 2 +
arch/x86/lib/retpoline.S | 141 ++++++++++++++++++++---------
tools/objtool/arch/x86/decode.c | 2 +-
tools/objtool/check.c | 21 +++--
13 files changed, 182 insertions(+), 85 deletions(-)
Total jobs: 164
Total errors: 62 (37.80%)
LAVA errors: 0 (0.00%)
Test errors: 51 (31.10%)
Job errors: 5 (3.05%)
Infra errors: 6 (3.66%)
Canceled jobs: 0 (0.00%)
Device type: hi6220-hikey-r2
Total jobs: 37
Total errors: 13 (35.14%)
Error type: Test
Error count: 9 (24.32%)
Error: No match for error type 'Test', message 'lava-test-interactive timed out after 600 seconds'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-15:
6695130
Error: No match for error type 'Test', message 'tradefed - adb device lost[311A0E78003D2FFF]'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-09:
6695009
Error: Device NOT found!
Count: 1 (2.70%)
IDs:
hikey-6220-r2-15:
6694979
Error: No match for error type 'Test', message 'tradefed - adb device lost[4595FE84003F72FC]'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-04:
6694387
Error: No match for error type 'Test', message 'tradefed - adb device lost[50D6538A01FE17F3]'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-15:
6694376
Error: No match for error type 'Test', message 'tradefed - adb device lost[2047EDF7003CEE68]'
Count: 2 (5.41%)
IDs:
hikey-6220-r2-01:
6694333 6694338
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-01:
6694329
Error: No match for error type 'Test', message 'tradefed - adb device lost[3F939C43003B7553]'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-14:
6694325
Error type: Job
Error count: 1 (2.70%)
Error: wait for prompt timed out
Count: 1 (2.70%)
IDs:
hikey-6220-r2-17:
6694990
Error type: Infrastructure
Error count: 3 (8.11%)
Error: fastboot-flash-action timed out
Count: 2 (5.41%)
IDs:
hikey-6220-r2-01:
6694320
hikey-6220-r2-02:
6694321
Error: No match for error type 'Infrastructure', message 'wait-device-boardid timed out after 889 seconds'
Count: 1 (2.70%)
IDs:
hikey-6220-r2-16:
6694319
Device type: dragonboard-845c
Total jobs: 75
Total errors: 30 (40.00%)
Error type: Test
Error count: 27 (36.00%)
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 20 (26.67%)
IDs:
db845c-01:
6690728 6690935 6690941 6691149
db845c-03:
6690768 6691017 6693880
db845c-04:
6690733 6690737 6693869 6694359 6694401
db845c-06:
6690742 6690749
db845c-07:
6692681
db845c-08:
6693604
db845c-09:
6690734 6690789 6694395 6694424
Error: No match for error type 'Test', message 'lava-test-interactive timed out after 600 seconds'
Count: 6 (8.00%)
IDs:
db845c-04:
6694303
db845c-07:
6694300
db845c-08:
6694297 6694302
db845c-09:
6694299 6694305
Error: Device NOT found!
Count: 1 (1.33%)
IDs:
db845c-01:
6690748
Error type: Job
Error count: 3 (4.00%)
Error: No match for error type 'Job', message 'login-action timed out after 741 seconds'
Count: 1 (1.33%)
IDs:
db845c-09:
6693894
Error: No match for error type 'Job', message 'login-action timed out after 869 seconds'
Count: 1 (1.33%)
IDs:
db845c-04:
6692618
Error: No match for error type 'Job', message 'login-action timed out after 705 seconds'
Count: 1 (1.33%)
IDs:
db845c-04:
6690792
Device type: x15
Total jobs: 8
Total errors: 0 (0.00%)
Device type: x86
Total jobs: 3
Total errors: 0 (0.00%)
Device type: qrb5165-rb5
Total jobs: 40
Total errors: 18 (45.00%)
Error type: Infrastructure
Error count: 3 (7.50%)
Error: Connection closed
Count: 3 (7.50%)
IDs:
rb5-03:
6687528 6690906 6690915
Error type: Test
Error count: 15 (37.50%)
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 592 seconds'
Count: 1 (2.50%)
IDs:
rb5-03:
6690911
Error: No match for error type 'Test', message 'The network seems not available, as the ping command failed'
Count: 8 (20.00%)
IDs:
rb5-01:
6687533 6687541 6689348
rb5-03:
6687527 6687544 6687546 6690667
rb5-07:
6687885
Error: No match for error type 'Test', message 'tradefed - adb device lost[74d67c95]'
Count: 3 (7.50%)
IDs:
rb5-03:
6687522 6688615 6690638
Error: No match for error type 'Test', message 'lava-docker-test-shell timed out after 595 seconds'
Count: 1 (2.50%)
IDs:
rb5-01:
6690386
Error: No match for error type 'Test', message 'tradefed - adb device lost[9496f60d]'
Count: 2 (5.00%)
IDs:
rb5-01:
6687530 6687539
Device type: bcm2711-rpi-4-b
Total jobs: 1
Total errors: 1 (100.00%)
Error type: Job
Error count: 1 (100.00%)
Error: wait for prompt timed out
Count: 1 (100.00%)
IDs:
rpi4-b-04:
6688361