History

Merge 5.12-rc6 into usb-next

We want the USB fixes in here as well and it resolves a merge issue with xhci-mtk.c

Greg Kroah-Hartman committed 5 years ago

Commit de800f22 parents bee1f89 e49d033492 files · +4525 −2125Browse files

Showing the changes to include/uapi (3 of 492 files). Show all

Unified · Split

3 files
  1. include/uapi/linux/blkpg.h +2 −26
  2. include/uapi/linux/bpf.h +11 −5
  3. include/uapi/linux/psample.h +1 −4
include/uapi/linux/blkpg.h+2−26
@@ -2,29 +2,6 @@ · 1 unmodified line
2#ifndef _UAPI__LINUX_BLKPG_H2#ifndef _UAPI__LINUX_BLKPG_H
3#define _UAPI__LINUX_BLKPG_H3#define _UAPI__LINUX_BLKPG_H
4 4
5/*
6 * Partition table and disk geometry handling
7 *
8 * A single ioctl with lots of subfunctions:
9 *
10 * Device number stuff:
11 * get_whole_disk() (given the device number of a partition,
12 * find the device number of the encompassing disk)
13 * get_all_partitions() (given the device number of a disk, return the
14 * device numbers of all its known partitions)
15 *
16 * Partition stuff:
17 * add_partition()
18 * delete_partition()
19 * test_partition_in_use() (also for test_disk_in_use)
20 *
21 * Geometry stuff:
22 * get_geometry()
23 * set_geometry()
24 * get_bios_drivedata()
25 *
26 * For today, only the partition stuff - aeb, 990515
27 */
28#include <linux/compiler.h>5#include <linux/compiler.h>
29#include <linux/ioctl.h>6#include <linux/ioctl.h>
30 7
@@ -52,9 +29,8 @@ struct blkpg_partition { · 21 unmodified lines
52 long long start; /* starting offset in bytes */29 long long start; /* starting offset in bytes */
53 long long length; /* length in bytes */30 long long length; /* length in bytes */
54 int pno; /* partition number */31 int pno; /* partition number */
55 char devname[BLKPG_DEVNAMELTH]; /* partition name, like sda5 or c0d1p2,32 char devname[BLKPG_DEVNAMELTH]; /* unused / ignored */
56 to be used in kernel messages */33 char volname[BLKPG_VOLNAMELTH]; /* unused / ignore */
57 char volname[BLKPG_VOLNAMELTH]; /* volume label */
58};34};
59 35
60#endif /* _UAPI__LINUX_BLKPG_H */36#endif /* _UAPI__LINUX_BLKPG_H */
include/uapi/linux/bpf.h+11−5
@@ -3850,7 +3850,7 @@ union bpf_attr { · 3849 unmodified lines
3850 *3850 *
3851 * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)3851 * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
3852 * Description3852 * Description
3853 * Check ctx packet size against exceeding MTU of net device (based3853 * Check packet size against exceeding MTU of net device (based
3854 * on *ifindex*). This helper will likely be used in combination3854 * on *ifindex*). This helper will likely be used in combination
3855 * with helpers that adjust/change the packet size.3855 * with helpers that adjust/change the packet size.
3856 *3856 *
@@ -3867,6 +3867,14 @@ union bpf_attr { · 10 unmodified lines
3867 * against the current net device. This is practical if this isn't3867 * against the current net device. This is practical if this isn't
3868 * used prior to redirect.3868 * used prior to redirect.
3869 *3869 *
3870 * On input *mtu_len* must be a valid pointer, else verifier will
3871 * reject BPF program. If the value *mtu_len* is initialized to
3872 * zero then the ctx packet size is use. When value *mtu_len* is
3873 * provided as input this specify the L3 length that the MTU check
3874 * is done against. Remember XDP and TC length operate at L2, but
3875 * this value is L3 as this correlate to MTU and IP-header tot_len
3876 * values which are L3 (similar behavior as bpf_fib_lookup).
3877 *
3870 * The Linux kernel route table can configure MTUs on a more3878 * The Linux kernel route table can configure MTUs on a more
3871 * specific per route level, which is not provided by this helper.3879 * specific per route level, which is not provided by this helper.
3872 * For route level MTU checks use the **bpf_fib_lookup**\ ()3880 * For route level MTU checks use the **bpf_fib_lookup**\ ()
@@ -3891,11 +3899,9 @@ union bpf_attr { · 18 unmodified lines
3891 *3899 *
3892 * On return *mtu_len* pointer contains the MTU value of the net3900 * On return *mtu_len* pointer contains the MTU value of the net
3893 * device. Remember the net device configured MTU is the L3 size,3901 * device. Remember the net device configured MTU is the L3 size,
3894 * which is returned here and XDP and TX length operate at L2.3902 * which is returned here and XDP and TC length operate at L2.
3895 * Helper take this into account for you, but remember when using3903 * Helper take this into account for you, but remember when using
3896 * MTU value in your BPF-code. On input *mtu_len* must be a valid3904 * MTU value in your BPF-code.
3897 * pointer and be initialized (to zero), else verifier will reject
3898 * BPF program.
3899 *3905 *
3900 * Return3906 * Return
3901 * * 0 on success, and populate MTU value in *mtu_len* pointer.3907 * * 0 on success, and populate MTU value in *mtu_len* pointer.
include/uapi/linux/psample.h+1−4
@@ -3,7 +3,6 @@ · 2 unmodified lines
3#define __UAPI_PSAMPLE_H3#define __UAPI_PSAMPLE_H
4 4
5enum {5enum {
6 /* sampled packet metadata */
7 PSAMPLE_ATTR_IIFINDEX,6 PSAMPLE_ATTR_IIFINDEX,
8 PSAMPLE_ATTR_OIFINDEX,7 PSAMPLE_ATTR_OIFINDEX,
9 PSAMPLE_ATTR_ORIGSIZE,8 PSAMPLE_ATTR_ORIGSIZE,
@@ -11,10 +10,8 @@ enum { · 1 unmodified line
11 PSAMPLE_ATTR_GROUP_SEQ,10 PSAMPLE_ATTR_GROUP_SEQ,
12 PSAMPLE_ATTR_SAMPLE_RATE,11 PSAMPLE_ATTR_SAMPLE_RATE,
13 PSAMPLE_ATTR_DATA,12 PSAMPLE_ATTR_DATA,
14 PSAMPLE_ATTR_TUNNEL,
15
16 /* commands attributes */
17 PSAMPLE_ATTR_GROUP_REFCOUNT,13 PSAMPLE_ATTR_GROUP_REFCOUNT,
14 PSAMPLE_ATTR_TUNNEL,
18 15
19 __PSAMPLE_ATTR_MAX16 __PSAMPLE_ATTR_MAX
20};17};