Commit bd92dd8e authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: factor-out cgroup data inherit helper 



MPTCP will soon need the same functionality for passive sockets,
factor them out in a common helper. No functional change intended.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Reviewed-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-2-1f34b6c1e0b1@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 075b19c2

net/mptcp/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -707,6 +707,8 @@ mptcp_subflow_delegated_next(struct mptcp_delegated_action *delegated) 
	return ret;

}



void __mptcp_inherit_cgrp_data(struct sock *sk, struct sock *ssk);



int mptcp_is_enabled(const struct net *net);

unsigned int mptcp_get_add_addr_timeout(const struct net *net);

int mptcp_is_checksum_enabled(const struct net *net);

net/mptcp/subflow.c

+12 −8
Original line number Diff line number Diff line
@@ -1712,21 +1712,25 @@ int __mptcp_subflow_connect(struct sock *sk, const struct mptcp_pm_local *local, 
	return err;

}



static void mptcp_attach_cgroup(struct sock *parent, struct sock *child)

void __mptcp_inherit_cgrp_data(struct sock *sk, struct sock *ssk)

{

#ifdef CONFIG_SOCK_CGROUP_DATA

	struct sock_cgroup_data *parent_skcd = &parent->sk_cgrp_data,

				*child_skcd = &child->sk_cgrp_data;

	struct sock_cgroup_data *sk_cd = &sk->sk_cgrp_data,

				*ssk_cd = &ssk->sk_cgrp_data;



	/* only the additional subflows created by kworkers have to be modified */

	if (cgroup_id(sock_cgroup_ptr(parent_skcd)) !=

	    cgroup_id(sock_cgroup_ptr(child_skcd))) {

		cgroup_sk_free(child_skcd);

		*child_skcd = *parent_skcd;

		cgroup_sk_clone(child_skcd);

	if (cgroup_id(sock_cgroup_ptr(sk_cd)) !=

	    cgroup_id(sock_cgroup_ptr(ssk_cd))) {

		cgroup_sk_free(ssk_cd);

		*ssk_cd = *sk_cd;

		cgroup_sk_clone(sk_cd);

	}

#endif /* CONFIG_SOCK_CGROUP_DATA */

}



static void mptcp_attach_cgroup(struct sock *parent, struct sock *child)

{

	__mptcp_inherit_cgrp_data(parent, child);

	if (mem_cgroup_sockets_enabled)

		mem_cgroup_sk_inherit(parent, child);

}