From: Alex Williamson <alex.williamson@redhat.com>

Coverity reports a tained scalar when traversing the capabilities

chain (CID 1516589). In practice I've never seen a device with a

chain so broken as to cause an issue, but it's also pretty easy to

sanitize.

Fixes: f6b30c1984f7 ("hw/vfio/pci-quirks: Support alternate offset for GPUDirect Cliques")

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci-quirks.c | 10 ++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci-quirks.c

+++ b/hw/vfio/pci-quirks.c

@@ -XXX,XX +XXX,XX @@ const PropertyInfo qdev_prop_nv_gpudirect_clique = {

.set = set_nv_gpudirect_clique_id,

};

+static bool is_valid_std_cap_offset(uint8_t pos)

+{

+ return (pos >= PCI_STD_HEADER_SIZEOF &&

+ pos <= (PCI_CFG_SPACE_SIZE - PCI_CAP_SIZEOF));

+}

+

static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)

{

PCIDevice *pdev = &vdev->pdev;

@@ -XXX,XX +XXX,XX @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)

*/

ret = pread(vdev->vbasedev.fd, &tmp, 1,

vdev->config_offset + PCI_CAPABILITY_LIST);

- if (ret != 1 || !tmp) {

+ if (ret != 1 || !is_valid_std_cap_offset(tmp)) {

error_setg(errp, "NVIDIA GPUDirect Clique ID: error getting cap list");

return -EINVAL;

}

@@ -XXX,XX +XXX,XX @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)

d4_conflict = true;

}

tmp = pdev->config[tmp + PCI_CAP_LIST_NEXT];

- } while (tmp);

+ } while (is_valid_std_cap_offset(tmp));

if (!c8_conflict) {

pos = 0xC8;

--

2.41.0

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

When vfio realize fails, INTx isn't disabled if it has been enabled.

This may confuse host side with unhandled interrupt report.

Fixes: c5478fea27ac ("vfio/pci: Respond to KVM irqchip change notifier")

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci.c | 3 +++

1 file changed, 3 insertions(+)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_realize(PCIDevice *pdev, Error **errp)

return;

out_deregister:

+ if (vdev->interrupt == VFIO_INT_INTx) {

+ vfio_intx_disable(vdev);

+ }

pci_device_set_intx_routing_notifier(&vdev->pdev, NULL);

if (vdev->irqchip_change_notifier.notify) {

kvm_irqchip_remove_change_notifier(&vdev->irqchip_change_notifier);

--

2.41.0

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

Contrary to multiple device blocker which needs to consider already-attached

devices to unblock/block dynamically, the vIOMMU migration blocker is a device

specific config. Meaning it only needs to know whether the device is bypassing

or not the vIOMMU (via machine property, or per pxb-pcie::bypass_iommu), and

does not need the state of currently present devices. For this reason, the

vIOMMU global migration blocker can be consolidated into the per-device

migration blocker, allowing us to remove some unnecessary code.

This change also makes vfio_mig_active() more accurate as it doesn't check for

global blocker.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/hw/vfio/vfio-common.h | 3 +--

hw/vfio/common.c | 51 ++---------------------------------

hw/vfio/migration.c | 7 ++---

hw/vfio/pci.c | 1 -

4 files changed, 7 insertions(+), 55 deletions(-)

diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/vfio/vfio-common.h

+++ b/include/hw/vfio/vfio-common.h

@@ -XXX,XX +XXX,XX @@ extern VFIOGroupList vfio_group_list;

bool vfio_mig_active(void);

int vfio_block_multiple_devices_migration(VFIODevice *vbasedev, Error **errp);

void vfio_unblock_multiple_devices_migration(void);

-int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp);

+bool vfio_viommu_preset(VFIODevice *vbasedev);

int64_t vfio_mig_bytes_transferred(void);

void vfio_reset_bytes_transferred(void);

@@ -XXX,XX +XXX,XX @@ int vfio_spapr_remove_window(VFIOContainer *container,

int vfio_migration_realize(VFIODevice *vbasedev, Error **errp);

void vfio_migration_exit(VFIODevice *vbasedev);

-void vfio_migration_finalize(void);

#endif /* HW_VFIO_VFIO_COMMON_H */

diff --git a/hw/vfio/common.c b/hw/vfio/common.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/common.c

+++ b/hw/vfio/common.c

@@ -XXX,XX +XXX,XX @@ bool vfio_mig_active(void)

}

static Error *multiple_devices_migration_blocker;

-static Error *giommu_migration_blocker;

static unsigned int vfio_migratable_device_num(void)

{

@@ -XXX,XX +XXX,XX @@ void vfio_unblock_multiple_devices_migration(void)

multiple_devices_migration_blocker = NULL;

}

-static bool vfio_viommu_preset(void)

+bool vfio_viommu_preset(VFIODevice *vbasedev)

{

- VFIOAddressSpace *space;

-

- QLIST_FOREACH(space, &vfio_address_spaces, list) {

- if (space->as != &address_space_memory) {

- return true;

- }

- }

-

- return false;

-}

-

-int vfio_block_giommu_migration(VFIODevice *vbasedev, Error **errp)

-{

- int ret;

-

- if (giommu_migration_blocker ||

- !vfio_viommu_preset()) {

- return 0;

- }

-

- if (vbasedev->enable_migration == ON_OFF_AUTO_ON) {

- error_setg(errp,

- "Migration is currently not supported with vIOMMU enabled");

- return -EINVAL;

- }

-

- error_setg(&giommu_migration_blocker,

- "Migration is currently not supported with vIOMMU enabled");

- ret = migrate_add_blocker(giommu_migration_blocker, errp);

- if (ret < 0) {

- error_free(giommu_migration_blocker);

- giommu_migration_blocker = NULL;

- }

-

- return ret;

-}

-

-void vfio_migration_finalize(void)

-{

- if (!giommu_migration_blocker ||

- vfio_viommu_preset()) {

- return;

- }

-

- migrate_del_blocker(giommu_migration_blocker);

- error_free(giommu_migration_blocker);

- giommu_migration_blocker = NULL;

+ return vbasedev->group->container->space->as != &address_space_memory;

}

static void vfio_set_migration_error(int err)

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/migration.c

+++ b/hw/vfio/migration.c

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

return ret;

}

