]> git.proxmox.com Git - mirror_ubuntu-impish-kernel.git/log
mirror_ubuntu-impish-kernel.git
2 years agoUBUNTU: Ubuntu-5.13.0-14.14 master
Andrea Righi [Mon, 2 Aug 2021 12:23:08 +0000 (14:23 +0200)]
UBUNTU: Ubuntu-5.13.0-14.14

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 2 Aug 2021 12:22:32 +0000 (14:22 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1938565
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 2 Aug 2021 11:24:07 +0000 (13:24 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: use ext4_grp_locked_error in mb_find_extent
Stephen Brennan [Wed, 23 Jun 2021 23:21:14 +0000 (16:21 -0700)]
ext4: use ext4_grp_locked_error in mb_find_extent

Commit 5d1b1b3f492f ("ext4: fix BUG when calling ext4_error with locked
block group") introduces ext4_grp_locked_error to handle unlocking a
group in error cases. Otherwise, there is a possibility of a sleep while
atomic. However, since 43c73221b3b1 ("ext4: replace BUG_ON with WARN_ON
in mb_find_extent()"), mb_find_extent() has contained a ext4_error()
call while a group spinlock is held. Replace this with
ext4_grp_locked_error.

Fixes: 43c73221b3b1 ("ext4: replace BUG_ON with WARN_ON in mb_find_extent()")
Cc: <stable@vger.kernel.org> # 4.14+
Signed-off-by: Stephen Brennan <stephen.s.brennan@oracle.com>
Reviewed-by: Lukas Czerner <lczerner@redhat.com>
Reviewed-by: Junxiao Bi <junxiao.bi@oracle.com>
Link: https://lore.kernel.org/r/20210623232114.34457-1-stephen.s.brennan@oracle.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit cd84bbbac12a173a381a64c6ec8b76a5277b87b5)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: fix avefreec in find_group_orlov
Pan Dong [Tue, 25 May 2021 07:36:56 +0000 (15:36 +0800)]
ext4: fix avefreec in find_group_orlov

The avefreec should be average free clusters instead
of average free blocks, otherwize Orlov's allocator
will not work properly when bigalloc enabled.

Cc: stable@kernel.org
Signed-off-by: Pan Dong <pandong.peter@bytedance.com>
Link: https://lore.kernel.org/r/20210525073656.31594-1-pandong.peter@bytedance.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit c89849cc0259f3d33624cc3bd127685c3c0fa25d)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: remove check for zero nr_to_scan in ext4_es_scan()
Zhang Yi [Sat, 22 May 2021 10:30:44 +0000 (18:30 +0800)]
ext4: remove check for zero nr_to_scan in ext4_es_scan()

After converting fs shrinkers to new scan/count API, we are no longer
pass zero nr_to_scan parameter to detect the number of objects to free,
just remove this check.

Fixes: 1ab6c4997e04 ("fs: convert fs shrinkers to new scan/count API")
Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210522103045.690103-2-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit e5e7010e5444d923e4091cafff61d05f2d19cada)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: correct the cache_nr in tracepoint ext4_es_shrink_exit
Zhang Yi [Sat, 22 May 2021 10:30:45 +0000 (18:30 +0800)]
ext4: correct the cache_nr in tracepoint ext4_es_shrink_exit

The cache_cnt parameter of tracepoint ext4_es_shrink_exit means the
remaining cache count after shrink, but now it is the cache count before
shrink, fix it by read sbi->s_extent_cache_cnt again.

Fixes: 1ab6c4997e04 ("fs: convert fs shrinkers to new scan/count API")
Cc: stable@vger.kernel.org # 3.12+
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210522103045.690103-3-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit 4fb7c70a889ead2e91e184895ac6e5354b759135)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: return error code when ext4_fill_flex_info() fails
Yang Yingliang [Mon, 10 May 2021 11:10:51 +0000 (19:10 +0800)]
ext4: return error code when ext4_fill_flex_info() fails

After commit c89128a00838 ("ext4: handle errors on
ext4_commit_super"), 'ret' may be set to 0 before calling
ext4_fill_flex_info(), if ext4_fill_flex_info() fails ext4_mount()
doesn't return error code, it makes 'root' is null which causes crash
in legacy_get_tree().

Fixes: c89128a00838 ("ext4: handle errors on ext4_commit_super")
Reported-by: Hulk Robot <hulkci@huawei.com>
Cc: <stable@vger.kernel.org> # v4.18+
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Link: https://lore.kernel.org/r/20210510111051.55650-1-yangyingliang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit 8f6840c4fd1e7bd715e403074fb161c1a04cda73)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: fix overflow in ext4_iomap_alloc()
Jan Kara [Mon, 12 Apr 2021 10:23:33 +0000 (12:23 +0200)]
ext4: fix overflow in ext4_iomap_alloc()

A code in iomap alloc may overflow block number when converting it to
byte offset. Luckily this is mostly harmless as we will just use more
expensive method of writing using unwritten extents even though we are
writing beyond i_size.

Cc: stable@kernel.org
Fixes: 378f32bab371 ("ext4: introduce direct I/O write using iomap infrastructure")
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210412102333.2676-4-jack@suse.cz
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit d0b040f5f2557b2f507c01e88ad8cff424fdc6a9)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: fix kernel infoleak via ext4_extent_header
Anirudh Rayabharam [Thu, 6 May 2021 18:56:54 +0000 (00:26 +0530)]
ext4: fix kernel infoleak via ext4_extent_header

Initialize eh_generation of struct ext4_extent_header to prevent leaking
info to userspace. Fixes KMSAN kernel-infoleak bug reported by syzbot at:
http://syzkaller.appspot.com/bug?id=78e9ad0e6952a3ca16e8234724b2fa92d041b9b8

Cc: stable@kernel.org
Reported-by: syzbot+2dcfeaf8cb49b05e8f1a@syzkaller.appspotmail.com
Fixes: a86c61812637 ("[PATCH] ext3: add extent map support")
Signed-off-by: Anirudh Rayabharam <mail@anirudhrb.com>
Link: https://lore.kernel.org/r/20210506185655.7118-1-mail@anirudhrb.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit ce3aba43599f0b50adbebff133df8d08a3d5fffe)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoext4: cleanup in-core orphan list if ext4_truncate() failed to get a transaction...
Zhang Yi [Fri, 7 May 2021 07:19:04 +0000 (15:19 +0800)]
ext4: cleanup in-core orphan list if ext4_truncate() failed to get a transaction handle

In ext4_orphan_cleanup(), if ext4_truncate() failed to get a transaction
handle, it didn't remove the inode from the in-core orphan list, which
may probably trigger below error dump in ext4_destroy_inode() during the
final iput() and could lead to memory corruption on the later orphan
list changes.

 EXT4-fs (sda): Inode 6291467 (00000000b8247c67): orphan list check failed!
 00000000b8247c670001f30a 00000004 00000000 00000023  ............#...
 00000000e24cde7100000006 014082a3 00000000 00000000  ......@.........
 0000000072c6a5ee00000000 00000000 00000000 00000000  ................
 ...

This patch fix this by cleanup in-core orphan list manually if
ext4_truncate() return error.

Cc: stable@kernel.org
Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20210507071904.160808-1-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
(cherry picked from commit b9a037b7f3c401d3c63e0423e56aef606b1ffaaf)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agobpf: Fix integer overflow in argument calculation for bpf_map_area_alloc
Bui Quang Minh [Sun, 13 Jun 2021 14:34:39 +0000 (21:34 +0700)]
bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc

In 32-bit architecture, the result of sizeof() is a 32-bit integer so
the expression becomes the multiplication between 2 32-bit integer which
can potentially leads to integer overflow. As a result,
bpf_map_area_alloc() allocates less memory than needed.

Fix this by casting 1 operand to u64.

Fixes: 0d2c4f964050 ("bpf: Eliminate rlimit-based memory accounting for sockmap and sockhash maps")
Fixes: 99c51064fb06 ("devmap: Use bpf_map_area_alloc() for allocating hash buckets")
Fixes: 546ac1ffb70d ("bpf: add devmap, a map for storing net device references")
Signed-off-by: Bui Quang Minh <minhquangbui99@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20210613143440.71975-1-minhquangbui99@gmail.com
(cherry picked from commit 7dd5d437c258bbf4cc15b35229e5208b87b8b4e0)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoseq_buf: Fix overflow in seq_buf_putmem_hex()
Yun Zhou [Sat, 26 Jun 2021 03:21:55 +0000 (11:21 +0800)]
seq_buf: Fix overflow in seq_buf_putmem_hex()

There's two variables being increased in that loop (i and j), and i
follows the raw data, and j follows what is being written into the buffer.
We should compare 'i' to MAX_MEMHEX_BYTES or compare 'j' to HEX_CHARS.
Otherwise, if 'j' goes bigger than HEX_CHARS, it will overflow the
destination buffer.

Link: https://lore.kernel.org/lkml/20210625122453.5e2fe304@oasis.local.home/
Link: https://lkml.kernel.org/r/20210626032156.47889-1-yun.zhou@windriver.com
Cc: stable@vger.kernel.org
Fixes: 5e3ca0ec76fce ("ftrace: introduce the "hex" output method")
Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit d3b16034a24a112bb83aeb669ac5b9b01f744bb7)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: random: properly make getrandom() ready earlier
Andrea Righi [Fri, 30 Jul 2021 09:19:44 +0000 (11:19 +0200)]
UBUNTU: SAUCE: random: properly make getrandom() ready earlier

This replaces commit 4d75a68d22d7 ("UBUNTU: SAUCE: random: Make
getrandom() ready earlier") with a proper implementation.

We want to make getrandom() available when crng is initialized at least
to the first stage (not necessarily initialized from input_pool). To do
so we need to check this in wait_for_random_bytes() using a wait_event
with a proper timeout and try to generate some entropy when the timeout
expires to prevent the system to get stuck indefinitely.

This indefinite wait issue has been systematically reproduced on some
arm64 ThunderX boards. With this new patch applied the problem doesn't
seem to happen anymore.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: Revert "UBUNTU: SAUCE: random: Make getrandom() ready earlier"
Andrea Righi [Fri, 30 Jul 2021 09:16:59 +0000 (11:16 +0200)]
UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: random: Make getrandom() ready earlier"

This reverts commit 4d75a68d22d7fc04e6aff3bfda730f7c0902125a. Superseded
by the next commit.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Ubuntu-5.13.0-13.13
Andrea Righi [Fri, 23 Jul 2021 14:12:58 +0000 (16:12 +0200)]
UBUNTU: Ubuntu-5.13.0-13.13

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Fri, 23 Jul 2021 14:12:04 +0000 (16:12 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1937577
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Fri, 23 Jul 2021 13:58:21 +0000 (15:58 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: update dkms package versions
Andrea Righi [Fri, 23 Jul 2021 13:56:30 +0000 (15:56 +0200)]
UBUNTU: update dkms package versions

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] update toolchain in configs
Andrea Righi [Fri, 23 Jul 2021 13:51:47 +0000 (15:51 +0200)]
UBUNTU: [Config] update toolchain in configs

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] re-enable shiftfs
Andrea Righi [Fri, 23 Jul 2021 13:51:21 +0000 (15:51 +0200)]
UBUNTU: [Config] re-enable shiftfs

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: shifts: update shiftfs for idmapped mounts
Paolo Pisati [Tue, 20 Jul 2021 16:17:31 +0000 (18:17 +0200)]
UBUNTU: SAUCE: shifts: update shiftfs for idmapped mounts

Update shifts following upstream commit "6521f891708 namei: prepare for
idmapped mounts" and commit "9fe61450972 namei: introduce struct renamedata" but
don't let it be mounted on top of idmapped mounts.

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Ubuntu-5.13.0-12.12
Andrea Righi [Mon, 12 Jul 2021 12:09:16 +0000 (14:09 +0200)]
UBUNTU: Ubuntu-5.13.0-12.12

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 12 Jul 2021 08:14:17 +0000 (10:14 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] rename linux-unstable to linux in getabis
Andrea Righi [Mon, 12 Jul 2021 08:13:47 +0000 (10:13 +0200)]
UBUNTU: [Packaging] rename linux-unstable to linux in getabis

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: update dkms package versions
Andrea Righi [Mon, 12 Jul 2021 08:11:12 +0000 (10:11 +0200)]
UBUNTU: update dkms package versions

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoLinux 5.13.1
Sasha Levin [Wed, 7 Jul 2021 12:24:58 +0000 (08:24 -0400)]
Linux 5.13.1

BugLink: https://bugs.launchpad.net/bugs/1935807
Tested-by: Fox Chen <foxhlchen@gmail.com>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Linux Kernel Functional Testing <lkft@linaro.org>
Tested-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoRevert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack"
Sean Christopherson [Tue, 22 Jun 2021 17:56:50 +0000 (10:56 -0700)]
Revert "KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack"

BugLink: https://bugs.launchpad.net/bugs/1935807
commit f71a53d1180d5ecc346f0c6a23191d837fe2871b upstream.

Restore CR4.LA57 to the mmu_role to fix an amusing edge case with nested
virtualization.  When KVM (L0) is using TDP, CR4.LA57 is not reflected in
mmu_role.base.level because that tracks the shadow root level, i.e. TDP
level.  Normally, this is not an issue because LA57 can't be toggled
while long mode is active, i.e. the guest has to first disable paging,
then toggle LA57, then re-enable paging, thus ensuring an MMU
reinitialization.

But if L1 is crafty, it can load a new CR4 on VM-Exit and toggle LA57
without having to bounce through an unpaged section.  L1 can also load a
new CR3 on exit, i.e. it doesn't even need to play crazy paging games, a
single entry PML5 is sufficient.  Such shenanigans are only problematic
if L0 and L1 use TDP, otherwise L1 and L2 share an MMU that gets
reinitialized on nested VM-Enter/VM-Exit due to mmu_role.base.guest_mode.

Note, in the L2 case with nested TDP, even though L1 can switch between
L2s with different LA57 settings, thus bypassing the paging requirement,
in that case KVM's nested_mmu will track LA57 in base.level.

This reverts commit 8053f924cad30bf9f9a24e02b6c8ddfabf5202ea.

Fixes: 8053f924cad3 ("KVM: x86/mmu: Drop kvm_mmu_extended_role.cr4_la57 hack")
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
Message-Id: <20210622175739.3610207-6-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] Enable CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT
Colin Ian King [Fri, 25 Jun 2021 08:42:17 +0000 (09:42 +0100)]
UBUNTU: [Config] Enable CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT

Kernel stack offset randomization is a useful security feature
that should be enabled. Benchmarking showed that the impact is
within the noise of various microbenchmarks so I believe this
has some added benefit with minimal performance impact. The
security folk believe this is worth enabling, so lets switch
it on.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoselftests/ftrace: fix event-no-pid on 1-core machine
Krzysztof Kozlowski [Mon, 5 Jul 2021 15:47:33 +0000 (17:47 +0200)]
selftests/ftrace: fix event-no-pid on 1-core machine

BugLink: https://bugs.launchpad.net/bugs/1935807
BugLink: https://bugs.launchpad.net/bugs/1927749
When running event-no-pid test on small machines (e.g. cloud 1-core
instance), other events might not happen:

    + cat trace
    + cnt=0
    + [ 0 -eq 0 ]
    + fail No other events were recorded
    [15] event tracing - restricts events based on pid notrace filtering [FAIL]

Schedule a simple sleep task to be sure that some other process events
get recorded.

Fixes: ebed9628f5c2 ("selftests/ftrace: Add test to test new set_event_notrace_pid file")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
(cherry picked from commit 07b60713b57a8f952d029a2b6849d003d9c16108)
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ubuntu-host: add generic lseek op
Colin Ian King [Wed, 30 Jun 2021 09:14:08 +0000 (10:14 +0100)]
UBUNTU: ubuntu-host: add generic lseek op

BugLink: https://bugs.launchpad.net/bugs/1935807
BugLink: https://bugs.launchpad.net/bugs/1934110
Currently the lseek op is null and seeking on the esm-token procfs
file will cause an oops as detected by the stress-ng procfs stressor
as shown by the following splat:

[  942.470568] BUG: kernel NULL pointer dereference, address: 0000000000000000
[  942.471157] #PF: supervisor instruction fetch in kernel mode
[  942.471724] #PF: error_code(0x0010) - not-present page
[  942.472297] PGD 0 P4D 0
[  942.472867] Oops: 0010 [#1] SMP PTI
[  942.473435] CPU: 2 PID: 5661 Comm: stress-ng Not tainted 5.13.0-9-generic #9
[  942.474012] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015
[  942.474599] RIP: 0010:0x0
[  942.475194] Code: Unable to access opcode bytes at RIP 0xffffffffffffffd6.
[  942.475792] RSP: 0018:ffffaacf80ff7eb8 EFLAGS: 00010246
[  942.476383] RAX: 0000000000000000 RBX: ffff9eaa8a175240 RCX: 0000000000000001
[  942.476986] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff9eaa838d5800
[  942.477600] RBP: ffffaacf80ff7ed0 R08: 0000000000004000 R09: 0000000000000004
[  942.478203] R10: 0000000000000002 R11: 0000000000000000 R12: 0000000000000000
[  942.478800] R13: 0000000000000000 R14: ffffffffffffffea R15: ffff9eaa838d5800
[  942.479399] FS:  00007f998d487f00(0000) GS:ffff9eaaffc80000(0000) knlGS:0000000000000000
[  942.480006] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  942.480607] CR2: ffffffffffffffd6 CR3: 000000010a774002 CR4: 0000000000370ee0
[  942.481219] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  942.481855] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[  942.482458] Call Trace:
[  942.483052]  proc_reg_llseek+0x4e/0x80
[  942.483646]  ? __fdget_pos+0x43/0x50
[  942.484234]  ksys_lseek+0x84/0xc0
[  942.484815]  __x64_sys_lseek+0x1a/0x20
[  942.485412]  do_syscall_64+0x61/0xb0
[  942.485966]  ? asm_exc_page_fault+0x8/0x30
[  942.486476]  entry_SYSCALL_64_after_hwframe+0x44/0xae
[  942.486994] RIP: 0033:0x7f998d5c1cdb
[  942.487512] Code: ff ff c3 0f 1f 40 00 48 8b 15 89 81 0d 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb ba 0f 1f 00 f3 0f 1e fa b8 08 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 05 c3 0f 1f 40 00 48 8b 15 59 81 0d 00 f7 d8
[  942.488593] RSP: 002b:00007ffdf61c5328 EFLAGS: 00000246 ORIG_RAX: 0000000000000008
[  942.489148] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f998d5c1cdb
[  942.489710] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000004
[  942.490252] RBP: 0000000000000004 R08: 000001785e4740dd R09: 0000562dbebb9e50
[  942.490801] R10: 00007ffdf61c5300 R11: 0000000000000246 R12: 00007ffdf61c63f0
[  942.491354] R13: 00007ffdf61c53f0 R14: 0000000000000003 R15: 00000000000001e9

