Commit 9b68f30b authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by Daniel Borkmann
Browse files

net: Use umd_cleanup_helper() 



bpfilter_umh_cleanup() is the same function as umd_cleanup_helper().
Drop the redundant function.

Signed-off-by: default avatarJarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20230526112104.1044686-1-jarkko@kernel.org
parent ffadc372

include/linux/bpfilter.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,6 @@ int bpfilter_ip_set_sockopt(struct sock *sk, int optname, sockptr_t optval, 
			    unsigned int optlen);

			    unsigned int optlen);

int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,

int bpfilter_ip_get_sockopt(struct sock *sk, int optname, char __user *optval,

			    int __user *optlen);

			    int __user *optlen);

void bpfilter_umh_cleanup(struct umd_info *info);





struct bpfilter_umh_ops {

struct bpfilter_umh_ops {

	struct umd_info info;

	struct umd_info info;

net/bpfilter/bpfilter_kern.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ static void shutdown_umh(void) 
	if (tgid) {

	if (tgid) {

		kill_pid(tgid, SIGKILL, 1);

		kill_pid(tgid, SIGKILL, 1);

		wait_event(tgid->wait_pidfd, thread_group_exited(tgid));

		wait_event(tgid->wait_pidfd, thread_group_exited(tgid));

		bpfilter_umh_cleanup(info);

		umd_cleanup_helper(info);

	}

	}

}

}

net/ipv4/bpfilter/sockopt.c

+1 −10
Original line number Original line Diff line number Diff line
@@ -12,15 +12,6 @@ 
struct bpfilter_umh_ops bpfilter_ops;

struct bpfilter_umh_ops bpfilter_ops;

EXPORT_SYMBOL_GPL(bpfilter_ops);

EXPORT_SYMBOL_GPL(bpfilter_ops);





void bpfilter_umh_cleanup(struct umd_info *info)

{

	fput(info->pipe_to_umh);

	fput(info->pipe_from_umh);

	put_pid(info->tgid);

	info->tgid = NULL;

}

EXPORT_SYMBOL_GPL(bpfilter_umh_cleanup);



static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval,

static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval,

				 unsigned int optlen, bool is_set)

				 unsigned int optlen, bool is_set)

{

{
@@ -38,7 +29,7 @@ static int bpfilter_mbox_request(struct sock *sk, int optname, sockptr_t optval, 
	}

	}

	if (bpfilter_ops.info.tgid &&

	if (bpfilter_ops.info.tgid &&

	    thread_group_exited(bpfilter_ops.info.tgid))

	    thread_group_exited(bpfilter_ops.info.tgid))

		bpfilter_umh_cleanup(&bpfilter_ops.info);

		umd_cleanup_helper(&bpfilter_ops.info);





	if (!bpfilter_ops.info.tgid) {

	if (!bpfilter_ops.info.tgid) {

		err = bpfilter_ops.start();

		err = bpfilter_ops.start();