- ret = vfio_block_giommu_migration(vbasedev, errp);

- if (ret) {

- return ret;

+ if (vfio_viommu_preset(vbasedev)) {

+ error_setg(&err, "%s: Migration is currently not supported "

+ "with vIOMMU enabled", vbasedev->name);

+ return vfio_block_migration(vbasedev, err, errp);

}

trace_vfio_migration_realize(vbasedev->name);

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_instance_finalize(Object *obj)

*/

vfio_put_device(vdev);

vfio_put_group(group);

- vfio_migration_finalize();

}

static void vfio_exitfn(PCIDevice *pdev)

--

2.41.0

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

When vfio_realize() succeeds, hot unplug will call vfio_exitfn()

to free resources allocated in vfio_realize(); when vfio_realize()

fails, vfio_exitfn() is never called and we need to free resources

in vfio_realize().

In the case that vfio_migration_realize() fails,

e.g: with -only-migratable & enable-migration=off, we see below:

(qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,enable-migration=off

0000:81:11.1: Migration disabled

Error: disallowing migration blocker (--only-migratable) for: 0000:81:11.1: Migration is disabled for VFIO device

If we hotplug again we should see same log as above, but we see:

(qemu) device_add vfio-pci,host=81:11.1,id=vfio1,bus=root1,enable-migration=off

Error: vfio 0000:81:11.1: device is already attached

That's because some references to VFIO device isn't released.

For resources allocated in vfio_migration_realize(), free them by

jumping to out_deinit path with calling a new function

vfio_migration_deinit(). For resources allocated in vfio_realize(),

free them by jumping to de-register path in vfio_realize().

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Fixes: a22651053b59 ("vfio: Make vfio-pci device migration capable")

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/migration.c | 33 +++++++++++++++++++++++----------

hw/vfio/pci.c | 1 +

2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/migration.c

+++ b/hw/vfio/migration.c

@@ -XXX,XX +XXX,XX @@ static int vfio_migration_init(VFIODevice *vbasedev)

return 0;

}

+static void vfio_migration_deinit(VFIODevice *vbasedev)

+{

+ VFIOMigration *migration = vbasedev->migration;

+

+ remove_migration_state_change_notifier(&migration->migration_state);

+ qemu_del_vm_change_state_handler(migration->vm_state);

+ unregister_savevm(VMSTATE_IF(vbasedev->dev), "vfio", vbasedev);

+ vfio_migration_free(vbasedev);

+ vfio_unblock_multiple_devices_migration();

+}

+

static int vfio_block_migration(VFIODevice *vbasedev, Error *err, Error **errp)

{

int ret;

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

error_setg(&err,

"%s: VFIO device doesn't support device dirty tracking",

vbasedev->name);

- return vfio_block_migration(vbasedev, err, errp);

+ goto add_blocker;

}

warn_report("%s: VFIO device doesn't support device dirty tracking",

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

ret = vfio_block_multiple_devices_migration(vbasedev, errp);

if (ret) {

- return ret;

+ goto out_deinit;

}

if (vfio_viommu_preset(vbasedev)) {

error_setg(&err, "%s: Migration is currently not supported "

"with vIOMMU enabled", vbasedev->name);

- return vfio_block_migration(vbasedev, err, errp);

+ goto add_blocker;

}

trace_vfio_migration_realize(vbasedev->name);

return 0;

+

+add_blocker:

+ ret = vfio_block_migration(vbasedev, err, errp);

+out_deinit:

+ if (ret) {

+ vfio_migration_deinit(vbasedev);

+ }

+ return ret;

}

void vfio_migration_exit(VFIODevice *vbasedev)

{

if (vbasedev->migration) {

- VFIOMigration *migration = vbasedev->migration;

-

- remove_migration_state_change_notifier(&migration->migration_state);

- qemu_del_vm_change_state_handler(migration->vm_state);

- unregister_savevm(VMSTATE_IF(vbasedev->dev), "vfio", vbasedev);

- vfio_migration_free(vbasedev);

- vfio_unblock_multiple_devices_migration();

+ vfio_migration_deinit(vbasedev);

}

if (vbasedev->migration_blocker) {

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_realize(PCIDevice *pdev, Error **errp)

ret = vfio_migration_realize(vbasedev, errp);

if (ret) {

error_report("%s: Migration disabled", vbasedev->name);

+ goto out_deregister;

}

}

--

2.41.0

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

Property enable_migration supports [on/off/auto].

In ON mode, error pointer is passed to errp and logged.

In OFF mode, we doesn't need to log "Migration disabled" as it's intentional.

In AUTO mode, we should only ever see errors or warnings if the device

supports migration and an error or incompatibility occurs while further

probing or configuring it. Lack of support for migration shoundn't

generate an error or warning.

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci.c | 1 -

1 file changed, 1 deletion(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_realize(PCIDevice *pdev, Error **errp)

if (!pdev->failover_pair_id) {

ret = vfio_migration_realize(vbasedev, errp);

if (ret) {

- error_report("%s: Migration disabled", vbasedev->name);

goto out_deregister;

}

}

--

2.41.0

From: Zhenzhong Duan <zhenzhong.duan@intel.com>

Make vfio_migration_realize() adhere to the convention of other realize()

callbacks(like qdev_realize) by returning bool instead of int.

Suggested-by: Cédric Le Goater <clg@redhat.com>

Suggested-by: Joao Martins <joao.m.martins@oracle.com>

Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>

Reviewed-by: Joao Martins <joao.m.martins@oracle.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/hw/vfio/vfio-common.h | 2 +-

hw/vfio/migration.c | 15 ++++++++++-----

hw/vfio/pci.c | 3 +--

3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/vfio/vfio-common.h

+++ b/include/hw/vfio/vfio-common.h

@@ -XXX,XX +XXX,XX @@ int vfio_spapr_create_window(VFIOContainer *container,

int vfio_spapr_remove_window(VFIOContainer *container,

hwaddr offset_within_address_space);

-int vfio_migration_realize(VFIODevice *vbasedev, Error **errp);

+bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp);

void vfio_migration_exit(VFIODevice *vbasedev);

#endif /* HW_VFIO_VFIO_COMMON_H */

diff --git a/hw/vfio/migration.c b/hw/vfio/migration.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/migration.c

+++ b/hw/vfio/migration.c

@@ -XXX,XX +XXX,XX @@ void vfio_reset_bytes_transferred(void)

bytes_transferred = 0;

}

-int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

+/*

+ * Return true when either migration initialized or blocker registered.

+ * Currently only return false when adding blocker fails which will

+ * de-register vfio device.

+ */

+bool vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

{

Error *err = NULL;

int ret;

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

if (vbasedev->enable_migration == ON_OFF_AUTO_OFF) {

error_setg(&err, "%s: Migration is disabled for VFIO device",

vbasedev->name);

- return vfio_block_migration(vbasedev, err, errp);

+ return !vfio_block_migration(vbasedev, err, errp);

}

ret = vfio_migration_init(vbasedev);

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

vbasedev->name, ret, strerror(-ret));

}

