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 5C417393DFD for ; Mon, 20 Apr 2026 10:07:38 +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=1776679658; cv=none; b=GkjsGBPvpruBA4eqFacPT7yz6Ti3Loy4HM2Q2FqAeP+qw6c1sknvxexBfpILd+Nvgfwzy9nsT+2wOWAz7wA4a1nnz07GRUCmLkzfylgw+UdujPgh8E94ynSXiKkcXUuW27U9oJgQ7gc66PuXaXDssDzBbCbHS3cFPgmOz3VDuZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776679658; c=relaxed/simple; bh=sfJLUkuZkzPQ2f6Ut8VdERvlNYrXTpqTIEcjeV5JHcw=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=P63K5Oa9KpAL6hPrM4/QRzdg4Ssz0Yyxz47LOhhsBRnvMkuClfcCAdLtAgl18B+YOI5fD0/UPhW6Rb1evnngUqBDotxK3ei1NA2Bd7sFB3EOSKCAjAoYP+bZHnM8Pmx9iW8FP4id5A1pqykqdDhD6QXfsn70mn4NBArgT8Z1v5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O5zMEY6g; 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="O5zMEY6g" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43F99C2BCB3; Mon, 20 Apr 2026 10:07:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776679658; bh=sfJLUkuZkzPQ2f6Ut8VdERvlNYrXTpqTIEcjeV5JHcw=; h=Date:Subject:From:To:Cc:References:In-Reply-To:From; b=O5zMEY6giwHDLNwe8GJkTu9B491RbZnAGIom8cdU1zsqGz9FmsmpHYsrNpqEcqdRJ BQYNT6xV72e8qsFjOQ4DpOcJmsYn5fuNwyOxPdkQnolRCfWqHIXBA50HIINsE92nD/ CSdbZf4Bpq+6kyYK6ONSou3kwqEH8nZRZR5cdcN1u7N2L3PZ96ebF/rUmPD9sVaBbv USBLbZjn9CeecJe7wtFVH6MEMyGARtWKZVhEUT3lAZL2dF4JbTnup5GbIQecUiX6Wk I9P58SKqkW0klXx4bXkhfnmJ9NXbf+pua436YRzTfi5/Vq4y0ElcajalYQqCramrOG WZoeFK//eE1LQ== Message-ID: <84c5be94-2791-4065-a096-b9b87ba24202@kernel.org> Date: Mon, 20 Apr 2026 12:07:34 +0200 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta Subject: Re: [PATCH mptcp-net] mptcp: sockopt: set timestamp flags on subflow socket, not msk Content-Language: fr From: Matthieu Baerts To: Gang Yan , mptcp@lists.linux.dev Cc: Gang Yan References: <20260420093343.16443-1-gang.yan@linux.dev> <0709c747-463f-4f5f-995b-156764f35da3@kernel.org> Autocrypt: addr=matttbe@kernel.org; keydata= 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 lzVbFe7fduHbABmYz9cefQpO7wDE/Q== Organization: NGI0 Core In-Reply-To: <0709c747-463f-4f5f-995b-156764f35da3@kernel.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 20/04/2026 11:46, Matthieu Baerts wrote: > Hi Gang, > > On 20/04/2026 11:33, Gang Yan wrote: >> From: Gang Yan >> >> Both mptcp_setsockopt_sol_socket_tstamp() and >> mptcp_setsockopt_sol_socket_timestamping() iterate over subflows, >> acquire the subflow socket lock, but then erroneously pass the MPTCP >> msk socket to sock_set_timestamp() / sock_set_timestamping() instead >> of the subflow ssk. As a result, the timestamp flags are set on the >> wrong socket and have no effect on the actual subflows. >> >> Pass ssk instead of sk to both helpers. > > Good catch! How did you find the issue? It would be good to add a test > for that, but not sure how. > >> Fixes: 3f4f958c3a3c ("mptcp: sockopt: propagate timestamp request to subflows") > > It looks like this commit doesn't exist in the 'export' or 'export-net' > branches. I guess you meant to use 9061f24bf82e instead? > > When you do a git blame, do not use branches from the TopGit tree. Use > 'net', 'net-next', or the 'export' ones. > >> Fixes: 6c9a0a0f2333 ("mptcp: setsockopt: convert to mptcp_setsockopt_sol_socket_timestamping()") It looks like only the previous one is enough. This second commit moves code around, but it already contained the issue fixed here. Cheers, Matt -- Sponsored by the NGI0 Core fund.