Fix this by using the generic lseek operation.

Fixes: 71adefd254f2 ("UBUNTU: Add ubuntu-host module")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Ubuntu-5.13.0-11.11
Andrea Righi [Tue, 29 Jun 2021 05:50:25 +0000 (07:50 +0200)]
UBUNTU: Ubuntu-5.13.0-11.11

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 28 Jun 2021 16:22:11 +0000 (18:22 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1933854
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 28 Jun 2021 15:23:04 +0000 (17:23 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] update variants
Andrea Righi [Mon, 28 Jun 2021 15:21:34 +0000 (17:21 +0200)]
UBUNTU: [Packaging] update variants

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Change source package name to linux
Andrea Righi [Mon, 28 Jun 2021 14:25:57 +0000 (16:25 +0200)]
UBUNTU: [Packaging] Change source package name to linux

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agomm/page_alloc: Correct return value of populated elements if bulk array is populated
Mel Gorman [Mon, 28 Jun 2021 15:02:19 +0000 (16:02 +0100)]
mm/page_alloc: Correct return value of populated elements if bulk array is populated

Dave Jones reported the following

This made it into 5.13 final, and completely breaks NFSD for me
(Serving tcp v3 mounts).  Existing mounts on clients hang, as do
new mounts from new clients.  Rebooting the server back to rc7
everything recovers.

The commit b3b64ebd3822 ("mm/page_alloc: do bulk array bounds check after
checking populated elements") returns the wrong value if the array is
already populated which is interpreted as an allocation failure. Dave
reported this fixes his problem and it also passed a test running dbench
over NFS.

Fixes: b3b64ebd3822 ("mm/page_alloc: do bulk array bounds check after checking populated elements")
Reported-and-tested-by: Dave Jones <davej@codemonkey.org.uk>
Signed-off-by: Mel Gorman <mgorman@techsingularity.net>
Cc: <stable@vger.kernel.org> [5.13+]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 66d9282523b3228183b14d9f812872dd2620704d)
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] Configure CONFIG_SYSTEM_REVOCATION_KEYS with revoked keys
Dimitri John Ledkov [Tue, 15 Jun 2021 15:40:04 +0000 (16:40 +0100)]
UBUNTU: [Config] Configure CONFIG_SYSTEM_REVOCATION_KEYS with revoked keys