- return vfio_block_migration(vbasedev, err, errp);

+ return !vfio_block_migration(vbasedev, err, errp);

}

if (!vbasedev->dirty_pages_supported) {

@@ -XXX,XX +XXX,XX @@ int vfio_migration_realize(VFIODevice *vbasedev, Error **errp)

}

trace_vfio_migration_realize(vbasedev->name);

- return 0;

+ return true;

add_blocker:

ret = vfio_block_migration(vbasedev, err, errp);

@@ -XXX,XX +XXX,XX @@ out_deinit:

if (ret) {

vfio_migration_deinit(vbasedev);

}

- return ret;

+ return !ret;

}

void vfio_migration_exit(VFIODevice *vbasedev)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_realize(PCIDevice *pdev, Error **errp)

}

if (!pdev->failover_pair_id) {

- ret = vfio_migration_realize(vbasedev, errp);

- if (ret) {

+ if (!vfio_migration_realize(vbasedev, errp)) {

goto out_deregister;

}

}

--

2.41.0

From: Avihai Horon <avihaih@nvidia.com>

vfio_realize() has the following flow:

1. vfio_bars_prepare() -- sets VFIOBAR->size.

2. msix_early_setup().

3. vfio_bars_register() -- allocates VFIOBAR->mr.

After vfio_bars_prepare() is called msix_early_setup() can fail. If it

does fail, vfio_bars_register() is never called and VFIOBAR->mr is not

allocated.

In this case, vfio_bars_finalize() is called as part of the error flow

to free the bars' resources. However, vfio_bars_finalize() calls

object_unparent() for VFIOBAR->mr after checking only VFIOBAR->size, and

thus we get a null pointer dereference.

Fix it by checking VFIOBAR->mr in vfio_bars_finalize().

Fixes: 89d5202edc50 ("vfio/pci: Allow relocating MSI-X MMIO")

Signed-off-by: Avihai Horon <avihaih@nvidia.com>

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Reviewed-by: Alex Williamson <alex.williamson@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

hw/vfio/pci.c | 4 +++-

1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/vfio/pci.c

+++ b/hw/vfio/pci.c

@@ -XXX,XX +XXX,XX @@ static void vfio_bars_finalize(VFIOPCIDevice *vdev)

vfio_bar_quirk_finalize(vdev, i);

vfio_region_finalize(&bar->region);

- if (bar->size) {

+ if (bar->mr) {

+ assert(bar->size);

object_unparent(OBJECT(bar->mr));

g_free(bar->mr);

+ bar->mr = NULL;

}

}

--

2.41.0

Reviewed-by: Thomas Huth <thuth@redhat.com>

igned-off-by: Cédric Le Goater <clg@redhat.com>

Signed-off-by: Cédric Le Goater <clg@redhat.com>

---

include/standard-headers/drm/drm_fourcc.h | 43 ++++++

include/standard-headers/linux/const.h | 2 +-

include/standard-headers/linux/pci_regs.h | 1 +

include/standard-headers/linux/vhost_types.h | 16 +++

include/standard-headers/linux/virtio_blk.h | 18 +--

.../standard-headers/linux/virtio_config.h | 6 +

include/standard-headers/linux/virtio_net.h | 1 +

linux-headers/asm-arm64/bitsperlong.h | 23 ---

linux-headers/asm-arm64/kvm.h | 33 +++++

linux-headers/asm-generic/bitsperlong.h | 13 +-

linux-headers/asm-generic/unistd.h | 134 +++++-------------

linux-headers/asm-mips/unistd_n32.h | 1 +

linux-headers/asm-mips/unistd_n64.h | 1 +

linux-headers/asm-mips/unistd_o32.h | 1 +

linux-headers/asm-powerpc/unistd_32.h | 1 +

linux-headers/asm-powerpc/unistd_64.h | 1 +

linux-headers/asm-riscv/bitsperlong.h | 13 --

linux-headers/asm-riscv/kvm.h | 134 +++++++++++++++++-

linux-headers/asm-riscv/unistd.h | 9 ++

linux-headers/asm-s390/unistd_32.h | 2 +

linux-headers/asm-s390/unistd_64.h | 2 +

linux-headers/asm-x86/kvm.h | 3 +

linux-headers/asm-x86/unistd_32.h | 1 +

linux-headers/asm-x86/unistd_64.h | 1 +

linux-headers/asm-x86/unistd_x32.h | 1 +

linux-headers/linux/const.h | 2 +-

linux-headers/linux/kvm.h | 18 ++-

linux-headers/linux/mman.h | 14 ++

linux-headers/linux/psp-sev.h | 7 +

linux-headers/linux/userfaultfd.h | 17 ++-

linux-headers/linux/vfio.h | 27 ++++

linux-headers/linux/vhost.h | 31 ++++

32 files changed, 423 insertions(+), 154 deletions(-)

diff --git a/include/standard-headers/drm/drm_fourcc.h b/include/standard-headers/drm/drm_fourcc.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/drm/drm_fourcc.h

+++ b/include/standard-headers/drm/drm_fourcc.h

@@ -XXX,XX +XXX,XX @@ extern "C" {

*/

#define I915_FORMAT_MOD_4_TILED_DG2_RC_CCS_CC fourcc_mod_code(INTEL, 12)

+/*

+ * Intel Color Control Surfaces (CCS) for display ver. 14 render compression.

+ *

+ * The main surface is tile4 and at plane index 0, the CCS is linear and

+ * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in

+ * main surface. In other words, 4 bits in CCS map to a main surface cache

+ * line pair. The main surface pitch is required to be a multiple of four

+ * tile4 widths.

+ */

+#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS fourcc_mod_code(INTEL, 13)

+

+/*

+ * Intel Color Control Surfaces (CCS) for display ver. 14 media compression

+ *

+ * The main surface is tile4 and at plane index 0, the CCS is linear and

+ * at index 1. A 64B CCS cache line corresponds to an area of 4x1 tiles in

+ * main surface. In other words, 4 bits in CCS map to a main surface cache

+ * line pair. The main surface pitch is required to be a multiple of four

+ * tile4 widths. For semi-planar formats like NV12, CCS planes follow the

+ * Y and UV planes i.e., planes 0 and 1 are used for Y and UV surfaces,

+ * planes 2 and 3 for the respective CCS.

+ */

+#define I915_FORMAT_MOD_4_TILED_MTL_MC_CCS fourcc_mod_code(INTEL, 14)

+

+/*

+ * Intel Color Control Surface with Clear Color (CCS) for display ver. 14 render

+ * compression.

+ *

+ * The main surface is tile4 and is at plane index 0 whereas CCS is linear

+ * and at index 1. The clear color is stored at index 2, and the pitch should

+ * be ignored. The clear color structure is 256 bits. The first 128 bits

+ * represents Raw Clear Color Red, Green, Blue and Alpha color each represented

+ * by 32 bits. The raw clear color is consumed by the 3d engine and generates

+ * the converted clear color of size 64 bits. The first 32 bits store the Lower

+ * Converted Clear Color value and the next 32 bits store the Higher Converted

+ * Clear Color value when applicable. The Converted Clear Color values are

+ * consumed by the DE. The last 64 bits are used to store Color Discard Enable

+ * and Depth Clear Value Valid which are ignored by the DE. A CCS cache line

+ * corresponds to an area of 4x1 tiles in the main surface. The main surface

+ * pitch is required to be a multiple of 4 tile widths.

+ */

+#define I915_FORMAT_MOD_4_TILED_MTL_RC_CCS_CC fourcc_mod_code(INTEL, 15)

+

/*

* Tiled, NV12MT, grouped in 64 (pixels) x 32 (lines) -sized macroblocks

*

diff --git a/include/standard-headers/linux/const.h b/include/standard-headers/linux/const.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/const.h

+++ b/include/standard-headers/linux/const.h

@@ -XXX,XX +XXX,XX @@

#define _BITUL(x)    (_UL(1) << (x))

#define _BITULL(x)    (_ULL(1) << (x))

-#define __ALIGN_KERNEL(x, a)        __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)

+#define __ALIGN_KERNEL(x, a)        __ALIGN_KERNEL_MASK(x, (__typeof__(x))(a) - 1)

#define __ALIGN_KERNEL_MASK(x, mask)    (((x) + (mask)) & ~(mask))

#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))

diff --git a/include/standard-headers/linux/pci_regs.h b/include/standard-headers/linux/pci_regs.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/pci_regs.h

+++ b/include/standard-headers/linux/pci_regs.h

@@ -XXX,XX +XXX,XX @@

#define PCI_EXT_CAP_ID_DVSEC    0x23    /* Designated Vendor-Specific */

#define PCI_EXT_CAP_ID_DLF    0x25    /* Data Link Feature */

#define PCI_EXT_CAP_ID_PL_16GT    0x26    /* Physical Layer 16.0 GT/s */

+#define PCI_EXT_CAP_ID_PL_32GT 0x2A /* Physical Layer 32.0 GT/s */

#define PCI_EXT_CAP_ID_DOE    0x2E    /* Data Object Exchange */

#define PCI_EXT_CAP_ID_MAX    PCI_EXT_CAP_ID_DOE

diff --git a/include/standard-headers/linux/vhost_types.h b/include/standard-headers/linux/vhost_types.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/vhost_types.h

+++ b/include/standard-headers/linux/vhost_types.h

@@ -XXX,XX +XXX,XX @@ struct vhost_vring_addr {

    uint64_t log_guest_addr;

};

+struct vhost_worker_state {

+    /*

+     * For VHOST_NEW_WORKER the kernel will return the new vhost_worker id.

+     * For VHOST_FREE_WORKER this must be set to the id of the vhost_worker

+     * to free.

+     */

+    unsigned int worker_id;

+};

+

+struct vhost_vring_worker {

+    /* vring index */

+    unsigned int index;

+    /* The id of the vhost_worker returned from VHOST_NEW_WORKER */

+    unsigned int worker_id;

+};

+

/* no alignment requirement */

struct vhost_iotlb_msg {

    uint64_t iova;

diff --git a/include/standard-headers/linux/virtio_blk.h b/include/standard-headers/linux/virtio_blk.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/virtio_blk.h

+++ b/include/standard-headers/linux/virtio_blk.h

@@ -XXX,XX +XXX,XX @@ struct virtio_blk_config {

    /* Zoned block device characteristics (if VIRTIO_BLK_F_ZONED) */

    struct virtio_blk_zoned_characteristics {

-        uint32_t zone_sectors;

-        uint32_t max_open_zones;

-        uint32_t max_active_zones;

-        uint32_t max_append_sectors;

-        uint32_t write_granularity;

+        __virtio32 zone_sectors;

+        __virtio32 max_open_zones;

+        __virtio32 max_active_zones;

+        __virtio32 max_append_sectors;

+        __virtio32 write_granularity;

        uint8_t model;

        uint8_t unused2[3];

    } zoned;

@@ -XXX,XX +XXX,XX @@ struct virtio_blk_outhdr {

*/

struct virtio_blk_zone_descriptor {

    /* Zone capacity */

-    uint64_t z_cap;

+    __virtio64 z_cap;

    /* The starting sector of the zone */

-    uint64_t z_start;

+    __virtio64 z_start;

    /* Zone write pointer position in sectors */

-    uint64_t z_wp;

+    __virtio64 z_wp;

    /* Zone type */

    uint8_t z_type;

    /* Zone state */

@@ -XXX,XX +XXX,XX @@ struct virtio_blk_zone_descriptor {

};

struct virtio_blk_zone_report {

-    uint64_t nr_zones;

+    __virtio64 nr_zones;

    uint8_t reserved[56];

    struct virtio_blk_zone_descriptor zones[];

};

diff --git a/include/standard-headers/linux/virtio_config.h b/include/standard-headers/linux/virtio_config.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/virtio_config.h

+++ b/include/standard-headers/linux/virtio_config.h

@@ -XXX,XX +XXX,XX @@

*/

#define VIRTIO_F_SR_IOV            37

+/*

+ * This feature indicates that the driver passes extra data (besides

+ * identifying the virtqueue) in its device notifications.

+ */

+#define VIRTIO_F_NOTIFICATION_DATA    38

+

/*

* This feature indicates that the driver can reset a queue individually.

*/

diff --git a/include/standard-headers/linux/virtio_net.h b/include/standard-headers/linux/virtio_net.h

index XXXXXXX..XXXXXXX 100644

--- a/include/standard-headers/linux/virtio_net.h

+++ b/include/standard-headers/linux/virtio_net.h

@@ -XXX,XX +XXX,XX @@

#define VIRTIO_NET_F_GUEST_USO6    55    /* Guest can handle USOv6 in. */

#define VIRTIO_NET_F_HOST_USO    56    /* Host can handle USO in. */

#define VIRTIO_NET_F_HASH_REPORT 57    /* Supports hash report */

+#define VIRTIO_NET_F_GUEST_HDRLEN 59    /* Guest provides the exact hdr_len value. */

#define VIRTIO_NET_F_RSS     60    /* Supports RSS RX steering */

#define VIRTIO_NET_F_RSC_EXT     61    /* extended coalescing info */

#define VIRTIO_NET_F_STANDBY     62    /* Act as standby for another device

diff --git a/linux-headers/asm-arm64/bitsperlong.h b/linux-headers/asm-arm64/bitsperlong.h

index XXXXXXX..XXXXXXX 100644

--- a/linux-headers/asm-arm64/bitsperlong.h

+++ b/linux-headers/asm-arm64/bitsperlong.h

@@ -1,24 +1 @@

-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

-/*

- * Copyright (C) 2012 ARM Ltd.

- *

- * This program is free software; you can redistribute it and/or modify

- * it under the terms of the GNU General Public License version 2 as

- * published by the Free Software Foundation.

- *

- * This program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

- * GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public License

- * along with this program. If not, see <http://www.gnu.org/licenses/>.

- */

-#ifndef __ASM_BITSPERLONG_H

-#define __ASM_BITSPERLONG_H

-

-#define __BITS_PER_LONG 64

-

#include <asm-generic/bitsperlong.h>

-

-#endif    /* __ASM_BITSPERLONG_H */

diff --git a/linux-headers/asm-arm64/kvm.h b/linux-headers/asm-arm64/kvm.h

index XXXXXXX..XXXXXXX 100644

--- a/linux-headers/asm-arm64/kvm.h

+++ b/linux-headers/asm-arm64/kvm.h

@@ -XXX,XX +XXX,XX @@ struct kvm_arm_copy_mte_tags {

    __u64 reserved[2];

};

+/*

+ * Counter/Timer offset structure. Describe the virtual/physical offset.

+ * To be used with KVM_ARM_SET_COUNTER_OFFSET.

+ */

+struct kvm_arm_counter_offset {

+    __u64 counter_offset;

+    __u64 reserved;

+};

+

#define KVM_ARM_TAGS_TO_GUEST        0

#define KVM_ARM_TAGS_FROM_GUEST        1

@@ -XXX,XX +XXX,XX @@ enum {

    KVM_REG_ARM_VENDOR_HYP_BIT_PTP        = 1,

};

+/* Device Control API on vm fd */

+#define KVM_ARM_VM_SMCCC_CTRL        0

+#define KVM_ARM_VM_SMCCC_FILTER    0

+

/* Device Control API: ARM VGIC */

#define KVM_DEV_ARM_VGIC_GRP_ADDR    0

#define KVM_DEV_ARM_VGIC_GRP_DIST_REGS    1

@@ -XXX,XX +XXX,XX @@ enum {

#define KVM_ARM_VCPU_TIMER_CTRL        1

#define KVM_ARM_VCPU_TIMER_IRQ_VTIMER        0

#define KVM_ARM_VCPU_TIMER_IRQ_PTIMER        1

+#define KVM_ARM_VCPU_TIMER_IRQ_HVTIMER    2

+#define KVM_ARM_VCPU_TIMER_IRQ_HPTIMER    3

#define KVM_ARM_VCPU_PVTIME_CTRL    2

#define KVM_ARM_VCPU_PVTIME_IPA    0

@@ -XXX,XX +XXX,XX @@ enum {

/* run->fail_entry.hardware_entry_failure_reason codes. */

#define KVM_EXIT_FAIL_ENTRY_CPU_UNSUPPORTED    (1ULL << 0)

+enum kvm_smccc_filter_action {

+    KVM_SMCCC_FILTER_HANDLE = 0,

+    KVM_SMCCC_FILTER_DENY,

+    KVM_SMCCC_FILTER_FWD_TO_USER,

+

+};

+

+struct kvm_smccc_filter {

+    __u32 base;

+    __u32 nr_functions;

+    __u8 action;

+    __u8 pad[15];

+};

+

+/* arm64-specific KVM_EXIT_HYPERCALL flags */

+#define KVM_HYPERCALL_EXIT_SMC        (1U << 0)

+#define KVM_HYPERCALL_EXIT_16BIT    (1U << 1)

+

#endif

#endif /* __ARM_KVM_H__ */

diff --git a/linux-headers/asm-generic/bitsperlong.h b/linux-headers/asm-generic/bitsperlong.h

index XXXXXXX..XXXXXXX 100644

--- a/linux-headers/asm-generic/bitsperlong.h

+++ b/linux-headers/asm-generic/bitsperlong.h

@@ -XXX,XX +XXX,XX @@

#ifndef __ASM_GENERIC_BITS_PER_LONG

#define __ASM_GENERIC_BITS_PER_LONG

+#ifndef __BITS_PER_LONG

+/*

+ * In order to keep safe and avoid regression, only unify uapi

+ * bitsperlong.h for some archs which are using newer toolchains

+ * that have the definitions of __CHAR_BIT__ and __SIZEOF_LONG__.

+ * See the following link for more info:

+ * https://lore.kernel.org/linux-arch/b9624545-2c80-49a1-ac3c-39264a591f7b@app.fastmail.com/

+ */

+#if defined(__CHAR_BIT__) && defined(__SIZEOF_LONG__)

+#define __BITS_PER_LONG (__CHAR_BIT__ * __SIZEOF_LONG__)

+#else

/*

* There seems to be no way of detecting this automatically from user

* space, so 64 bit architectures should override this in their

@@ -XXX,XX +XXX,XX @@

* both 32 and 64 bit user space must not rely on CONFIG_64BIT

* to decide it, but rather check a compiler provided macro.

*/

-#ifndef __BITS_PER_LONG

#define __BITS_PER_LONG 32

#endif

+#endif

#endif /* __ASM_GENERIC_BITS_PER_LONG */

diff --git a/linux-headers/asm-generic/unistd.h b/linux-headers/asm-generic/unistd.h

index XXXXXXX..XXXXXXX 100644

--- a/linux-headers/asm-generic/unistd.h

+++ b/linux-headers/asm-generic/unistd.h

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_io_destroy, sys_io_destroy)

__SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)

#define __NR_io_cancel 3

__SYSCALL(__NR_io_cancel, sys_io_cancel)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_io_getevents 4

__SC_3264(__NR_io_getevents, sys_io_getevents_time32, sys_io_getevents)

#endif

-/* fs/xattr.c */

#define __NR_setxattr 5

__SYSCALL(__NR_setxattr, sys_setxattr)

#define __NR_lsetxattr 6

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_removexattr, sys_removexattr)

__SYSCALL(__NR_lremovexattr, sys_lremovexattr)

#define __NR_fremovexattr 16

__SYSCALL(__NR_fremovexattr, sys_fremovexattr)

-

-/* fs/dcache.c */

#define __NR_getcwd 17

__SYSCALL(__NR_getcwd, sys_getcwd)

-

-/* fs/cookies.c */

#define __NR_lookup_dcookie 18

__SC_COMP(__NR_lookup_dcookie, sys_lookup_dcookie, compat_sys_lookup_dcookie)

-

-/* fs/eventfd.c */

#define __NR_eventfd2 19

__SYSCALL(__NR_eventfd2, sys_eventfd2)

-

-/* fs/eventpoll.c */

#define __NR_epoll_create1 20

__SYSCALL(__NR_epoll_create1, sys_epoll_create1)

#define __NR_epoll_ctl 21

__SYSCALL(__NR_epoll_ctl, sys_epoll_ctl)

#define __NR_epoll_pwait 22

__SC_COMP(__NR_epoll_pwait, sys_epoll_pwait, compat_sys_epoll_pwait)

-

-/* fs/fcntl.c */

#define __NR_dup 23

__SYSCALL(__NR_dup, sys_dup)

#define __NR_dup3 24

__SYSCALL(__NR_dup3, sys_dup3)

#define __NR3264_fcntl 25

__SC_COMP_3264(__NR3264_fcntl, sys_fcntl64, sys_fcntl, compat_sys_fcntl64)

-

-/* fs/inotify_user.c */

#define __NR_inotify_init1 26

__SYSCALL(__NR_inotify_init1, sys_inotify_init1)

#define __NR_inotify_add_watch 27

__SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)

#define __NR_inotify_rm_watch 28

__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)

-

-/* fs/ioctl.c */

#define __NR_ioctl 29

__SC_COMP(__NR_ioctl, sys_ioctl, compat_sys_ioctl)

-

-/* fs/ioprio.c */

#define __NR_ioprio_set 30

__SYSCALL(__NR_ioprio_set, sys_ioprio_set)

#define __NR_ioprio_get 31

__SYSCALL(__NR_ioprio_get, sys_ioprio_get)

-

-/* fs/locks.c */

#define __NR_flock 32

__SYSCALL(__NR_flock, sys_flock)

-

-/* fs/namei.c */

#define __NR_mknodat 33

__SYSCALL(__NR_mknodat, sys_mknodat)

#define __NR_mkdirat 34

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_unlinkat, sys_unlinkat)

__SYSCALL(__NR_symlinkat, sys_symlinkat)

#define __NR_linkat 37

__SYSCALL(__NR_linkat, sys_linkat)

+

#ifdef __ARCH_WANT_RENAMEAT

/* renameat is superseded with flags by renameat2 */

#define __NR_renameat 38

__SYSCALL(__NR_renameat, sys_renameat)

#endif /* __ARCH_WANT_RENAMEAT */

-/* fs/namespace.c */

#define __NR_umount2 39

__SYSCALL(__NR_umount2, sys_umount)

#define __NR_mount 40

__SYSCALL(__NR_mount, sys_mount)

#define __NR_pivot_root 41

__SYSCALL(__NR_pivot_root, sys_pivot_root)

-

-/* fs/nfsctl.c */

#define __NR_nfsservctl 42

__SYSCALL(__NR_nfsservctl, sys_ni_syscall)

-

-/* fs/open.c */

#define __NR3264_statfs 43

__SC_COMP_3264(__NR3264_statfs, sys_statfs64, sys_statfs, \

     compat_sys_statfs64)

@@ -XXX,XX +XXX,XX @@ __SC_COMP_3264(__NR3264_truncate, sys_truncate64, sys_truncate, \

#define __NR3264_ftruncate 46

__SC_COMP_3264(__NR3264_ftruncate, sys_ftruncate64, sys_ftruncate, \

     compat_sys_ftruncate64)

-

#define __NR_fallocate 47

__SC_COMP(__NR_fallocate, sys_fallocate, compat_sys_fallocate)

#define __NR_faccessat 48

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_openat, sys_openat)

__SYSCALL(__NR_close, sys_close)

#define __NR_vhangup 58

__SYSCALL(__NR_vhangup, sys_vhangup)

-

-/* fs/pipe.c */

#define __NR_pipe2 59

__SYSCALL(__NR_pipe2, sys_pipe2)

-

-/* fs/quota.c */

#define __NR_quotactl 60

__SYSCALL(__NR_quotactl, sys_quotactl)

-

-/* fs/readdir.c */

#define __NR_getdents64 61

__SYSCALL(__NR_getdents64, sys_getdents64)

-

-/* fs/read_write.c */

#define __NR3264_lseek 62

__SC_3264(__NR3264_lseek, sys_llseek, sys_lseek)

#define __NR_read 63

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_pwrite64, sys_pwrite64, compat_sys_pwrite64)

__SC_COMP(__NR_preadv, sys_preadv, compat_sys_preadv)

#define __NR_pwritev 70

__SC_COMP(__NR_pwritev, sys_pwritev, compat_sys_pwritev)

-

-/* fs/sendfile.c */

#define __NR3264_sendfile 71

__SYSCALL(__NR3264_sendfile, sys_sendfile64)

-/* fs/select.c */

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_pselect6 72

__SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_pselect6_time32)

