diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 10:57:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-04-05 10:57:00 +0000 |
| commit | af6a9ee102cf7ba0fd5f8a2ee5fa3cfe124a5f1a (patch) | |
| tree | ff765eede37d5b14bcc1fb92e1a4cc59f94e4fd0 | |
| parent | 737fcbd0205fae39f4f9d28750302430ee181557 (diff) | |
| parent | c55e62bccbe9391649704c56160772af8b031788 (diff) | |
| download | net-android13-mainline-sdkext-release.tar.gz | |
Snap for 9886856 from c55e62bccbe9391649704c56160772af8b031788 to mainline-sdkext-releaseaml_sdk_331812000aml_sdk_331811000android13-mainline-sdkext-release
Change-Id: I8e910156521f4ea6a3b89eeadb044514c704f84f
| -rw-r--r-- | common/native/bpf_headers/include/bpf/BpfUtils.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/native/bpf_headers/include/bpf/BpfUtils.h b/common/native/bpf_headers/include/bpf/BpfUtils.h index 206acba9..99c7a91d 100644 --- a/common/native/bpf_headers/include/bpf/BpfUtils.h +++ b/common/native/bpf_headers/include/bpf/BpfUtils.h @@ -63,8 +63,9 @@ static inline int synchronizeKernelRCU() { // 4.9 kernels. The kernel code of socket release on pf_key socket will // explicitly call synchronize_rcu() which is exactly what we need. // - // Linux 4.14/4.19/5.4/5.10/5.15 (and 5.18) still have this same behaviour. + // Linux 4.14/4.19/5.4/5.10/5.15/6.1 (and 6.3-rc5) still have this same behaviour. // see net/key/af_key.c: pfkey_release() -> synchronize_rcu() + // https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/net/key/af_key.c?h=v6.3-rc5#n185 const int pfSocket = socket(AF_KEY, SOCK_RAW | SOCK_CLOEXEC, PF_KEY_V2); if (pfSocket < 0) { |