From: Alexei Starovoitov Date: Fri, 28 Feb 2020 02:50:20 +0000 (-0800) Subject: Merge branch 'bpf_sk_storage_via_inet_diag' X-Git-Tag: block-5.7-2020-04-09~9^2~287^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=812285fa5ab129e3a55682314bf235f701564310;p=linux-2.6-block.git Merge branch 'bpf_sk_storage_via_inet_diag' Martin KaFai Lau says: ==================== The bpf_prog can store specific info to a sk by using bpf_sk_storage. In other words, a sk can be extended by a bpf_prog. This series is to support providing bpf_sk_storage data during inet_diag's dump. The primary target is the usage like iproute2's "ss". The first two patches are refactoring works in inet_diag to make adding bpf_sk_storage support easier. The next two patches do the actual work. Please see individual patch for details. v2: - Add commit message for u16 to u32 change in min_dump_alloc in Patch 4 (Song) - Add comment to explain the !skb->len check in __inet_diag_dump in Patch 4. - Do the map->map_type check earlier in Patch 3 for readability. ==================== Signed-off-by: Alexei Starovoitov --- 812285fa5ab129e3a55682314bf235f701564310