summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch')
-rw-r--r--debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch b/debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch
index 8abf764af..759d06a9d 100644
--- a/debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch
+++ b/debian/patches-rt/0059-bpf-Remove-in_atomic-from-bpf_link_put.patch
@@ -1,8 +1,8 @@
-From 05999b640eb04be872e5491a040701fcddc73349 Mon Sep 17 00:00:00 2001
+From e506df4b11ac1bdab837fcfd9d9882168de5441d Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Wed, 14 Jun 2023 10:34:30 +0200
-Subject: [PATCH 59/62] bpf: Remove in_atomic() from bpf_link_put().
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.69-rt21.tar.xz
+Subject: [PATCH 59/64] bpf: Remove in_atomic() from bpf_link_put().
+Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/6.1/older/patches-6.1.82-rt27.tar.xz
bpf_free_inode() is invoked as a RCU callback. Usually RCU callbacks are
invoked within softirq context. By setting rcutree.use_softirq=0 boot
@@ -35,10 +35,10 @@ Signed-off-by: Clark Williams <clark.williams@gmail.com>
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index c0915e2424f1..f8ba6e0a5c08 100644
+index f467e53e09ab..78219335b0c9 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
-@@ -2732,28 +2732,31 @@ static void bpf_link_put_deferred(struct work_struct *work)
+@@ -2760,28 +2760,31 @@ static void bpf_link_put_deferred(struct work_struct *work)
bpf_link_free(link);
}
@@ -79,7 +79,7 @@ index c0915e2424f1..f8ba6e0a5c08 100644
return 0;
}
-@@ -4674,7 +4677,7 @@ static int link_update(union bpf_attr *attr)
+@@ -4711,7 +4714,7 @@ static int link_update(union bpf_attr *attr)
if (ret)
bpf_prog_put(new_prog);
out_put_link:
@@ -88,7 +88,7 @@ index c0915e2424f1..f8ba6e0a5c08 100644
return ret;
}
-@@ -4697,7 +4700,7 @@ static int link_detach(union bpf_attr *attr)
+@@ -4734,7 +4737,7 @@ static int link_detach(union bpf_attr *attr)
else
ret = -EOPNOTSUPP;
@@ -97,7 +97,7 @@ index c0915e2424f1..f8ba6e0a5c08 100644
return ret;
}
-@@ -4767,7 +4770,7 @@ static int bpf_link_get_fd_by_id(const union bpf_attr *attr)
+@@ -4804,7 +4807,7 @@ static int bpf_link_get_fd_by_id(const union bpf_attr *attr)
fd = bpf_link_new_fd(link);
if (fd < 0)
@@ -106,7 +106,7 @@ index c0915e2424f1..f8ba6e0a5c08 100644
return fd;
}
-@@ -4844,7 +4847,7 @@ static int bpf_iter_create(union bpf_attr *attr)
+@@ -4881,7 +4884,7 @@ static int bpf_iter_create(union bpf_attr *attr)
return PTR_ERR(link);
err = bpf_iter_new_fd(link);
@@ -116,5 +116,5 @@ index c0915e2424f1..f8ba6e0a5c08 100644
return err;
}
--
-2.43.0
+2.44.0