BugLink: https://bugs.launchpad.net/bugs/1932029
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Revoke 2012 UEFI signing certificate as built-in
Dimitri John Ledkov [Tue, 15 Jun 2021 15:40:03 +0000 (16:40 +0100)]
UBUNTU: [Packaging] Revoke 2012 UEFI signing certificate as built-in

BugLink: https://bugs.launchpad.net/bugs/1932029
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] build canonical-revoked-certs.pem from branch/arch certs
Dimitri John Ledkov [Tue, 15 Jun 2021 15:40:02 +0000 (16:40 +0100)]
UBUNTU: [Packaging] build canonical-revoked-certs.pem from branch/arch certs

BugLink: https://bugs.launchpad.net/bugs/1932029
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Ubuntu-unstable-5.13.0-10.10
Andrea Righi [Mon, 28 Jun 2021 06:40:05 +0000 (08:40 +0200)]
UBUNTU: Ubuntu-unstable-5.13.0-10.10

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] update configs and annotations after rebase to 5.13
Andrea Righi [Mon, 28 Jun 2021 06:36:16 +0000 (08:36 +0200)]
UBUNTU: [Config] update configs and annotations after rebase to 5.13

Commit c6414e1a2bd2 ("gpio: AMD8111 and TQMX86 require HAS_IOPORT_MAP")
added a dependency of HAS_IOPORT_MAP for TQMX86, so this module cannot
be enabled anymore on armhf.

