diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile
index bafdc5373a13..00b62ab5c932 100644
--- a/tools/testing/selftests/bpf/Makefile
+++ b/tools/testing/selftests/bpf/Makefile
@@ -558,6 +558,13 @@ $(OUTPUT)/bench_ringbufs.o: $(OUTPUT)/ringbuf_bench.skel.h \
 $(OUTPUT)/bench_bloom_filter_map.o: $(OUTPUT)/bloom_filter_bench.skel.h
 $(OUTPUT)/bench_bpf_loop.o: $(OUTPUT)/bpf_loop_bench.skel.h
 $(OUTPUT)/bench_strncmp.o: $(OUTPUT)/strncmp_bench.skel.h
+$(OUTPUT)/bench_local_storage.o: $(OUTPUT)/local_storage_bench__create_map.skel.h \
+				  $(OUTPUT)/local_storage_bench__get10.skel.h \
+				  $(OUTPUT)/local_storage_bench__get100.skel.h \
+				  $(OUTPUT)/local_storage_bench__get1000.skel.h \
+				  $(OUTPUT)/local_storage_bench__get10_interleaved.skel.h \
+				  $(OUTPUT)/local_storage_bench__get100_interleaved.skel.h \
+				  $(OUTPUT)/local_storage_bench__get1000_interleaved.skel.h
 $(OUTPUT)/bench.o: bench.h testing_helpers.h $(BPFOBJ)
 $(OUTPUT)/bench: LDLIBS += -lm
 $(OUTPUT)/bench: $(OUTPUT)/bench.o \
@@ -569,7 +576,8 @@ $(OUTPUT)/bench: $(OUTPUT)/bench.o \
 		 $(OUTPUT)/bench_ringbufs.o \
 		 $(OUTPUT)/bench_bloom_filter_map.o \
 		 $(OUTPUT)/bench_bpf_loop.o \
-		 $(OUTPUT)/bench_strncmp.o
+		 $(OUTPUT)/bench_strncmp.o \
+		 $(OUTPUT)/bench_local_storage.o
 	$(call msg,BINARY,,$@)
 	$(Q)$(CC) $(CFLAGS) $(LDFLAGS) $(filter %.a %.o,$^) $(LDLIBS) -o $@
 
diff --git a/tools/testing/selftests/bpf/bench.c b/tools/testing/selftests/bpf/bench.c
index f061cc20e776..f88b5f264ce7 100644
--- a/tools/testing/selftests/bpf/bench.c
+++ b/tools/testing/selftests/bpf/bench.c
@@ -150,6 +150,53 @@ void ops_report_final(struct bench_res res[], int res_cnt)
 	printf("latency %8.3lf ns/op\n", 1000.0 / hits_mean * env.producer_cnt);
 }
 
+void local_storage_report_progress(int iter, struct bench_res *res,
+				   long delta_ns)
+{
+	double important_hits_per_sec, hits_per_sec;
+	double delta_sec = delta_ns / 1000000000.0;
+
+	hits_per_sec = res->hits / 1000000.0 / delta_sec;
+	important_hits_per_sec = res->important_hits / 1000000.0 / delta_sec;
+
+	printf("Iter %3d (%7.3lfus): ", iter, (delta_ns - 1000000000) / 1000.0);
+
+	printf("hits %8.3lfM/s ", hits_per_sec);
+	printf("important_hits %8.3lfM/s\n", important_hits_per_sec);
+}
+
+void local_storage_report_final(struct bench_res res[], int res_cnt)
+{
+	double important_hits_mean = 0.0, important_hits_stddev = 0.0;
+	double hits_mean = 0.0, hits_stddev = 0.0;
+	int i;
+
+	for (i = 0; i < res_cnt; i++) {
+		hits_mean += res[i].hits / 1000000.0 / (0.0 + res_cnt);
+		important_hits_mean += res[i].important_hits / 1000000.0 / (0.0 + res_cnt);
+	}
+
+	if (res_cnt > 1)  {
+		for (i = 0; i < res_cnt; i++) {
+			hits_stddev += (hits_mean - res[i].hits / 1000000.0) *
+				       (hits_mean - res[i].hits / 1000000.0) /
+				       (res_cnt - 1.0);
+			important_hits_stddev +=
+				       (important_hits_mean - res[i].important_hits / 1000000.0) *
+				       (important_hits_mean - res[i].important_hits / 1000000.0) /
+				       (res_cnt - 1.0);
+		}
+
+		hits_stddev = sqrt(hits_stddev);
+		important_hits_stddev = sqrt(important_hits_stddev);
+	}
+	printf("Summary: hits throughput %8.3lf \u00B1 %5.3lf M ops/s, ",
+	       hits_mean, hits_stddev);
+	printf("hits latency %8.3lf ns/op, ", 1000.0 / hits_mean);
+	printf("important_hits throughput %8.3lf \u00B1 %5.3lf M ops/s\n",
+	       important_hits_mean, important_hits_stddev);
+}
+
 const char *argp_program_version = "benchmark";
 const char *argp_program_bug_address = "<bpf@vger.kernel.org>";
 const char argp_program_doc[] =
