[UBUNTU 20.04] Include patches to avoid self-detected stall with Secure Execution

Even if the two commits applied cleanly (well for jammy only one of them is needed, see bug description for more details), I get compile errors, like:

On 22.04:
"
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c: In function ‘make_secure_pte’:
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:198:19: error: ‘UVC_CC_OK’ undeclared (first use in this function)
  198 | if (cc == UVC_CC_OK)
      | ^~~~~~~~~
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:198:19: note: each undeclared identifier is reported only once for each function it appears in
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:200:24: error: ‘UVC_CC_BUSY’ undeclared (first use in this function); did you mean ‘SIGP_CC_BUSY’?
  200 | else if (cc == UVC_CC_BUSY || cc == UVC_CC_PARTIAL)
      | ^~~~~~~~~~~
      | SIGP_CC_BUSY
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:200:45: error: ‘UVC_CC_PARTIAL’ undeclared (first use in this function)
  200 | else if (cc == UVC_CC_BUSY || cc == UVC_CC_PARTIAL)
      | ^~~~~~~~~~~~~~
make[4]: *** [/<<PKGBUILDDIR>>/scripts/Makefile.build:285: arch/s390/kernel/uv.o] Error 1
make[3]: *** [/<<PKGBUILDDIR>>/scripts/Makefile.build:548: arch/s390/kernel] Error 2
make[2]: *** [/<<PKGBUILDDIR>>/Makefile:1875: arch/s390] Error 2
make[2]: *** Waiting for unfinished jobs....
"

Similar on 20.04:
"
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c: In function ‘make_secure_pte’:
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:195:12: error: ‘UVC_CC_OK’ undeclared (first use in this function)
  195 | if (cc == UVC_CC_OK)
      | ^~~~~~~~~
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:195:12: note: each undeclared identifier is reported only once for each function it appears in
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:197:17: error: ‘UVC_CC_BUSY’ undeclared (first use in this function); did you mean ‘SIGP_CC_BUSY’?
  197 | else if (cc == UVC_CC_BUSY || cc == UVC_CC_PARTIAL)
      | ^~~~~~~~~~~
      | SIGP_CC_BUSY
/<<PKGBUILDDIR>>/arch/s390/kernel/uv.c:197:38: error: ‘UVC_CC_PARTIAL’ undeclared (first use in this function)
  197 | else if (cc == UVC_CC_BUSY || cc == UVC_CC_PARTIAL)
      | ^~~~~~~~~~~~~~
make[4]: *** [/<<PKGBUILDDIR>>/scripts/Makefile.build:270: arch/s390/kernel/uv.o] Error 1
make[3]: *** [/<<PKGBUILDDIR>>/scripts/Makefile.build:519: arch/s390/kernel] Error 2
make[2]: *** [/<<PKGBUILDDIR>>/Makefile:1762: arch/s390] Error 2
make[2]: *** Waiting for unfinished jobs....
"

I assume that maybe a pre-required commit (or more is missing)?

------- Comment From <email address hidden> 2022-06-21 11:45 EDT-------
> I assume that maybe a pre-required commit (or more is missing)?

Right, those defines were added with

commit 57c5df13eca4017ed28f9375dc1d246ec0f54217
Author: Claudio Imbrenda <email address hidden>
AuthorDate: Mon Sep 20 15:24:49 2021 +0200
Commit: Christian Borntraeger <email address hidden>
CommitDate: Mon Oct 25 09:20:38 2021 +0200

KVM: s390: pv: add macros for UVC CC values

Would you prefer to pick this commit too or do you want backports?

Btw. full logs can be found here:
https://launchpadlibrarian.net/608480309/buildlog_ubuntu-jammy-s390x.linux_5.15.0-40.43~lp1979296_BUILDING.txt.gz
https://launchpadlibrarian.net/608479639/buildlog_ubuntu-focal-s390x.linux_5.4.0-121.137~lp1959973_BUILDING.txt.gz

Looks like there was a little overlap in the last two posts...

If they can be cleanly cherry-picked, than it's all good (and I could).

Test kernels (jammy 5.15, focal 5.4 and bionic hwe-5.4) are currently build in PPA:
https://launchpad.net/~fheimes/+archive/ubuntu/lp1979296
https://launchpad.net/~fheimes/+archive/ubuntu/lp1979296/+packages

SRU request submitted to the Ubuntu kernel team mailing list for jammy and focal.
https://lists.ubuntu.com/archives/kernel-team/2022-June/thread.html#131188
Changing status to 'In Progress' for jammy and focal.

