From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA3DF3B6BFA for ; Mon, 20 Jul 2026 08:54:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537668; cv=none; b=WBvky4MkyR5qvSifYqkQgRitvYcbzTX6nqIGKSxdmnA9fa43z2o6H65EsVMV7KO/zWp1rQmD4MO6Lxj7afbez4DCQWhprhKfm3gRS6lne882/yOqCT/LxAIKepr1xDQRh5ObucA+6C0to/mYvb25Nopd+ut0QOR8YZJx7Wvx9MI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784537668; c=relaxed/simple; bh=JR6+wiYEzymVSgI+F8TR0ERtiCjyqEe3VGm2WWzZ1sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mTBOmh9n2iltM0q6brMCtymaN7E1aXgtMZktnxRwff3fqDEYupgE4fSYG7R9G6cn2WM0dBsFyCrNFpogv8jqyA0zkWOCaNhJ24Es88GDLze9roR0nDNPk5aC46edDeRZAz48bHb54pCcdJtvhet43vOy6egyy4rct82SVpxac+k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L11ywaTZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L11ywaTZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F130A1F000E9; Mon, 20 Jul 2026 08:54:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1784537666; bh=8xT7KPyrlqY6Li7yh+OJts/3JUbzqCS+K2PNnVm6zAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=L11ywaTZQHjkqoJNdSvAP0OEPQSKoAU70HR6g/jpGkj1qZj1T+t3d74Li13gQILKM 0Z/zGmtT5L0RQWT08sgyXeLM4/9s/aidITfyb0CrV9bLbLHmv7BJoQA3serqnk1IZI TpYqUTD6Rt53H3sVH0E8HMQqwXXpOZAQeABt0hDRxxS/YBIC2wt3QLL+meiyctB4Q4 Xzxrf5yiT+0MEyV8+B2uLCLQKbSow/59+GRGEO/uiXZPlvcrok4STRl0uUhbcd5SVo ArZMQLx8a1r+SRrLwvjKhzbAWPyMjnXAos13li1qJ3YU6OpFwVt4PkCvOaPU4nd6mR b0iHcE1sTWc0Q== From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: bpf@vger.kernel.org, Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , Quentin Monnet , Tao Chen , STAR Labs SG Subject: [PATCH bpf-next 3/9] bpf: Factor stackid_new_bucket from __bpf_get_stackid Date: Mon, 20 Jul 2026 10:53:45 +0200 Message-ID: <20260720085351.655075-4-jolsa@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260720085351.655075-1-jolsa@kernel.org> References: <20260720085351.655075-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The new stackid_new_bucket allocates the new bucket and initializes it with the trace data. Signed-off-by: Jiri Olsa --- kernel/bpf/stackmap.c | 49 +++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index 7bc2a966e3e8..48a2e28f0c68 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -559,31 +559,53 @@ static int stackid_fastpath(struct stackid *stackid, struct bpf_map *map, return -ENOENT; } +static struct stack_map_bucket * +stackid_new_bucket(struct stackid *stackid, struct bpf_map *map, + struct perf_callchain_entry *trace, u64 flags) +{ + struct bpf_stack_map *smap = container_of(map, struct bpf_stack_map, map); + struct bpf_stack_build_id *id_offs; + struct stack_map_bucket *bucket; + u32 i; + + bucket = (struct stack_map_bucket *) pcpu_freelist_pop(&smap->freelist); + if (unlikely(!bucket)) + return NULL; + + if (stack_map_use_build_id(map)) { + id_offs = (struct bpf_stack_build_id *)bucket->data; + for (i = 0; i < stackid->nr; i++) + id_offs[i].ip = stackid->ips[i]; + } else { + memcpy(bucket->data, stackid->ips, stackid->len); + } + + bucket->hash = stackid->hash; + bucket->nr = stackid->nr; + return bucket; +} + static long __bpf_get_stackid(struct stackid *stackid, struct bpf_map *map, struct perf_callchain_entry *trace, u64 flags) { struct bpf_stack_map *smap = container_of(map, struct bpf_stack_map, map); struct stack_map_bucket *new_bucket, *old_bucket; bool user = flags & BPF_F_USER_STACK; - u32 trace_len, i; + u32 trace_len; int err; err = stackid_fastpath(stackid, map, trace, flags); if (err != -ENOENT) return err; + new_bucket = stackid_new_bucket(stackid, map, trace, flags); + if (!new_bucket) + return -ENOMEM; + if (stack_map_use_build_id(map)) { struct bpf_stack_build_id *id_offs; - /* for build_id+offset, pop a bucket before slow cmp */ - new_bucket = (struct stack_map_bucket *) - pcpu_freelist_pop(&smap->freelist); - if (unlikely(!new_bucket)) - return -ENOMEM; - new_bucket->nr = stackid->nr; id_offs = (struct bpf_stack_build_id *)new_bucket->data; - for (i = 0; i < stackid->nr; i++) - id_offs[i].ip = stackid->ips[i]; stack_map_get_build_id_offset(id_offs, stackid->nr, user, false /* !may_fault */); trace_len = stackid->nr * sizeof(struct bpf_stack_build_id); if (stackid->hash_matches && stackid->bucket->nr == stackid->nr && @@ -595,17 +617,8 @@ static long __bpf_get_stackid(struct stackid *stackid, struct bpf_map *map, pcpu_freelist_push(&smap->freelist, &new_bucket->fnode); return -EEXIST; } - } else { - new_bucket = (struct stack_map_bucket *) - pcpu_freelist_pop(&smap->freelist); - if (unlikely(!new_bucket)) - return -ENOMEM; - memcpy(new_bucket->data, stackid->ips, stackid->len); } - new_bucket->hash = stackid->hash; - new_bucket->nr = stackid->nr; - old_bucket = xchg(&smap->buckets[stackid->id], new_bucket); if (old_bucket) pcpu_freelist_push(&smap->freelist, &old_bucket->fnode); -- 2.54.0