Skip to content

Commit 3ea1d7f

Browse files
yonghong-songYonghong Song
andauthored
Sync with latest libbpf repo (#5320)
The top upstream libbpf commit is commit 02bdeb7a2c2e7cb2c9cecb125527a9c5a6bbf139 (HEAD -> master, origin/master, origin/HEAD) Author: Mykyta Yatsenko <[email protected]> Date: Mon May 19 13:54:21 2025 +0100 sync: latest libbpf changes from kernel Co-authored-by: Yonghong Song <[email protected]>
1 parent fbe2864 commit 3ea1d7f

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

src/cc/compat/linux/virtual_bpf.h

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ union bpf_attr {
15071507
__s32 map_token_fd;
15081508
};
15091509

1510-
struct { /* anonymous struct used by BPF_MAP_*_ELEM commands */
1510+
struct { /* anonymous struct used by BPF_MAP_*_ELEM and BPF_MAP_FREEZE commands */
15111511
__u32 map_fd;
15121512
__aligned_u64 key;
15131513
union {
@@ -1996,11 +1996,15 @@ union bpf_attr {
19961996
* long bpf_skb_store_bytes(struct sk_buff *skb, u32 offset, const void *from, u32 len, u64 flags)
19971997
* Description
19981998
* Store *len* bytes from address *from* into the packet
1999-
* associated to *skb*, at *offset*. *flags* are a combination of
2000-
* **BPF_F_RECOMPUTE_CSUM** (automatically recompute the
2001-
* checksum for the packet after storing the bytes) and
2002-
* **BPF_F_INVALIDATE_HASH** (set *skb*\ **->hash**, *skb*\
2003-
* **->swhash** and *skb*\ **->l4hash** to 0).
1999+
* associated to *skb*, at *offset*. The *flags* are a combination
2000+
* of the following values:
2001+
*
2002+
* **BPF_F_RECOMPUTE_CSUM**
2003+
* Automatically update *skb*\ **->csum** after storing the
2004+
* bytes.
2005+
* **BPF_F_INVALIDATE_HASH**
2006+
* Set *skb*\ **->hash**, *skb*\ **->swhash** and *skb*\
2007+
* **->l4hash** to 0.
20042008
*
20052009
* A call to this helper is susceptible to change the underlying
20062010
* packet buffer. Therefore, at load time, all checks on pointers
@@ -2052,7 +2056,7 @@ union bpf_attr {
20522056
* untouched (unless **BPF_F_MARK_ENFORCE** is added as well), and
20532057
* for updates resulting in a null checksum the value is set to
20542058
* **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates
2055-
* the checksum is to be computed against a pseudo-header.
2059+
* that the modified header field is part of the pseudo-header.
20562060
*
20572061
* This helper works in combination with **bpf_csum_diff**\ (),
20582062
* which does not update the checksum in-place, but offers more
@@ -6025,7 +6029,10 @@ union bpf_attr {
60256029
FN(user_ringbuf_drain, 209, ##ctx) \
60266030
FN(cgrp_storage_get, 210, ##ctx) \
60276031
FN(cgrp_storage_delete, 211, ##ctx) \
6028-
/* */
6032+
/* This helper list is effectively frozen. If you are trying to \
6033+
* add a new helper, you should add a kfunc instead which has \
6034+
* less stability guarantees. See Documentation/bpf/kfuncs.rst \
6035+
*/
60296036

60306037
/* backwards-compatibility macros for users of __BPF_FUNC_MAPPER that don't
60316038
* know or care about integer value that is now passed as second argument
@@ -6718,6 +6725,7 @@ struct bpf_link_info {
67186725
__u32 name_len;
67196726
__u32 offset; /* offset from file_name */
67206727
__u64 cookie;
6728+
__u64 ref_ctr_offset;
67216729
} uprobe; /* BPF_PERF_EVENT_UPROBE, BPF_PERF_EVENT_URETPROBE */
67226730
struct {
67236731
__aligned_u64 func_name; /* in/out */

0 commit comments

Comments
 (0)