From nobody Thu Apr 25 21:14:22 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:b119:0:0:0:0:0 with SMTP id r25csp1107851jah; Wed, 12 Jan 2022 14:16:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJynT8en4wtyZV8A9u4QDKvuPDlT3nLgBKK+fM0wUoDcZ1PcDX+FcwzQeC+1+32i0x1Ypyzz X-Received: by 2002:a17:90a:5b04:: with SMTP id o4mr1956934pji.20.1642025783873; Wed, 12 Jan 2022 14:16:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642025783; cv=none; d=google.com; s=arc-20160816; b=UOKD2TvUUiQvpI1Jea2h9KwR6B4sC3uN1RLMnhpZHjBg+hQmRCzQE60OIBiJktzxPs 5W2t7NBBFN6QE34BLRE44iUrMSWTlLo7VEKlYq12KTeplqhL/17rByi7C6MzoG9wA16d e9f+xfFtsFiuxBYmT/cmYURKy6RUWy7qSXyF3LuYv8Sg3tN58/EpfasDwEKZ3E4/7imO ma13erUY7RVb2VC3KLQwdSJyxXDiE/vV3qpz/GggScrFtJstSoorwhEqcO+grqVpx4VL vg6iZGxav8Tk9u7V67wRAG7ZM74TNa187OF4SepW6/e5H8hOpQqhx3n1LWRh59ThM8ug TnPA== 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=+F/uDcYCwP8ScYvfcAQxgZzhECYnOJvlkEiYSLtsYR0=; b=wq7R3RpHPb4Dh2i2qM4RtUYzBmTYrFyZl3VaflXExvpYDZRVg3jZI4w9PssWryU2jF J+krEB6h0lb+HVQnPQOh9NdOcowsHatAeNm+MBwurtExO1+PqA5GrINW1HhGVjArr8ZC mTnnG4ktYkDig0PHLHtpilNmGg2d8t8yfheKAsh+hJMy0yZvzWiNvM3sYL5yHkILrysV 8VkTahN7ftZgDQ0Em5WOwpN7jC0Ha3dGnGvJP9mRAz0Vlp4rq010hJai8Erf0/vnPHuw yuojEf/Eeu2JkWR6vKPKmbz3wrCb/NKO27ujjC45lWvwYiSm0ZhntPJzDQOuvB3IvsoL 8JEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TDWRvqd4; spf=pass (google.com: domain of mptcp+bounces-3084-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3084-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id t21si917084plo.38.2022.01.12.14.16.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Jan 2022 14:16:23 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3084-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TDWRvqd4; spf=pass (google.com: domain of mptcp+bounces-3084-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3084-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 sjc.edge.kernel.org (Postfix) with ESMTPS id A102E3E1008 for ; Wed, 12 Jan 2022 22:16:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B82C72C9C; Wed, 12 Jan 2022 22:16:15 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 B02E42CA3 for ; Wed, 12 Jan 2022 22:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642025774; x=1673561774; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Os1olhoABT+f4KyuwprcHhMuPQjSCE5mLtE/+Pl2+1A=; b=TDWRvqd43x7D4kg3nqpir70LfJslOdkO4ImvLPmjzUYgnpghz10+Gcge mWHmcy9uAHMZJTRA1I+d6l6bwksbR456iKpNJb6ANm/JVSPxhuAYG56Xi THy6IAZVTAFqKAk0qQ8pj0Th0MIIXXdWDxJZp2b4okUCf/SuFg0XN0ghD lv/UCdnp0GUbZwKYd0z1CfE3HEsaJYTKYqlOrW+4icdukM1CqAw40Zlvi XJkJapZZYT7kcLAb+7V1hRiESR7B401w9PUXRDCEJErasoZ/A+pOIOsOF 0RVhidWhMaAObo01QccWIOgyNZw9ZkjVdAUxH1PsPOCf/gDLsZB2IzKfY Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10225"; a="307213940" X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="307213940" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:07 -0800 X-IronPort-AV: E=Sophos;i="5.88,284,1635231600"; d="scan'208";a="490907361" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2022 14:16:07 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 11/21] mptcp: read attributes of addr entries managed by userspace PMs Date: Wed, 12 Jan 2022 17:15:13 -0500 Message-Id: <20220112221523.1829397-12-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220112221523.1829397-1-kishen.maloor@intel.com> References: <20220112221523.1829397-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 | 101 ++++++++++++++++++++++++++++------------- net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 2 +- 3 files changed, 71 insertions(+), 34 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 052a803a7f71..40c41a0498fc 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1175,6 +1175,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct sock_common *skc) struct mptcp_addr_info msk_local; struct pm_nl_pernet *pernet; int ret =3D -1; + int pm_type; =20 if (WARN_ON_ONCE(!msk)) return -1; @@ -1192,31 +1193,50 @@ 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; - } - } - 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 0; - entry->lsk_ref =3D NULL; - ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); - if (ret < 0) - kfree(entry); + + pm_type =3D READ_ONCE(msk->pm.pm_type); + + if (pm_type =3D=3D MPTCP_PM_TYPE_KERNEL) { + 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; + + 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 0; + entry->lsk_ref =3D NULL; + ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); + if (ret < 0) + kfree(entry); + } else if (pm_type =3D=3D MPTCP_PM_TYPE_USERSPACE) { + 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; + + 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); + } =20 return ret; } @@ -1461,22 +1481,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 (READ_ONCE(msk->pm.pm_type) =3D=3D MPTCP_PM_TYPE_KERNEL) { + 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 63b4ea850d07..c6f7c22d0e11 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -772,7 +772,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(struct mptcp_sock *msk, 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 b75b7b186d34..29e51986c985 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1419,7 +1419,7 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, local_id =3D err; } =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