From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 1CB531FBA for ; Tue, 10 May 2022 00:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1652141495; x=1683677495; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=JRWDYvtZUGpVSDg/cdmZXf0a9yWmQlMjBZ2gVp/jLDo=; b=H/A2ZSx/ECREUeH0ONuD0V39DOi2putb8/2+/h8bcmtEp3RwI4lZAMS+ JnlfVRJ4d+fhTlkAoQmkMg4007n6gtbpYNpB9vV/BgVfNKK9uYtjJ3ySc /hlrShH1Lh8BcAIEPSGYY/QXcvih+QrffMLj3DOlq3JBpB3HL/KxguHv2 flStLsnnS18g3MQY0wmho7436hNyVNSz79E8EW4FBpcrB8BqhlNc5H7OX fSKYB5UDHm6saq82C/6RIF0Zt6Re0Yuvt/ZVg2x4VcKvvy93yVTqupd9H sOoiJAGECgVJrkKQylkg2EkFMbXY6j6i4mg2eDdWNe2Sx1F7HgdbFNTCO w==; X-IronPort-AV: E=McAfee;i="6400,9594,10342"; a="294434610" X-IronPort-AV: E=Sophos;i="5.91,212,1647327600"; d="scan'208";a="294434610" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 17:11:34 -0700 X-IronPort-AV: E=Sophos;i="5.91,212,1647327600"; d="scan'208";a="738427098" Received: from vde-mobl3.amr.corp.intel.com ([10.212.252.83]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 May 2022 17:11:34 -0700 Date: Mon, 9 May 2022 17:11:27 -0700 (PDT) From: Mat Martineau To: Matthieu Baerts cc: mptcp@lists.linux.dev Subject: Re: [PATCH mptcp-next] Revert "mptcp: add data lock for sk timers" In-Reply-To: <2ff24f02-800b-d980-9019-74f214e53c56@tessares.net> Message-ID: <38dab5e7-1193-db64-a6ca-22aba0622b49@linux.intel.com> References: <0343ae0f3f81535f20d387147ce6b8e4158cc1fc.1651770128.git.pabeni@redhat.com> <2ff24f02-800b-d980-9019-74f214e53c56@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed On Fri, 6 May 2022, Matthieu Baerts wrote: > Hi Paolo, Mat, > > On 05/05/2022 19:12, Paolo Abeni wrote: >> This reverts commit 4293248c6704b854bf816aa1967e433402bee11c. >> >> Additional locks are not needed, all the touched sections >> are already under mptcp socket lock protection. > > Thank you for the patch and the review! > > Now in our tree (fixes for net-next) with Mat's RvB and a Fixes tag. > > New patches for t/upstream: > - 2ff5e4eba944: Revert "mptcp: add data lock for sk timers" > - Results: bc6528b2b1d7..22856348dac5 (export) This shows up in a different place in the export branch commit history than I expected: * 1238ef9dd5ce (HEAD, tag: export/20220509T115202, mptcp-nn/export) DO-NOT-MERGE: mptcp: enabled by default * a89b2ebc4a26 DO-NOT-MERGE: mptcp: use kmalloc on kasan build * 8adddf50a9e9 DO-NOT-MERGE: git markup: features other trees * c0e05f5207ec selftests/bpf: add bpf_first test * 90b2072ffc21 selftests/bpf: add bpf_first scheduler * 2f547420d0f4 mptcp: add bpf_mptcp_sched_ops * cf597ecbdb4b mptcp: add get_subflow wrappers * 1b3d7a5f1f10 mptcp: add sched in mptcp_sock * e31f54bd6183 mptcp: add a new sysctl scheduler * 74d3c74494e6 mptcp: add struct mptcp_sched_ops * 416cb433f1df selftests/bpf: verify first of struct mptcp_sock * 57dcfb6f61ec selftests/bpf: verify ca_name of struct mptcp_sock * 8996b41ffcd2 selftests/bpf: verify token of struct mptcp_sock * f8f99d2ff6a7 selftests/bpf: test bpf_skc_to_mptcp_sock * 3fb057749027 selftests/bpf: add MPTCP test base * 1585ded1ef3d selftests/bpf: Enable CONFIG_IKCONFIG_PROC in config * d4fc73d43d5b bpf: add bpf_skc_to_mptcp_sock_proto * 581159326c14 bpf: expose is_mptcp flag to bpf_tcp_sock * b20a348378e2 DO-NOT-MERGE: git markup: features net-next-next * fa71bf0a2db6 selftests: mptcp: add MP_FAIL reset testcase * fddb2da3de32 DO-NOT-MERGE: git markup: features net-next Expected to see the patch here. * 218186cd781d mptcp: sockopt: add TCP_DEFER_ACCEPT support * 6d8839d159a7 DO-NOT-MERGE: git markup: fixes net-next * f858740fef1e TopGit-driven merge of branches: |\ | * baa752231c4d DO-NOT-MERGE: git markup: end common net net-next | * cad34cf702bc DO-NOT-MERGE: mptcp: add CI support | * d7945d0bf36f DO-NOT-MERGE: git markup: fixes net | * d8e908a27426 selftests: mptcp: add subflow limits test-cases | * 001ce634cb09 mptcp: fix subflow accounting on close | * ca2debea5aa8 net/sched: act_pedit: really ensure the skb is writable | * 945110b5a812 DO-NOT-MERGE: git markup: fixes other trees | * 55775678c466 x86/pm: Fix false positive kmemleak report in msr_build_context() | * 7a38d7853776 DO-NOT-MERGE: git markup: net * | 4f43f697b6be Revert "mptcp: add data lock for sk timers" ^^^ but it's here instead * | f57e72f418df selftests: mptcp: fix a mp_fail test warning * | 49161dcf2772 DO-NOT-MERGE: git markup: net-next * | c908565eecf2 (mptcp-nn/net-next) Merge tag 'batadv-next-pullrequest-202205 Matthieu, is that what you intended? > > > Builds and tests are now in progress: > > https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220506T190735 > https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export -- Mat Martineau Intel