DLPX-75524 avoid unnecessary nfserr_jukebox returns from nfsd_file_acquire (#8) #16

Ignore: yes Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1894300 Properties: no-test-build Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1894638 Properties: no-test-build Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: William Breathitt Gray <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1895991 Properties: no-test-build Signed-off-by: William Breathitt Gray <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1893115 Signed-off-by: William Breathitt Gray <[email protected]>

Signed-off-by: William Breathitt Gray <[email protected]>

Ignore: yes Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Ignore: yes Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1898781 AWS F1 (x86_64) instance types need the fpga-mgr module. Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Colin Ian King <[email protected]> Signed-off-by: William Breathitt Gray <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1893817 Using write-combine is crucial for performance of PCI devices where significant amounts of transactions go over PCI BARs. arm64 supports write-combine PCI mappings, so the appropriate define has been added which will expose write-combine mappings under sysfs for prefetchable PCI resources. Signed-off-by: Clint Sbisa <[email protected]> Reference: https://lore.kernel.org/linux-pci/[email protected]/ Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Andrea Righi <[email protected]> Acked-by: Colin Ian King <[email protected]> Signed-off-by: William Breathitt Gray <[email protected]>

Ignore: yes Signed-off-by: Andrea Righi <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1900671 Properties: no-test-build Signed-off-by: Andrea Righi <[email protected]>

The Intel BlueZ project recommends in [1] to disable highspeed support as part of the fixes for the security issues. This does the required changes. [1] https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00435.html CVE-2020-24490 CVE-2020-12351 CVE-2020-12352 NOTE: apply the same change that has been applied to the generic kernel. In amd64 bluetooth is disabled in the annotations file we need to specify '-' for CONFIG_BT, while arm64 has bluetooth enabled, so it needs to be 'n'. Signed-off-by: Andrea Righi <[email protected]>

Signed-off-by: Andrea Righi <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The new functions use device_{online,offline}() which are userspace safe. This is in preparation to move cpu_{up, down} kernel users to use a safer interface that is not racy with userspace. Suggested-by: "Paul E. McKenney" <[email protected]> Signed-off-by: Qais Yousef <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Paul E. McKenney <[email protected]> Link: https://lkml.kernel.org/r/[email protected] (cherry picked from commit 93ef142) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves driver handles the enclave lifetime management. This includes enclave creation, termination and setting up its resources such as memory and CPU. An enclave runs alongside the VM that spawned it. It is abstracted as a process running in the VM that launched it. The process interacts with the NE driver, that exposes an ioctl interface for creating an enclave and setting up its resources. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * No changes. v7 -> v8 * Add NE custom error codes for user space memory regions not backed by pages multiple of 2 MiB, invalid flags and enclave CID. * Add max flag value for enclave image load info. v6 -> v7 * Clarify in the ioctls documentation that the return value is -1 and errno is set on failure. * Update the error code value for NE_ERR_INVALID_MEM_REGION_SIZE as it gets in user space as value 25 (ENOTTY) instead of 515. Update the NE custom error codes values range to not be the same as the ones defined in include/linux/errno.h, although these are not propagated to user space. v5 -> v6 * Fix typo in the description about the NE CPU pool. * Update documentation to kernel-doc format. * Remove the ioctl to query API version. v4 -> v5 * Add more details about the ioctl calls usage e.g. error codes, file descriptors used. * Update the ioctl to set an enclave vCPU to not return a file descriptor. * Add specific NE error codes. v3 -> v4 * Decouple NE ioctl interface from KVM API. * Add NE API version and the corresponding ioctl call. * Add enclave / image load flags options. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * Add ioctl for getting enclave image load metadata. * Update NE_ENCLAVE_START ioctl name to NE_START_ENCLAVE. * Add entry in Documentation/userspace-api/ioctl/ioctl-number.rst for NE ioctls. * Update NE ioctls definition based on the updated ioctl range for major and minor. Reviewed-by: Alexander Graf <[email protected]> Reviewed-by: Stefan Hajnoczi <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (backported from commit 15b760c) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves (NE) driver communicates with a new PCI device, that is exposed to a virtual machine (VM) and handles commands meant for handling enclaves lifetime e.g. creation, termination, setting memory regions. The communication with the PCI device is handled using a MMIO space and MSI-X interrupts. This device communicates with the hypervisor on the host, where the VM that spawned the enclave itself runs, e.g. to launch a VM that is used for the enclave. Define the MMIO space of the NE PCI device, the commands that are provided by this device. Add an internal data structure used as private data for the PCI device driver and the function for the PCI device command requests handling. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Fix indent for the NE PCI device command types enum. v7 -> v8 * No changes. v6 -> v7 * Update the documentation to include references to the NE PCI device id and MMIO bar. v5 -> v6 * Update documentation to kernel-doc format. v4 -> v5 * Add a TODO for including flags in the request to the NE PCI device to set a memory region for an enclave. It is not used for now. v3 -> v4 * Remove the "packed" attribute and include padding in the NE data structures. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * Update path naming to drivers/virt/nitro_enclaves. * Update NE_ENABLE_OFF / NE_ENABLE_ON defines. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru-Catalin Vasile <[email protected]> Signed-off-by: Alexandru Ciobotaru <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 0a44561) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves driver keeps an internal info per each enclave. This is needed to be able to manage enclave resources state, enclave notifications and have a reference of the PCI device that handles command requests for enclave lifetime management. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Add data structure to keep references to both Nitro Enclaves misc and PCI devices. v7 -> v8 * No changes. v6 -> v7 * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. v5 -> v6 * Update documentation to kernel-doc format. * Include in the enclave memory region data structure the user space address and size for duplicate user space memory regions checks. v4 -> v5 * Include enclave cores field in the enclave metadata. * Update the vCPU ids data structure to be a cpumask instead of a list. v3 -> v4 * Add NUMA node field for an enclave metadata as the enclave memory and CPUs need to be from the same NUMA node. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * Add enclave memory regions and vcpus count for enclave bookkeeping. * Update ne_state comments to reflect NE_START_ENCLAVE ioctl naming update. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru-Catalin Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 1df6248) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves PCI device is used by the kernel driver as a means of communication with the hypervisor on the host where the primary VM and the enclaves run. It handles requests with regard to enclave lifetime. Setup the PCI device driver and add support for MSI-X interrupts. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Init the reference to the ne_pci_dev in the ne_devs data structure. v7 -> v8 * Add NE PCI driver shutdown logic. v6 -> v7 * No changes. v5 -> v6 * Update documentation to kernel-doc format. v4 -> v5 * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Update NE PCI driver name to "nitro_enclaves". v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. * Remove the WARN_ON calls. * Remove linux/bug include that is not needed. * Update static calls sanity checks. * Remove "ratelimited" from the logs that are not in the ioctl call paths. * Update kzfree() calls to kfree(). v1 -> v2 * Add log pattern for NE. * Update PCI device setup functions to receive PCI device data structure and then get private data from it inside the functions logic. * Remove the BUG_ON calls. * Add teardown function for MSI-X setup. * Update goto labels to match their purpose. * Implement TODO for NE PCI device disable state check. * Update function name for NE PCI device probe / remove. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru-Catalin Vasile <[email protected]> Signed-off-by: Alexandru Ciobotaru <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 89308c1) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves PCI device exposes a MMIO space that this driver uses to submit command requests and to receive command replies e.g. for enclave creation / termination or setting enclave resources. Add logic for handling PCI device command requests based on the given command type. Register an MSI-X interrupt vector for command reply notifications to handle this type of communication events. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * No changes. v7 -> v8 * Update function signature for submit request and retrive reply functions as they only returned 0, no error code. * Include command type value in the error logs of ne_do_request(). v6 -> v7 * No changes. v5 -> v6 * Update documentation to kernel-doc format. v4 -> v5 * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Return IRQ_NONE when interrupts are not handled. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Remove "ratelimited" from the logs that are not in the ioctl call paths. v1 -> v2 * Add log pattern for NE. * Remove the BUG_ON calls. * Update goto labels to match their purpose. * Add fix for kbuild report: https://lore.kernel.org/lkml/202004231644.xTmN4Z1z%[email protected]/ Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru-Catalin Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit ad2b698) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 In addition to the replies sent by the Nitro Enclaves PCI device in response to command requests, out-of-band enclave events can happen e.g. an enclave crashes. In this case, the Nitro Enclaves driver needs to be aware of the event and notify the corresponding user space process that abstracts the enclave. Register an MSI-X interrupt vector to be used for this kind of out-of-band events. The interrupt notifies that the state of an enclave changed and the driver logic scans the state of each running enclave to identify for which this notification is intended. Create an workqueue to handle the out-of-band events. Notify user space enclave process that is using a polling mechanism on the enclave fd. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the reference to the pdev directly from the ne_pci_dev instead of the one from the enclave data structure. v7 -> v8 * No changes. v6 -> v7 * No changes. v5 -> v6 * Update documentation to kernel-doc format. v4 -> v5 * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Return IRQ_NONE when interrupts are not handled. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Remove "ratelimited" from the logs that are not in the ioctl call paths. v1 -> v2 * Add log pattern for NE. * Update goto labels to match their purpose. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru-Catalin Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e5d616d) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 The Nitro Enclaves driver provides an ioctl interface to the user space for enclave lifetime management e.g. enclave creation / termination and setting enclave resources such as memory and CPU. This ioctl interface is mapped to a Nitro Enclaves misc device. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE misc device in the NE PCI device driver logic. v7 -> v8 * Add define for the CID of the primary / parent VM. * Update the NE PCI driver shutdown logic to include misc device deregister. v6 -> v7 * Set the NE PCI device the parent of the NE misc device to be able to use it in the ioctl logic. * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. v5 -> v6 * Remove the ioctl to query API version. * Update documentation to kernel-doc format. v4 -> v5 * Update the size of the NE CPU pool string from 4096 to 512 chars. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Remove the NE CPU pool init during kernel module loading, as the CPU pool is now setup at runtime, via a sysfs file for the kernel parameter. * Add minimum enclave memory size definition. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. * Remove the WARN_ON calls. * Remove linux/bug and linux/kvm_host includes that are not needed. * Remove "ratelimited" from the logs that are not in the ioctl call paths. * Remove file ops that do nothing for now - open and release. v1 -> v2 * Add log pattern for NE. * Update goto labels to match their purpose. * Update ne_cpu_pool data structure to include the global mutex. * Update NE misc device mode to 0660. * Check if the CPU siblings are included in the NE CPU pool, as full CPU cores are given for the enclave(s). Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit bd47c99) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add ioctl command logic for enclave VM creation. It triggers a slot allocation. The enclave resources will be associated with this slot and it will be used as an identifier for triggering enclave run. Return a file descriptor, namely enclave fd. This is further used by the associated user space enclave process to set enclave resources and trigger enclave termination. The poll function is implemented in order to notify the enclave process when an enclave exits without a specific enclave termination command trigger e.g. when an enclave crashes. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE PCI device. v7 -> v8 * No changes. v6 -> v7 * Use the NE misc device parent field to get the NE PCI device. * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. v5 -> v6 * Update the code base to init the ioctl function in this patch. * Update documentation to kernel-doc format. v4 -> v5 * Release the reference to the NE PCI device on create VM error. * Close enclave fd on copy_to_user() failure; rename fd to enclave fd while at it. * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. * Remove log on copy_to_user() failure. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Update the NE ioctl call to match the decoupling from the KVM API. * Add metadata for the NUMA node for the enclave memory and CPUs. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Update kzfree() calls to kfree(). * Remove file ops that do nothing for now - open. v1 -> v2 * Add log pattern for NE. * Update goto labels to match their purpose. * Remove the BUG_ON calls. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 38907e1) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 An enclave, before being started, has its resources set. One of its resources is CPU. A NE CPU pool is set and enclave CPUs are chosen from it. Offline the CPUs from the NE CPU pool during the pool setup and online them back during the NE CPU pool teardown. The CPU offline is necessary so that there would not be more vCPUs than physical CPUs available to the primary / parent VM. In that case the CPUs would be overcommitted and would change the initial configuration of the primary / parent VM of having dedicated vCPUs to physical CPUs. The enclave CPUs need to be full cores and from the same NUMA node. CPU 0 and its siblings have to remain available to the primary / parent VM. Add ioctl command logic for setting an enclave vCPU. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE PCI device. v7 -> v8 * No changes. v6 -> v7 * Check for error return value when setting the kernel parameter string. * Use the NE misc device parent field to get the NE PCI device. * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. * Calculate the number of threads per core and not use smp_num_siblings that is x86 specific. v5 -> v6 * Check CPUs are from the same NUMA node before going through CPU siblings during the NE CPU pool setup. * Update documentation to kernel-doc format. v4 -> v5 * Set empty string in case of invalid NE CPU pool. * Clear NE CPU pool mask on pool setup failure. * Setup NE CPU cores out of the NE CPU pool. * Early exit on NE CPU pool setup if enclave(s) already running. * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. * Add check for maximum vCPU id possible before looking into the CPU pool. * Remove log on copy_from_user() / copy_to_user() failure and on admin capability check for setting the NE CPU pool. * Update the ioctl call to not create a file descriptor for the vCPU. * Split the CPU pool usage logic in 2 separate functions - one to get a CPU from the pool and the other to check the given CPU is available in the pool. v3 -> v4 * Setup the NE CPU pool at runtime via a sysfs file for the kernel parameter. * Check enclave CPUs to be from the same NUMA node. * Use dev_err instead of custom NE log pattern. * Update the NE ioctl call to match the decoupling from the KVM API. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Update kzfree() calls to kfree(). * Remove file ops that do nothing for now - open, ioctl and release. v1 -> v2 * Add log pattern for NE. * Update goto labels to match their purpose. * Remove the BUG_ON calls. * Check if enclave state is init when setting enclave vCPU. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit ff8a4d3) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Before setting the memory regions for the enclave, the enclave image needs to be placed in memory. After the memory regions are set, this memory cannot be used anymore by the VM, being carved out. Add ioctl command logic to get the offset in enclave memory where to place the enclave image. Then the user space tooling copies the enclave image in the memory using the given memory offset. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * No changes. v7 -> v8 * Add custom error code for incorrect enclave image load info flag. v6 -> v7 * No changes. v5 -> v6 * Check for invalid enclave image load flags. v4 -> v5 * Check for the enclave not being started when invoking this ioctl call. * Remove log on copy_from_user() / copy_to_user() failure. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Set enclave image load offset based on flags. * Update the naming for the ioctl command from metadata to info. v2 -> v3 * No changes. v1 -> v2 * New in v2. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 988b7a4) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Another resource that is being set for an enclave is memory. User space memory regions, that need to be backed by contiguous memory regions, are associated with the enclave. One solution for allocating / reserving contiguous memory regions, that is used for integration, is hugetlbfs. The user space process that is associated with the enclave passes to the driver these memory regions. The enclave memory regions need to be from the same NUMA node as the enclave CPUs. Add ioctl command logic for setting user space memory region for an enclave. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE PCI device. v7 -> v8 * Add early check, while getting user pages, to be multiple of 2 MiB for the pages that back the user space memory region. * Add custom error code for incorrect user space memory region flag. * Include in a separate function the sanity checks for each page of the user space memory region. v6 -> v7 * Update check for duplicate user space memory regions to cover additional possible scenarios. v5 -> v6 * Check for max number of pages allocated for the internal data structure for pages. * Check for invalid memory region flags. * Check for aligned physical memory regions. * Update documentation to kernel-doc format. * Check for duplicate user space memory regions. * Use directly put_page() instead of unpin_user_pages(), to match the get_user_pages() calls. v4 -> v5 * Add early exit on set memory region ioctl function call error. * Remove log on copy_from_user() failure. * Exit without unpinning the pages on NE PCI dev request failure as memory regions from the user space range may have already been added. * Add check for the memory region user space address to be 2 MiB aligned. * Update logic to not have a hardcoded check for 2 MiB memory regions. v3 -> v4 * Check enclave memory regions are from the same NUMA node as the enclave CPUs. * Use dev_err instead of custom NE log pattern. * Update the NE ioctl call to match the decoupling from the KVM API. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Update kzfree() calls to kfree(). v1 -> v2 * Add log pattern for NE. * Update goto labels to match their purpose. * Remove the BUG_ON calls. * Check if enclave max memory regions is reached when setting an enclave memory region. * Check if enclave state is init when setting an enclave memory region. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 7dc9d43) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 After all the enclave resources are set, the enclave is ready for beginning to run. Add ioctl command logic for starting an enclave after all its resources, memory regions and CPUs, have been set. The enclave start information includes the local channel addressing - vsock CID - and the flags associated with the enclave. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE PCI device. v7 -> v8 * Add check for invalid enclave CID value e.g. well-known CIDs and parent VM CID. * Add custom error code for incorrect flag in enclave start info and invalid enclave CID. v6 -> v7 * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. v5 -> v6 * Check for invalid enclave start flags. * Update documentation to kernel-doc format. v4 -> v5 * Add early exit on enclave start ioctl function call error. * Move sanity checks in the enclave start ioctl function, outside of the switch-case block. * Remove log on copy_from_user() / copy_to_user() failure. v3 -> v4 * Use dev_err instead of custom NE log pattern. * Update the naming for the ioctl command from metadata to info. * Check for minimum enclave memory size. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. v1 -> v2 * Add log pattern for NE. * Check if enclave state is init when starting an enclave. * Remove the BUG_ON calls. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 111c775) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 An enclave is associated with an fd that is returned after the enclave creation logic is completed. This enclave fd is further used to setup enclave resources. Once the enclave needs to be terminated, the enclave fd is closed. Add logic for enclave termination, that is mapped to the enclave fd release callback. Free the internal enclave info used for bookkeeping. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Use the ne_devs data structure to get the refs for the NE PCI device. v7 -> v8 * No changes. v6 -> v7 * Remove the pci_dev_put() call as the NE misc device parent field is used now to get the NE PCI device. * Update the naming and add more comments to make more clear the logic of handling full CPU cores and dedicating them to the enclave. v5 -> v6 * Update documentation to kernel-doc format. * Use directly put_page() instead of unpin_user_pages(), to match the get_user_pages() calls. v4 -> v5 * Release the reference to the NE PCI device on enclave fd release. * Adapt the logic to cpumask enclave vCPU ids and CPU cores. * Remove sanity checks for situations that shouldn't happen, only if buggy system or broken logic at all. v3 -> v4 * Use dev_err instead of custom NE log pattern. v2 -> v3 * Remove the WARN_ON calls. * Update static calls sanity checks. * Update kzfree() calls to kfree(). v1 -> v2 * Add log pattern for NE. * Remove the BUG_ON calls. * Update goto labels to match their purpose. * Add early exit in release() if there was a slot alloc error in the fd creation path. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 9c8eb50) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add kernel config entry for Nitro Enclaves, including dependencies. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * No changes. v7 -> v8 * No changes. v6 -> v7 * Remove, for now, the dependency on ARM64 arch. x86 is currently supported, with Arm to come afterwards. The NE kernel driver can be built for aarch64 arch. v5 -> v6 * No changes. v4 -> v5 * Add arch dependency for Arm / x86. v3 -> v4 * Add PCI and SMP dependencies. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * Update path to Kconfig to match the drivers/virt/nitro_enclaves directory. * Update help in Kconfig. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 07499cc) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add Makefile for the Nitro Enclaves driver, considering the option set in the kernel config. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Remove -Wall flags, could use W=1 as an option for this. v7 -> v8 * No changes. v6 -> v7 * No changes. v5 -> v6 * No changes. v4 -> v5 * No changes. v3 -> v4 * No changes. v2 -> v3 * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * Update path to Makefile to match the drivers/virt/nitro_enclaves directory. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 0f5c7b7) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add a user space sample for the usage of the ioctl interface provided by the Nitro Enclaves driver. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * No changes. v7 -> v8 * Track NE custom error codes for invalid page size, invalid flags and enclave CID. * Update the heartbeat logic to have a listener fd first, then start the enclave and then accept connection to get the heartbeat. * Update the reference link to the hugetlb documentation. v6 -> v7 * Track POLLNVAL as poll event in addition to POLLHUP. v5 -> v6 * Remove "rc" mentioning when printing errno string. * Remove the ioctl to query API version. * Include usage info for NUMA-aware hugetlb configuration. * Update documentation to kernel-doc format. * Add logic for enclave image loading. v4 -> v5 * Print enclave vCPU ids when they are created. * Update logic to map the modified vCPU ioctl call. * Add check for the path to the enclave image to be less than PATH_MAX. * Update the ioctl calls error checking logic to match the NE specific error codes. v3 -> v4 * Update usage details to match the updates in v4. * Update NE ioctl interface usage. v2 -> v3 * Remove the include directory to use the uapi from the kernel. * Remove the GPL additional wording as SPDX-License-Identifier is already in place. v1 -> v2 * New in v2. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Alexandru Vasile <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit acc4229) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add documentation on the overview of Nitro Enclaves. Include it in the virtualization specific directory. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Move the Nitro Enclaves documentation to the "virt" directory and add an entry for it in the corresponding index file. v7 -> v8 * Add info about the primary / parent VM CID value. * Update reference link for huge pages. * Add reference link for the x86 boot protocol. * Add license mention and update doc title / chapter formatting. v6 -> v7 * No changes. v5 -> v6 * No changes. v4 -> v5 * No changes. v3 -> v4 * Update doc type from .txt to .rst. * Update documentation based on the changes from v4. v2 -> v3 * No changes. v1 -> v2 * New in v2. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (backported from commit bf15d79) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903087 Add entry in the MAINTAINERS file for the Nitro Enclaves files such as the documentation, the header files, the driver itself and the user space sample. Changelog v9 -> v10 * Update commit message to include the changelog before the SoB tag(s). v8 -> v9 * Update the location of the documentation, as it has been moved to the "virt" directory. v7 -> v8 * No changes. v6 -> v7 * No changes. v5 -> v6 * No changes. v4 -> v5 * No changes. v3 -> v4 * No changes. v2 -> v3 * Update file entries to be in alphabetical order. v1 -> v2 * No changes. Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e82ed73) Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Acked-by: Kleber Sacilotto de Souza <[email protected]> Acked-by: Acked-by: William Breathitt Gray <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1902281 Relax the synchronous IOMMU TLB invalidation constraint by default to get a significant performance improvement on some AWS arm64 instance types. This is a performance vs security tradeoff and it is not suitable for the generic kernel. In the particular AWS environment it is reasonable to relax the constraint without realisticly introducing security flaws. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Colin Ian King <[email protected]> Acked-by: Thadeu Lima de Souza Cascardo <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

Ignore: yes Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1903158 Properties: no-test-build Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1896824 This config option has been removed by commit 973c096 upstream (vgacon: remove software scrollback support). Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Ignore: yes Signed-off-by: Marcelo Henrique Cerri <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1907372 Properties: no-test-build Signed-off-by: Marcelo Henrique Cerri <[email protected]>

Signed-off-by: Marcelo Henrique Cerri <[email protected]>

Ignore: yes Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1907586 Properties: no-test-build Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1904450 Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Ignore: yes Signed-off-by: Khalid Elmously <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1908586 Properties: no-test-build Signed-off-by: Khalid Elmously <[email protected]>

Signed-off-by: Khalid Elmously <[email protected]>

Ignore: yes Signed-off-by: Marcelo Henrique Cerri <[email protected]>

Signed-off-by: Marcelo Henrique Cerri <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1906850 If the device in the Xen bus is already in the "closed" state when hibernating there's no need to close the bus again. Doing so can only cause errors that would prevent the system to hibernate correctly. Signed-off-by: Andrea Righi <[email protected]> Acked-by: William Breathitt Gray <[email protected]> Acked-by: Stefan Bader <[email protected]> Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1908264 Signed-off-by: Heitor Alves de Siqueira <[email protected]> Acked-by: Marcelo Henrique Cerri <[email protected]> Acked-by: Khalid Elmously <[email protected]> Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1911314 Properties: no-test-build Signed-off-by: Kelsey Skunberg <[email protected]>

Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1840488 Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Andrea Righi <[email protected]> Acked-by: Marcelo Henrique Cerri <[email protected]> Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1840488 Signed-off-by: Kamal Mostafa <[email protected]> Acked-by: Thadeu Lima de Souza Cascardo <[email protected]> Acked-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913135 Properties: no-test-build Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1908561 Config change prompted at close by updateconfigs. Matches master config. Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1910816 Config change prompted at close from updateconfig. Matches master config. Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1910817 Config change prompted at close by updateconfigs. Matches master config. Signed-off-by: Kelsey Skunberg <[email protected]>

Signed-off-by: Kelsey Skunberg <[email protected]>

Ignore: yes Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1916146 Properties: no-test-build Signed-off-by: Ian May <[email protected]>

In order to support the livepatch key we need to ensure we do not allow that key to load modules which are not for the specific kernel. From the documentation on kernel module signing: If you use the same private key to sign modules for multiple kernel configurations, you must ensure that the module version information is sufficient to prevent loading a module into a different kernel. Either set ``CONFIG_MODVERSIONS=y`` or ensure that each configuration has a different kernel release string by changing ``EXTRAVERSION`` or ``CONFIG_LOCALVERSION``. BugLink: https://bugs.launchpad.net/bugs/1898716 Signed-off-by: Ian May <[email protected]>

…erts Merge common, branch-specific, and arch-specific certs and form a certs database for inclusion in the kernel keyring. Commit is copied from master. BugLink: https://bugs.launchpad.net/bugs/1898716 Signed-off-by: Ian May <[email protected]>

Config change prompted by updateconfigs after MODVERSIONS was turned back on. BugLink: https://bugs.launchpad.net/bugs/1898716 Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1915195 Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Ignore: yes Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

…batching requests" BugLink: https://bugs.launchpad.net/bugs/1902864 This reverts commit 1fe4a81. This patch will be replaced by a new upstream patch. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1902864 Hibernate and resume process submits individual IO requests for each page of the data, so use blk_plug to improve the batching of these requests. Testing this change with hibernate and resumes consistently shows merging of the IO requests and more than an order of magnitude improvement in hibernate and resume speed is observed. One hibernate and resume cycle for 16GB RAM out of 32GB in use takes around 21 minutes before the change, and 1 minutes after the change on a system with limited storage IOPS. Signed-off-by: Xiaoyi Chen <[email protected]> Co-Developed-by: Anchal Agarwal <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> [ rjw: Subject and changelog edits, white space damage fixes ] Signed-off-by: Rafael J. Wysocki <[email protected]> (cherry picked from commit 55c4478) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…ernate" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 9fd2d4b. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… instability in hibernation" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 6e855ca. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…clock offset" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 3b2dd88. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 1875054. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…lock" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit bf1807f. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… hibernation" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit c0734e8. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… hibernation" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 2d73c3e. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…uring hibernation" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 1fb6702. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…llbacks" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit acde8f3. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…SOR_shared_info on Resume" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 1ece7d6. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…ort" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit e805184. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… mode" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit 4f7a50f. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 To differentiate between Xen suspend, PM suspend and PM hibernation, keep track of the on-going suspend mode by mainly using a new PM notifier. Since Xen suspend doesn't have corresponding PM event, its main logic is modfied to acquire pm_mutex and set the current mode. Note that we may see deadlock if PM suspend/hibernation is interrupted by Xen suspend. PM suspend/hibernation depends on xenwatch thread to process xenbus state transactions, but the thread will sleep to wait pm_mutex which is already held by PM suspend/hibernation context in the scenario. Though, acquirng pm_mutex is still right thing to do, and we would need to modify Xen shutdown code to avoid the issue. This will be fixed by a separate patch. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Sebastian Biemueller <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273194/ (cherry picked from 4b7a1a62bd56a4a3720864bbacb5e364716f8656 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…oing suspend mode BugLink: https://bugs.launchpad.net/bugs/1913410 Introduce simple functions which help to know the on-going suspend mode so that other Xen-related code can behave differently according to the current suspend mode. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Alakesh Haloi <[email protected]> Reviewed-by: Sebastian Biemueller <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273190/ (cherry picked from cf00e0a79beb244b822a1a5f9774c9b0d816b1fe https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Since commit b3e96c0 ("xen: use freeze/restore/thaw PM events for suspend/resume/chkpt"), xenbus uses PMSG_FREEZE, PMSG_THAW and PMSG_RESTORE events for Xen suspend. However, they're actually assigned to xenbus_dev_suspend(), xenbus_dev_cancel() and xenbus_dev_resume() respectively, and only suspend and resume callbacks are supported at driver level. To support PM suspend and PM hibernation, modify the bus level PM callbacks to invoke not only device driver's suspend/resume but also freeze/thaw/restore. Note that we'll use freeze/restore callbacks even for PM suspend whereas suspend/resume callbacks are normally used in the case, becausae the existing xenbus device drivers already have suspend/resume callbacks specifically designed for Xen suspend. So we can allow the device drivers to keep the existing callbacks wihtout modification. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273200/ (cherry picked from 5ced975b640420d52216fea0989e93ad08d4b9f5 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…ed_info on Resume BugLink: https://bugs.launchpad.net/bugs/1913410 Introduce a small function which re-uses shared page's PA allocated during guest initialization time in reserve_shared_info() and not allocate new page during resume flow. It also does the mapping of shared_info_page by calling xen_hvm_init_shared_info() to use the function. Backport Notes: We don't need this commit 8d5ce0dad4ab2a4c8c8a3c36f6fb8c46b695b053 ("x86/xen: decouple shared_info mapping from xen_hvm_init_shared_info()") here since xen_hvm_init_shared_info changed in 4.14 kernel just to do the mapping and allocation of shared page is done in a separate function. We don't need to decouple this kernel API anymore Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Sebastian Biemueller <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273203/ (cherry picked from 9b3205829a1f92ed86cb9f4df1b3729c21b65ebc https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Add Xen PVHVM specific system core callbacks for PM suspend and hibernation support. The callbacks suspend and resume Xen primitives, like shared_info, pvclock and grant table. Note that Xen suspend can handle them in a different manner, but system core callbacks are called from the context. So if the callbacks are called from Xen suspend context, return immediately. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273204/ (cherry picked from ffa2a71c65ea7a188c0458e8e20e81dc8f35ad70 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…tion BugLink: https://bugs.launchpad.net/bugs/1913410 Add freeze and restore callbacks for PM suspend and hibernation support. The freeze handler stops a block-layer queue and disconnect the frontend from the backend while freeing ring_info and associated resources. The restore handler re-allocates ring_info and re-connect to the backedend, so the rest of the kernel can continue to use the block device transparently.Also, the handlers are used for both PM suspend and hibernation so that we can keep the existing suspend/resume callbacks for Xen suspend without modification. If a backend doesn't have commit 12ea729 ("xen/blkback: unmap all persistent grants when frontend gets disconnected"), the frontend may see massive amount of grant table warning when freeing resources. [ 36.852659] deferring g.e. 0xf9 (pfn 0xffffffffffffffff) [ 36.855089] xen:grant_table: WARNING: g.e. 0x112 still in use! In this case, persistent grants would need to be disabled. Ensure no reqs/rsps in rings before disconnecting. When disconnecting the frontend from the backend in blkfront_freeze(), there still may be unconsumed requests or responses in the rings, especially when the backend is backed by network-based device. If the frontend gets disconnected with such reqs/rsps remaining there, it can cause grant warnings and/or losing reqs/rsps by freeing pages afterward. This can lead resumed kernel into unrecoverable state like unexpected freeing of grant page and/or hung task due to the lost reqs or rsps. Therefore we have to ensure that there is no unconsumed requests or responses before disconnecting. Actually, the frontend just needs to wait for some amount of time so that the backend can process the requests, put responses and notify the frontend back. Timeout used here is based on some heuristic. If we somehow hit the timeout, it would mean something serious happens in the backend, the frontend will just return an error to PM core and PM suspend/hibernation will be aborted. This may be something should be fixed by the backend side, but a frontend side fix is probably still worth doing to work with broader backends. Backport Note: Unlike 4.9 kernel, blk-mq is default for 4.14 kernel and request-based mode cod eis not included in this frontend driver. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8297625/ (cherry picked from e408feeed76b405078558b64970a2723aad962b9 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…tion support BugLink: https://bugs.launchpad.net/bugs/1913410 Add freeze and restore callbacks for PM suspend and hibernation support. The freeze handler simply disconnects the frotnend from the backend and frees resources associated with queues after disabling the net_device from the system. The restore handler just changes the frontend state and let the xenbus handler to re-allocate the resources and re-connect to the backend. This can be performed transparently to the rest of the system. The handlers are used for both PM suspend and hibernation so that we can keep the existing suspend/resume callbacks for Xen suspend without modification. Freezing netfront devices is normally expected to finish within a few hundred milliseconds, but it can rarely take more than 5 seconds and hit the hard coded timeout, it would depend on backend state which may be congested and/or have complex configuration. While it's rare case, longer default timeout seems a bit more reasonable here to avoid hitting the timeout. Also, make it configurable via module parameter so that we can cover broader setups than what we know currently. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> CR: https://cr.amazon.com/r/8297632 (cherry picked from efa965d3718f25c1e4546ff8f001be1ea4291e78 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Currently, steal time accounting code in scheduler expects steal clock callback to provide monotonically increasing value. If the accounting code receives a smaller value than previous one, it uses a negative value to calculate steal time and results in incorrectly updated idle and steal time accounting. This breaks userspace tools which read /proc/stat. top - 08:05:35 up 2:12, 3 users, load average: 0.00, 0.07, 0.23 Tasks: 80 total, 1 running, 79 sleeping, 0 stopped, 0 zombie Cpu(s): 0.0%us, 0.0%sy, 0.0%ni,30100.0%id, 0.0%wa, 0.0%hi, 0.0%si,-1253874204672.0%st This can actually happen when a Xen PVHVM guest gets restored from hibernation, because such a restored guest is just a fresh domain from Xen perspective and the time information in runstate info starts over from scratch. This patch introduces xen_save_steal_clock() which saves current values in runstate info into per-cpu variables. Its couterpart, xen_restore_steal_clock(), sets offset if it found the current values in runstate info are smaller than previous ones. xen_steal_clock() is also modified to use the offset to ensure that scheduler only sees monotonically increasing number. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273209/ (cherry picked from 6825139c3a18456e2ca1197874636e409979a9ac https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Save steal clock values of all present CPUs in the system core ops suspend callbacks. Also, restore a boot CPU's steal clock in the system core resume callback. For non-boot CPUs, restore after they're brought up, because runstate info for non-boot CPUs are not active until then. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273212/ (cherry picked from 3aabd54a0faacdec2dcfb1f70eb1774b25c1e12a https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Add a simple helper function to "shutdown" active PIRQs, which actually closes event channels but keeps related IRQ structures intact. PM suspend/hibernation code will rely on this. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273214/ (cherry picked from a519d27a20cbf26a6ec8a4f38336550378cbb6eb https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… suspend callback BugLink: https://bugs.launchpad.net/bugs/1913410 Close event channels allocated for devices which are backed by PIRQ and still active when suspending the system core. Normally, the devices are emulated legacy devices, e.g. PS/2 keyboard, floppy controller and etc. Without this, in PM hibernation, information about the event channel remains in hibernation image, but there is no guarantee that the same event channel numbers are assigned to the devices when restoring the system. This may cause conflict like the following and prevent some devices from being restored correctly. [ 102.330821] ------------[ cut here ]------------ [ 102.333264] WARNING: CPU: 0 PID: 2324 at drivers/xen/events/events_base.c:878 bind_evtchn_to_irq+0x88/0xf0 ... [ 102.348057] Call Trace: [ 102.348057] [<ffffffff813001df>] dump_stack+0x63/0x84 [ 102.348057] [<ffffffff81071811>] __warn+0xd1/0xf0 [ 102.348057] [<ffffffff810718fd>] warn_slowpath_null+0x1d/0x20 [ 102.348057] [<ffffffff8139a1f8>] bind_evtchn_to_irq+0x88/0xf0 [ 102.348057] [<ffffffffa00cd420>] ? blkif_copy_from_grant+0xb0/0xb0 [xen_blkfront] [ 102.348057] [<ffffffff8139a307>] bind_evtchn_to_irqhandler+0x27/0x80 [ 102.348057] [<ffffffffa00cc785>] talk_to_blkback+0x425/0xcd0 [xen_blkfront] [ 102.348057] [<ffffffff811e0c8a>] ? __kmalloc+0x1ea/0x200 [ 102.348057] [<ffffffffa00ce84d>] blkfront_restore+0x2d/0x60 [xen_blkfront] [ 102.348057] [<ffffffff813a0078>] xenbus_dev_restore+0x58/0x100 [ 102.348057] [<ffffffff813a1ff0>] ? xenbus_frontend_delayed_resume+0x20/0x20 [ 102.348057] [<ffffffff813a200e>] xenbus_dev_cond_restore+0x1e/0x30 [ 102.348057] [<ffffffff813f797e>] dpm_run_callback+0x4e/0x130 [ 102.348057] [<ffffffff813f7f17>] device_resume+0xe7/0x210 [ 102.348057] [<ffffffff813f7810>] ? pm_dev_dbg+0x80/0x80 [ 102.348057] [<ffffffff813f9374>] dpm_resume+0x114/0x2f0 [ 102.348057] [<ffffffff810c00cf>] hibernation_snapshot+0x15f/0x380 [ 102.348057] [<ffffffff810c0ac3>] hibernate+0x183/0x290 [ 102.348057] [<ffffffff810be1af>] state_store+0xcf/0xe0 [ 102.348057] [<ffffffff813020bf>] kobj_attr_store+0xf/0x20 [ 102.348057] [<ffffffff8127c88a>] sysfs_kf_write+0x3a/0x50 [ 102.348057] [<ffffffff8127c3bb>] kernfs_fop_write+0x10b/0x190 [ 102.348057] [<ffffffff81200008>] __vfs_write+0x28/0x120 [ 102.348057] [<ffffffff81200c19>] ? rw_verify_area+0x49/0xb0 [ 102.348057] [<ffffffff81200e62>] vfs_write+0xb2/0x1b0 [ 102.348057] [<ffffffff81202196>] SyS_write+0x46/0xa0 [ 102.348057] [<ffffffff81520cf7>] entry_SYSCALL_64_fastpath+0x1a/0xa9 [ 102.423005] ---[ end trace b8d6718e22e2b107 ]--- [ 102.425031] genirq: Flags mismatch irq 6. 00000000 (blkif) vs. 00000000 (floppy) Note that we don't explicitly re-allocate event channels for such devices in the resume callback. Re-allocation will occur when PM core re-enable IRQs for the devices at later point. Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8273217/ (cherry picked from a37c4912153527588553cfa1b90bdd4aff62ff58 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Persistent grants make it far more likely to exhaust domain-0's grant table entries particularily with a high number of devices across a high number of domains. It is useful for an instance to be able to control disabling this feature to help mitigate against grant starvation. Forward port: For 4.14.y linux kernel, we are no longer using out of tree xen blockfront driver. This patch has been ported on intree xen blockfront driver. For reference: Original CR: https://cr.amazon.com/r/5182736/ Reviewed-by: Eduardo Valentin <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Reviewed-by: Anchal Agarwal <[email protected]> Signed-off-by: Anthony Liguori <[email protected]> Signed-off-by: Cristian Gafton <[email protected]> Signed-off-by: Munehisa Kamata <[email protected]> Signed-off-by: Vallish Vaidyeshwara <[email protected]> CR: https://cr.amazon.com/r/8309443 (cherry picked from c4d8fcf9bf9d6e1ed87394f5ccd5d2f5f696ca63 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

… suspend/resume" BugLink: https://bugs.launchpad.net/bugs/1913410 This reverts commit e91b2b1. evtchn are supposed to be masked during resume however they are not which causes special interrupts like PV spinlock to cause kernel BUG() as its expects the IRQ to be masked. This causes instances that are live migrated successfully to crash after few minutes. Signed-off--by: Anchal Agarwal <[email protected]> Signed-off--by: Eduardo Valentin <[email protected]> Reviewed-by: Frank van der Linden <[email protected]> Reviewed-by: Alakesh Haloi <[email protected]> Reviewed-by: Vallish Vaidyeshwara <[email protected]> CR: https://cr.amazon.com/r/8361544/ (cherry picked from 8866ffb1fd9d5336541f5214f50fbcd06f67ffd3 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…to negotiate_mq BugLink: https://bugs.launchpad.net/bugs/1913410 The code for talk_to_blkback API changed in kernel-4.14.45 to include a call to negotiate_mq. Subsequent calls causes kernel panic [ 84.440105] Call Trace: [ 84.443707] talk_to_blkback+0x6d/0x8b0 [xen_blkfront] [ 84.449147] blkfront_restore+0x33/0x60 [xen_blkfront] [ 84.453336] ? xenbus_read_otherend_details+0x50/0xb0 [ 84.457804] xenbus_dev_cancel+0x5f/0x160 [ 84.463286] ? xenbus_dev_resume+0x170/0x170 [ 84.466891] dpm_run_callback+0x3b/0x100 [ 84.470516] device_resume+0x10d/0x420 [ 84.473844] dpm_resume+0xfd/0x2f0 [ 84.476984] hibernation_snapshot+0x218/0x410 [ 84.480794] hibernate+0x14b/0x270 [ 84.484030] state_store+0x50/0x60 [ 84.487443] kernfs_fop_write+0x105/0x180 [ 84.492695] __vfs_write+0x36/0x160 [ 84.496672] ? __audit_syscall_entry+0xbc/0x110 [ 84.502123] vfs_write+0xad/0x1a0 [ 84.506857] SyS_write+0x52/0xc0 [ 84.511420] do_syscall_64+0x67/0x100 [ 84.516365] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 [ 84.522571] RIP: 0033:0x7f44a03407e4 [ 84.526210] RSP: 002b:00007ffd5e0ec3c8 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 [ 84.534041] RAX: ffffffffffffffda RBX: 0000000000000004 RCX: 00007f44a03407e4 [ 84.542571] RDX: 0000000000000004 RSI: 0000000001e94990 RDI: 0000000000000001 [ 84.549142] RBP: 0000000001e94990 R08: 00007f44a060c8c0 R09: 00007f44a0c57740 [ 84.554658] R10: 00007f44a03cd320 R11: 0000000000000246 R12: 0000000000000004 [ 84.560411] R13: 0000000000000001 R14: 00007f44a060b760 R15: 0000000000000004 [ 84.565744] Code: 39 ab e8 00 00 00 77 8a 31 c0 5b 5d c3 44 8b 05 50 57 00 00 45 85 c0 0f 84 2f ff ff ff 89 c0 48 69 f8 e0 40 01 00 e9 30 ff ff ff <0f> 0b 48 8b 7b 28 48 c7 c2 78 58 16 a0 be f4 ff ff ff e8 7e 37 [ 84.580594] RIP: negotiate_mq+0x12b/0x150 [xen_blkfront] RSP: ffffc90000ebbc70 Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Frank van der Linden <[email protected]> Reviewed-by: Vallish Vaidyeshwara <[email protected]> (cherry picked from 39aae083b6ecdd5ae6c306dd8c5d6f54ae357cd6 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…tore BugLink: https://bugs.launchpad.net/bugs/1913410 On regular start, the instance will perform a regular boot, in which rootfs is mounted accordingly to the xen-blkback features (in particular feature-barrier and feature-flush-cache). That will setup the journal accordingly to the provided features on SB. On a start from hibernation, the instance boots, detects that a hibernation image is present, push the image to memory and jumps back where it was. There is no regular mount of the rootfs, it uses the data structures already in the previous saved memory image. Now, When the instance hibernates, it may move from its original dom0 to a new dom0 when it is restarted. So, given the above, if the xen-blkback features change then the guest can be in trouble. And I see the original assumption was that the dom0 environment would be preserved. I did a couple of experiments, and I confirm that these particular features change quite a lot across hibernation attempts: [ 2343.157903] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 2444.712339] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 2537.105884] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 2636.641298] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 2729.868349] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 2827.118979] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 2924.812599] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 3018.063399] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 3116.685040] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 3209.164475] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 3317.981362] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 3415.939725] blkfront: xvda: flush diskcache: enabled; persistent grants: disabled; indirect descriptors: enabled; [ 3514.202478] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; [ 3619.355791] blkfront: xvda: barrier or flush: disabled; persistent grants: disabled; indirect descriptors: enabled; Now, considering the above, this patch fixes the following scenario: a. Instance boots and sets up bio queue on a dom0 A with softbarrier supported. b. hibernates c. When asked to restore, the instance is back on dom0 B with unsupported softbarrier. d. Restoration goes well until next journal commit is issued. Remember that it is still using the previous image rootfs data structures, therefore is gonna request a softbarrier. e. The bio will error out and throw a "operation not supported" message and cause the journal to fail, and it will decide to remount the rootfs as RO. [ 1138.909290] print_req_error: operation not supported error, dev xvda, sector 4470400, flags 6008 [ 1139.025685] Aborting journal on device xvda1-8. [ 1139.029758] print_req_error: operation not supported error, dev xvda, sector 4460544, flags 26008 [ 1139.326119] Buffer I/O error on dev xvda1, logical block 0, lost sync page write [ 1139.331398] EXT4-fs error (device xvda1): ext4_journal_check_start:61: Detected aborted journal [ 1139.337296] EXT4-fs (xvda1): Remounting filesystem read-only [ 1139.341006] EXT4-fs (xvda1): previous I/O error to superblock detected [ 1139.345704] print_req_error: operation not supported error, dev xvda, sector 4096, flags 26008 The fix is essentially to read xenbus to query the new xen blkback capabilities and update them into the request queue. Reviewed-by: Balbir Singh <[email protected]> Reviewed-by: Vallish Vaidyeshwara <[email protected]> Signed-off-by: Eduardo Valentin <[email protected]> (cherry picked from 4cfdb7fd77e0eaa214e54d23f78641231188a940 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 The hibernation code unlinks event channels from these (legacy) IRQs, so they must be reinitialized on wakeup, much like in the Xen suspend/resume case. Signed-off-by: Frank van der Linden <[email protected]> Reviewed-by: Cristian Gafton <[email protected]> Reviewed-by: Anchal Agarwal <[email protected]> Reviewed-by: Alakesh Haloi <[email protected]> CR: https://code.amazon.com/reviews/CR-3702953/ (cherry picked from ea90a679e818224f8b4c74828c12eda0368652b5 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…e_pirqs. BugLink: https://bugs.launchpad.net/bugs/1913410 Restoring all PIRQs, which is the right thing to do, was causing problems on larger instances. This is a horrible workaround until this issue is fully understood. Signed-off-by: Frank van der Linden <[email protected]> Reviewed-by: Alakesh Haloi <[email protected]> Reviewed-by: Anchal Agarwal <[email protected]> Reviewed-by: Qian Lu <[email protected]> (cherry picked from 88d49684bde78117795c5cafb8fd326188e9031e https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 When xennet_connect is called in the resume path, it needs to re-attach the netif, otherwise it will no longer be found by various operations (such as ethtool ioctls, etc). Signed-off-by: Frank van der Linden <[email protected]> Reviewed-by: Alakesh Haloi <[email protected]> Reviewed-by: Vallish Vaidyeshwara <[email protected]> (cherry picked from 77c6280bdadf99a5f257bab61485cf71ff3cb448 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 shutdown_pirq is invoked during hibernation path and hence PIRQs should be restarted during resume. [Commit: xen: Only restore the ACPI SCI interrupt in xen_restore_pirqs] restores only ACPI SCI interrupt however, that is not the right thing to do as all pirqs should be enabled as a part of resume_device_irqs during suspend/resume device interrupts. Apparently, chip->irq_startup is called only if IRQD_IRQ_STARTED is unset during irq_startup on resume. This flag gets cleared by free_irq->irq_shutdown during suspend. free_irq() never gets explicitly called for ioapic-edge and ioapic-level interrupts as respective drivers do nothing during suspend/resume. So we shut them down explicitly in the first place in syscore_suspend path to clear IRQ<>event channel mapping. shutdown_pirq being called explicitly during suspend does not clear this flags, hence .irq_enable is called in irq_startup during resume instead and pirq's never start up. This commit exports irq_state_clr_started API to clear the flag during shutdown_pirq. Also, following the order in which ipis/virqs/pirqs are restored during xen resume, the same order should be followed for hibernation path. As per the flow of hibernation_platform_enter, we should not restore pirqs explicitly in syscore_resume ops and it should be done in resume devices path. Signed-off-by: Anchal Agarwal <[email protected]> (cherry picked from 3545d5ba7721fe4d30074d62954163ba6712b627 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

…t segments up to 64 BugLink: https://bugs.launchpad.net/bugs/1913410 Bump the maximum number of indirect segments up to 64. For blk-mq without a scheduler, which is the default for multi-queued devices, this is needed to avoid a throughput regression for 'st1' EBS volumes. On a c4.8xlarge instance: sudo fio --bs=1M --name=seqread --ioengine=libaio --rw=read --direct=1 --filename=/dev/sdg --clocksource=clock_gettime --size=1G --numjobs=8 before: READ: io=8192.0MB, aggrb=44772KB/s, minb=5596KB/s, maxb=5922KB/s, mint=177050msec, maxt=187361msec after: READ: io=8192.0MB, aggrb=136059KB/s, minb=17007KB/s, maxb=17022KB/s, mint=61600msec, maxt=61654msec Signed-off-by: Frank van der Linden <[email protected]> (cherry picked from 5cb56694a81fe29d76fecc6ad7a651cc7459da1c https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 System instability are seen during resume from hibernation when system is under heavy CPU load. This is due to the lack of update of sched clock data, and the scheduler would then think that heavy CPU hog tasks need more time in CPU, causing the system to freeze during the unfreezing of tasks. For example, threaded irqs, and kernel processes servicing network interface may be delayed for several tens of seconds, causing the system to be unreachable. Situation like this can be reported by using lockup detectors such as workqueue lockup detectors: [root@ip-172-31-67-114 ec2-user]# echo disk > /sys/power/state Message from syslogd@ip-172-31-67-114 at May 7 18:23:21 ... kernel:BUG: workqueue lockup - pool cpus=0 node=0 flags=0x0 nice=0 stuck for 57s! Message from syslogd@ip-172-31-67-114 at May 7 18:23:21 ... kernel:BUG: workqueue lockup - pool cpus=1 node=0 flags=0x0 nice=0 stuck for 57s! Message from syslogd@ip-172-31-67-114 at May 7 18:23:21 ... kernel:BUG: workqueue lockup - pool cpus=3 node=0 flags=0x1 nice=0 stuck for 57s! Message from syslogd@ip-172-31-67-114 at May 7 18:29:06 ... kernel:BUG: workqueue lockup - pool cpus=3 node=0 flags=0x1 nice=0 stuck for 403s! The fix for this situation is to mark the sched clock as unstable as early as possible in the resume path, leaving it unstable for the duration of the resume process. This will force the scheduler to attempt to align the sched clock across CPUs using the delta with time of day, updating sched clock data. In a post hibernation event, we can then mark the sched clock as stable again, avoiding unnecessary syncs with time of day on systems in which TSC is reliable. Reviewed-by: Erik Quanstrom <[email protected]> Reviewed-by: Frank van der Linden <[email protected]> Reviewed-by: Balbir Singh <[email protected]> Reviewed-by: Munehisa Kamata <[email protected]> Tested-by: Anchal Agarwal <[email protected]> Signed-off-by: Eduardo Valentin <[email protected]> CR: https://cr.amazon.com/r/8440112/ (cherry picked from aae9984b06c262e9bb9995c7015c940932307427 https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 Currently we do not see sleep_enable bit set after guest resumes from hibernation. Hibernation is triggered in guest on receiving a sleep trigger from the hypervisor(S4 state). We see that power button is enabled on wake up however sleep button isn't. This causes 2nd sleep trigger to fail since PMEN register does not have bit 9 set in its register on resume which is expected by hypervisor to be set before it can send an SCI interrupt to the guest. Expected PMEN=0x320 on fresh boot however, after resume PMEN=0x120 Signed-off-by: Anchal Agarwal <[email protected]> Reviewed-by: Balbir Singh <[email protected]> Reviewed-by: Frank van der Linden <[email protected]> CR: https://code.amazon.com/reviews/CR-3704872 (cherry picked from 6c69fa0dd3203465a30ddb2fad56378cd0ccdc8e https://github.com/amazonlinux/linux.git) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1913410 If the device in the Xen bus is already in the "closed" state when hibernating there's no need to close the bus again. Doing so can only cause errors that would prevent the system to hibernate correctly. OldBug: https://bugs.launchpad.net/bugs/1906850 Signed-off-by: Andrea Righi <[email protected]> Acked-by: William Breathitt Gray <[email protected]> Acked-by: Stefan Bader <[email protected]> Signed-off-by: Ian May <[email protected]> Signed-off-by: Andrea Righi <[email protected]> Acked-by: Kelsey Skunberg <[email protected]> Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1918694 Large KVM instance types (in particular c5.18xlarge) can experience failures when resuming from hibernation, in particular the system gets stuck immediately after the hibernated kernel is resumed (more exactly when the resume callbacks are executed). The failure seems to be related to the KVM paravirtual clock driver and a reliable workaround is to double the size of HVC_BOOT_ARRAY_SIZE. NOTE: Amazon is currently working on a proper fix that would allow to allocate hv_clock_boot dynamicall, for now doubling the size of this array seems to prevent the issue from happening. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Colin King <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1921016 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1916290 In LP: #1872863 we started to build and ship the bochs-drm.ko driver again, however this config wasn't enforced and because of that derivatives didn't inherit. Enforce CONFIG_DRM_BOCHS=m and let the derivatives update their configuration to include it or not. Signed-off-by: Marcelo Henrique Cerri <[email protected]> Acked-by: Colin King <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> [smb: dropped BugLink to related bug] Signed-off-by: Stefan Bader <[email protected]> Copied from master Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1923247 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1926522 Properties: no-test-build Signed-off-by: Kelsey Skunberg <[email protected]>

Signed-off-by: Kelsey Skunberg <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1926967 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Fix up a number of misformated or incorrect annotations. Properties: no-test-build Ignore: yes Signed-off-by: Seth Forshee <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]> Ignore: yes copied from master Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1920246 Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927692 Signed-off-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/d5473b56cf1fa900ca4bd2b3fc1e5b8874399919.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <[email protected]> (backported from commit 75551db) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927692 crng_init_wait is only used to wayt for crng_init to be set to 2, so there's no point to waking it when crng_init is set to 1. Remove the unnecessary wake_up_interruptible() call. Signed-off-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/6fbc0bfcbfc1fa2c76fd574f5b6f552b11be7fde.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <[email protected]> (cherry picked from commit 4c8d062) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927692 /dev/random and getrandom() never warn. Split the meat of urandom_read() into urandom_read_nowarn() and leave the warning code in urandom_read(). This has no effect on kernel behavior, but it makes subsequent patches more straightforward. It also makes the fact that getrandom() never warns more obvious. Signed-off-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/c87ab200588de746431d9f916501ef11e5242b13.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <[email protected]> (cherry picked from commit c6f1deb) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927692 The separate blocking pool is going away. Start by ignoring GRND_RANDOM in getentropy(2). This should not materially break any API. Any code that worked without this change should work at least as well with this change. Signed-off-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/705c5a091b63cc5da70c99304bb97e0109be0a26.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <[email protected]> (cherry picked from commit 48446f1) Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927692 This patch changes the read semantics of /dev/random to be the same as /dev/urandom except that reads will block until the CRNG is ready. None of the cleanups that this enables have been done yet. As a result, this gives a warning about an unused function. Signed-off-by: Andy Lutomirski <[email protected]> Link: https://lore.kernel.org/r/5e6ac8831c6cf2e56a7a4b39616d1732b2bdd06c.1577088521.git.luto@kernel.org Signed-off-by: Theodore Ts'o <[email protected]> (backported from commit 30c08ef) [rtg - context adjustment] Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

We no longer require the primary kernel package to build nvidia packages. LRM handles all required builds internally. Switch off nvidia desktop and server builds in main packages. Ignore: yes Signed-off-by: Kelsey Skunberg <[email protected]> Copied from master Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1927595 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

There was a bug in our tools which caused 'hex' options to be omitted from the annotations. This has been fixed, so update the annotations to include these options. In the process I've also picked up any config changes not already reflected in the annotations file and reordered the options based on any menu changes since they were last fully refreshed. Properties: no-test-build Ignore: yes Signed-off-by: Seth Forshee <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Tim Gardner <[email protected]> Copied from master Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1920944 This reverts commit b797d49. Replace temporary workaround with a new patch set that addresses the problem in a better way. Signed-off-by: Andrea Righi <[email protected]> Acked-by: Guilherme G. Piccoli <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Ian May <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1930005 Properties: no-test-build Signed-off-by: Ian May <[email protected]>

Signed-off-by: Ian May <[email protected]>

Ignore: yes Signed-off-by: Stefan Bader <[email protected]>

Signed-off-by: Stefan Bader <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1932453 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Stefan Bader <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1934318 Properties: no-test-build Signed-off-by: Stefan Bader <[email protected]>

Signed-off-by: Stefan Bader <[email protected]>

Ignore: yes Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1935052 Enable v4l2loopback and friends. Signed-off-by: Tim Gardner <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Acked-by: Kleber Sacilotto de Souza <[email protected]> Signed-off-by: Kelsey Skunberg <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1936512 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1936242 Signed-off-by: Kamal Mostafa <[email protected]> Signed-off-by: Stefan Bader <[email protected]> Copied from master No annotation updates required since aws includes from master. Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1939772 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1942529 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1944754 BugLink: https://bugs.launchpad.net/bugs/1761379 Adds default-jdk-headless and java-common as Build-Depends, which will allow libperf-jvmti.so to be built. The library will be installed on the linux-tools package the same way other tools are installed. That allows a user to use the current kernel version as given by `uname -r` to find the library at /usr/lib/linux-tools/`uname -r`/libperf-jvmti.so, which will be a symlink to a version-specific library. This requires arches and derivatives to opt in with do_tools_perf_jvmti. Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]> Acked-by: Andy Whitcroft <[email protected]> Acked-by: Colin Ian King <[email protected]> Signed-off-by: Khalid Elmously <[email protected]> Copied from focal:linux Signed-off-by: Tim Gardner <[email protected]> Acked-by: Ian May <[email protected]> Acked-by: Marcelo Cerri <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1944873 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1786013 Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1947230 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1949811 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951011 Signed-off-by: Tim Gardner <[email protected]> Acked-by: Dimitri John Ledkov <[email protected]> Acked-by: Marcelo Cerri <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

…voked keys BugLink: https://bugs.launchpad.net/bugs/1932029 Signed-off-by: Dimitri John Ledkov <[email protected]> Signed-off-by: Andrea Righi <[email protected]> (cherry picked from commit 741f622c4dbc162b82f8c9045f9c6c6446f57eb5) (xnox: cherry-pick is from impish:linux) Signed-off-by: Dimitri John Ledkov <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Stefan Bader <[email protected]> Copied from master Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1952285 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

New backport of pahole is now available in focal & bionic (and builders extra ppa) that works with new enough kernels, thus it is now possible to enable CONFIG_DEBUG_INFO_BTF on all arches for the v5.4 based kernels. BugLink: https://bugs.launchpad.net/bugs/1945632 Signed-off-by: Dimitri John Ledkov <[email protected]> Acked-by: Tim Gardner <[email protected]> Acked-by: Stefan Bader <[email protected]> Signed-off-by: Kleber Sacilotto de Souza <[email protected]> Copied from master Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Stefan Bader <[email protected]>

Signed-off-by: Stefan Bader <[email protected]>

Ignore: yes Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Update the assigned value of the poll result to be EPOLLHUP instead of POLLHUP to match the __poll_t type. While at it, simplify the logic of setting the mask result of the poll function. Reported-by: kernel test robot <[email protected]> Reviewed-by: Alexander Graf <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit d9109fe) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 A failing usercopy of the slot uid will lead to a stale entry in the file descriptor table as put_unused_fd() won't release it. This enables userland to refer to a dangling 'file' object through that still valid file descriptor, leading to all kinds of use-after-free exploitation scenarios. Exchanging put_unused_fd() for close_fd(), ksys_close() or alike won't solve the underlying issue, as the file descriptor might have been replaced in the meantime, e.g. via userland calling close() on it (leading to a NULL pointer dereference in the error handling code as 'fget(enclave_fd)' will return a NULL pointer) or by dup2()'ing a completely different file object to that very file descriptor, leading to the same situation: a dangling file descriptor pointing to a freed object -- just in this case to a file object of user's choosing. Generally speaking, after the call to fd_install() the file descriptor is live and userland is free to do whatever with it. We cannot rely on it to still refer to our enclave object afterwards. In fact, by abusing userfaultfd() userland can hit the condition without any racing and abuse the error handling in the nitro code as it pleases. To fix the above issues, defer the call to fd_install() until all possible errors are handled. In this case it's just the usercopy, so do it directly in ne_create_vm_ioctl() itself. Signed-off-by: Mathias Krause <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Cc: stable <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit f1ce398) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Enable Bus Master for the NE PCI device, according to the PCI spec for submitting memory or I/O requests: Master Enable – Controls the ability of a PCI Express Endpoint to issue Memory and I/O Read/Write Requests, and the ability of a Root or Switch Port to forward Memory and I/O Read/Write Requests in the Upstream direction Cc: Andra Paraschiv <[email protected]> Cc: Alexandru Vasile <[email protected]> Cc: Alexandru Ciobotaru <[email protected]> Reviewed-by: Andra Paraschiv <[email protected]> Signed-off-by: Longpeng(Mike) <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit d874742) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Update the kernel config to enable the Nitro Enclaves kernel driver for Arm64 support. Reviewed-by: George-Aurelian Popescu <[email protected]> Acked-by: Stefano Garzarella <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit f7e55f0) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Add references for hugepages and booting steps for Arm64. Include info about the current supported architectures for the NE kernel driver. Reviewed-by: George-Aurelian Popescu <[email protected]> Acked-by: Stefano Garzarella <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit cfa3c18) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Fix the reported issue from the kernel-doc script, to have a comment per identifier. Reviewed-by: George-Aurelian Popescu <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e16a30a) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Update the copyright statement to include 2021, as a change has been made over this year. Check commit d874742 ("nitro_enclaves: Set Bus Master for the NE PCI device") for the codebase update from this file (ne_pci_dev.c). Reviewed-by: George-Aurelian Popescu <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e3cba4d) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Update the codebase formatting to fix the reports from the checkpatch script, to match the open parenthesis. Reviewed-by: George-Aurelian Popescu <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 02bba59) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Fix the typos in the words spelling as per the checkpatch script reports. Reviewed-by: George-Aurelian Popescu <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 059ebe4) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1951873 Remove blank lines that are not necessary, fixing the checkpatch script reports. While at it, add a blank line after the switch default block, similar to the other parts of the codebase. Reviewed-by: George-Aurelian Popescu <[email protected]> Signed-off-by: Andra Paraschiv <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit da1c396) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Kamal Mostafa <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1955214 (focal/linux-aws: 5.4.0-1064.67 -proposed tracker (LP: #1955214)) Properties: no-test-build Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Signed-off-by: Kleber Sacilotto de Souza <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1959785 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1959246 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1959593 Signed-off-by: Tim Gardner <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Marcelo Cerri <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Andrea Righi <[email protected]>

