Cross-merge networking fixes after downstream PR. No conflicts or adjacent changes.
Showing the changes to tools/include/uapi/linux (6 of 304 files). Show all
Unified · Split
| @@ -112,4 +112,9 @@ · 111 unmodified lines | ||
| 112 | 112 | |
| 113 | 113 | #define AT_RECURSIVE 0x8000 /* Apply to the entire subtree */ |
| 114 | 114 | |
| 115 | +/* Flags for name_to_handle_at(2). We reuse AT_ flag space to save bits... */ | |
| 116 | +#define AT_HANDLE_FID AT_REMOVEDIR /* file handle is needed to | |
| 117 | + compare object identity and may not | |
| 118 | + be usable to open_by_handle_at(2) */ | |
| 119 | + | |
| 115 | 120 | #endif /* _UAPI_LINUX_FCNTL_H */ |
| @@ -1190,6 +1190,8 @@ struct kvm_ppc_resize_hpt { · 1189 unmodified lines | ||
| 1190 | 1190 | #define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225 |
| 1191 | 1191 | #define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226 |
| 1192 | 1192 | #define KVM_CAP_COUNTER_OFFSET 227 |
| 1193 | +#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228 | |
| 1194 | +#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229 | |
| 1193 | 1195 | |
| 1194 | 1196 | #ifdef KVM_CAP_IRQ_ROUTING |
| 1195 | 1197 | |
| @@ -1442,6 +1444,8 @@ enum kvm_device_type { · 246 unmodified lines | ||
| 1442 | 1444 | #define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE |
| 1443 | 1445 | KVM_DEV_TYPE_ARM_PV_TIME, |
| 1444 | 1446 | #define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME |
| 1447 | + KVM_DEV_TYPE_RISCV_AIA, | |
| 1448 | +#define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA | |
| 1445 | 1449 | KVM_DEV_TYPE_MAX, |
| 1446 | 1450 | }; |
| 1447 | 1451 | |
| @@ -1613,7 +1617,7 @@ struct kvm_s390_ucas_mapping { · 165 unmodified lines | ||
| 1613 | 1617 | #define KVM_GET_DEBUGREGS _IOR(KVMIO, 0xa1, struct kvm_debugregs) |
| 1614 | 1618 | #define KVM_SET_DEBUGREGS _IOW(KVMIO, 0xa2, struct kvm_debugregs) |
| 1615 | 1619 | /* |
| 1616 | − * vcpu version available with KVM_ENABLE_CAP | |
| 1620 | + * vcpu version available with KVM_CAP_ENABLE_CAP | |
| 1617 | 1621 | * vm version available with KVM_CAP_ENABLE_CAP_VM |
| 1618 | 1622 | */ |
| 1619 | 1623 | #define KVM_ENABLE_CAP _IOW(KVMIO, 0xa3, struct kvm_enable_cap) |
| @@ -4,6 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | |
| 5 | 5 | #include <asm/mman.h> |
| 6 | 6 | #include <asm-generic/hugetlb_encode.h> |
| 7 | +#include <linux/types.h> | |
| 7 | 8 | |
| 8 | 9 | #define MREMAP_MAYMOVE 1 |
| 9 | 10 | #define MREMAP_FIXED 2 |
| @@ -41,4 +42,17 @@ · 31 unmodified lines | ||
| 41 | 42 | #define MAP_HUGE_2GB HUGETLB_FLAG_ENCODE_2GB |
| 42 | 43 | #define MAP_HUGE_16GB HUGETLB_FLAG_ENCODE_16GB |
| 43 | 44 | |
| 45 | +struct cachestat_range { | |
| 46 | + __u64 off; | |
| 47 | + __u64 len; | |
| 48 | +}; | |
| 49 | + | |
| 50 | +struct cachestat { | |
| 51 | + __u64 nr_cache; | |
| 52 | + __u64 nr_dirty; | |
| 53 | + __u64 nr_writeback; | |
| 54 | + __u64 nr_evicted; | |
| 55 | + __u64 nr_recently_evicted; | |
| 56 | +}; | |
| 57 | + | |
| 44 | 58 | #endif /* _UAPI_LINUX_MMAN_H */ |
| @@ -74,7 +74,8 @@ · 73 unmodified lines | ||
| 74 | 74 | #define MOVE_MOUNT_T_AUTOMOUNTS 0x00000020 /* Follow automounts on to path */ |
| 75 | 75 | #define MOVE_MOUNT_T_EMPTY_PATH 0x00000040 /* Empty to path permitted */ |
| 76 | 76 | #define MOVE_MOUNT_SET_GROUP 0x00000100 /* Set sharing group instead */ |
| 77 | −#define MOVE_MOUNT__MASK 0x00000177 | |
| 77 | +#define MOVE_MOUNT_BENEATH 0x00000200 /* Mount beneath top mount */ | |
| 78 | +#define MOVE_MOUNT__MASK 0x00000377 | |
| 78 | 79 | |
| 79 | 80 | /* |
| 80 | 81 | * fsopen() flags. |
| @@ -294,4 +294,15 @@ struct prctl_mm_map { · 293 unmodified lines | ||
| 294 | 294 | |
| 295 | 295 | #define PR_SET_MEMORY_MERGE 67 |
| 296 | 296 | #define PR_GET_MEMORY_MERGE 68 |
| 297 | + | |
| 298 | +#define PR_RISCV_V_SET_CONTROL 69 | |
| 299 | +#define PR_RISCV_V_GET_CONTROL 70 | |
| 300 | +# define PR_RISCV_V_VSTATE_CTRL_DEFAULT 0 | |
| 301 | +# define PR_RISCV_V_VSTATE_CTRL_OFF 1 | |
| 302 | +# define PR_RISCV_V_VSTATE_CTRL_ON 2 | |
| 303 | +# define PR_RISCV_V_VSTATE_CTRL_INHERIT (1 << 4) | |
| 304 | +# define PR_RISCV_V_VSTATE_CTRL_CUR_MASK 0x3 | |
| 305 | +# define PR_RISCV_V_VSTATE_CTRL_NEXT_MASK 0xc | |
| 306 | +# define PR_RISCV_V_VSTATE_CTRL_MASK 0x1f | |
| 307 | + | |
| 297 | 308 | #endif /* _LINUX_PRCTL_H */ |
| @@ -45,6 +45,25 @@ · 44 unmodified lines | ||
| 45 | 45 | #define VHOST_SET_LOG_BASE _IOW(VHOST_VIRTIO, 0x04, __u64) |
| 46 | 46 | /* Specify an eventfd file descriptor to signal on log write. */ |
| 47 | 47 | #define VHOST_SET_LOG_FD _IOW(VHOST_VIRTIO, 0x07, int) |
| 48 | +/* By default, a device gets one vhost_worker that its virtqueues share. This | |
| 49 | + * command allows the owner of the device to create an additional vhost_worker | |
| 50 | + * for the device. It can later be bound to 1 or more of its virtqueues using | |
| 51 | + * the VHOST_ATTACH_VRING_WORKER command. | |
| 52 | + * | |
| 53 | + * This must be called after VHOST_SET_OWNER and the caller must be the owner | |
| 54 | + * of the device. The new thread will inherit caller's cgroups and namespaces, | |
| 55 | + * and will share the caller's memory space. The new thread will also be | |
| 56 | + * counted against the caller's RLIMIT_NPROC value. | |
| 57 | + * | |
| 58 | + * The worker's ID used in other commands will be returned in | |
| 59 | + * vhost_worker_state. | |
| 60 | + */ | |
| 61 | +#define VHOST_NEW_WORKER _IOR(VHOST_VIRTIO, 0x8, struct vhost_worker_state) | |
| 62 | +/* Free a worker created with VHOST_NEW_WORKER if it's not attached to any | |
| 63 | + * virtqueue. If userspace is not able to call this for workers its created, | |
| 64 | + * the kernel will free all the device's workers when the device is closed. | |
| 65 | + */ | |
| 66 | +#define VHOST_FREE_WORKER _IOW(VHOST_VIRTIO, 0x9, struct vhost_worker_state) | |
| 48 | 67 | |
| 49 | 68 | /* Ring setup. */ |
| 50 | 69 | /* Set number of descriptors in ring. This parameter can not |
| @@ -70,6 +89,18 @@ · 19 unmodified lines | ||
| 70 | 89 | #define VHOST_VRING_BIG_ENDIAN 1 |
| 71 | 90 | #define VHOST_SET_VRING_ENDIAN _IOW(VHOST_VIRTIO, 0x13, struct vhost_vring_state) |
| 72 | 91 | #define VHOST_GET_VRING_ENDIAN _IOW(VHOST_VIRTIO, 0x14, struct vhost_vring_state) |
| 92 | +/* Attach a vhost_worker created with VHOST_NEW_WORKER to one of the device's | |
| 93 | + * virtqueues. | |
| 94 | + * | |
| 95 | + * This will replace the virtqueue's existing worker. If the replaced worker | |
| 96 | + * is no longer attached to any virtqueues, it can be freed with | |
| 97 | + * VHOST_FREE_WORKER. | |
| 98 | + */ | |
| 99 | +#define VHOST_ATTACH_VRING_WORKER _IOW(VHOST_VIRTIO, 0x15, \ | |
| 100 | + struct vhost_vring_worker) | |
| 101 | +/* Return the vring worker's ID */ | |
| 102 | +#define VHOST_GET_VRING_WORKER _IOWR(VHOST_VIRTIO, 0x16, \ | |
| 103 | + struct vhost_vring_worker) | |
| 73 | 104 | |
| 74 | 105 | /* The following ioctls use eventfd file descriptors to signal and poll |
| 75 | 106 | * for events. */ |