@@ -XXX,XX +XXX,XX @@ __SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_psel

__SC_COMP_3264(__NR_ppoll, sys_ppoll_time32, sys_ppoll, compat_sys_ppoll_time32)

#endif

-/* fs/signalfd.c */

#define __NR_signalfd4 74

__SC_COMP(__NR_signalfd4, sys_signalfd4, compat_sys_signalfd4)

-

-/* fs/splice.c */

#define __NR_vmsplice 75

__SYSCALL(__NR_vmsplice, sys_vmsplice)

#define __NR_splice 76

__SYSCALL(__NR_splice, sys_splice)

#define __NR_tee 77

__SYSCALL(__NR_tee, sys_tee)

-

-/* fs/stat.c */

#define __NR_readlinkat 78

__SYSCALL(__NR_readlinkat, sys_readlinkat)

+

#if defined(__ARCH_WANT_NEW_STAT) || defined(__ARCH_WANT_STAT64)

#define __NR3264_fstatat 79

__SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)

@@ -XXX,XX +XXX,XX @@ __SC_3264(__NR3264_fstatat, sys_fstatat64, sys_newfstatat)

__SC_3264(__NR3264_fstat, sys_fstat64, sys_newfstat)

#endif

-/* fs/sync.c */

#define __NR_sync 81