Update config and annotations with CONFIG_BPF_UNPRIV_DEFAULT_OFF and CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY. Signed-off-by: Andrea Righi <[email protected]>

Fix build erros on linux-aws after applying the backported arm patch set for CVE-2022-23960. CVE-2022-23960 Signed-off-by: Andrea Righi <[email protected]>

Signed-off-by: Andrea Righi <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1964175 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1966242 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1965002 Theoretically, when the hardware signature in FACS changes, the OS is supposed to gracefully decline to attempt to resume from S4: "If the signature has changed, OSPM will not restore the system context and can boot from scratch" In practice, Windows doesn't do this and many laptop vendors do allow the signature to change especially when docking/undocking, so it would be a bad idea to simply comply with the specification by default in the general case. However, there are use cases where we do want the compliant behaviour and we know it's safe. Specifically, when resuming virtual machines where we know the hypervisor has changed sufficiently that resume will fail. We really want to be able to *tell* the guest kernel not to try, so it boots cleanly and doesn't just crash. This patch provides a way to opt in to the spec-compliant behaviour on the command line. A follow-up patch may do this automatically for certain "known good" machines based on a DMI match, or perhaps just for all hypervisor guests since there's no good reason a hypervisor would change the hardware_signature that it exposes to guests *unless* it wants them to obey the ACPI specification. Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> (cherry picked from commit 74d9555) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Ian May <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

