tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

libbpf: fix formatting of bpf_object__append_subprog_code

The commit 6c918709bd30 ("libbpf: Refactor bpf_object__reloc_code")
added the bpf_object__append_subprog_code() with incorrect indentations.
Use tabs instead. (This also makes a consequent commit better readable.)

Signed-off-by: Anton Protopopov <a.s.protopopov@gmail.com>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20251019202145.3944697-14-a.s.protopopov@gmail.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

authored by

Anton Protopopov and committed by
Alexei Starovoitov e7586577 2f69c568

+21 -21
+21 -21
tools/lib/bpf/libbpf.c
··· 6436 6436 bpf_object__append_subprog_code(struct bpf_object *obj, struct bpf_program *main_prog, 6437 6437 struct bpf_program *subprog) 6438 6438 { 6439 - struct bpf_insn *insns; 6440 - size_t new_cnt; 6441 - int err; 6439 + struct bpf_insn *insns; 6440 + size_t new_cnt; 6441 + int err; 6442 6442 6443 - subprog->sub_insn_off = main_prog->insns_cnt; 6443 + subprog->sub_insn_off = main_prog->insns_cnt; 6444 6444 6445 - new_cnt = main_prog->insns_cnt + subprog->insns_cnt; 6446 - insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns)); 6447 - if (!insns) { 6448 - pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name); 6449 - return -ENOMEM; 6450 - } 6451 - main_prog->insns = insns; 6452 - main_prog->insns_cnt = new_cnt; 6445 + new_cnt = main_prog->insns_cnt + subprog->insns_cnt; 6446 + insns = libbpf_reallocarray(main_prog->insns, new_cnt, sizeof(*insns)); 6447 + if (!insns) { 6448 + pr_warn("prog '%s': failed to realloc prog code\n", main_prog->name); 6449 + return -ENOMEM; 6450 + } 6451 + main_prog->insns = insns; 6452 + main_prog->insns_cnt = new_cnt; 6453 6453 6454 - memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns, 6455 - subprog->insns_cnt * sizeof(*insns)); 6454 + memcpy(main_prog->insns + subprog->sub_insn_off, subprog->insns, 6455 + subprog->insns_cnt * sizeof(*insns)); 6456 6456 6457 - pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n", 6458 - main_prog->name, subprog->insns_cnt, subprog->name); 6457 + pr_debug("prog '%s': added %zu insns from sub-prog '%s'\n", 6458 + main_prog->name, subprog->insns_cnt, subprog->name); 6459 6459 6460 - /* The subprog insns are now appended. Append its relos too. */ 6461 - err = append_subprog_relos(main_prog, subprog); 6462 - if (err) 6463 - return err; 6464 - return 0; 6460 + /* The subprog insns are now appended. Append its relos too. */ 6461 + err = append_subprog_relos(main_prog, subprog); 6462 + if (err) 6463 + return err; 6464 + return 0; 6465 6465 } 6466 6466 6467 6467 static int