From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 303431E5B71 for ; Tue, 21 Oct 2025 10:49:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761043764; cv=none; b=ayV1GJ+LYQrzaTeL/MLy0chJJ2qov2jFeyGDeD3Zr7rSSW6dxwqkCI4SyEfl1Q3eQmmmbFAtERbISYpCDwlu9+rnYILqZmRnd7F+e4vnpEm+12jYIEf6rVBm9lu+V5IpXWws0TFshorXYCJXbsZ3fBJuC2En+R0a/MeJpY/Pk24= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761043764; c=relaxed/simple; bh=hrF0LCmElQ4WpX5W62bYMJ+jvZnpkYWbqiea2O+smAw=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=qiiSduWKeLxwETxkDk0u2urek0CZql1fkw8zE72iEyM/f2qeoMayETkI2bd5qg5CLdUkZmynE8FVWWZvkhHhMRxNX6LWG/YnzLPDCgMDDEIimfp5ZhnxliqbTDDQnB1d77FAmimOgWDpn5C2BcYhk+TCczCL0U982KUpKgpvRDU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com; spf=pass smtp.mailfrom=cloudflare.com; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b=ChnEU0FF; arc=none smtp.client-ip=209.85.218.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=cloudflare.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cloudflare.com header.i=@cloudflare.com header.b="ChnEU0FF" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-b54f55a290cso828174766b.2 for ; Tue, 21 Oct 2025 03:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloudflare.com; s=google09082023; t=1761043761; x=1761648561; darn=vger.kernel.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=7EOHmK2OfLfwzNiHBksUI9w2NZOUojlK5wP3wAwmdUc=; b=ChnEU0FF2MBGOqWLekXisSjna5eNyAi/g7y7+pWsBzT+/GkhltvS4OgQ9nA5zuUr1U IFLooonoNDeXoajSkb3prNRHm6TwqZFYgAejnP4ksdDwixBcv8344/JvpF/FWHuU+gCw eGV22EtHpMnzAPzkWxTWaySDw4GbQQN5PETcJhsYDehrigkHuoAKxqGvsUAWHt2DhHZ3 NM1EGCJcAZAr9sqt6RAUtPKbMkm6gUQdGg0ba7nvi2KLdWlHqBQ+A0/gHSl/rgk/4OmG ic5jgPQs54mKjT2ng05T8j3L80wd+9zgOdLbY9UlGQ2E+gAvPRoz56TjsT+c7RQxRyr9 2ysw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761043761; x=1761648561; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=7EOHmK2OfLfwzNiHBksUI9w2NZOUojlK5wP3wAwmdUc=; b=h3DR7DL1Z3Xi0z7Lr2yClfFk73EsIHlzu+ecIhaXmtJ2qwVwlZa96rPUAgdJUd2fK/ R8N/ndy+a9/VxtODxNnGbpf22v4+pnd06mnC1NT7N+zfritfGKJhUvc0uc0by5D93PR0 OydK7AlAkhrtu9cRwJ8mtpu4LzDaAr/MNUeggUEN4gIZ2HqR3MXe6Z3fFoVG6P+5IPSd iS/RfksQtL5lwLGfuF+/ftxieT/Q2g3pruYqObVqeyN6e/KJqWHykBsyB/VvDhbVigJb s1HlCtnAT6rIMoOOZTLzhO4sV1RoZ3PNE8k8eSiQT0bBjEN3Sc17rc5Cl3s9OZJG24p2 Vd+Q== X-Forwarded-Encrypted: i=1; AJvYcCVxyEtaUCgAQucjG7T3snw1QqyiSe5VPzDitKvorHZRItzK6uVouFPk6h7ZegIdGAW6+SPQSSA=@vger.kernel.org X-Gm-Message-State: AOJu0Yyl2T4A/YfHYPTrRORyMSFf752EqKFfXLq9K9eKN90RAlFzI5oe Chq9tHF8NSJ4zZhIhohO9SkWU8QuD2SOAk1U/lNKae4Gq4AcCfZkF2AqMW3AmOUZESI= X-Gm-Gg: ASbGncv4azc6HRG+ufzIsNATvU3xxbn7FvRa942t6XUFACNOuOoQny9EZ1pRt5fky3e zgTBDPpDIhFcVggMrjMv2mTJlJnftEK9smQvcHwLoUA7bTQKkoRp56/BmPSnmXGni24tobcgxFh ibCJ+qKLt3nWu6nNC0p2uUDa8cqcZjM6xVxhcBxcbl5MOmYACqiWKIs9L9bDbkmWRO5qET8OhqD 9M4OOyK1l+oBoPO2GjKI83ngF8wriOlkpwt/9/Ihwaj+sYd3ejBrLxQbHpKzmVfxYnUIbXkS1Jg UUnNyrzKEPVXTq4JBRDMG1r865Px/aei9yLO+YAmIakDffzXzrkqWv727S033UB54wKdBvJNQ75 S58z8+Q0H9BWGr5QYilGDF8vZl/PB8luIRFgxntWHPyG6xu4yOZTdfX6uNhjazXwIcQ8JpUISHt 5TvZU= X-Google-Smtp-Source: AGHT+IHy8op2SrI/lJue90xZTdUE8jYPVJKT9x3Xt5nh13yYcQucOr2Oqx/NtzVh356uT2+TUQAh8g== X-Received: by 2002:a17:907:3f11:b0:b42:7c2:1f9f with SMTP id a640c23a62f3a-b6475706f53mr1757165566b.62.1761043761371; Tue, 21 Oct 2025 03:49:21 -0700 (PDT) Received: from cloudflare.com ([2a09:bac5:5063:2432::39b:d0]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b65eb036a3esm1068920266b.46.2025.10.21.03.49.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Oct 2025 03:49:20 -0700 (PDT) From: Jakub Sitnicki To: Jiayuan Chen Cc: mptcp@lists.linux.dev, netdev@vger.kernel.org, bpf@vger.kernel.org, Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , John Fastabend , "David S. Miller" , Jakub Kicinski , Simon Horman , Matthieu Baerts , Mat Martineau , Geliang Tang , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , Florian Westphal , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH net v2 2/3] bpf,sockmap: disallow MPTCP sockets from sockmap updates In-Reply-To: <20251020060503.325369-3-jiayuan.chen@linux.dev> (Jiayuan Chen's message of "Mon, 20 Oct 2025 14:04:47 +0800") References: <20251020060503.325369-1-jiayuan.chen@linux.dev> <20251020060503.325369-3-jiayuan.chen@linux.dev> Date: Tue, 21 Oct 2025 12:49:19 +0200 Message-ID: <87cy6gwmvk.fsf@cloudflare.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Mon, Oct 20, 2025 at 02:04 PM +08, Jiayuan Chen wrote: > MPTCP creates subflows for data transmission, and these sockets should not > be added to sockmap because MPTCP sets specialized data_ready handlers > that would be overridden by sockmap. > > Additionally, for the parent socket of MPTCP subflows (plain TCP socket), > MPTCP sk requires specific protocol handling that conflicts with sockmap's > operation(mptcp_prot). > > This patch adds proper checks to reject MPTCP subflows and their parent > sockets from being added to sockmap, while preserving compatibility with > reuseport functionality for listening MPTCP sockets. > > Fixes: 0b4f33def7bb ("mptcp: fix tcp fallback crash") > Signed-off-by: Jiayuan Chen > --- > net/core/sock_map.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/net/core/sock_map.c b/net/core/sock_map.c > index 5947b38e4f8b..da21deb970b3 100644 > --- a/net/core/sock_map.c > +++ b/net/core/sock_map.c > @@ -535,6 +535,15 @@ static bool sock_map_redirect_allowed(const struct sock *sk) > > static bool sock_map_sk_is_suitable(const struct sock *sk) > { > + if ((sk_is_tcp(sk) && sk_is_mptcp(sk)) /* subflow */ || > + (sk->sk_protocol == IPPROTO_MPTCP && sk->sk_state != TCP_LISTEN)) { > + /* Disallow MPTCP subflows and their parent socket. > + * However, a TCP_LISTEN MPTCP socket is permitted because > + * sockmap can also serve for reuseport socket selection. > + */ > + pr_err_once("sockmap: MPTCP sockets are not supported\n"); > + return false; > + } > return !!sk->sk_prot->psock_update_sk_prot; > } You're checking sk_state without sk_lock held. That doesn't seem right. Take a look how we always call sock_map_sk_state_allowed() after grabbing the lock. Same might apply to sk_is_mptcp(). Please double check.