History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says: ==================== pull-request: bpf 2020-08-21 The following pull-request contains BPF updates for your *net* tree. We've added 11 non-merge commits during the last 5 day(s) which contain a total of 12 files changed, 78 insertions(+), 24 deletions(-). The main changes are: 1) three fixes in BPF task iterator logic, from Yonghong. 2) fix for compressed dwarf sections in vmlinux, from Jiri. 3) fix xdp attach regression, from Andrii. ====================

David S. Miller committed 6 years ago

Commit 4af7b322 parents 774d977 b16fc0912 files · +78 −24Browse files

Showing the changes to tools/include/uapi (1 of 12 files). Show all

Unified · Split

tools/include/uapi/linux/bpf.h+5−5
@@ -767,7 +767,7 @@ union bpf_attr { · 766 unmodified lines
767 *767 *
768 * Also, note that **bpf_trace_printk**\ () is slow, and should768 * Also, note that **bpf_trace_printk**\ () is slow, and should
769 * only be used for debugging purposes. For this reason, a notice769 * only be used for debugging purposes. For this reason, a notice
770 * bloc (spanning several lines) is printed to kernel logs and770 * block (spanning several lines) is printed to kernel logs and
771 * states that the helper should not be used "for production use"771 * states that the helper should not be used "for production use"
772 * the first time this helper is used (or more precisely, when772 * the first time this helper is used (or more precisely, when
773 * **trace_printk**\ () buffers are allocated). For passing values773 * **trace_printk**\ () buffers are allocated). For passing values
@@ -1033,14 +1033,14 @@ union bpf_attr { · 259 unmodified lines
1033 *1033 *
1034 * int ret;1034 * int ret;
1035 * struct bpf_tunnel_key key = {};1035 * struct bpf_tunnel_key key = {};
1036 * 1036 *
1037 * ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);1037 * ret = bpf_skb_get_tunnel_key(skb, &key, sizeof(key), 0);
1038 * if (ret < 0)1038 * if (ret < 0)
1039 * return TC_ACT_SHOT; // drop packet1039 * return TC_ACT_SHOT; // drop packet
1040 * 1040 *
1041 * if (key.remote_ipv4 != 0x0a000001)1041 * if (key.remote_ipv4 != 0x0a000001)
1042 * return TC_ACT_SHOT; // drop packet1042 * return TC_ACT_SHOT; // drop packet
1043 * 1043 *
1044 * return TC_ACT_OK; // accept packet1044 * return TC_ACT_OK; // accept packet
1045 *1045 *
1046 * This interface can also be used with all encapsulation devices1046 * This interface can also be used with all encapsulation devices
@@ -1147,7 +1147,7 @@ union bpf_attr { · 100 unmodified lines
1147 * Description1147 * Description
1148 * Retrieve the realm or the route, that is to say the1148 * Retrieve the realm or the route, that is to say the
1149 * **tclassid** field of the destination for the *skb*. The1149 * **tclassid** field of the destination for the *skb*. The
1150 * indentifier retrieved is a user-provided tag, similar to the1150 * identifier retrieved is a user-provided tag, similar to the
1151 * one used with the net_cls cgroup (see description for1151 * one used with the net_cls cgroup (see description for
1152 * **bpf_get_cgroup_classid**\ () helper), but here this tag is1152 * **bpf_get_cgroup_classid**\ () helper), but here this tag is
1153 * held by a route (a destination entry), not by a task.1153 * held by a route (a destination entry), not by a task.