Also update CONFIG_KERNEL_LZ4 in the config, because of commit
4ed757d8a68f ("UBUNTU: [Config] use ZSTD to compress amd64 kernels").

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 28 Jun 2021 06:28:02 +0000 (08:28 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1933795
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Rebase to v5.13
Andrea Righi [Mon, 28 Jun 2021 06:07:14 +0000 (08:07 +0200)]
UBUNTU: Rebase to v5.13

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 28 Jun 2021 06:06:35 +0000 (08:06 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agomedia: uvcvideo: Fix pixel format change for Elgato Cam Link 4K
Benjamin Drung [Wed, 23 Jun 2021 22:16:20 +0000 (22:16 +0000)]
media: uvcvideo: Fix pixel format change for Elgato Cam Link 4K

BugLink: https://bugs.launchpad.net/bugs/1932367
The Elgato Cam Link 4K HDMI video capture card reports to support three
different pixel formats, where the first format depends on the connected
HDMI device.

```
$ v4l2-ctl -d /dev/video0 --list-formats-ext
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture

[0]: 'NV12' (Y/CbCr 4:2:0)
Size: Discrete 3840x2160
Interval: Discrete 0.033s (29.970 fps)
[1]: 'NV12' (Y/CbCr 4:2:0)
Size: Discrete 3840x2160
Interval: Discrete 0.033s (29.970 fps)
[2]: 'YU12' (Planar YUV 4:2:0)
Size: Discrete 3840x2160
Interval: Discrete 0.033s (29.970 fps)
```

Changing the pixel format to anything besides the first pixel format
does not work:

```
$ v4l2-ctl -d /dev/video0 --try-fmt-video pixelformat=YU12
Format Video Capture:
Width/Height      : 3840/2160
Pixel Format      : 'NV12' (Y/CbCr 4:2:0)
Field             : None
Bytes per Line    : 3840
Size Image        : 12441600
Colorspace        : sRGB
Transfer Function : Rec. 709
YCbCr/HSV Encoding: Rec. 709
Quantization      : Default (maps to Limited Range)
Flags             :
```

User space applications like VLC might show an error message on the
terminal in that case:

```
libv4l2: error set_fmt gave us a different result than try_fmt!
```

Depending on the error handling of the user space applications, they
might display a distorted video, because they use the wrong pixel format
for decoding the stream.

The Elgato Cam Link 4K responds to the USB video probe
VS_PROBE_CONTROL/VS_COMMIT_CONTROL with a malformed data structure: The
second byte contains bFormatIndex (instead of being the second byte of
bmHint). The first byte is always zero. The third byte is always 1.

The firmware bug was reported to Elgato on 2020-12-01 and it was
forwarded by the support team to the developers as feature request.
There is no firmware update available since then. The latest firmware
for Elgato Cam Link 4K as of 2021-03-23 has MCU 20.02.19 and FPGA 67.

Therefore correct the malformed data structure for this device. The
change was successfully tested with VLC, OBS, and Chromium using
different pixel formats (YUYV, NV12, YU12), resolutions (3840x2160,
1920x1080), and frame rates (29.970 and 59.940 fps).

Cc: stable@vger.kernel.org
Signed-off-by: Benjamin Drung <bdrung@posteo.de>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
(backported from commit 4c6e0976295add7f0ed94d276c04a3d6f1ea8f83 linux-next)
Signed-off-by: Benjamin Drung <bdrung@posteo.de>
[ changed uvc_trace(UVC_TRACE_VIDEO) -> uvc_dbg(stream->dev, VIDEO) ]
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] use ZSTD to compress s390 kernels
Dimitri John Ledkov [Thu, 24 Jun 2021 20:53:47 +0000 (21:53 +0100)]
UBUNTU: [Packaging] use ZSTD to compress s390 kernels

BugLink: https://bugs.launchpad.net/bugs/1931725
linux-next has ZSTD support for s390 arch now, cherry-pick those
commits and enable ZSTD compression for s390x like it was already done
on amd64.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agos390/boot: add zstd support
Dimitri John Ledkov [Thu, 24 Jun 2021 20:53:46 +0000 (21:53 +0100)]
s390/boot: add zstd support

Enable ztsd support in s390/boot, to enable booting with zstd
compressed kernel when configured with CONFIG_KERNEL_ZSTD=y.

BOOT_HEAP_SIZE is defined to 0x30000 in this case. Actual decompressor
memory usage with allyesconfig is currently 0x26150.

BugLink: https://bugs.launchpad.net/bugs/1931725
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
cc: Heiko Carstens <hca@linux.ibm.com>
cc: Vasily Gorbik <gor@linux.ibm.com>
cc: Christian Borntraeger <borntraeger@de.ibm.com>
cc: linux-s390@vger.kernel.org
Link: https://lore.kernel.org/r/20210615114150.325080-1-dimitri.ledkov@canonical.com
[gor: added BOOT_HEAP_SIZE for zstd]
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
(cherry picked from commit 7b034d9c1b08b3d06ad712283c1115a7fe39e354 linux-next)
BugLink: https://bugs.launchpad.net/bugs/1931725
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agos390/decompressor: correct BOOT_HEAP_SIZE condition
Vasily Gorbik [Thu, 24 Jun 2021 20:53:45 +0000 (21:53 +0100)]
s390/decompressor: correct BOOT_HEAP_SIZE condition

Currently BOOT_HEAP_SIZE is always defined as 0x400000 due to
bogus condition. Use CONFIG_KERNEL_BZIP2 instead of
CONFIG_HAVE_KERNEL_BZIP2 to correct that.

BOOT_HEAP_SIZE of 0x10000 is still good enough for every decompressor
algorithm but bzip2. Actual decompressor memory usage with allyesconfig
is the following:
gzip  0xbc28
bzip2 0x379518
xz    0x7410
lzma  0x3e6c
lzo   0
lz4   0

Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
(cherry picked from commit 54f45214522ae74dc23ad262346ce1abbf96b1ed linux-next)
BugLink: https://bugs.launchpad.net/bugs/1931725
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: selftests: icmp_redirect: support expected failures
Andrea Righi [Tue, 22 Jun 2021 07:46:48 +0000 (09:46 +0200)]
UBUNTU: SAUCE: selftests: icmp_redirect: support expected failures

According to a comment in commit 99513cfa16c6 ("selftest: Fixes for
icmp_redirect test") the test "IPv6: mtu exception plus redirect" is
expected to fail, because of a bug in the IPv6 logic that hasn't been
fixed yet apparently.

We should probably consider this failure as an "expected failure",
therefore change the script to return XFAIL for that particular test and
also report the total amount of expected failures at the end of the run.

Link: https://lore.kernel.org/lkml/YNGVaO0pN9VqR8tJ@xps-13-7390/T/#u
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: selftests: tls: fix chacha+bidir tests
Jakub Kicinski [Fri, 18 Jun 2021 20:25:04 +0000 (13:25 -0700)]
UBUNTU: SAUCE: selftests: tls: fix chacha+bidir tests

ChaCha support did not adjust the bidirectional test.
We need to set up KTLS in reverse direction correctly,
otherwise these two cases will fail:

  tls.12_chacha.bidir
  tls.13_chacha.bidir

Fixes: 4f336e88a870 ("selftests/tls: add CHACHA20-POLY1305 to tls selftests")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://lore.kernel.org/r/20210618202504.1435179-2-kuba@kernel.org
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agotls: prevent oversized sendfile() hangs by ignoring MSG_MORE
Jakub Kicinski [Fri, 18 Jun 2021 20:34:06 +0000 (13:34 -0700)]
tls: prevent oversized sendfile() hangs by ignoring MSG_MORE

We got multiple reports that multi_chunk_sendfile test
case from tls selftest fails. This was sort of expected,
as the original fix was never applied (see it in the first
Link:). The test in question uses sendfile() with count
larger than the size of the underlying file. This will
make splice set MSG_MORE on all sendpage calls, meaning
TLS will never close and flush the last partial record.

Eric seem to have addressed a similar problem in
commit 35f9c09fe9c7 ("tcp: tcp_sendpages() should call tcp_push() once")
by introducing MSG_SENDPAGE_NOTLAST. Unlike MSG_MORE
MSG_SENDPAGE_NOTLAST is not set on the last call
of a "pipefull" of data (PIPE_DEF_BUFFERS == 16,
so every 16 pages or whenever we run out of data).

Having a break every 16 pages should be fine, TLS
can pack exactly 4 pages into a record, so for
aligned reads there should be no difference,
unaligned may see one extra record per sendpage().

Sticking to TCP semantics seems preferable to modifying
splice, but we can revisit it if real life scenarios
show a regression.

Reported-by: Vadim Fedorenko <vfedorenko@novek.ru>
Reported-by: Seth Forshee <seth.forshee@canonical.com>
Link: https://lore.kernel.org/netdev/1591392508-14592-1-git-send-email-pooja.trivedi@stackpath.com/
Fixes: 3c4d7559159b ("tls: kernel TLS support")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit d452d48b9f8b1a7f8152d33ef52cfd7fe1735b0a linux-next)
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: Ubuntu-unstable-5.13.0-9.9
Andrea Righi [Mon, 21 Jun 2021 08:55:36 +0000 (10:55 +0200)]
UBUNTU: Ubuntu-unstable-5.13.0-9.9

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] update annotations after rebase to 5.13-rc7
Andrea Righi [Mon, 21 Jun 2021 08:37:55 +0000 (10:37 +0200)]
UBUNTU: [Config] update annotations after rebase to 5.13-rc7