…guests BugLink: https://bugs.launchpad.net/bugs/1965002 The ACPI specification says that OSPM should refuse to restore from hibernate if the hardware signature changes, and should boot from scratch. However, real BIOSes often vary the hardware signature in cases where we *do* want to resume from hibernate, so Linux doesn't follow the spec by default. However, in a virtual environment there's no reason for the VMM to vary the hardware signature *unless* it wants to trigger a clean reboot as defined by the ACPI spec. So enable the check by default if a hypervisor is detected. Signed-off-by: David Woodhouse <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> (cherry picked from commit f6c46b1 linux-next) Signed-off-by: Tim Gardner <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Ian May <[email protected]> Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1967362 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1969020 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1973946 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://launchpad.net/bugs/1956086 Signed-off-by: Ike Panhc <[email protected]> Acked-by: Stefan Bader <[email protected]> Acked-by: Tim Gardner <[email protected]> Signed-off-by: Stefan Bader <[email protected]> Copied from master Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1974356 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

Ignore: yes Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Ignore: yes Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Signed-off-by: Thadeu Lima de Souza Cascardo <[email protected]>

Ignore: yes Signed-off-by: Tim Gardner <[email protected]>

BugLink: https://bugs.launchpad.net/bugs/1979456 Properties: no-test-build Signed-off-by: Tim Gardner <[email protected]>