__SYSCALL(__NR_sync, sys_sync)

#define __NR_fsync 82

__SYSCALL(__NR_fsync, sys_fsync)

#define __NR_fdatasync 83

__SYSCALL(__NR_fdatasync, sys_fdatasync)

+

#ifdef __ARCH_WANT_SYNC_FILE_RANGE2

#define __NR_sync_file_range2 84

__SC_COMP(__NR_sync_file_range2, sys_sync_file_range2, \

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_sync_file_range, sys_sync_file_range, \

     compat_sys_sync_file_range)

#endif

-/* fs/timerfd.c */

#define __NR_timerfd_create 85

__SYSCALL(__NR_timerfd_create, sys_timerfd_create)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_timerfd_settime 86

__SC_3264(__NR_timerfd_settime, sys_timerfd_settime32, \

@@ -XXX,XX +XXX,XX @@ __SC_3264(__NR_timerfd_gettime, sys_timerfd_gettime32, \

     sys_timerfd_gettime)

#endif

-/* fs/utimes.c */

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_utimensat 88

__SC_3264(__NR_utimensat, sys_utimensat_time32, sys_utimensat)

#endif

-/* kernel/acct.c */

#define __NR_acct 89

__SYSCALL(__NR_acct, sys_acct)

-

-/* kernel/capability.c */

#define __NR_capget 90

__SYSCALL(__NR_capget, sys_capget)

#define __NR_capset 91

__SYSCALL(__NR_capset, sys_capset)

-

-/* kernel/exec_domain.c */

#define __NR_personality 92

__SYSCALL(__NR_personality, sys_personality)

-

-/* kernel/exit.c */

#define __NR_exit 93

__SYSCALL(__NR_exit, sys_exit)

#define __NR_exit_group 94

__SYSCALL(__NR_exit_group, sys_exit_group)

#define __NR_waitid 95

__SC_COMP(__NR_waitid, sys_waitid, compat_sys_waitid)

-

-/* kernel/fork.c */

#define __NR_set_tid_address 96

__SYSCALL(__NR_set_tid_address, sys_set_tid_address)

#define __NR_unshare 97

__SYSCALL(__NR_unshare, sys_unshare)

-/* kernel/futex.c */

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_futex 98

__SC_3264(__NR_futex, sys_futex_time32, sys_futex)

#endif

+

#define __NR_set_robust_list 99

__SC_COMP(__NR_set_robust_list, sys_set_robust_list, \

     compat_sys_set_robust_list)

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \

__SC_COMP(__NR_get_robust_list, sys_get_robust_list, \

     compat_sys_get_robust_list)

-/* kernel/hrtimer.c */

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_nanosleep 101

__SC_3264(__NR_nanosleep, sys_nanosleep_time32, sys_nanosleep)

#endif

-/* kernel/itimer.c */

#define __NR_getitimer 102

__SC_COMP(__NR_getitimer, sys_getitimer, compat_sys_getitimer)

#define __NR_setitimer 103

__SC_COMP(__NR_setitimer, sys_setitimer, compat_sys_setitimer)

-

-/* kernel/kexec.c */

#define __NR_kexec_load 104

__SC_COMP(__NR_kexec_load, sys_kexec_load, compat_sys_kexec_load)

-

-/* kernel/module.c */

#define __NR_init_module 105

__SYSCALL(__NR_init_module, sys_init_module)

#define __NR_delete_module 106

__SYSCALL(__NR_delete_module, sys_delete_module)

-

-/* kernel/posix-timers.c */

#define __NR_timer_create 107

__SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_timer_gettime 108

__SC_3264(__NR_timer_gettime, sys_timer_gettime32, sys_timer_gettime)

#endif

+

#define __NR_timer_getoverrun 109

__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_timer_settime 110

__SC_3264(__NR_timer_settime, sys_timer_settime32, sys_timer_settime)

#endif

+

#define __NR_timer_delete 111

__SYSCALL(__NR_timer_delete, sys_timer_delete)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_clock_settime 112

__SC_3264(__NR_clock_settime, sys_clock_settime32, sys_clock_settime)

@@ -XXX,XX +XXX,XX @@ __SC_3264(__NR_clock_nanosleep, sys_clock_nanosleep_time32, \

     sys_clock_nanosleep)

#endif

-/* kernel/printk.c */

#define __NR_syslog 116

__SYSCALL(__NR_syslog, sys_syslog)

-

-/* kernel/ptrace.c */

#define __NR_ptrace 117

__SC_COMP(__NR_ptrace, sys_ptrace, compat_sys_ptrace)

-

-/* kernel/sched/core.c */

#define __NR_sched_setparam 118

__SYSCALL(__NR_sched_setparam, sys_sched_setparam)

#define __NR_sched_setscheduler 119

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_sched_yield, sys_sched_yield)

__SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)

#define __NR_sched_get_priority_min 126

__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_sched_rr_get_interval 127

__SC_3264(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32, \

     sys_sched_rr_get_interval)

#endif

-/* kernel/signal.c */

#define __NR_restart_syscall 128

__SYSCALL(__NR_restart_syscall, sys_restart_syscall)

#define __NR_kill 129

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_rt_sigaction, sys_rt_sigaction, compat_sys_rt_sigaction)

__SC_COMP(__NR_rt_sigprocmask, sys_rt_sigprocmask, compat_sys_rt_sigprocmask)

#define __NR_rt_sigpending 136

__SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_rt_sigtimedwait 137

__SC_COMP_3264(__NR_rt_sigtimedwait, sys_rt_sigtimedwait_time32, \

     sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)

#endif

+

#define __NR_rt_sigqueueinfo 138

__SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \

     compat_sys_rt_sigqueueinfo)

#define __NR_rt_sigreturn 139

__SC_COMP(__NR_rt_sigreturn, sys_rt_sigreturn, compat_sys_rt_sigreturn)

-

-/* kernel/sys.c */

#define __NR_setpriority 140

__SYSCALL(__NR_setpriority, sys_setpriority)

#define __NR_getpriority 141

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_prctl, sys_prctl)

#define __NR_getcpu 168