Disable CONFIG_XILINX_ZYNQMP_DPDMA on amd64, beacuse this now depends on
CONFIG_HAS_IOMEM.

Also drop deprecated option CONFIG_ACPI_CPPC_CPUFREQ_FIE, and update
modules list on amd64.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 21 Jun 2021 08:09:36 +0000 (10:09 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1933070
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Rebase to v5.13-rc7
Andrea Righi [Mon, 21 Jun 2021 08:39:48 +0000 (10:39 +0200)]
UBUNTU: Rebase to v5.13-rc7

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 21 Jun 2021 07:38:49 +0000 (09:38 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Fix ODM DRIVERS Kconfig
Chia-Lin Kao (AceLan) [Fri, 11 Jun 2021 10:01:31 +0000 (18:01 +0800)]
UBUNTU: [Packaging] Fix ODM DRIVERS Kconfig

BugLink: https://bugs.launchpad.net/bugs/1912789
Encounted below errors, prefer 'help' over '---help---' for new help texts
ubuntu/Kconfig:7: syntax error
ubuntu/Kconfig:6: unknown statement "---help---"
ubuntu/Kconfig:7: unknown statement "Turn"

Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Fix ODM support in actual build
Stefan Bader [Fri, 11 Jun 2021 10:01:30 +0000 (18:01 +0800)]
UBUNTU: [Packaging] Fix ODM support in actual build

BugLink: https://bugs.launchpad.net/bugs/1912789
The config update was working with the conditional entry but the actual
build is different and was just ignoring everything.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
(cherry picked commit from 198971108d5dfe12b9846bf0d115accc3d1c3fe8
focal)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Turn on ODM support for amd64
Stefan Bader [Fri, 11 Jun 2021 10:01:29 +0000 (18:01 +0800)]
UBUNTU: [Packaging] Turn on ODM support for amd64

BugLink: https://bugs.launchpad.net/1912789
Now there is the support in place let us turn this on for amd64. This is
added as enabled generally in the config because otherwise updating the
config for drivers depending on it would not work. It is changed at
build time for arches which have not enabled it. Also it will
automatically go away for backports.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
(backported from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4 focal)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] Add support for ODM drivers
Stefan Bader [Fri, 11 Jun 2021 10:01:28 +0000 (18:01 +0800)]
UBUNTU: [Packaging] Add support for ODM drivers

BugLink: https://bugs.launchpad.net/bugs/1912789
We want to be able to selectively turn on ODM driver support for those
kernels/arches we have to but otherwise not inherit this to other
derivatives. This is done by a new config option which we will have to
depend on in the new drivers config options. Support is toggled by
changing a makefile rule variable. The new config option will be hidden
as long as not at least one of the arches supported turns on the rule
variable.

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
(cherry picked from commit 4aeffc246531a666c1fad1925ebf1a6e68a704e4
focal)
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: mfd: Add support for IO functions of AAEON devices
Kunyang_Fan [Wed, 16 Jun 2021 05:56:58 +0000 (13:56 +0800)]
UBUNTU: ODM: mfd: Add support for IO functions of AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
This adds the supports for multiple IO functions of the
AAEON x86 devices and makes use of the WMI interface to
control the these IO devices including:

- GPIO
- LED
- Watchdog
- HWMON

It also adds the mfd child device drivers to support
the above IO functions.

Signed-off-by: Kunyang_Fan <kunyang_fan@asus.com>
Review-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Review-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: gpio: add driver for AAEON devices
Kunyang_Fan [Wed, 16 Jun 2021 05:56:59 +0000 (13:56 +0800)]
UBUNTU: ODM: gpio: add driver for AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
This patch add support for the GPIO pins whose control are
transported to BIOS through ASUS WMI interface.

Signed-off-by: Kunyang_Fan <kunyang_fan@asus.com>
Review-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Review-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: watchdog: add driver for AAEON devices
Kunyang_Fan [Wed, 16 Jun 2021 05:57:00 +0000 (13:57 +0800)]
UBUNTU: ODM: watchdog: add driver for AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
This patch adds support for the watchdog whose control are
transported to BIOS through ASUS WMI interface.

This driver imitates the old type SIO watchdog driver to
provide the basic control for watchdog functions.

Signed-off-by: Kunyang_Fan <kunyang_fan@asus.com>
Review-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Review-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: leds: add driver for AAEON devices
Kunyang_Fan [Wed, 16 Jun 2021 05:57:02 +0000 (13:57 +0800)]
UBUNTU: ODM: leds: add driver for AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
This patch adds support for the led devices which can
be controlled from sysfs through ASUS WMI interface.

Signed-off-by: Kunyang_Fan <kunyang_fan@asus.com>
Review-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Review-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: hwmon: add driver for AAEON devices
Kunyang_Fan [Wed, 16 Jun 2021 05:57:01 +0000 (13:57 +0800)]
UBUNTU: ODM: hwmon: add driver for AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
This refator patch adds support for the hwmon information
which are transported to userspace through ASUS WMI interface.

Signed-off-by: Kunyang_Fan <kunyang_fan@asus.com>
Review-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Review-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: ODM: [Config] update config for AAEON devices
Chia-Lin Kao (AceLan) [Wed, 16 Jun 2021 05:57:03 +0000 (13:57 +0800)]
UBUNTU: ODM: [Config] update config for AAEON devices

BugLink: https://bugs.launchpad.net/bugs/1929504
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging]: Add kernel command line condition to hv-kvp-daemon service
Dimitri John Ledkov [Tue, 15 Jun 2021 22:42:58 +0000 (23:42 +0100)]
UBUNTU: [Packaging]: Add kernel command line condition to hv-kvp-daemon service

