diff --git a/tools/testing/selftests/bpf/prog_tests/xdp_fentry_ext.c b/tools/testing/selftests/bpf/prog_tests/xdp_fentry_ext.c
new file mode 100644
index 000000000000..68cd83fad632
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/xdp_fentry_ext.c
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <test_progs.h>
+#include <network_helpers.h>
+
+#include "test_xdp_ext.skel.h"
+#include "test_xdp_bpf2bpf.skel.h"
+#include "xdp_dummy.skel.h"
+
+void test_xdp_fentry_ext(void)
+{
+        /* Using the skeleton framework does not work, as it does not like
+         * like the prog_replace() function to be noinline
+         */
+
+	__u32 duration = 0, retval, size;
+        const char *file = "./test_xdp_ext.o";
+        const char *ext_file = "./xdp_dummy.o";
+        struct bpf_program *prog;
+        struct bpf_program *ext_prog;
+	struct bpf_object *xdp_obj, *ext_obj = NULL;
+        struct test_xdp_bpf2bpf *ftrace_skel = NULL;
+        int err, xdp_fd, ext_fd;
+	char buf[128];
+
+        err = bpf_prog_load(file, BPF_PROG_TYPE_XDP, &xdp_obj, &xdp_fd);
+	if (CHECK_FAIL(err))
+		return;
+
+        /* Load the EXT program to attach to replace existing function */
+        ext_obj = bpf_object__open_file(ext_file, NULL);
+        if (CHECK(IS_ERR_OR_NULL(ext_obj), "obj_open",
+                  "failed to open %s: %ld\n",
+                  ext_file, PTR_ERR(ext_obj)))
+                goto out;
+
+        ext_prog = bpf_object__find_program_by_title(ext_obj, "xdp_dummy");
+        if (CHECK(!ext_prog, "find_prog", "xdp_dummy_prog not found\n"))
+                goto out;
+
+        err = bpf_program__set_attach_target(ext_prog, xdp_fd, "prog_replace");
+	if (CHECK(err, "set_attach", "err %d, errno %d\n", err, errno))
+                goto out;
+
+        bpf_program__set_type(ext_prog, BPF_PROG_TYPE_EXT);
+
+        err = bpf_object__load(ext_obj);
+	if (CHECK(err, "obj_load", "err %d\n", err))
+		goto out;
+
+        bpf_program__attach_trace(ext_prog);
+
+        ext_fd = bpf_program__fd(ext_prog);
+
+        /* Now try to attach an fentry trace to the EXT program above */
+
+	ftrace_skel = test_xdp_bpf2bpf__open();
+	if (CHECK(!ftrace_skel, "__open", "ftrace skeleton failed\n"))
+		goto out;
+
+        prog = ftrace_skel->progs.trace_on_entry;
+	bpf_program__set_expected_attach_type(prog, BPF_TRACE_FENTRY);
+	bpf_program__set_attach_target(prog, ext_fd, "xdp_dummy_prog");
+
+	prog = ftrace_skel->progs.trace_on_exit;
+	bpf_program__set_expected_attach_type(prog, BPF_TRACE_FEXIT);
+	bpf_program__set_attach_target(prog, ext_fd, "xdp_dummy_prog");
+
+	err = test_xdp_bpf2bpf__load(ftrace_skel);
+	if (CHECK(err, "__load", "ftrace skeleton failed\n"))
+		goto out;
+
+	err = test_xdp_bpf2bpf__attach(ftrace_skel);
+	if (CHECK(err, "ftrace_attach", "ftrace attach failed: %d\n", err))
+		goto out;
+
+
+	/* Execute the xdp program by sending a dummy packet */
+	err = bpf_prog_test_run(xdp_fd, 1, &pkt_v4, sizeof(pkt_v4),
+				buf, &size, &retval, &duration);
+
+	if (CHECK(err || retval != XDP_PASS , "packet",
+		  "err %d, errno %d, retval %d %c= %d\n",
+                  err, errno, retval, retval != XDP_PASS ? '!' : '=', XDP_PASS))
+		goto out;
+
+out:
+	bpf_object__close(xdp_obj);
+        if (ext_obj)
+                bpf_object__close(ext_obj);
+        if (ftrace_skel)
+                test_xdp_bpf2bpf__destroy(ftrace_skel);
+
+}
+
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
index a038e827f850..41b2a103c7ca 100644
--- a/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
+++ b/tools/testing/selftests/bpf/progs/test_xdp_bpf2bpf.c
@@ -42,7 +42,8 @@ struct {
 
 __u64 test_result_fentry = 0;
 SEC("fentry/FUNC")
-int BPF_PROG(trace_on_entry, struct xdp_buff *xdp)
+//int BPF_PROG(trace_on_entry, struct xdp_buff *xdp)
+int trace_on_entry(struct xdp_buff *xdp)
 {
 	struct meta meta;
 	void *data_end = (void *)(long)xdp->data_end;
@@ -61,7 +62,8 @@ int BPF_PROG(trace_on_entry, struct xdp_buff *xdp)
 
 __u64 test_result_fexit = 0;
 SEC("fexit/FUNC")
-int BPF_PROG(trace_on_exit, struct xdp_buff *xdp, int ret)
+//int BPF_PROG(trace_on_exit, struct xdp_buff *xdp, int ret)
+int trace_on_exit(struct xdp_buff *xdp, int ret)
 {
 	test_result_fexit = ret;
 	return 0;
diff --git a/tools/testing/selftests/bpf/progs/test_xdp_ext.c b/tools/testing/selftests/bpf/progs/test_xdp_ext.c
new file mode 100644
index 000000000000..37bd16c95b36
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/test_xdp_ext.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
+
+__u64 xdp_ext_called = 0;
+
+__attribute__ ((noinline))
+int prog_replace(struct xdp_md *ctx) {
+        volatile int ret = XDP_ABORTED;
+
+        return ret;
+}
+
+SEC("xdp_ext_call")
+int xdp_ext_call_func(struct xdp_md *ctx)
+{
+
+        return prog_replace(ctx);
+}
+
+char _license[] SEC("license") = "GPL";
