mirror of https://github.com/xemu-project/xemu.git
linux-headers: update to 6.10-rc1
Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de> Message-Id: <20240527-pvpanic-shutdown-v8-2-5a28ec02558b@t-8ch.de> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
parent
c51dca0428
commit
c5614ee3f2
|
@ -752,6 +752,61 @@ enum ethtool_module_power_mode {
|
|||
ETHTOOL_MODULE_POWER_MODE_HIGH,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_pse_types - Types of PSE controller.
|
||||
* @ETHTOOL_PSE_UNKNOWN: Type of PSE controller is unknown
|
||||
* @ETHTOOL_PSE_PODL: PSE controller which support PoDL
|
||||
* @ETHTOOL_PSE_C33: PSE controller which support Clause 33 (PoE)
|
||||
*/
|
||||
enum ethtool_pse_types {
|
||||
ETHTOOL_PSE_UNKNOWN = 1 << 0,
|
||||
ETHTOOL_PSE_PODL = 1 << 1,
|
||||
ETHTOOL_PSE_C33 = 1 << 2,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_c33_pse_admin_state - operational state of the PoDL PSE
|
||||
* functions. IEEE 802.3-2022 30.9.1.1.2 aPSEAdminState
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN: state of PSE functions is unknown
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED: PSE functions are disabled
|
||||
* @ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED: PSE functions are enabled
|
||||
*/
|
||||
enum ethtool_c33_pse_admin_state {
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_UNKNOWN = 1,
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_DISABLED,
|
||||
ETHTOOL_C33_PSE_ADMIN_STATE_ENABLED,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_c33_pse_pw_d_status - power detection status of the PSE.
|
||||
* IEEE 802.3-2022 30.9.1.1.3 aPoDLPSEPowerDetectionStatus:
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN: PSE status is unknown
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED: The enumeration "disabled"
|
||||
* indicates that the PSE State diagram is in the state DISABLED.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING: The enumeration "searching"
|
||||
* indicates the PSE State diagram is in a state other than those
|
||||
* listed.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING: The enumeration
|
||||
* "deliveringPower" indicates that the PSE State diagram is in the
|
||||
* state POWER_ON.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_TEST: The enumeration "test" indicates that
|
||||
* the PSE State diagram is in the state TEST_MODE.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_FAULT: The enumeration "fault" indicates that
|
||||
* the PSE State diagram is in the state TEST_ERROR.
|
||||
* @ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT: The enumeration "otherFault"
|
||||
* indicates that the PSE State diagram is in the state IDLE due to
|
||||
* the variable error_condition = true.
|
||||
*/
|
||||
enum ethtool_c33_pse_pw_d_status {
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_UNKNOWN = 1,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_DISABLED,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_SEARCHING,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_DELIVERING,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_TEST,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_FAULT,
|
||||
ETHTOOL_C33_PSE_PW_D_STATUS_OTHERFAULT,
|
||||
};
|
||||
|
||||
/**
|
||||
* enum ethtool_podl_pse_admin_state - operational state of the PoDL PSE
|
||||
* functions. IEEE 802.3-2018 30.15.1.1.2 aPoDLPSEAdminState
|
||||
|
|
|
@ -1144,8 +1144,14 @@
|
|||
#define PCI_DOE_DATA_OBJECT_HEADER_2_LENGTH 0x0003ffff
|
||||
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_INDEX 0x000000ff
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_REQ_3_VER 0x0000ff00
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_VID 0x0000ffff
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_PROTOCOL 0x00ff0000
|
||||
#define PCI_DOE_DATA_OBJECT_DISC_RSP_3_NEXT_INDEX 0xff000000
|
||||
|
||||
/* Compute Express Link (CXL r3.1, sec 8.1.5) */
|
||||
#define PCI_DVSEC_CXL_PORT 3
|
||||
#define PCI_DVSEC_CXL_PORT_CTL 0x0c
|
||||
#define PCI_DVSEC_CXL_PORT_CTL_UNMASK_SBR 0x00000001
|
||||
|
||||
#endif /* LINUX_PCI_REGS_H */
|
||||
|
|
|
@ -13,7 +13,6 @@
|
|||
|
||||
enum virtio_bt_config_type {
|
||||
VIRTIO_BT_CONFIG_TYPE_PRIMARY = 0,
|
||||
VIRTIO_BT_CONFIG_TYPE_AMP = 1,
|
||||
};
|
||||
|
||||
enum virtio_bt_config_vendor {
|
||||
|
|
|
@ -90,6 +90,8 @@
|
|||
#define VIRTIO_MEM_F_ACPI_PXM 0
|
||||
/* unplugged memory must not be accessed */
|
||||
#define VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE 1
|
||||
/* plugged memory will remain plugged when suspending+resuming */
|
||||
#define VIRTIO_MEM_F_PERSISTENT_SUSPEND 2
|
||||
|
||||
|
||||
/* --- virtio-mem: guest -> host requests --- */
|
||||
|
|
|
@ -56,6 +56,7 @@
|
|||
#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
|
||||
* Steering */
|
||||
#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
|
||||
#define VIRTIO_NET_F_DEVICE_STATS 50 /* Device can provide device-level statistics. */
|
||||
#define VIRTIO_NET_F_VQ_NOTF_COAL 52 /* Device supports virtqueue notification coalescing */
|
||||
#define VIRTIO_NET_F_NOTF_COAL 53 /* Device supports notifications coalescing */
|
||||
#define VIRTIO_NET_F_GUEST_USO4 54 /* Guest can handle USOv4 in. */
|
||||
|
@ -406,4 +407,146 @@ struct virtio_net_ctrl_coal_vq {
|
|||
struct virtio_net_ctrl_coal coal;
|
||||
};
|
||||
|
||||
/*
|
||||
* Device Statistics
|
||||
*/
|
||||
#define VIRTIO_NET_CTRL_STATS 8
|
||||
#define VIRTIO_NET_CTRL_STATS_QUERY 0
|
||||
#define VIRTIO_NET_CTRL_STATS_GET 1
|
||||
|
||||
struct virtio_net_stats_capabilities {
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_CVQ (1ULL << 32)
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_BASIC (1ULL << 0)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_CSUM (1ULL << 1)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_GSO (1ULL << 2)
|
||||
#define VIRTIO_NET_STATS_TYPE_RX_SPEED (1ULL << 3)
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_BASIC (1ULL << 16)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_CSUM (1ULL << 17)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_GSO (1ULL << 18)
|
||||
#define VIRTIO_NET_STATS_TYPE_TX_SPEED (1ULL << 19)
|
||||
|
||||
uint64_t supported_stats_types[1];
|
||||
};
|
||||
|
||||
struct virtio_net_ctrl_queue_stats {
|
||||
struct {
|
||||
uint16_t vq_index;
|
||||
uint16_t reserved[3];
|
||||
uint64_t types_bitmap[1];
|
||||
} stats[1];
|
||||
};
|
||||
|
||||
struct virtio_net_stats_reply_hdr {
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_CVQ 32
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_BASIC 0
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_CSUM 1
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_GSO 2
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_RX_SPEED 3
|
||||
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_BASIC 16
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_CSUM 17
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_GSO 18
|
||||
#define VIRTIO_NET_STATS_TYPE_REPLY_TX_SPEED 19
|
||||
uint8_t type;
|
||||
uint8_t reserved;
|
||||
uint16_t vq_index;
|
||||
uint16_t reserved1;
|
||||
uint16_t size;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_cvq {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t command_num;
|
||||
uint64_t ok_num;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_basic {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_notifications;
|
||||
|
||||
uint64_t rx_packets;
|
||||
uint64_t rx_bytes;
|
||||
|
||||
uint64_t rx_interrupts;
|
||||
|
||||
uint64_t rx_drops;
|
||||
uint64_t rx_drop_overruns;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_basic {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_notifications;
|
||||
|
||||
uint64_t tx_packets;
|
||||
uint64_t tx_bytes;
|
||||
|
||||
uint64_t tx_interrupts;
|
||||
|
||||
uint64_t tx_drops;
|
||||
uint64_t tx_drop_malformed;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_csum {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_csum_valid;
|
||||
uint64_t rx_needs_csum;
|
||||
uint64_t rx_csum_none;
|
||||
uint64_t rx_csum_bad;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_csum {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_csum_none;
|
||||
uint64_t tx_needs_csum;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_gso {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t rx_gso_packets;
|
||||
uint64_t rx_gso_bytes;
|
||||
uint64_t rx_gso_packets_coalesced;
|
||||
uint64_t rx_gso_bytes_coalesced;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_gso {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
uint64_t tx_gso_packets;
|
||||
uint64_t tx_gso_bytes;
|
||||
uint64_t tx_gso_segments;
|
||||
uint64_t tx_gso_segments_bytes;
|
||||
uint64_t tx_gso_packets_noseg;
|
||||
uint64_t tx_gso_bytes_noseg;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_rx_speed {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
/* rx_{packets,bytes}_allowance_exceeded are too long. So rename to
|
||||
* short name.
|
||||
*/
|
||||
uint64_t rx_ratelimit_packets;
|
||||
uint64_t rx_ratelimit_bytes;
|
||||
};
|
||||
|
||||
struct virtio_net_stats_tx_speed {
|
||||
struct virtio_net_stats_reply_hdr hdr;
|
||||
|
||||
/* tx_{packets,bytes}_allowance_exceeded are too long. So rename to
|
||||
* short name.
|
||||
*/
|
||||
uint64_t tx_ratelimit_packets;
|
||||
uint64_t tx_ratelimit_bytes;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_VIRTIO_NET_H */
|
||||
|
|
|
@ -3,7 +3,10 @@
|
|||
#ifndef __PVPANIC_H__
|
||||
#define __PVPANIC_H__
|
||||
|
||||
#define PVPANIC_PANICKED (1 << 0)
|
||||
#define PVPANIC_CRASH_LOADED (1 << 1)
|
||||
#include "standard-headers/linux/const.h"
|
||||
|
||||
#define PVPANIC_PANICKED _BITUL(0)
|
||||
#define PVPANIC_CRASH_LOADED _BITUL(1)
|
||||
#define PVPANIC_SHUTDOWN _BITUL(2)
|
||||
|
||||
#endif /* __PVPANIC_H__ */
|
||||
|
|
|
@ -842,8 +842,11 @@ __SYSCALL(__NR_lsm_set_self_attr, sys_lsm_set_self_attr)
|
|||
#define __NR_lsm_list_modules 461
|
||||
__SYSCALL(__NR_lsm_list_modules, sys_lsm_list_modules)
|
||||
|
||||
#define __NR_mseal 462
|
||||
__SYSCALL(__NR_mseal, sys_mseal)
|
||||
|
||||
#undef __NR_syscalls
|
||||
#define __NR_syscalls 462
|
||||
#define __NR_syscalls 463
|
||||
|
||||
/*
|
||||
* 32 bit systems traditionally used different
|
||||
|
|
|
@ -390,5 +390,6 @@
|
|||
#define __NR_lsm_get_self_attr (__NR_Linux + 459)
|
||||
#define __NR_lsm_set_self_attr (__NR_Linux + 460)
|
||||
#define __NR_lsm_list_modules (__NR_Linux + 461)
|
||||
#define __NR_mseal (__NR_Linux + 462)
|
||||
|
||||
#endif /* _ASM_UNISTD_N32_H */
|
||||
|
|
|
@ -366,5 +366,6 @@
|
|||
#define __NR_lsm_get_self_attr (__NR_Linux + 459)
|
||||
#define __NR_lsm_set_self_attr (__NR_Linux + 460)
|
||||
#define __NR_lsm_list_modules (__NR_Linux + 461)
|
||||
#define __NR_mseal (__NR_Linux + 462)
|
||||
|
||||
#endif /* _ASM_UNISTD_N64_H */
|
||||
|
|
|
@ -436,5 +436,6 @@
|
|||
#define __NR_lsm_get_self_attr (__NR_Linux + 459)
|
||||
#define __NR_lsm_set_self_attr (__NR_Linux + 460)
|
||||
#define __NR_lsm_list_modules (__NR_Linux + 461)
|
||||
#define __NR_mseal (__NR_Linux + 462)
|
||||
|
||||
#endif /* _ASM_UNISTD_O32_H */
|
||||
|
|
|
@ -443,6 +443,7 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
|
||||
#endif /* _ASM_UNISTD_32_H */
|
||||
|
|
|
@ -415,6 +415,7 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
|
||||
#endif /* _ASM_UNISTD_64_H */
|
||||
|
|
|
@ -434,5 +434,6 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
#endif /* _ASM_S390_UNISTD_32_H */
|
||||
|
|
|
@ -382,5 +382,6 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
#endif /* _ASM_S390_UNISTD_64_H */
|
||||
|
|
|
@ -452,6 +452,7 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
|
||||
#endif /* _ASM_UNISTD_32_H */
|
||||
|
|
|
@ -374,6 +374,7 @@
|
|||
#define __NR_lsm_get_self_attr 459
|
||||
#define __NR_lsm_set_self_attr 460
|
||||
#define __NR_lsm_list_modules 461
|
||||
#define __NR_mseal 462
|
||||
|
||||
|
||||
#endif /* _ASM_UNISTD_64_H */
|
||||
|
|
|
@ -318,6 +318,7 @@
|
|||
#define __NR_set_mempolicy_home_node (__X32_SYSCALL_BIT + 450)
|
||||
#define __NR_cachestat (__X32_SYSCALL_BIT + 451)
|
||||
#define __NR_fchmodat2 (__X32_SYSCALL_BIT + 452)
|
||||
#define __NR_map_shadow_stack (__X32_SYSCALL_BIT + 453)
|
||||
#define __NR_futex_wake (__X32_SYSCALL_BIT + 454)
|
||||
#define __NR_futex_wait (__X32_SYSCALL_BIT + 455)
|
||||
#define __NR_futex_requeue (__X32_SYSCALL_BIT + 456)
|
||||
|
@ -326,6 +327,7 @@
|
|||
#define __NR_lsm_get_self_attr (__X32_SYSCALL_BIT + 459)
|
||||
#define __NR_lsm_set_self_attr (__X32_SYSCALL_BIT + 460)
|
||||
#define __NR_lsm_list_modules (__X32_SYSCALL_BIT + 461)
|
||||
#define __NR_mseal (__X32_SYSCALL_BIT + 462)
|
||||
#define __NR_rt_sigaction (__X32_SYSCALL_BIT + 512)
|
||||
#define __NR_rt_sigreturn (__X32_SYSCALL_BIT + 513)
|
||||
#define __NR_ioctl (__X32_SYSCALL_BIT + 514)
|
||||
|
|
|
@ -1217,9 +1217,9 @@ struct kvm_vfio_spapr_tce {
|
|||
/* Available with KVM_CAP_SPAPR_RESIZE_HPT */
|
||||
#define KVM_PPC_RESIZE_HPT_PREPARE _IOR(KVMIO, 0xad, struct kvm_ppc_resize_hpt)
|
||||
#define KVM_PPC_RESIZE_HPT_COMMIT _IOR(KVMIO, 0xae, struct kvm_ppc_resize_hpt)
|
||||
/* Available with KVM_CAP_PPC_RADIX_MMU or KVM_CAP_PPC_HASH_MMU_V3 */
|
||||
/* Available with KVM_CAP_PPC_MMU_RADIX or KVM_CAP_PPC_MMU_HASH_V3 */
|
||||
#define KVM_PPC_CONFIGURE_V3_MMU _IOW(KVMIO, 0xaf, struct kvm_ppc_mmuv3_cfg)
|
||||
/* Available with KVM_CAP_PPC_RADIX_MMU */
|
||||
/* Available with KVM_CAP_PPC_MMU_RADIX */
|
||||
#define KVM_PPC_GET_RMMU_INFO _IOW(KVMIO, 0xb0, struct kvm_ppc_rmmu_info)
|
||||
/* Available with KVM_CAP_PPC_GET_CPU_CHAR */
|
||||
#define KVM_PPC_GET_CPU_CHAR _IOR(KVMIO, 0xb1, struct kvm_ppc_cpu_char)
|
||||
|
|
|
@ -55,4 +55,12 @@
|
|||
#define __counted_by(m)
|
||||
#endif
|
||||
|
||||
#ifndef __counted_by_le
|
||||
#define __counted_by_le(m)
|
||||
#endif
|
||||
|
||||
#ifndef __counted_by_be
|
||||
#define __counted_by_be(m)
|
||||
#endif
|
||||
|
||||
#endif /* _LINUX_STDDEF_H */
|
||||
|
|
Loading…
Reference in New Issue