On Sat, Aug 01, 2020 at 09:13:57AM +0200, Maciej Fijalkowski wrote: > On Sat, Aug 01, 2020 at 03:03:19AM +0200, Daniel Borkmann wrote: > > On 7/31/20 2:03 AM, Maciej Fijalkowski wrote: > > > v5->v6: > > > - propagate only those poke descriptors that individual subprogram is > > > actually using (Daniel) > > > - drop the cumbersome check if poke desc got filled in map_poke_run() > > > - move poke->ip renaming in bpf_jit_add_poke_descriptor() from patch 4 > > > to patch 3 to provide bisectability (Daniel) > > > > I did a basic test with Cilium on K8s with this set, spawning a few Pods > > and checking connectivity & whether we're not crashing since it has bit more > > elaborate tail call use. So far so good. I was inclined to push the series > > out, but there is one more issue I noticed and didn't notice earlier when > > reviewing, and that is overall stack size: > > > > What happens when you create a single program that has nested BPF to BPF > > calls e.g. either up to the maximum nesting or one call that is using up > > the max stack size which is then doing another BPF to BPF call that contains > > the tail call. In the tail call map, you have the same program in there. > > This means we create a worst case stack from BPF size of max_stack_size * > > max_tail_call_size, that is, 512*32. So that adds 16k worst case. For x86 > > we have a stack of arch/x86/include/asm/page_64_types.h: > > > > #define THREAD_SIZE_ORDER (2 + KASAN_STACK_ORDER) > > #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) > > > > So we end up with 16k in a typical case. And this will cause kernel stack > > overflow; I'm at least not seeing where we handle this situation in the Not quite. The subprog is always 32 byte stack (from safety pov). The real stack (when JITed) can be lower or zero. So the max stack is (512 - 32) * 32 = 15360. So there is no overflow, but may be a bit too close to comfort. Imo the room is ok to land the set and the better enforcement can be done as a follow up later, like below idea... > > set. Hm, need to think more, but maybe this needs tracking of max stack > > across tail calls to force an upper limit.. > > My knee jerk reaction would be to decrement the allowed max tail calls, > but not sure if it's an option and if it would help. How about make the verifier use a lower bound for a function with a tail call ? Something like 64 would work. subprog_info[idx].stack_depth with tail_call will be >= 64. Then the main function will be automatically limited to 512-64 and the worst case stack = 14kbyte. When the sub prog with tail call is not an empty body (malicious stack abuser) then the lower bound won't affect anything. A bit annoying that stack_depth will be used by JIT to actually allocate that much. Some of it will not be used potentially, but I think it's fine. It's much simpler solution than to keep two variables to track stack size. Or may be check_max_stack_depth() can be a bit smarter and it can detect that subprog is using tail_call without actually hacking stack_depth variable. Essentially I'm proposing to tweak this formula: depth += round_up(max_t(u32, subprog[idx].stack_depth, 1), 32); and replace 1 with 64 for subprogs with tail_call.
