From: Alexei Starovoitov Date: Mon, 28 Sep 2020 23:40:47 +0000 (-0700) Subject: Merge branch 'Sockmap copying' X-Git-Tag: v5.10-rc1~107^2~96^2~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84a20d8e8795b45e3f1673648d43b4cf0f594359;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'Sockmap copying' Lorenz Bauer says: ==================== Changes in v2: - Check sk_fullsock in map_update_elem (Martin) Enable calling map_update_elem on sockmaps from bpf_iter context. This in turn allows us to copy a sockmap by iterating its elements. The change itself is tiny, all thanks to the ground work from Martin, whose series [1] this patch is based on. I updated the tests to do some copying, and also included two cleanups. I'm sending this out now rather than when Martin's series has landed because I hope this can get in before the merge window (potentially) closes this weekend. 1: https://lore.kernel.org/bpf/20200925000337.3853598-1-kafai@fb.com/ ==================== Signed-off-by: Alexei Starovoitov --- 84a20d8e8795b45e3f1673648d43b4cf0f594359