This bug is awaiting verification that the linux/5.4.0-123.139 kernel in -proposed solves the problem. Please test the kernel and update this bug with the results. If the problem is solved, change the tag 'verification-needed-focal' to 'verification-done-focal'. If the problem still exists, change the tag 'verification-needed-focal' to 'verification-failed-focal'.

If verification is not done by 5 working days from today, this fix will be dropped from the source code, and this bug will be closed.

See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you!

------- Comment From <email address hidden> 2022-07-13 11:50 EDT-------
Gave it some testing with secure execution guests with 1GB ramdisks that needed to be unpacked during boot and started 100 of them at the same time. No rcu stall.

Looks good.

Glad to hear/read that - thx, for the verification!

This bug is awaiting verification that the linux/5.15.0-43.46 kernel in -proposed solves the problem. Please test the kernel and update this bug with the results. If the problem is solved, change the tag 'verification-needed-jammy' to 'verification-done-jammy'. If the problem still exists, change the tag 'verification-needed-jammy' to 'verification-failed-jammy'.

If verification is not done by 5 working days from today, this fix will be dropped from the source code, and this bug will be closed.

See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to enable and use -proposed. Thank you!

------- Comment From <email address hidden> 2022-07-15 10:04 EDT-------
(In reply to comment #15)
> This bug is awaiting verification that the linux/5.15.0-43.46 kernel in
> -proposed solves the problem. Please test the kernel and update this bug
> with the results. If the problem is solved, change the tag
> 'verification-needed-jammy' to 'verification-done-jammy'. If the problem
> still exists, change the tag 'verification-needed-jammy' to
> 'verification-failed-jammy'.
>
> If verification is not done by 5 working days from today, this fix will be
> dropped from the source code, and this bug will be closed.
>
> See https://wiki.ubuntu.com/Testing/EnableProposed for documentation how to
> enable and use -proposed. Thank you!

Same testcase as on focal successful also on jammy.

This bug was fixed in the package linux - 5.15.0-43.46

---------------
linux (5.15.0-43.46) jammy; urgency=medium

  * jammy/linux: 5.15.0-43.46 -proposed tracker (LP: #1981243)

  * Packaging resync (LP: #1786013)
    - debian/dkms-versions -- update from kernel-versions (main/2022.07.11)

  * nbd: requests can become stuck when disconnecting from server with qemu-nbd
    (LP: #1896350)
    - nbd: don't handle response without a corresponding request message
    - nbd: make sure request completion won't concurrent
    - nbd: don't clear 'NBD_CMD_INFLIGHT' flag if request is not completed
    - nbd: fix io hung while disconnecting device

  * Ubuntu 22.04 and 20.04 DPC Fixes for Failure Cases of DownPort Containment
    events (LP: #1965241)
    - PCI/portdrv: Rename pm_iter() to pcie_port_device_iter()
    - PCI: pciehp: Ignore Link Down/Up caused by error-induced Hot Reset
    - [Config] Enable config option CONFIG_PCIE_EDR

  * [SRU] Ubuntu 22.04 Feature Request-Add support for a NVMe-oF-TCP CDC Client
    - TP 8010 (LP: #1948626)
    - nvme: add CNTRLTYPE definitions for 'identify controller'
    - nvme: send uevent on connection up
    - nvme: expose cntrltype and dctype through sysfs

  * [UBUNTU 22.04] Kernel oops while removing device from cio_ignore list
    (LP: #1980951)
    - s390/cio: derive cdev information only for IO-subchannels

  * Jammy Charmed OpenStack deployment fails over connectivity issues when using
    converged OVS bridge for control and data planes (LP: #1978820)
    - net/mlx5e: TC NIC mode, fix tc chains miss table

  * Hairpin traffic does not work with centralized NAT gw (LP: #1967856)
    - net: openvswitch: fix misuse of the cached connection on tuple changes

  * alsa: asoc: amd: the internal mic can't be dedected on yellow carp machines
    (LP: #1980700)
    - ASoC: amd: Add driver data to acp6x machine driver
    - ASoC: amd: Add support for enabling DMIC on acp6x via _DSD

  * AMD ACP 6.x DMIC Supports (LP: #1949245)
    - ASoC: amd: add Yellow Carp ACP6x IP register header
    - ASoC: amd: add Yellow Carp ACP PCI driver
    - ASoC: amd: add acp6x init/de-init functions
    - ASoC: amd: add platform devices for acp6x pdm driver and dmic driver
    - ASoC: amd: add acp6x pdm platform driver
    - ASoC: amd: add acp6x irq handler
    - ASoC: amd: add acp6x pdm driver dma ops
    - ASoC: amd: add acp6x pci driver pm ops
    - ASoC: amd: add acp6x pdm driver pm ops
    - ASoC: amd: enable Yellow carp acp6x drivers build
    - ASoC: amd: create platform device for acp6x machine driver
    - ASoC: amd: add YC machine driver using dmic
    - ASoC: amd: enable Yellow Carp platform machine driver build
    - ASoC: amd: fix uninitialized variable in snd_acp6x_probe()
    - [Config] Enable AMD ACP 6 DMIC Support

  * [UBUNTU 20.04] Include patches to avoid self-detected stall with Secure
    Execution (LP: #1979296)
    - KVM: s390: pv: add macros for UVC CC values
    - KVM: s390: pv: avoid stalls when making pages secure

  * [22.04 FEAT] KVM: Attestation support for Secure Execution (crypto)
    (LP: #1959973)
    - drivers/s390/char: Add Ultravisor io device
    - s390/uv_uapi: depend on CONFIG_S390
    - [Co...

This bug was fixed in the package linux - 5.4.0-124.140

---------------
linux (5.4.0-124.140) focal; urgency=medium

  * CVE-2022-2586
    - SAUCE: netfilter: nf_tables: do not allow SET_ID to refer to another table
    - SAUCE: netfilter: nf_tables: do not allow RULE_ID to refer to another chain

  * CVE-2022-2588
    - SAUCE: net_sched: cls_route: remove from list when handle is 0

  * CVE-2022-34918
    - netfilter: nf_tables: stricter validation of element data

linux (5.4.0-123.139) focal; urgency=medium

  * focal/linux: 5.4.0-123.139 -proposed tracker (LP: #1981284)

  * Packaging resync (LP: #1786013)
    - debian/dkms-versions -- update from kernel-versions (main/2022.07.11)

  * Hairpin traffic does not work with centralized NAT gw (LP: #1967856)
    - net: openvswitch: fix misuse of the cached connection on tuple changes

  * [UBUNTU 20.04] Include patches to avoid self-detected stall with Secure
    Execution (LP: #1979296)
    - KVM: s390: pv: add macros for UVC CC values
    - KVM: s390: pv: avoid stalls when making pages secure
    - KVM: s390: pv: avoid stalls for kvm_s390_pv_init_vm

  * Focal update: v5.4.195 upstream stable release (LP: #1980407)
    - batman-adv: Don't skb_split skbuffs with frag_list
    - hwmon: (tmp401) Add OF device ID table
    - mac80211: Reset MBSSID parameters upon connection
    - net: Fix features skip in for_each_netdev_feature()
    - ipv4: drop dst in multicast routing path
    - drm/nouveau: Fix a potential theorical leak in nouveau_get_backlight_name()
    - netlink: do not reset transport header in netlink_recvmsg()
    - mac80211_hwsim: call ieee80211_tx_prepare_skb under RCU protection
    - dim: initialize all struct fields
    - hwmon: (ltq-cputemp) restrict it to SOC_XWAY
    - s390/ctcm: fix variable dereferenced before check
    - s390/ctcm: fix potential memory leak
    - s390/lcs: fix variable dereferenced before check
    - net/sched: act_pedit: really ensure the skb is writable
    - net/smc: non blocking recvmsg() return -EAGAIN when no data and
      signal_pending
    - net: sfc: ef10: fix memory leak in efx_ef10_mtd_probe()
    - gfs2: Fix filesystem block deallocation for short writes
    - hwmon: (f71882fg) Fix negative temperature
    - ASoC: max98090: Reject invalid values in custom control put()
    - ASoC: max98090: Generate notifications on changes for custom control
    - ASoC: ops: Validate input values in snd_soc_put_volsw_range()
    - s390: disable -Warray-bounds
    - net: emaclite: Don't advertise 1000BASE-T and do auto negotiation
    - tcp: resalt the secret every 10 seconds
    - tty: n_gsm: fix mux activation issues in gsm_config()
    - usb: cdc-wdm: fix reading stuck on device close
    - usb: typec: tcpci: Don't skip cleanup in .remove() on error
    - USB: serial: pl2303: add device id for HP LM930 Display
    - USB: serial: qcserial: add support for Sierra Wireless EM7590
    - USB: serial: option: add Fibocom L610 modem
    - USB: serial: option: add Fibocom MA510 modem
    - slimbus: qcom: Fix IRQ check in qcom_slim_probe
    - serial: 8250_mtk: Fix UART_EFR register address
    - serial: 8250_mtk: Fix register address for XON/XOFF character
    - dr...