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
45734573 *
45744574 * long bpf_check_mtu(void *ctx, u32 ifindex, u32 *mtu_len, s32 len_diff, u64 flags)
45754575 * Description
4576− * Check ctx packet size against exceeding MTU of net device (based
4576+ * Check packet size against exceeding MTU of net device (based
45774577 * on *ifindex*). This helper will likely be used in combination
45784578 * with helpers that adjust/change the packet size.
45794579 *
@@ -4590,6 +4590,14 @@ union bpf_attr { · 10 unmodified lines
45904590 * against the current net device. This is practical if this isn't
45914591 * used prior to redirect.
45924592 *
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+ *
45934601 * The Linux kernel route table can configure MTUs on a more
45944602 * specific per route level, which is not provided by this helper.
45954603 * For route level MTU checks use the **bpf_fib_lookup**\ ()
@@ -4614,11 +4622,9 @@ union bpf_attr { · 18 unmodified lines
46144622 *
46154623 * On return *mtu_len* pointer contains the MTU value of the net
46164624 * 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.
46184626 * 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 valid
4620− * pointer and be initialized (to zero), else verifier will reject
4621− * BPF program.
4627+ * MTU value in your BPF-code.
46224628 *
46234629 * Return
46244630 * * 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
903903 };
904904
905905 /* 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)
907908
908909 struct fuse_lseek_in {
909910 uint64_t fh;
include/uapi/linux/psample.h+1−4
@@ -3,7 +3,6 @@ · 2 unmodified lines
33 #define __UAPI_PSAMPLE_H
44
55 enum {
6− /* sampled packet metadata */
76 PSAMPLE_ATTR_IIFINDEX,
87 PSAMPLE_ATTR_OIFINDEX,
98 PSAMPLE_ATTR_ORIGSIZE,
@@ -11,10 +10,8 @@ enum { · 1 unmodified line
1110 PSAMPLE_ATTR_GROUP_SEQ,
1211 PSAMPLE_ATTR_SAMPLE_RATE,
1312 PSAMPLE_ATTR_DATA,
14− PSAMPLE_ATTR_TUNNEL,
15−
16− /* commands attributes */
1713 PSAMPLE_ATTR_GROUP_REFCOUNT,
14+ PSAMPLE_ATTR_TUNNEL,
1815
1916 PSAMPLE_ATTR_PAD,
2017 PSAMPLE_ATTR_OUT_TC, /* u16 */