From nobody Mon Feb 9 08:29:23 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a50:bae3:0:0:0:0:0 with SMTP id x90csp411289ede; Wed, 16 Mar 2022 12:08:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwap04UNs9ua+NEh/bhhawQgAWim8WNCBBStFbU1mSTAlkPA+HlcrULCz7D+aG8twlpeLm1 X-Received: by 2002:a05:6512:32c2:b0:448:95f0:6062 with SMTP id f2-20020a05651232c200b0044895f06062mr683507lfg.204.1647457706954; Wed, 16 Mar 2022 12:08:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647457706; cv=none; d=google.com; s=arc-20160816; b=dS9tWNclztlh9JFiHSgR8zQAzg6cnkvFVlWT3HvIMj3FcK5pqh4o+pO2cv700sf1lf gyA4FU4iEdpjquzEYiPUVCIGWrAjs8IwCiHJszbhq7YErTHWLRHRBk8QxnwAw2HE/BuN 5uzcvDoOK+z4F8BM7r3oN0Kty6C8hxP05g+iGU44nh1MjNLt+mAvns/l8+4n2Jk4IVtz LpNUBulS3RDTN2TddTyLCvAFzEM/nhKyAMgOMskV5Cu4jbhBQU5u7JkHmLGne3aMWXL6 URAAm45YJtjlojCxFG8lUH5UVr6/OrVSY4iELcE5TTz5hFzuEj7PP0Zl72P4ihMP4F4+ JSWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=dSsUvrUY0A2BPSL0GCynK0DmW/C1kECi8PjialSO5FE=; b=gWsn7O9tj4b+4q3CVoG8rpUGsE1lWoVqCW/+m7GldmW/b6FA0ug3ZTXQolcNsf9Wvx zGa2sV5OuNU3WVc7zYDEvXWFI7dil2VzmxifwByZXgH/grUr/y2qmOKq0Ohwu3S3kPYj nQ1dXwQhS2xGTBYbnbMGWxL1j1HKCW8j5xfMOklZiibBwZvTNeWZG2rOxL5eTfONbh8/ eGa60O3pjsXVhCGBeY43WR5t0qlJXwm88Etp3cj0Z2Y6/2S85aN4fkt4dW1Z46NuYpcd y/7IL0yEEOkv9S+CmcpW9ILvT0mZ+SJ0Yq+ZLa7NRMT6etIzJiOoGGwS9CPsWe/JMVOD FC3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ECGKUVcb; spf=pass (google.com: domain of mptcp+bounces-4246-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4246-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id k42-20020a0565123daa00b004486c05dd93si3006808lfv.347.2022.03.16.12.08.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2022 12:08:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4246-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ECGKUVcb; spf=pass (google.com: domain of mptcp+bounces-4246-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4246-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 6EEBD1C0F11 for ; Wed, 16 Mar 2022 19:08:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CF48C38F5; Wed, 16 Mar 2022 19:08:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C6E053B3B for ; Wed, 16 Mar 2022 19:08:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1647457701; x=1678993701; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=tC8JkpfYi0kkl5wM0uvDEhTO+mgvGHdJCJDa/cUtsUg=; b=ECGKUVcbilH1g2rOPCgUtwnw9mPyKcIWpU0CcJj4NiRey7DGsPaf2Na5 n/MKxYDT5GIhA6pBot0KuBlwvMQdMfPDlaThbKoNzNSnk2mBnNcKePhvx MrcCSeC/QAX9Ah18vZ3fCbZT52xQXWIouFSLDdV68Zt/3snMx+hZ6pObx XSBVfQf/8xkCb6g+vLZS0vdalfmGyJpG5l6o7oGdrlnRzkZo2iwZLPCKD kHrBWsK9ZebN+YhuyXUFjFrKS9fy3ZOzb59NYom6oZO8vrd2OWJxSsckF 9wWe98QVY8xQfIVqZXqMldKVr8LEOXdltqb1iCwhzk9J3SyrBvb4U+/n3 Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10288"; a="256880339" X-IronPort-AV: E=Sophos;i="5.90,187,1643702400"; d="scan'208";a="256880339" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 12:08:19 -0700 X-IronPort-AV: E=Sophos;i="5.90,187,1643702400"; d="scan'208";a="557595359" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Mar 2022 12:08:18 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next 03/14] mptcp: read attributes of addr entries managed by userspace PMs Date: Wed, 16 Mar 2022 15:08:02 -0400 Message-Id: <20220316190813.634423-4-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220316190813.634423-1-kishen.maloor@intel.com> References: <20220316190813.634423-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change introduces a parallel path in the kernel for retrieving the local id, flags, if_index for an addr entry in the context of an MPTCP connection that's being managed by a userspace PM. The userspace and in-kernel PM modes deviate in their procedures for obtaining this information. Signed-off-by: Kishen Maloor --- net/mptcp/pm_netlink.c | 95 ++++++++++++++++++++++++++++-------------- net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 2 +- 3 files changed, 67 insertions(+), 33 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index c994a2ef3ed3..703f5a591955 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1109,31 +1109,47 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk= , struct sock_common *skc) =20 pernet =3D net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); =20 - rcu_read_lock(); - list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { - if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) { - ret =3D entry->addr.id; - break; + if (mptcp_pm_is_kernel(msk)) { + rcu_read_lock(); + list_for_each_entry_rcu(entry, &pernet->local_addr_list, list) { + if (addresses_equal(&entry->addr, &skc_local, entry->addr.port)) { + ret =3D entry->addr.id; + break; + } } + rcu_read_unlock(); + if (ret >=3D 0) + return ret; + + /* address not found, add to local list */ + entry =3D kmalloc(sizeof(*entry), GFP_ATOMIC); + if (!entry) + return -ENOMEM; + + entry->addr =3D skc_local; + entry->addr.id =3D 0; + entry->addr.port =3D 0; + entry->ifindex =3D 0; + entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; + entry->lsk =3D NULL; + ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); + if (ret < 0) + kfree(entry); + } else if (mptcp_pm_is_userspace(msk)) { + struct mptcp_pm_addr_entry new_entry; + __be16 msk_sport =3D ((struct inet_sock *) + inet_sk((struct sock *)msk))->inet_sport; + + memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); + new_entry.addr =3D skc_local; + new_entry.addr.id =3D 0; + new_entry.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; + + if (new_entry.addr.port =3D=3D msk_sport) + new_entry.addr.port =3D 0; + + ret =3D mptcp_userspace_pm_append_new_local_addr(msk, &new_entry); } - rcu_read_unlock(); - if (ret >=3D 0) - return ret; - - /* address not found, add to local list */ - entry =3D kmalloc(sizeof(*entry), GFP_ATOMIC); - if (!entry) - return -ENOMEM; - - entry->addr =3D skc_local; - entry->addr.id =3D 0; - entry->addr.port =3D 0; - entry->ifindex =3D 0; - entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; - entry->lsk =3D NULL; - ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); - if (ret < 0) - kfree(entry); =20 return ret; } @@ -1371,22 +1387,39 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *sk= b, struct genl_info *info) return 0; } =20 -int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, +int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned = int id, u8 *flags, int *ifindex) { - struct mptcp_pm_addr_entry *entry; + struct mptcp_pm_addr_entry *entry, *match =3D NULL; + struct sock *sk =3D (struct sock *)msk; + struct net *net =3D sock_net(sk); =20 *flags =3D 0; *ifindex =3D 0; =20 if (id) { - rcu_read_lock(); - entry =3D __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id); - if (entry) { - *flags =3D entry->flags; - *ifindex =3D entry->ifindex; + if (mptcp_pm_is_kernel(msk)) { + rcu_read_lock(); + entry =3D __lookup_addr_by_id(net_generic(net, pm_nl_pernet_id), id); + if (entry) { + *flags =3D entry->flags; + *ifindex =3D entry->ifindex; + } + rcu_read_unlock(); + } else { + mptcp_data_lock(sk); + list_for_each_entry(entry, &msk->local_addr_list, list) { + if (id =3D=3D entry->addr.id) { + match =3D entry; + break; + } + } + mptcp_data_unlock(sk); + if (match) { + *flags =3D match->flags; + *ifindex =3D match->ifindex; + } } - rcu_read_unlock(); } =20 return 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 2d18d2e7ee0e..870627304462 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -770,7 +770,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, const struct mptcp_addr_info *addr); -int mptcp_pm_get_flags_and_ifindex_by_id(struct net *net, unsigned int id, +int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, + unsigned int id, u8 *flags, int *ifindex); =20 int mptcp_pm_announce_addr(struct mptcp_sock *msk, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 59657b7e4788..ff12893e03ab 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1455,7 +1455,7 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, if (local_id) subflow_set_local_id(subflow, local_id); =20 - mptcp_pm_get_flags_and_ifindex_by_id(sock_net(sk), local_id, + mptcp_pm_get_flags_and_ifindex_by_id(msk, local_id, &flags, &ifindex); subflow->remote_key =3D msk->remote_key; subflow->local_key =3D msk->local_key; --=20 2.31.1