linux-cloud-tools-common ships a service for hyper-v hypervisor. It is
known to be prohibited on certain instance types. Add a kernel command
line condition to skip starting this service there.

BugLink: https://bugs.launchpad.net/bugs/1932081
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
cc: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoPCI: Coalesce host bridge contiguous apertures
Kai-Heng Feng [Mon, 7 Jun 2021 16:39:10 +0000 (00:39 +0800)]
PCI: Coalesce host bridge contiguous apertures

BugLink: https://bugs.launchpad.net/bugs/1931147
Built-in graphics on HP EliteDesk 805 G6 doesn't work because graphics
can't get the BAR it needs:

  pci_bus 0000:00: root bus resource [mem 0x10020200000-0x100303fffff window]
  pci_bus 0000:00: root bus resource [mem 0x10030400000-0x100401fffff window]

  pci 0000:00:08.1:   bridge window [mem 0xd2000000-0xd23fffff]
  pci 0000:00:08.1:   bridge window [mem 0x10030000000-0x100401fffff 64bit pref]
  pci 0000:00:08.1: can't claim BAR 15 [mem 0x10030000000-0x100401fffff 64bit pref]: no compatible bridge window
  pci 0000:00:08.1: [mem 0x10030000000-0x100401fffff 64bit pref] clipped to [mem 0x10030000000-0x100303fffff 64bit pref]
  pci 0000:00:08.1:   bridge window [mem 0x10030000000-0x100303fffff 64bit pref]
  pci 0000:07:00.0: can't claim BAR 0 [mem 0x10030000000-0x1003fffffff 64bit pref]: no compatible bridge window
  pci 0000:07:00.0: can't claim BAR 2 [mem 0x10040000000-0x100401fffff 64bit pref]: no compatible bridge window

