bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel. #2634

kernel-patches-bot · 2022-02-24T22:04:00Z

Pull request for series with
subject: bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel.
version: 1
url: https://patchwork.kernel.org/project/netdevbpf/list/?series=617733

kernel-patches-bot · 2022-02-24T22:04:00Z

Master branch: 08d4dba
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=617733
version: 1

kernel-patches-bot · 2022-02-25T18:00:18Z

Master branch: 08d4dba
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=618128
version: 2

kernel-patches-bot · 2022-02-25T19:10:33Z

Master branch: 08d4dba
series: https://patchwork.kernel.org/project/netdevbpf/list/?series=618150
version: 3

…rnel. In a previous commit (1), BPF preload process was switched from user mode process to use in-kernel light skeleton instead. However, in the kernel context the available FD starts from 0, instead of normally 3 for user mode process. The preload process also left two FDs open, taking over FD 0 and 1. This later caused issues when kernel trys to setup stdin/stdout/stderr for init process, assuming FD 0,1,2 are available. As seen here: Before fix: ls -lah /proc/1/fd/* lrwx------1 root root 64 Feb 23 17:20 /proc/1/fd/0 -> /dev/null lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/1 -> /dev/null lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/2 -> /dev/console lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/6 -> /dev/console lrwx------ 1 root root 64 Feb 23 17:20 /proc/1/fd/7 -> /dev/console After Fix / Normal: ls -lah /proc/1/fd/* lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/0 -> /dev/console lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/1 -> /dev/console lrwx------ 1 root root 64 Feb 24 21:23 /proc/1/fd/2 -> /dev/console In this patch: - skel_closenz was changed to skel_closegez to correctly handle FD=0 case. - various places detecting FD > 0 was changed to FD >= 0. - Call iterators_skel__detach() funciton to release FDs after links are obtained. 1: commit cb80ddc ("bpf: Convert bpf_preload.ko to use light skeleton.") Fixes: commit cb80ddc ("bpf: Convert bpf_preload.ko to use light skeleton.") Signed-off-by: Yucong Sun <[email protected]> V3 -> V1: removed all changes related to handle fd=0. V2 -> V1: rename skel_closenez to skel_closegez, added comment as requested.

kernel-patches-bot · 2022-02-25T21:05:09Z

At least one diff in series https://patchwork.kernel.org/project/netdevbpf/list/?series=618150 irrelevant now. Closing PR.

…arations) Fix checkpatch code style warnings: WARNING: Missing a blank line after declarations kernel-patches#761: FILE: net/core/pktgen.c:761: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#780: FILE: net/core/pktgen.c:780: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#806: FILE: net/core/pktgen.c:806: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#823: FILE: net/core/pktgen.c:823: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#1968: FILE: net/core/pktgen.c:1968: + char f[32]; + memset(f, 0, 32); WARNING: Missing a blank line after declarations kernel-patches#2410: FILE: net/core/pktgen.c:2410: + struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id); + if (!x) { WARNING: Missing a blank line after declarations kernel-patches#2442: FILE: net/core/pktgen.c:2442: + __u16 t; + if (pkt_dev->flags & F_QUEUE_MAP_RND) { WARNING: Missing a blank line after declarations kernel-patches#2523: FILE: net/core/pktgen.c:2523: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#2567: FILE: net/core/pktgen.c:2567: + __u32 t; + if (pkt_dev->flags & F_IPSRC_RND) WARNING: Missing a blank line after declarations kernel-patches#2587: FILE: net/core/pktgen.c:2587: + __be32 s; + if (pkt_dev->flags & F_IPDST_RND) { WARNING: Missing a blank line after declarations kernel-patches#2634: FILE: net/core/pktgen.c:2634: + __u32 t; + if (pkt_dev->flags & F_TXSIZE_RND) { WARNING: Missing a blank line after declarations kernel-patches#2736: FILE: net/core/pktgen.c:2736: + int i; + for (i = 0; i < pkt_dev->cflows; i++) { WARNING: Missing a blank line after declarations kernel-patches#2738: FILE: net/core/pktgen.c:2738: + struct xfrm_state *x = pkt_dev->flows[i].x; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2752: FILE: net/core/pktgen.c:2752: + int nhead = 0; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2795: FILE: net/core/pktgen.c:2795: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#3480: FILE: net/core/pktgen.c:3480: + ktime_t idle_start = ktime_get(); + schedule(); Signed-off-by: Peter Seiderer <[email protected]> Signed-off-by: NipaLocal <nipa@local>

…arations) Fix checkpatch code style warnings: WARNING: Missing a blank line after declarations kernel-patches#761: FILE: net/core/pktgen.c:761: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#780: FILE: net/core/pktgen.c:780: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#806: FILE: net/core/pktgen.c:806: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#823: FILE: net/core/pktgen.c:823: + char c; + if (get_user(c, &user_buffer[i])) WARNING: Missing a blank line after declarations kernel-patches#1968: FILE: net/core/pktgen.c:1968: + char f[32]; + memset(f, 0, 32); WARNING: Missing a blank line after declarations kernel-patches#2410: FILE: net/core/pktgen.c:2410: + struct pktgen_net *pn = net_generic(dev_net(pkt_dev->odev), pg_net_id); + if (!x) { WARNING: Missing a blank line after declarations kernel-patches#2442: FILE: net/core/pktgen.c:2442: + __u16 t; + if (pkt_dev->flags & F_QUEUE_MAP_RND) { WARNING: Missing a blank line after declarations kernel-patches#2523: FILE: net/core/pktgen.c:2523: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#2567: FILE: net/core/pktgen.c:2567: + __u32 t; + if (pkt_dev->flags & F_IPSRC_RND) WARNING: Missing a blank line after declarations kernel-patches#2587: FILE: net/core/pktgen.c:2587: + __be32 s; + if (pkt_dev->flags & F_IPDST_RND) { WARNING: Missing a blank line after declarations kernel-patches#2634: FILE: net/core/pktgen.c:2634: + __u32 t; + if (pkt_dev->flags & F_TXSIZE_RND) { WARNING: Missing a blank line after declarations kernel-patches#2736: FILE: net/core/pktgen.c:2736: + int i; + for (i = 0; i < pkt_dev->cflows; i++) { WARNING: Missing a blank line after declarations kernel-patches#2738: FILE: net/core/pktgen.c:2738: + struct xfrm_state *x = pkt_dev->flows[i].x; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2752: FILE: net/core/pktgen.c:2752: + int nhead = 0; + if (x) { WARNING: Missing a blank line after declarations kernel-patches#2795: FILE: net/core/pktgen.c:2795: + unsigned int i; + for (i = 0; i < pkt_dev->nr_labels; i++) WARNING: Missing a blank line after declarations kernel-patches#3480: FILE: net/core/pktgen.c:3480: + ktime_t idle_start = ktime_get(); + schedule(); Signed-off-by: Peter Seiderer <[email protected]> Reviewed-by: Toke Høiland-Jørgensen <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]>

kernel-patches-bot added bpf-next new V1 labels Feb 24, 2022

kernel-patches-bot added V2 and removed V1 labels Feb 25, 2022

kernel-patches-bot force-pushed the series/617733=>bpf-next branch from 073a9b9 to a0fc1d0 Compare February 25, 2022 18:00

Nobody and others added 2 commits February 25, 2022 11:10

adding ci files

84764e5

kernel-patches-bot added V3 and removed V2 labels Feb 25, 2022

kernel-patches-bot force-pushed the series/617733=>bpf-next branch from a0fc1d0 to 6aa13e6 Compare February 25, 2022 19:10

kernel-patches-bot added accepted and removed new labels Feb 25, 2022

kernel-patches-bot closed this Feb 25, 2022

kernel-patches-bot deleted the series/617733=>bpf-next branch February 25, 2022 21:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel. #2634

bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel. #2634

Uh oh!

kernel-patches-bot commented Feb 24, 2022

Uh oh!

kernel-patches-bot commented Feb 24, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

Uh oh!

bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel. #2634

bpf: Fix issue with bpf preload module taking over stdout/stdin of kernel. #2634

Uh oh!

Conversation

kernel-patches-bot commented Feb 24, 2022

Uh oh!

kernel-patches-bot commented Feb 24, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

kernel-patches-bot commented Feb 25, 2022

Uh oh!

Uh oh!