__SYSCALL(__NR_getcpu, sys_getcpu)

-/* kernel/time.c */

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_gettimeofday 169

__SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)

__SC_3264(__NR_adjtimex, sys_adjtimex_time32, sys_adjtimex)

#endif

-/* kernel/sys.c */

#define __NR_getpid 172

__SYSCALL(__NR_getpid, sys_getpid)

#define __NR_getppid 173

@@ -XXX,XX +XXX,XX @@ __SYSCALL(__NR_getegid, sys_getegid)

__SYSCALL(__NR_gettid, sys_gettid)

#define __NR_sysinfo 179

__SC_COMP(__NR_sysinfo, sys_sysinfo, compat_sys_sysinfo)

-

-/* ipc/mqueue.c */

#define __NR_mq_open 180

__SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)

#define __NR_mq_unlink 181

__SYSCALL(__NR_mq_unlink, sys_mq_unlink)

+

#if defined(__ARCH_WANT_TIME32_SYSCALLS) || __BITS_PER_LONG != 32

#define __NR_mq_timedsend 182

__SC_3264(__NR_mq_timedsend, sys_mq_timedsend_time32, sys_mq_timedsend)

@@ -XXX,XX +XXX,XX @@ __SC_3264(__NR_mq_timedsend, sys_mq_timedsend_time32, sys_mq_timedsend)

__SC_3264(__NR_mq_timedreceive, sys_mq_timedreceive_time32, \

     sys_mq_timedreceive)

#endif

+

#define __NR_mq_notify 184

__SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)

#define __NR_mq_getsetattr 185

__SC_COMP(__NR_mq_getsetattr, sys_mq_getsetattr, compat_sys_mq_getsetattr)

-

-/* ipc/msg.c */

#define __NR_msgget 186

__SYSCALL(__NR_msgget, sys_msgget)

#define __NR_msgctl 187

@@ -XXX,XX +XXX,XX @@ __SC_COMP(__NR_msgctl, sys_msgctl, compat_sys_msgctl)

__SC_COMP(__NR_msgrcv, sys_msgrcv, compat_sys_msgrcv)