However, the root bus has two contiguous apertures that can contain the
child resource requested.

Coalesce contiguous apertures so we can allocate from the entire contiguous
region.

[bhelgaas: fold in https://lore.kernel.org/r/20210528170242.1564038-1-kai.heng.feng@canonical.com]
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212013
Suggested-by: Bjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20210401131252.531935-1-kai.heng.feng@canonical.com
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
(cherry picked from commit 65db04053efea3f3e412a7e0cc599962999c96b4 linux-next)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: Revert "net/tls(TLS_SW): Add selftest for 'chunked' sendfile test"
Seth Forshee [Thu, 17 Jun 2021 19:48:08 +0000 (14:48 -0500)]
UBUNTU: SAUCE: Revert "net/tls(TLS_SW): Add selftest for 'chunked' sendfile test"

This reverts commit 0e6fbe39bdf71b4e665767bcbf53567a3e6d0623. Based
on the commit message, this commit was added to demonstrate a problem
with sendfile when using ktls, but there's no indication that this
problem has ever been fixed. I'm inquiring about this upstream [1],
but in the mean time let's remove this test as it looks like its
expected to fail.

[1] https://lore.kernel.org/netdev/YMumgy19CXCk5rZD@ubuntu-x1/

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: SAUCE: selftests: seccomp: bump up timeout to 5min
Andrea Righi [Wed, 16 Jun 2021 09:05:12 +0000 (11:05 +0200)]
UBUNTU: SAUCE: selftests: seccomp: bump up timeout to 5min

 DEBUG| [stdout] # selftests: seccomp: seccomp_benchmark
 DEBUG| [stdout] # net.core.bpf_jit_enable = 1
 DEBUG| [stdout] # net.core.bpf_jit_harden = 0
 DEBUG| [stdout] #
 DEBUG| [stdout] not ok 2 selftests: seccomp: seccomp_benchmark # TIMEOUT 120 seconds

This test can easily fail if the testing environment is a bit
overloaded, so bump up the timeout to 5min to prevent false positive
failures.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
Acked-by: Colin Ian King <colin.king@canonical.com>
2 years agoUBUNTU: Ubuntu-unstable-5.13.0-8.8
Andrea Righi [Tue, 15 Jun 2021 13:07:34 +0000 (15:07 +0200)]
UBUNTU: Ubuntu-unstable-5.13.0-8.8

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Tue, 15 Jun 2021 12:57:18 +0000 (14:57 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1932018
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Tue, 15 Jun 2021 12:54:58 +0000 (14:54 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: update dkms package versions
Andrea Righi [Tue, 15 Jun 2021 12:53:35 +0000 (14:53 +0200)]
UBUNTU: update dkms package versions

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] enable signing for ppc64el
Seth Forshee [Mon, 14 Jun 2021 12:22:48 +0000 (07:22 -0500)]
UBUNTU: [Config] enable signing for ppc64el

A bug in 5.13 is preventing IBM from testing secure boot. They will
provide a fix, and we will need to provide a new signed kernel build
for them to test. Thus we must re-enable signing.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: [Config] use ZSTD to compress amd64 kernels
Seth Forshee [Mon, 14 Jun 2021 12:08:19 +0000 (07:08 -0500)]
UBUNTU: [Config] use ZSTD to compress amd64 kernels

BugLink: https://bugs.launchpad.net/bugs/1931725
Testing shows that while LZ4 decompresses faster than ZSTD, ZSTD
compresses much better, and the decreased load time for the smaller
kernel image more than makes up for the slower decompression. Switch
to ZSTD for kernel compression on amd64, which is the only arch which
currently supports it.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: Ubuntu-unstable-5.13.0-7.7
Andrea Righi [Mon, 14 Jun 2021 09:53:08 +0000 (11:53 +0200)]
UBUNTU: Ubuntu-unstable-5.13.0-7.7

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] update toolchain versions
Andrea Righi [Mon, 14 Jun 2021 08:36:48 +0000 (10:36 +0200)]
UBUNTU: [Config] update toolchain versions

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 14 Jun 2021 07:53:00 +0000 (09:53 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1931840
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Rebase to v5.13-rc6
Andrea Righi [Mon, 14 Jun 2021 07:43:43 +0000 (09:43 +0200)]
UBUNTU: Rebase to v5.13-rc6

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 14 Jun 2021 07:42:59 +0000 (09:42 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: update dkms package versions
Andrea Righi [Mon, 14 Jun 2021 07:38:31 +0000 (09:38 +0200)]
UBUNTU: update dkms package versions

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] update helper scripts
Andrea Righi [Mon, 14 Jun 2021 07:35:08 +0000 (09:35 +0200)]
UBUNTU: [Packaging] update helper scripts

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Packaging] resync getabis
Andrea Righi [Mon, 14 Jun 2021 07:35:08 +0000 (09:35 +0200)]
UBUNTU: [Packaging] resync getabis

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] update annotations after configs review
Andrea Righi [Thu, 10 Jun 2021 08:37:29 +0000 (10:37 +0200)]
UBUNTU: [Config] update annotations after configs review

