From nobody Mon Feb 9 23:00:44 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:3b21:0:0:0:0:0 with SMTP id c33csp2012732jaa; Wed, 2 Feb 2022 19:14:15 -0800 (PST) X-Google-Smtp-Source: ABdhPJzAWnpCB7tfldJgMuhmPHqgDOrfTW+xEywqGD/6H8PYJbs/1zXYdPdtZNkm3HUuoxSPAn0x X-Received: by 2002:a17:90b:240a:: with SMTP id nr10mr11444740pjb.110.1643858054884; Wed, 02 Feb 2022 19:14:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643858054; cv=none; d=google.com; s=arc-20160816; b=E6zotTFpWt+tXvfWWxJeK4zXJkCCRGrLBa4bCIRWe5mibQwNmw/Ym++6wumdCW7SbR J328ONz8/Z6+l+Mw7HhxF4nxY8xlHvZ2Nm5diIFcdbLEVDBMP4v1OFrG4S1ly6iZ/461 wtfPNFU+I/h//iGEjLH7dDhE7e1qU1esc+eGJUEKjb3yfRAtPWUuc1SaQ9xfRfT+v72g dMve57+gbbpQY4sz43KZSqFLBjLAVkWvFhomMLwdz5NHDYBvRSRz19P/roHpkkV/DZbj nWFnYeiqf+j6hOb9t1DlQ78Iyh3crHUA9d8eNAoXxDC4lEI1nKamEVkdEXmbJFuC9PGr 1d5w== 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=V240/8L6Arr4PghkV25w6nOpfKXsBOXWCuSaIiHfzHQ=; b=KkOPCwYxBNmbo4WCavA8udRjCCN+I7qKfJqWkPLyoRnJFsJEzkR/Tgrs+lgZFn73TC 3nM0zs9jGfw5qlAQ1Zt/up1lAPQECpGcd593emTJUyMr3p5lL7fC/aU9rPBOSK7os7yK 2gV2lBT+XuDcW2YhkaW2lb8NUbsPoqKzovw+Q4GXazO02qGgE6VGqiAXkXd6drGfgeqV J61xdx+HQHP//9g8u4+RdEXb+imd6US1kP1raAx6T0ckJKSShHw49BzLZHZPH+4bEhN/ WUWuQwLJgU1PJ+AZd7wNUACp98VTJaDOHYGUpplBvw4CwOeu7OBTUPxb4gIk2vIXQZ9d 0f9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SZVAbfe2; spf=pass (google.com: domain of mptcp+bounces-3428-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3428-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. [147.75.69.165]) by mx.google.com with ESMTPS id b1si6395281pje.2.2022.02.02.19.14.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 02 Feb 2022 19:14:14 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3428-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=SZVAbfe2; spf=pass (google.com: domain of mptcp+bounces-3428-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3428-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 557E83E1064 for ; Thu, 3 Feb 2022 03:14:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8DA642C9D; Thu, 3 Feb 2022 03:14:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 4ECA62CA1 for ; Thu, 3 Feb 2022 03:14:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643858051; x=1675394051; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nCFbXJvRXu4v7kZJGSu1BKj2zC6DwwvUDEjIpEjsWKw=; b=SZVAbfe27DQNYOr03t5m0c37QH/xlE+9EkwGk2SV2FCnZL+l9E0RkmeI tjTgbKoQxbPzdk5RnOxkjaxQnaROuupc8UEhSY8pezJU/qGeC/91f4WdN goRRMy83wSZEJgWXU0guibtCgG001oL2D5HfCeWbhyhV32LVnuOTDRiek kIMsZZ4AAZ+6Yv5gW2Dq5U+AIhpbirev5HiARYlzV3kaxGTC8XXfFfXw4 i6bVxSMgOe9smOfQlCXCkp3KA5GGtlGeGOwmKppMmHGkh/sQWADc+IdY4 SrdD94pgxGoivL3/zPmy/hMH5wBexr5G5OCHFX05DxG1pFSOS6ppiMn79 w==; X-IronPort-AV: E=McAfee;i="6200,9189,10246"; a="235467498" X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="235467498" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 19:14:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,338,1635231600"; d="scan'208";a="631204624" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2022 19:14:09 -0800 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-next v4 03/13] mptcp: read attributes of addr entries managed by userspace PMs Date: Wed, 2 Feb 2022 22:13:53 -0500 Message-Id: <20220203031403.2996549-4-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220203031403.2996549-1-kishen.maloor@intel.com> References: <20220203031403.2996549-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 | 97 ++++++++++++++++++++++++++++-------------- net/mptcp/protocol.h | 2 +- net/mptcp/subflow.c | 2 +- 3 files changed, 67 insertions(+), 34 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index ac5d152fbb77..7058d55e3a0a 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1230,31 +1230,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; - } - } - 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); + 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; + + 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 (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; + + 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; } @@ -1488,22 +1504,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 6b7e51a2bd09..b6af57d5ff5b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -771,7 +771,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 d3691b95401a..19df5293334f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1416,7 +1416,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