@@ -188,12 +235,14 @@ static const struct argp_option opts[] = {
 extern struct argp bench_ringbufs_argp;
 extern struct argp bench_bloom_map_argp;
 extern struct argp bench_bpf_loop_argp;
+extern struct argp bench_local_storage_argp;
 extern struct argp bench_strncmp_argp;
 
 static const struct argp_child bench_parsers[] = {
 	{ &bench_ringbufs_argp, 0, "Ring buffers benchmark", 0 },
 	{ &bench_bloom_map_argp, 0, "Bloom filter map benchmark", 0 },
 	{ &bench_bpf_loop_argp, 0, "bpf_loop helper benchmark", 0 },
+	{ &bench_local_storage_argp, 0, "local_storage benchmark", 0 },
 	{ &bench_strncmp_argp, 0, "bpf_strncmp helper benchmark", 0 },
 	{},
 };
@@ -396,6 +445,8 @@ extern const struct bench bench_hashmap_with_bloom;
 extern const struct bench bench_bpf_loop;
 extern const struct bench bench_strncmp_no_helper;
 extern const struct bench bench_strncmp_helper;
+extern const struct bench bench_local_storage_cache_seq_get;
+extern const struct bench bench_local_storage_cache_interleaved_get;
 
 static const struct bench *benchs[] = {
 	&bench_count_global,
@@ -430,6 +481,8 @@ static const struct bench *benchs[] = {
 	&bench_bpf_loop,
 	&bench_strncmp_no_helper,
 	&bench_strncmp_helper,
+	&bench_local_storage_cache_seq_get,
+	&bench_local_storage_cache_interleaved_get,
 };
 
 static void setup_benchmark()
@@ -547,5 +600,7 @@ int main(int argc, char **argv)
 		bench->report_final(state.results + env.warmup_sec,
 				    state.res_cnt - env.warmup_sec);
 
+	if (bench->teardown)
+		bench->teardown();
 	return 0;
 }
diff --git a/tools/testing/selftests/bpf/bench.h b/tools/testing/selftests/bpf/bench.h
index fb3e213df3dc..0a137eedc959 100644
--- a/tools/testing/selftests/bpf/bench.h
+++ b/tools/testing/selftests/bpf/bench.h
@@ -34,12 +34,14 @@ struct bench_res {
 	long hits;
 	long drops;
 	long false_hits;
+	long important_hits;
 };
 
 struct bench {
 	const char *name;
 	void (*validate)(void);
 	void (*setup)(void);
+	void (*teardown)(void);
 	void *(*producer_thread)(void *ctx);
 	void *(*consumer_thread)(void *ctx);
 	void (*measure)(struct bench_res* res);
@@ -61,6 +63,9 @@ void false_hits_report_progress(int iter, struct bench_res *res, long delta_ns);
 void false_hits_report_final(struct bench_res res[], int res_cnt);
 void ops_report_progress(int iter, struct bench_res *res, long delta_ns);
 void ops_report_final(struct bench_res res[], int res_cnt);
+void local_storage_report_progress(int iter, struct bench_res *res,
+				   long delta_ns);
+void local_storage_report_final(struct bench_res res[], int res_cnt);
 
 static inline __u64 get_time_ns(void)
 {
diff --git a/tools/testing/selftests/bpf/benchs/bench_local_storage.c b/tools/testing/selftests/bpf/benchs/bench_local_storage.c
new file mode 100644
index 000000000000..fe7ccafb7f8d
--- /dev/null
+++ b/tools/testing/selftests/bpf/benchs/bench_local_storage.c
@@ -0,0 +1,264 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include <argp.h>
+#include "local_storage_bench__create_map.skel.h"
+#include "local_storage_bench__get10.skel.h"
+#include "local_storage_bench__get100.skel.h"
+#include "local_storage_bench__get1000.skel.h"
+#include "local_storage_bench__get10_interleaved.skel.h"
+#include "local_storage_bench__get100_interleaved.skel.h"
+#include "local_storage_bench__get1000_interleaved.skel.h"
+#include "bench.h"
+
+static struct {
+	__u32 nr_maps;
+} args = {
+	.nr_maps = 100,
+};
+
+enum {
+	ARG_NR_MAPS = 6000,
+};
+
+static const struct argp_option opts[] = {
+	{ "nr_maps", ARG_NR_MAPS, "NR_MAPS", 0,
+		"Set number of local_storage maps"},
+	{},
+};
+
+static error_t parse_arg(int key, char *arg, struct argp_state *state)
+{
+	long ret;
+
+	switch (key) {
+	case ARG_NR_MAPS:
+		ret = strtol(arg, NULL, 10);
+		if (ret < 1 || ret > UINT_MAX) {
+			fprintf(stderr, "invalid nr_maps");
+			argp_usage(state);
+		}
+		args.nr_maps = ret;
+		break;
+	default:
+		return ARGP_ERR_UNKNOWN;
+	}
+
+	return 0;
+}
+
+const struct argp bench_local_storage_argp = {
+	.options = opts,
+	.parser = parse_arg,
+};
+
+static void validate(void)
+{
+	if (env.producer_cnt != 1) {
+		fprintf(stderr, "benchmark doesn't support multi-producer!\n");
+		exit(1);
+	}
+	if (env.consumer_cnt != 1) {
+		fprintf(stderr, "benchmark doesn't support multi-consumer!\n");
+		exit(1);
+	}
+
+	if (!(args.nr_maps == 10 || args.nr_maps == 100 || args.nr_maps == 1000)) {
+		fprintf(stderr, "nr_maps must be 10, 100, or 1000\n");
+		exit(1);
+	}
+}
+
+/* Map name in _get10, _get100, etc progs must match this pattern for
+ * PIN_BY_NAME to reuse existing map
+ */
+#define MAP_PIN_PATTERN "/sys/fs/bpf/local_storage_bench_pinned"
+
+void (*destroy_skel)(void *obj);
+long *skel_bss_important_hits;
+long *skel_bss_hits;
+void *test_skel;
+
+static void teardown(void);
+
+static void local_storage_cache_get_setup(void)
+{
+	struct local_storage_bench__get1000 *get1000_skel;
+	struct local_storage_bench__get100 *get100_skel;
+	struct local_storage_bench__get10 *get10_skel;
+	struct local_storage_bench__create_map *skel;
+	char path[100];
+	int i;
+
+	setup_libbpf();
+
+	for (i = 0; i < args.nr_maps; i++) {
+		skel = local_storage_bench__create_map__open_and_load();
+
+		sprintf(path, MAP_PIN_PATTERN "_%04d", i);
+		bpf_map__pin(skel->maps.map_to_pin, path);
+
+		local_storage_bench__create_map__destroy(skel);
+	}
+
+	switch (args.nr_maps) {
+	case 10:
+		get10_skel = local_storage_bench__get10__open_and_load();
+		local_storage_bench__get10__attach(get10_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get10__destroy;
+		test_skel = (void *)get10_skel;
+		skel_bss_hits = &get10_skel->bss->hits;
+		skel_bss_important_hits = &get10_skel->bss->important_hits;
+		break;
+	case 100:
+		get100_skel = local_storage_bench__get100__open_and_load();
+		local_storage_bench__get100__attach(get100_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get100__destroy;
+		test_skel = (void *)get100_skel;
+		skel_bss_hits = &get100_skel->bss->hits;
+		skel_bss_important_hits = &get100_skel->bss->important_hits;
+		break;
+	case 1000:
+		get1000_skel = local_storage_bench__get1000__open_and_load();
+		local_storage_bench__get1000__attach(get1000_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get1000__destroy;
+		test_skel = (void *)get1000_skel;
+		skel_bss_hits = &get1000_skel->bss->hits;
+		skel_bss_important_hits = &get1000_skel->bss->important_hits;
+		break;
+	default:
+		fprintf(stderr,
+			"got an invalid nr_maps in setup, does validate() need update?");
+		teardown();
+		exit(1);
+		break;
+	}
+}
+
+static void local_storage_cache_get_interleaved_setup(void)
+{
+	struct local_storage_bench__get1000_interleaved *get1000_skel;
+	struct local_storage_bench__get100_interleaved *get100_skel;
+	struct local_storage_bench__get10_interleaved *get10_skel;
+	struct local_storage_bench__create_map *skel;
+	char path[100];
+	int i;
+
+	setup_libbpf();
+
+	for (i = 0; i < args.nr_maps; i++) {
+		skel = local_storage_bench__create_map__open_and_load();
+
+		sprintf(path, MAP_PIN_PATTERN "_%04d", i);
+		bpf_map__pin(skel->maps.map_to_pin, path);
+
+		local_storage_bench__create_map__destroy(skel);
+	}
+
+	switch (args.nr_maps) {
+	case 10:
+		get10_skel = local_storage_bench__get10_interleaved__open_and_load();
+		local_storage_bench__get10_interleaved__attach(get10_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get10_interleaved__destroy;
+		test_skel = (void *)get10_skel;
+		skel_bss_hits = &get10_skel->bss->hits;
+		skel_bss_important_hits = &get10_skel->bss->important_hits;
+		break;
+	case 100:
+		get100_skel = local_storage_bench__get100_interleaved__open_and_load();
+		local_storage_bench__get100_interleaved__attach(get100_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get100_interleaved__destroy;
+		test_skel = (void *)get100_skel;
+		skel_bss_hits = &get100_skel->bss->hits;
+		skel_bss_important_hits = &get100_skel->bss->important_hits;
+		break;
+	case 1000:
+		get1000_skel = local_storage_bench__get1000_interleaved__open_and_load();
+		local_storage_bench__get1000_interleaved__attach(get1000_skel);
+		destroy_skel = (void(*)(void *))local_storage_bench__get1000_interleaved__destroy;
+		test_skel = (void *)get1000_skel;
+		skel_bss_hits = &get1000_skel->bss->hits;
+		skel_bss_important_hits = &get1000_skel->bss->important_hits;
+		break;
+	default:
+		fprintf(stderr,
+			"got an invalid nr_maps in setup, does validate() need update?");
+		teardown();
+		exit(1);
+		break;
+	}
+}
+
+static void teardown(void)
+{
+	char path[100];
+	int i;
+
+	for (i = 0; i < args.nr_maps; i++) {
+		sprintf(path, MAP_PIN_PATTERN "_%04d", i);
+		unlink(path);
+	}
+
+	if (destroy_skel && test_skel)
+		destroy_skel(test_skel);
+}
+
+static void measure(struct bench_res *res)
+{
+	if (skel_bss_hits)
+		res->hits = atomic_swap(skel_bss_hits, 0);
+	if (skel_bss_important_hits)
+		res->important_hits = atomic_swap(skel_bss_important_hits, 0);
+}
+
+static inline void trigger_bpf_program(void)
+{
+	syscall(__NR_getpgid);
+}
+
+static void *consumer(void *input)
+{
+	return NULL;
+}
+
+static void *producer(void *input)
+{
+	while (true)
+		trigger_bpf_program();
+
+	return NULL;
+}
+
+/* cache sequential and interleaved get benchs test local_storage get
+ * performance, specifically they demonstrate performance cliff of
+ * current list-plus-cache local_storage model.
+ *
+ * cache sequential get: call bpf_task_storage_get on n maps in order
+ * cache interleaved get: like "sequential get", but interleave 4 calls to the
+ *	'important' map (local_storage_bench_pinned_0000) for every 10 calls. Goal
+ *	is to mimic environment where many progs are accessing their local_storage
+ *	maps, with 'our' prog needing to access its map more often than others
+ */
+const struct bench bench_local_storage_cache_seq_get = {
+	.name = "local-storage-cache-seq-get",
+	.validate = validate,
+	.setup = local_storage_cache_get_setup,
+	.producer_thread = producer,
+	.consumer_thread = consumer,
+	.measure = measure,
+	.report_progress = local_storage_report_progress,
+	.report_final = local_storage_report_final,
+	.teardown = teardown,
+};
+
+const struct bench bench_local_storage_cache_interleaved_get = {
+	.name = "local-storage-cache-interleaved-get",
+	.validate = validate,
+	.setup = local_storage_cache_get_interleaved_setup,
+	.producer_thread = producer,
+	.consumer_thread = consumer,
+	.measure = measure,
+	.report_progress = local_storage_report_progress,
+	.report_final = local_storage_report_final,
+	.teardown = teardown,
+};
diff --git a/tools/testing/selftests/bpf/benchs/run_bench_local_storage.sh b/tools/testing/selftests/bpf/benchs/run_bench_local_storage.sh
new file mode 100755
index 000000000000..a6f6f704cb7b
--- /dev/null
+++ b/tools/testing/selftests/bpf/benchs/run_bench_local_storage.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+source ./benchs/run_common.sh
+
+set -eufo pipefail
+
+header "Local Storage"
+for i in 10 100 1000; do
+subtitle "num_maps: $i"
+	summarize_local_storage "local_storage cache sequential  get: "\
+		"$(./bench --nr_maps $i local-storage-cache-seq-get)"
+	summarize_local_storage "local_storage cache interleaved get: "\
+		"$(./bench --nr_maps $i local-storage-cache-interleaved-get)"
+	printf "\n"
+done
diff --git a/tools/testing/selftests/bpf/benchs/run_common.sh b/tools/testing/selftests/bpf/benchs/run_common.sh
index 6c5e6023a69f..d9f40af82006 100644
--- a/tools/testing/selftests/bpf/benchs/run_common.sh
+++ b/tools/testing/selftests/bpf/benchs/run_common.sh
@@ -41,6 +41,16 @@ function ops()
 	echo "$*" | sed -E "s/.*latency\s+([0-9]+\.[0-9]+\sns\/op).*/\1/"
 }
 
+function local_storage()
+{
+	echo -n "hits throughput: "
+	echo -n "$*" | sed -E "s/.* hits throughput\s+([0-9]+\.[0-9]+ ± [0-9]+\.[0-9]+\sM\sops\/s).*/\1/"
+	echo -n -e ", hits latency: "
+	echo -n "$*" | sed -E "s/.* hits latency\s+([0-9]+\.[0-9]+\sns\/op).*/\1/"
+	echo -n ", important_hits throughput: "
+	echo "$*" | sed -E "s/.*important_hits throughput\s+([0-9]+\.[0-9]+ ± [0-9]+\.[0-9]+\sM\sops\/s).*/\1/"
+}
+
 function total()
 {
 	echo "$*" | sed -E "s/.*total operations\s+([0-9]+\.[0-9]+ ± [0-9]+\.[0-9]+M\/s).*/\1/"
@@ -67,6 +77,13 @@ function summarize_ops()
 	printf "%-20s %s\n" "$bench" "$(ops $summary)"
 }
 
+function summarize_local_storage()
+{
+	bench="$1"
+	summary=$(echo $2 | tail -n1)
+	printf "%-20s %s\n" "$bench" "$(local_storage $summary)"
+}
+
 function summarize_total()
 {
 	bench="$1"
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__create_map.c b/tools/testing/selftests/bpf/progs/local_storage_bench__create_map.c
new file mode 100644
index 000000000000..786465a79e9e
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__create_map.c
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+
+struct { \
+	__uint(type, BPF_MAP_TYPE_TASK_STORAGE); \
+	__uint(map_flags, BPF_F_NO_PREALLOC); \
+	__type(key, int); \
+	__type(value, __u32); \
+} map_to_pin SEC(".maps");
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get10.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get10.c
new file mode 100644
index 000000000000..75f50f961654
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get10.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0009} */
+PINNED_MAP10(0, 0, 0);
+
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10(0, 0, 0);
+	return 0;
+}
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get100.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get100.c
new file mode 100644
index 000000000000..64b5985b275d
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get100.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0099} */
+PINNED_MAP100(0, 0);
+
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10(0, 0, 0);
+	TASK_STORAGE_GET10(0, 0, 1);
+	TASK_STORAGE_GET10(0, 0, 2);
+	TASK_STORAGE_GET10(0, 0, 3);
+	TASK_STORAGE_GET10(0, 0, 4);
+	return 0;
+}
+
+/* Need to access maps in diff progs to work around verifier MAX_USED_MAPS */
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get2(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10(0, 0, 5);
+	TASK_STORAGE_GET10(0, 0, 6);
+	TASK_STORAGE_GET10(0, 0, 7);
+	TASK_STORAGE_GET10(0, 0, 8);
+	TASK_STORAGE_GET10(0, 0, 9);
+	return 0;
+}
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get1000.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get1000.c
new file mode 100644
index 000000000000..0558c0063703
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get1000.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+#define TASK_STORAGE_GET_FUNC_FIRST50(name, thous, hun) \
+SEC("fentry/" SYS_PREFIX "sys_getpgid") \
+int name(void *ctx) \
+{ \
+	struct task_struct *task = bpf_get_current_task_btf(); \
+	TASK_STORAGE_GET10(thous, hun, 0); \
+	TASK_STORAGE_GET10(thous, hun, 1); \
+	TASK_STORAGE_GET10(thous, hun, 2); \
+	TASK_STORAGE_GET10(thous, hun, 3); \
+	TASK_STORAGE_GET10(thous, hun, 4); \
+	return 0; \
+}
+
+#define TASK_STORAGE_GET_FUNC_LAST50(name, thous, hun) \
+SEC("fentry/" SYS_PREFIX "sys_getpgid") \
+int name(void *ctx) \
+{ \
+	struct task_struct *task = bpf_get_current_task_btf(); \
+	TASK_STORAGE_GET10(thous, hun, 5); \
+	TASK_STORAGE_GET10(thous, hun, 6); \
+	TASK_STORAGE_GET10(thous, hun, 7); \
+	TASK_STORAGE_GET10(thous, hun, 8); \
+	TASK_STORAGE_GET10(thous, hun, 9); \
+	return 0; \
+}
+
+#define TASK_STORAGE_GET_FUNC_100(name, thous, hun) \
+	TASK_STORAGE_GET_FUNC_FIRST50(name ## _first, thous, hun); \
+	TASK_STORAGE_GET_FUNC_FIRST50(name ##  _last, thous, hun);
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0999} */
+PINNED_MAP1000(0);
+
+TASK_STORAGE_GET_FUNC_100(do_map_get_000, 0, 0);
+TASK_STORAGE_GET_FUNC_100(do_map_get_100, 0, 1);
+TASK_STORAGE_GET_FUNC_100(do_map_get_200, 0, 2);
+TASK_STORAGE_GET_FUNC_100(do_map_get_300, 0, 3);
+TASK_STORAGE_GET_FUNC_100(do_map_get_400, 0, 4);
+TASK_STORAGE_GET_FUNC_100(do_map_get_500, 0, 5);
+TASK_STORAGE_GET_FUNC_100(do_map_get_600, 0, 6);
+TASK_STORAGE_GET_FUNC_100(do_map_get_700, 0, 7);
+TASK_STORAGE_GET_FUNC_100(do_map_get_800, 0, 8);
+TASK_STORAGE_GET_FUNC_100(do_map_get_900, 0, 9);
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get1000_interleaved.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get1000_interleaved.c
new file mode 100644
index 000000000000..fbcdcdfe3056
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get1000_interleaved.c
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+#define TASK_STORAGE_GET_FUNC_FIRST50(name, thous, hun) \
+SEC("fentry/" SYS_PREFIX "sys_getpgid") \
+int name(void *ctx) \
+{ \
+	struct task_struct *task = bpf_get_current_task_btf(); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 0); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 1); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 2); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 3); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 4); \
+	return 0; \
+}
+
+#define TASK_STORAGE_GET_FUNC_LAST50(name, thous, hun) \
+SEC("fentry/" SYS_PREFIX "sys_getpgid") \
+int name(void *ctx) \
+{ \
+	struct task_struct *task = bpf_get_current_task_btf(); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 5); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 6); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 7); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 8); \
+	TASK_STORAGE_GET10_INTERLEAVED(thous, hun, 9); \
+	return 0; \
+}
+
+#define TASK_STORAGE_GET_FUNC_100(name, thous, hun) \
+	TASK_STORAGE_GET_FUNC_FIRST50(name ## _first, thous, hun); \
+	TASK_STORAGE_GET_FUNC_FIRST50(name ##  _last, thous, hun);
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0999} */
+PINNED_MAP1000(0);
+
+TASK_STORAGE_GET_FUNC_100(do_map_get_000, 0, 0);
+TASK_STORAGE_GET_FUNC_100(do_map_get_100, 0, 1);
+TASK_STORAGE_GET_FUNC_100(do_map_get_200, 0, 2);
+TASK_STORAGE_GET_FUNC_100(do_map_get_300, 0, 3);
+TASK_STORAGE_GET_FUNC_100(do_map_get_400, 0, 4);
+TASK_STORAGE_GET_FUNC_100(do_map_get_500, 0, 5);
+TASK_STORAGE_GET_FUNC_100(do_map_get_600, 0, 6);
+TASK_STORAGE_GET_FUNC_100(do_map_get_700, 0, 7);
+TASK_STORAGE_GET_FUNC_100(do_map_get_800, 0, 8);
+TASK_STORAGE_GET_FUNC_100(do_map_get_900, 0, 9);
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get100_interleaved.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get100_interleaved.c
new file mode 100644
index 000000000000..337e3fbd2663
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get100_interleaved.c
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0099} */
+PINNED_MAP100(0, 0);
+
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 0);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 1);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 2);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 3);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 4);
+	return 0;
+}
+
+/* Need to access maps in diff progs to work around verifier MAX_USED_MAPS */
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get2(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 5);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 6);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 7);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 8);
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 9);
+	return 0;
+}
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench__get10_interleaved.c b/tools/testing/selftests/bpf/progs/local_storage_bench__get10_interleaved.c
new file mode 100644
index 000000000000..26af26c29738
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench__get10_interleaved.c
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include "vmlinux.h"
+#include <bpf/bpf_helpers.h>
+#include "bpf_misc.h"
+#include "local_storage_bench_helpers.h"
+
+long important_hits = 0;
+long hits = 0;
+
+/* Create maps local_storage_bench_pinned_{0000, .., 0009} */
+PINNED_MAP10(0, 0, 0);
+
+SEC("fentry/" SYS_PREFIX "sys_getpgid")
+int do_map_get(void *ctx)
+{
+	struct task_struct *task = bpf_get_current_task_btf();
+
+	TASK_STORAGE_GET10_INTERLEAVED(0, 0, 0);
+	return 0;
+}
+
+char _license[] SEC("license") = "GPL";
diff --git a/tools/testing/selftests/bpf/progs/local_storage_bench_helpers.h b/tools/testing/selftests/bpf/progs/local_storage_bench_helpers.h
new file mode 100644
index 000000000000..25e8a0a7f9a5
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/local_storage_bench_helpers.h
@@ -0,0 +1,85 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2022 Meta Platforms, Inc. and affiliates. */
+
+#include <bpf/bpf_helpers.h>
+
+#define PINNED_MAP(thous, hun, ten, one) \
+struct { \
+	__uint(type, BPF_MAP_TYPE_TASK_STORAGE); \
+	__uint(map_flags, BPF_F_NO_PREALLOC); \
+	__type(key, int); \
+	__type(value, __u32); \
+	__uint(pinning, LIBBPF_PIN_BY_NAME); \
+} local_storage_bench_pinned_ ## thous ## hun ## ten ## one SEC(".maps");
+
+#define PINNED_MAP10(thous, hun, ten) \
+	PINNED_MAP(thous, hun, ten, 0); \
+	PINNED_MAP(thous, hun, ten, 1); \
+	PINNED_MAP(thous, hun, ten, 2); \
+	PINNED_MAP(thous, hun, ten, 3); \
+	PINNED_MAP(thous, hun, ten, 4); \
+	PINNED_MAP(thous, hun, ten, 5); \
+	PINNED_MAP(thous, hun, ten, 6); \
+	PINNED_MAP(thous, hun, ten, 7); \
+	PINNED_MAP(thous, hun, ten, 8); \
+	PINNED_MAP(thous, hun, ten, 9);
+
+#define PINNED_MAP100(thous, hun) \
+	PINNED_MAP10(thous, hun, 0); \
+	PINNED_MAP10(thous, hun, 1); \
+	PINNED_MAP10(thous, hun, 2); \
+	PINNED_MAP10(thous, hun, 3); \
+	PINNED_MAP10(thous, hun, 4); \
+	PINNED_MAP10(thous, hun, 5); \
+	PINNED_MAP10(thous, hun, 6); \
+	PINNED_MAP10(thous, hun, 7); \
+	PINNED_MAP10(thous, hun, 8); \
+	PINNED_MAP10(thous, hun, 9);
+
+#define PINNED_MAP1000(thous) \
+	PINNED_MAP100(thous, 0); \
+	PINNED_MAP100(thous, 1); \
+	PINNED_MAP100(thous, 2); \
+	PINNED_MAP100(thous, 3); \
+	PINNED_MAP100(thous, 4); \
+	PINNED_MAP100(thous, 5); \
+	PINNED_MAP100(thous, 6); \
+	PINNED_MAP100(thous, 7); \
+	PINNED_MAP100(thous, 8); \
+	PINNED_MAP100(thous, 9);
+
+#define TASK_STORAGE_GET(thous, hun, ten, one) \
+({ \
+	bpf_task_storage_get(&local_storage_bench_pinned_ ## thous ## hun ## ten ## one, task, 0, BPF_LOCAL_STORAGE_GET_F_CREATE) ; \
+	__sync_add_and_fetch(&hits, 1); \
+	if (!thous && !hun && !ten && !one) \
+		__sync_add_and_fetch(&important_hits, 1); \
+})
+
+#define TASK_STORAGE_GET10(thous, hun, ten) \
+	TASK_STORAGE_GET(thous, hun, ten, 0); \
+	TASK_STORAGE_GET(thous, hun, ten, 1); \
+	TASK_STORAGE_GET(thous, hun, ten, 2); \
+	TASK_STORAGE_GET(thous, hun, ten, 3); \
+	TASK_STORAGE_GET(thous, hun, ten, 4); \
+	TASK_STORAGE_GET(thous, hun, ten, 5); \
+	TASK_STORAGE_GET(thous, hun, ten, 6); \
+	TASK_STORAGE_GET(thous, hun, ten, 7); \
+	TASK_STORAGE_GET(thous, hun, ten, 8); \
+	TASK_STORAGE_GET(thous, hun, ten, 9);
+
+#define TASK_STORAGE_GET10_INTERLEAVED(thous, hun, ten) \
+	TASK_STORAGE_GET(thous, hun, ten, 0); \
+	TASK_STORAGE_GET(0, 0, 0, 0); \
+	TASK_STORAGE_GET(thous, hun, ten, 1); \
+	TASK_STORAGE_GET(thous, hun, ten, 2); \
+	TASK_STORAGE_GET(0, 0, 0, 0); \
+	TASK_STORAGE_GET(thous, hun, ten, 3); \
+	TASK_STORAGE_GET(thous, hun, ten, 4); \
+	TASK_STORAGE_GET(thous, hun, ten, 5); \
+	TASK_STORAGE_GET(0, 0, 0, 0); \
+	TASK_STORAGE_GET(thous, hun, ten, 6); \
+	TASK_STORAGE_GET(thous, hun, ten, 7); \
+	TASK_STORAGE_GET(0, 0, 0, 0); \
+	TASK_STORAGE_GET(thous, hun, ten, 8); \
+	TASK_STORAGE_GET(thous, hun, ten, 9); \