Also update toolchain version (gcc) in amd64 config.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: SAUCE: drm/i915/adl_s: ADL-S platform Update PCI ids for Mobile BGA
Anand Moon [Tue, 8 Jun 2021 11:55:40 +0000 (19:55 +0800)]
UBUNTU: SAUCE: drm/i915/adl_s: ADL-S platform Update PCI ids for Mobile BGA

BugLink: https://bugs.launchpad.net/bugs/1931240
As per Bspec: 53655 Update PCI ids for Mobile BGA.

Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Anand Moon <anandx.ram.moon@intel.com>
Reviewed-by: Aditya Swarup <aditya.swarup@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210203091029.2089-1-anandx.ram.moon@intel.com
(cherry picked from
https://cgit.freedesktop.org/drm/drm-intel/commit/?h=for-linux-next&id=3f50033dd88af5b3acfc164c53925189cad4c677)
Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
2 years agoUBUNTU: [Config] CONFIG_DEBUG_INFO_COMPRESSED=n
Seth Forshee [Mon, 7 Jun 2021 16:11:39 +0000 (11:11 -0500)]
UBUNTU: [Config] CONFIG_DEBUG_INFO_COMPRESSED=n

BugLink: https://bugs.launchpad.net/bugs/1930713
Now that we've worked around the build size issues, turn this option
off again to reduce size of ddebs.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: [Config] enable signing for s390x
Seth Forshee [Mon, 7 Jun 2021 16:05:50 +0000 (11:05 -0500)]
UBUNTU: [Config] enable signing for s390x

We now have lockdown testing for 5.13 on s390, so we can turn this
back on.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: [Config] remove now unsued do_dkms_nvidia* build variables
Seth Forshee [Tue, 1 Jun 2021 13:29:38 +0000 (08:29 -0500)]
UBUNTU: [Config] remove now unsued do_dkms_nvidia* build variables

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: [Debian] remove nvidia dkms build support
Seth Forshee [Tue, 1 Jun 2021 13:26:19 +0000 (08:26 -0500)]
UBUNTU: [Debian] remove nvidia dkms build support

We no longer need to generate signatures for nvidia modules during our
kernel build, as they are signed using the ubuntu drivers key. Remove
support for building the nvidia modules.

We must still keep the dkms-build--* scripts for now, as our tooling
currently syncs these scripts from the kernel tree into
linux-restricted-modules.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
2 years agoUBUNTU: update dkms package versions
Andrea Righi [Tue, 8 Jun 2021 06:03:44 +0000 (08:03 +0200)]
UBUNTU: update dkms package versions

Manually fix nvidia packages / versions.

BugLink: https://bugs.launchpad.net/bugs/1786013
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Ubuntu-unstable-5.13.0-6.6
Andrea Righi [Mon, 7 Jun 2021 08:45:13 +0000 (10:45 +0200)]
UBUNTU: Ubuntu-unstable-5.13.0-6.6

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: link-to-tracker: update tracking bug
Andrea Righi [Mon, 7 Jun 2021 07:00:27 +0000 (09:00 +0200)]
UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1931071
Properties: no-test-build
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Config] CONFIG_SND_SOC_RT1308 can only be enabled on amd64
Andrea Righi [Mon, 7 Jun 2021 06:32:03 +0000 (08:32 +0200)]
UBUNTU: [Config] CONFIG_SND_SOC_RT1308 can only be enabled on amd64

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Rebase to v5.13-rc5
Andrea Righi [Mon, 7 Jun 2021 05:43:26 +0000 (07:43 +0200)]
UBUNTU: Rebase to v5.13-rc5

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: Start new release
Andrea Righi [Mon, 7 Jun 2021 05:42:37 +0000 (07:42 +0200)]
UBUNTU: Start new release

Ignore: yes
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoUBUNTU: [Debian] exclude $(DEBIAN)/__abi.current from linux-source
Seth Forshee [Wed, 2 Jun 2021 20:16:14 +0000 (15:16 -0500)]
UBUNTU: [Debian] exclude $(DEBIAN)/__abi.current from linux-source

BugLink: https://bugs.launchpad.net/bugs/1930713
Previously install-source ran before the flavour install, but that is
no longer the case. As a result the __abi.current driectory ends up
in the linux-source package. Explicitly exclude it when installing
files for linux-source.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
2 years agoUBUNTU: [Debian] dkms-build -- use fakeroot if not running as root
Seth Forshee [Tue, 1 Jun 2021 15:36:03 +0000 (10:36 -0500)]
UBUNTU: [Debian] dkms-build -- use fakeroot if not running as root

BugLink: https://bugs.launchpad.net/bugs/1930713
Some dkms builds require running as root, or at least the illusion of
doing so. However we need to do dkms builds before deleting the
flavour build directory in order to sign the modules, and this may
happen without fakeroot. Detect whether or not dkms-build has been
invoked as root, and if not use fakeroot to do the dkms build.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>
2 years agoUBUNTU: [Debian] remove dh_testroot from install targets
Seth Forshee [Fri, 21 May 2021 00:50:29 +0000 (19:50 -0500)]
UBUNTU: [Debian] remove dh_testroot from install targets

BugLink: https://bugs.launchpad.net/bugs/1930713
When invoked during the build phase we do not expect to be running as
root or under fakeroot.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Acked-by: Andy Whitcroft <apw@canonical.com>