From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CCC496F073 for ; Wed, 11 Dec 2024 03:42:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733888531; cv=none; b=nSlI1/lZcgmn5G9Spyma2jXrbyi5X3jN3RyuRwK72LJLInOkl6EJIClMKu9BHkoWq1zhdAc3GKRMAdyMLS1fpAzqotiCzMj4i9rZhKlKLWna6UGt3d+Br10/qNobowdfkWCZvFNsUdi3ctv+YCy0NCmut+ANMYvSp0rOHXpiPyE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733888531; c=relaxed/simple; bh=KNxWCfC3OU5+8y4zkoFF3ZXe2aYNzuXhcsHV1lUDNNE=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=pUbNYIa/u6cZZj2w6sD4T8nKidciYRaL+6ud8PkFzzNeXxXW5JB9eNAg1TVEZ3NAAuK8GlyY5NZ9MQN6YpIzvacgdqn6Cw88hNIDk57+fwGBAJmVxO/OnsBVDnouDPQImcZIOZgRrRBRmJWJkgWzZmgnUDNOW4zXk2hAKcL7sls= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HEuiwLDh; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HEuiwLDh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 422B8C4CED2; Wed, 11 Dec 2024 03:42:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733888531; bh=KNxWCfC3OU5+8y4zkoFF3ZXe2aYNzuXhcsHV1lUDNNE=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=HEuiwLDhdAAY7tUn1bKRmojGThAYduO4s/OBIMFLxic8vDs9PHc3NZMysyivAUdip NLq/nTkgKIZO851C7Fab/DGrsZx1XZ9R0UCRzhAbwXcRZCu4uqW2wgQ870M36dASUt /v/7Ds8Z7pg9Es5huCWLiSVFHlQ89iQNBonBsX2Ud4eynAjRQ5t/SouBqRww8NONr2 dA728UMV2Jn63giu5Ve3uR5ESHfyzXcUWWiIXejVs2gKt1dJYEtkMaRvZY1HtB2+Gj QgB7/3/3gfEfX9TmWg9XwdqVxzpDk0pX+x3vji/urAOcCEH1ULsIJ288XFkVl4IMQZ Fwf5PIHuqhtYg== Message-ID: <271ce327066dd6efe2e3ff793734a23279f26ca4.camel@kernel.org> Subject: Re: [PATCH mptcp-next v4 4/5] Squash to "bpf: Add mptcp_subflow bpf_iter" From: Geliang Tang To: Matthieu Baerts , mptcp@lists.linux.dev Cc: Geliang Tang Date: Wed, 11 Dec 2024 11:42:06 +0800 In-Reply-To: <0bf1ea97-64d2-4e0a-b4e7-9627a7d8aa0a@kernel.org> References: <0bf1ea97-64d2-4e0a-b4e7-9627a7d8aa0a@kernel.org> Autocrypt: addr=geliang@kernel.org; prefer-encrypt=mutual; keydata=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 Px+2P2cKc7LXXedb/qQ3M Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.54.0-1 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Hi Matt, On Tue, 2024-12-10 at 12:48 +0100, Matthieu Baerts wrote: > Hi Geliang, > > On 09/12/2024 09:47, Geliang Tang wrote: > > From: Geliang Tang > > > > Add "sizeof" and "alignof" checks. > > > > Address Martin's comments in v1: > > > > - bpf_iter_mptcp_subflow_new returns -EINVAL when msk socket lock > > isn't > >   held. > > > > Signed-off-by: Geliang Tang > > --- > >  net/mptcp/bpf.c | 10 +++++++++- > >  1 file changed, 9 insertions(+), 1 deletion(-) > > > > diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c > > index f9ba0a46a9f1..0563d3c6d9d3 100644 > > --- a/net/mptcp/bpf.c > > +++ b/net/mptcp/bpf.c > > @@ -232,12 +232,20 @@ bpf_iter_mptcp_subflow_new(struct > > bpf_iter_mptcp_subflow *it, > >      struct mptcp_sock *msk) > >  { > >   struct bpf_iter_mptcp_subflow_kern *kit = (void *)it; > > + struct sock *sk = (struct sock *)msk; > > + > > + BUILD_BUG_ON(sizeof(struct bpf_iter_mptcp_subflow_kern) > > > +      sizeof(struct bpf_iter_mptcp_subflow)); > > + BUILD_BUG_ON(__alignof__(struct > > bpf_iter_mptcp_subflow_kern) != > > +      __alignof__(struct bpf_iter_mptcp_subflow)); > >   > >   kit->msk = msk; > >   if (!msk) > >   return -EINVAL; > >   > > - msk_owned_by_me(msk); > > + if (!sock_owned_by_user_nocheck(sk) && > > +     !spin_is_locked(&sk->sk_lock.slock)) > > + return -EINVAL; > > Just to be sure, did you check it was always the case with the WIP > scheduler and path-manager BPF programs you have? Yes, I checked, BPF packet scheduler and BPF path manager are working fine. Thanks for your other suggestions on this set, I have updated to the new version v5. -Geliang > > We don't want to be too restrictive. (Or we need different helpers) > > Cheers, > Matt