All of lore.kernel.org
 help / color / mirror / Atom feed
From: Breno Leitao <leitao@debian.org>
To: sdf@google.com, axboe@kernel.dk, asml.silence@gmail.com,
	willemdebruijn.kernel@gmail.com
Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org, io-uring@vger.kernel.org,
	kuba@kernel.org, pabeni@redhat.com
Subject: [PATCH v2 7/8] io_uring/cmd: BPF hook for getsockopt cmd
Date: Tue,  8 Aug 2023 06:40:47 -0700	[thread overview]
Message-ID: <20230808134049.1407498-8-leitao@debian.org> (raw)
In-Reply-To: <20230808134049.1407498-1-leitao@debian.org>

Add BPF hooks support for getsockopts io_uring command. So, bpf cgroups
programs can run when SOCKET_URING_OP_GETSOCKOPT command is called.

This implementation follows a similar approach to what
__sys_getsockopt() does, but, using USER_SOCKPTR() for optval instead of
kernel pointer.

Signed-off-by: Breno Leitao <leitao@debian.org>
---
 io_uring/uring_cmd.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index dbba005a7290..3693e5779229 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -5,6 +5,8 @@
 #include <linux/io_uring.h>
 #include <linux/security.h>
 #include <linux/nospec.h>
+#include <linux/compat.h>
+#include <linux/bpf-cgroup.h>
 
 #include <uapi/linux/io_uring.h>
 #include <uapi/asm-generic/ioctls.h>
@@ -179,17 +181,23 @@ static inline int io_uring_cmd_getsockopt(struct socket *sock,
 	if (err)
 		return err;
 
-	if (level == SOL_SOCKET) {
+	err = -EOPNOTSUPP;
+	if (level == SOL_SOCKET)
 		err = sk_getsockopt(sock->sk, level, optname,
 				    USER_SOCKPTR(optval),
 				    KERNEL_SOCKPTR(&optlen));
-		if (err)
-			return err;
 
+	if (!in_compat_syscall())
+		err = BPF_CGROUP_RUN_PROG_GETSOCKOPT(sock->sk, level,
+						     optname,
+						     USER_SOCKPTR(optval),
+						     KERNEL_SOCKPTR(&optlen),
+						     optlen, err);
+
+	if (!err)
 		return optlen;
-	}
 
-	return -EOPNOTSUPP;
+	return err;
 }
 
 static inline int io_uring_cmd_setsockopt(struct socket *sock,
-- 
2.34.1


  parent reply	other threads:[~2023-08-08 19:17 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-08 13:40 [PATCH v2 0/8] io_uring: Initial support for {s,g}etsockopt commands Breno Leitao
2023-08-08 13:40 ` [PATCH v2 1/8] net: expose sock_use_custom_sol_socket Breno Leitao
2023-08-08 16:13   ` Hugo Villeneuve
2023-08-08 17:21     ` Breno Leitao
2023-08-08 17:46       ` Hugo Villeneuve
2023-08-09  9:39         ` Breno Leitao
2023-08-08 20:12       ` Jeff Moyer
2023-08-08 13:40 ` [PATCH v2 2/8] io_uring/cmd: Introduce SOCKET_URING_OP_GETSOCKOPT Breno Leitao
2023-08-09  4:07   ` kernel test robot
2023-08-09 10:27   ` kernel test robot
2023-08-09 13:21   ` Willem de Bruijn
2023-08-10 12:57     ` Pavel Begunkov
2023-08-08 13:40 ` [PATCH v2 3/8] io_uring/cmd: Introduce SOCKET_URING_OP_SETSOCKOPT Breno Leitao
2023-08-09  6:01   ` kernel test robot
2023-08-09 11:09   ` kernel test robot
2023-08-08 13:40 ` [PATCH v2 4/8] io_uring/cmd: Extend support beyond SOL_SOCKET Breno Leitao
2023-08-09 16:32   ` Gabriel Krisman Bertazi
2023-08-08 13:40 ` [PATCH v2 5/8] bpf: Leverage sockptr_t in BPF getsockopt hook Breno Leitao
2023-08-08 13:40 ` [PATCH v2 6/8] bpf: Leverage sockptr_t in BPF setsockopt hook Breno Leitao
2023-08-08 13:40 ` Breno Leitao [this message]
2023-08-09  4:17   ` [PATCH v2 7/8] io_uring/cmd: BPF hook for getsockopt cmd kernel test robot
2023-08-09 16:46   ` Gabriel Krisman Bertazi
2023-08-10  8:26     ` Breno Leitao
2023-08-08 13:40 ` [PATCH v2 8/8] io_uring/cmd: BPF hook for setsockopt cmd Breno Leitao
2023-08-09 22:02   ` Martin KaFai Lau
2023-08-08 17:35 ` [PATCH v2 0/8] io_uring: Initial support for {s,g}etsockopt commands Stanislav Fomichev
2023-08-09  9:40   ` Breno Leitao
2023-08-09 16:26     ` Stanislav Fomichev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230808134049.1407498-8-leitao@debian.org \
    --to=leitao@debian.org \
    --cc=asml.silence@gmail.com \
    --cc=axboe@kernel.dk \
    --cc=bpf@vger.kernel.org \
    --cc=io-uring@vger.kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=sdf@google.com \
    --cc=willemdebruijn.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.