This change makes the socket cookie generator as a global counter instead of per netns in order to fix cookie collisions for BPF use cases we ran into. See main patch #1 for more details. Given the change is small/trivial and fixes an issue we're seeing my preference would be net tree (though it cleanly applies to net-next as well). Went for net tree instead of bpf tree here given the main change is in net/core/sock_diag.c, but either way would be fine with me. Thanks a lot! v1 -> v2: - Fix up commit description in patch #1, thanks Eric! Daniel Borkmann (2): sock: make cookie generation global instead of per netns bpf: sync bpf.h to tools infrastructure include/net/net_namespace.h | 1 - include/uapi/linux/bpf.h | 4 ++-- net/core/sock_diag.c | 3 ++- tools/include/uapi/linux/bpf.h | 11 +++++++---- 4 files changed, 11 insertions(+), 8 deletions(-) -- 2.17.1
