Skip to content

Commit 6894e3b

Browse files
Geliang Tangintel-lab-lkp
authored andcommitted
mptcp: pm: initialize and release mptcp_pm_ops
Add a struct mptcp_pm_ops pointer "ops" in struct mptcp_pm_data, and two functions mptcp_pm_initialize() and mptcp_pm_release(), to set and release this pointer. mptcp_pm_initialize() is invoked in mptcp_pm_data_reset(), while mptcp_pm_release() is invoked in mptcp_destroy_common(). Signed-off-by: Geliang Tang <[email protected]>
1 parent ac7941e commit 6894e3b

File tree

3 files changed

+42
-0
lines changed

3 files changed

+42
-0
lines changed

net/mptcp/pm.c

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -603,8 +603,10 @@ bool mptcp_pm_addr_families_match(const struct sock *sk,
603603

604604
void mptcp_pm_data_reset(struct mptcp_sock *msk)
605605
{
606+
const char *path_manager = mptcp_get_path_manager(sock_net((struct sock *)msk));
606607
u8 pm_type = mptcp_get_pm_type(sock_net((struct sock *)msk));
607608
struct mptcp_pm_data *pm = &msk->pm;
609+
int ret;
608610

609611
pm->add_addr_signaled = 0;
610612
pm->add_addr_accepted = 0;
@@ -614,6 +616,12 @@ void mptcp_pm_data_reset(struct mptcp_sock *msk)
614616
pm->rm_list_rx.nr = 0;
615617
WRITE_ONCE(pm->pm_type, pm_type);
616618

619+
rcu_read_lock();
620+
ret = mptcp_pm_initialize(msk, mptcp_pm_find(path_manager));
621+
rcu_read_unlock();
622+
if (ret)
623+
return;
624+
617625
if (pm_type == MPTCP_PM_TYPE_KERNEL) {
618626
bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk);
619627

@@ -706,3 +714,33 @@ void mptcp_pm_unregister(struct mptcp_pm_ops *pm)
706714
list_del_rcu(&pm->list);
707715
spin_unlock(&mptcp_pm_list_lock);
708716
}
717+
718+
int mptcp_pm_initialize(struct mptcp_sock *msk, struct mptcp_pm_ops *pm)
719+
{
720+
if (!pm)
721+
pm = &mptcp_in_kernel_pm;
722+
723+
if (!bpf_try_module_get(pm, pm->owner))
724+
return -EBUSY;
725+
726+
msk->pm.ops = pm;
727+
if (msk->pm.ops->init)
728+
msk->pm.ops->init(msk);
729+
730+
pr_debug("pm %s initialized\n", pm->name);
731+
return 0;
732+
}
733+
734+
void mptcp_pm_release(struct mptcp_sock *msk)
735+
{
736+
struct mptcp_pm_ops *pm = msk->pm.ops;
737+
738+
if (!pm)
739+
return;
740+
741+
msk->pm.ops = NULL;
742+
if (pm->release)
743+
pm->release(msk);
744+
745+
bpf_module_put(pm, pm->owner);
746+
}

net/mptcp/protocol.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3307,6 +3307,7 @@ void mptcp_destroy_common(struct mptcp_sock *msk, unsigned int flags)
33073307
mptcp_token_destroy(msk);
33083308
mptcp_pm_free_anno_list(msk);
33093309
mptcp_free_local_addr_list(msk);
3310+
mptcp_pm_release(msk);
33103311
}
33113312

33123313
static void mptcp_destroy(struct sock *sk)

net/mptcp/protocol.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@ struct mptcp_pm_data {
220220
struct mptcp_addr_info remote;
221221
struct list_head anno_list;
222222
struct list_head userspace_pm_local_addr_list;
223+
struct mptcp_pm_ops *ops;
223224

224225
spinlock_t lock; /*protects the whole PM data */
225226

@@ -1054,6 +1055,8 @@ struct mptcp_pm_ops *mptcp_pm_find(const char *name);
10541055
int mptcp_pm_validate(struct mptcp_pm_ops *pm);
10551056
int mptcp_pm_register(struct mptcp_pm_ops *pm);
10561057
void mptcp_pm_unregister(struct mptcp_pm_ops *pm);
1058+
int mptcp_pm_initialize(struct mptcp_sock *msk, struct mptcp_pm_ops *pm);
1059+
void mptcp_pm_release(struct mptcp_sock *msk);
10571060

10581061
void mptcp_free_local_addr_list(struct mptcp_sock *msk);
10591062

0 commit comments

Comments
 (0)