History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

David S. Miller committed 5 years ago

Commit efd13b72 parents 84c7f6c 00232241022 files · +8206 −4635Browse files

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

Unified · Split

3 files
  1. include/uapi/linux/bpf.h +11 −5
  2. include/uapi/linux/fuse.h +2 −1
  3. include/uapi/linux/psample.h +1 −4
include/uapi/linux/bpf.h+11−5
@@ -4573,7 +4573,7 @@ union bpf_attr { · 4572 unmodified lines
4573 *4573 *
4574 * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)4574 * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
4575 * Description4575 * Description
4576 * Check ctx packet size against exceeding MTU of net device (based4576 * Check packet size against exceeding MTU of net device (based
4577 * on *ifindex*). This helper will likely be used in combination4577 * on *ifindex*). This helper will likely be used in combination
4578 * with helpers that adjust/change the packet size.4578 * with helpers that adjust/change the packet size.
4579 *4579 *
@@ -4590,6 +4590,14 @@ union bpf_attr { · 10 unmodified lines
4590 * against the current net device. This is practical if this isn't4590 * against the current net device. This is practical if this isn't
4591 * used prior to redirect.4591 * used prior to redirect.
4592 *4592 *
4593 * On input *mtu_len* must be a valid pointer, else verifier will
4594 * reject BPF program. If the value *mtu_len* is initialized to
4595 * zero then the ctx packet size is use. When value *mtu_len* is
4596 * provided as input this specify the L3 length that the MTU check
4597 * is done against. Remember XDP and TC length operate at L2, but
4598 * this value is L3 as this correlate to MTU and IP-header tot_len
4599 * values which are L3 (similar behavior as bpf_fib_lookup).
4600 *
4593 * The Linux kernel route table can configure MTUs on a more4601 * The Linux kernel route table can configure MTUs on a more
4594 * specific per route level, which is not provided by this helper.4602 * specific per route level, which is not provided by this helper.
4595 * For route level MTU checks use the **bpf_fib_lookup**\ ()4603 * For route level MTU checks use the **bpf_fib_lookup**\ ()
@@ -4614,11 +4622,9 @@ union bpf_attr { · 18 unmodified lines
4614 *4622 *
4615 * On return *mtu_len* pointer contains the MTU value of the net4623 * On return *mtu_len* pointer contains the MTU value of the net
4616 * device. Remember the net device configured MTU is the L3 size,4624 * device. Remember the net device configured MTU is the L3 size,
4617 * which is returned here and XDP and TX length operate at L2.4625 * which is returned here and XDP and TC length operate at L2.
4618 * Helper take this into account for you, but remember when using4626 * Helper take this into account for you, but remember when using
4619 * MTU value in your BPF-code. On input *mtu_len* must be a valid4627 * MTU value in your BPF-code.
4620 * pointer and be initialized (to zero), else verifier will reject
4621 * BPF program.
4622 *4628 *
4623 * Return4629 * Return
4624 * * 0 on success, and populate MTU value in *mtu_len* pointer.4630 * * 0 on success, and populate MTU value in *mtu_len* pointer.
include/uapi/linux/fuse.h+2−1
@@ -903,7 +903,8 @@ struct fuse_notify_retrieve_in { · 902 unmodified lines
903};903};
904 904
905/* Device ioctls: */905/* Device ioctls: */
906#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t)906#define FUSE_DEV_IOC_MAGIC 229
907#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
907 908
908struct fuse_lseek_in {909struct fuse_lseek_in {
909 uint64_t fh;910 uint64_t fh;
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_PAD,16 PSAMPLE_ATTR_PAD,
20 PSAMPLE_ATTR_OUT_TC, /* u16 */17 PSAMPLE_ATTR_OUT_TC, /* u16 */