UBUNTU: [Config] updateconfigs for BLK_DEV_FD_RAWCMD BugLink: https://bugs.launchpad.net/bugs/1979014 UBUNTU: [Config] updateconfigs for NVM, NVM_PBLK BugLink: https://bugs.launchpad.net/bugs/1979014 Signed-off-by: Tim Gardner <[email protected]>

Signed-off-by: Tim Gardner <[email protected]>

This is a placeholder commit to separate the Ubuntu kernel source and our patches. Used by kernel_merge_with_upstream() in the linux-pkg repo.

…messages (#2)

…usted (#3)

…quire (#8) Upstream fix from kernel 5.12 nfsd: Don't keep looking up unhashed files in the nfsd file cache If a file is unhashed, then we're going to reject it anyway and retry, so make sure we skip it when we're doing the RCU lockless lookup. This avoids a number of unnecessary nfserr_jukebox returns from nfsd_file_acquire() Fixes: 65294c1 ("nfsd: add a new struct file caching facility to nfsd")

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

DLPX-75524 avoid unnecessary nfserr_jukebox returns from nfsd_file_acquire (#8) #16

DLPX-75524 avoid unnecessary nfserr_jukebox returns from nfsd_file_acquire (#8) #16

Commits on Jun 22, 2022

Commits on Jul 14, 2022