MPTCP Linux Development
 help / color / mirror / Atom feed
* [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
@ 2026-05-26  9:04 Geliang Tang
  2026-05-26 10:41 ` MPTCP CI
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Geliang Tang @ 2026-05-26  9:04 UTC (permalink / raw)
  To: mptcp; +Cc: Geliang Tang, Paolo Abeni, Matthieu Baerts

From: Geliang Tang <tanggeliang@kylinos.cn>

The data_ack and data_ack32 fields in struct mptcp_ext are no longer used
anywhere. Remove them from the structure and update mptcp_dump_mpext()
trace helper accordingly. Drop the data_ack field from the trace entry
and the corresponding output in TP_printk().

Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
Based-on: <cover.1779485511.git.pabeni@redhat.com>
---
 include/net/mptcp.h          | 4 ----
 include/trace/events/mptcp.h | 6 ++----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index 02564eceeb7e..75a30c70c6e1 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -19,10 +19,6 @@ struct seq_file;
 
 /* MPTCP sk_buff extension data */
 struct mptcp_ext {
-	union {
-		u64	data_ack;
-		u32	data_ack32;
-	};
 	u64		data_seq;
 	u32		subflow_seq;
 	u16		data_len;
diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h
index 04521acba483..22882bd03459 100644
--- a/include/trace/events/mptcp.h
+++ b/include/trace/events/mptcp.h
@@ -75,7 +75,6 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
 	TP_ARGS(mpext),
 
 	TP_STRUCT__entry(
-		__field(u64, data_ack)
 		__field(u64, data_seq)
 		__field(u32, subflow_seq)
 		__field(u16, data_len)
@@ -94,7 +93,6 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
 	),
 
 	TP_fast_assign(
-		__entry->data_ack = mpext->ack64 ? mpext->data_ack : mpext->data_ack32;
 		__entry->data_seq = mpext->data_seq;
 		__entry->subflow_seq = mpext->subflow_seq;
 		__entry->data_len = mpext->data_len;
@@ -112,8 +110,8 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext,
 		__entry->infinite_map = mpext->infinite_map;
 	),
 
-	TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u csum=%x use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u csum_reqd=%u infinite_map=%u",
-		  __entry->data_ack, __entry->data_seq,
+	TP_printk("data_seq=%llu subflow_seq=%u data_len=%u csum=%x use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u csum_reqd=%u infinite_map=%u",
+		  __entry->data_seq,
 		  __entry->subflow_seq, __entry->data_len,
 		  __entry->csum, __entry->use_map,
 		  __entry->dsn64, __entry->data_fin,
-- 
2.53.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
  2026-05-26  9:04 [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext Geliang Tang
@ 2026-05-26 10:41 ` MPTCP CI
  2026-05-26 15:13 ` kernel test robot
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: MPTCP CI @ 2026-05-26 10:41 UTC (permalink / raw)
  To: Geliang Tang; +Cc: mptcp

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 1 failed test(s): packetdrill_dss ⚠️ 
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/26444090803

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/7312cf56b3ce
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1100810


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
  2026-05-26  9:04 [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext Geliang Tang
  2026-05-26 10:41 ` MPTCP CI
@ 2026-05-26 15:13 ` kernel test robot
  2026-05-26 15:44 ` kernel test robot
  2026-05-27 11:44 ` Matthieu Baerts
  3 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-05-26 15:13 UTC (permalink / raw)
  To: Geliang Tang, mptcp
  Cc: llvm, oe-kbuild-all, Geliang Tang, Paolo Abeni, Matthieu Baerts

Hi Geliang,

kernel test robot noticed the following build errors:

[auto build test ERROR on mptcp/export]
[also build test ERROR on mptcp/export-net linus/master v7.1-rc5 next-20260525]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Geliang-Tang/mptcp-remove-unused-data_ack-from-struct-mptcp_ext/20260526-174441
base:   https://github.com/multipath-tcp/mptcp_net-next.git export
patch link:    https://lore.kernel.org/r/59640df9a7c0528688419655e53cb4efc50aff41.1779786007.git.tanggeliang%40kylinos.cn
patch subject: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
config: x86_64-kexec (https://download.01.org/0day-ci/archive/20260526/202605261737.8n5ShBlg-lkp@intel.com/config)
compiler: clang version 20.1.8 (https://github.com/llvm/llvm-project 87f0227cb60147a26a1eeb4fb06e3b505e9c7261)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260526/202605261737.8n5ShBlg-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202605261737.8n5ShBlg-lkp@intel.com/

All errors (new ones prefixed by >>):

>> net/mptcp/options.c:607:18: error: no member named 'data_ack' in 'struct mptcp_ext'
     607 |                 opts->ext_copy.data_ack = ack_seq;
         |                 ~~~~~~~~~~~~~~ ^
>> net/mptcp/options.c:611:18: error: no member named 'data_ack32' in 'struct mptcp_ext'
     611 |                 opts->ext_copy.data_ack32 = (uint32_t)ack_seq;
         |                 ~~~~~~~~~~~~~~ ^
   net/mptcp/options.c:1479:31: error: no member named 'data_ack' in 'struct mptcp_ext'
    1479 |                                 put_unaligned_be64(mpext->data_ack, ptr);
         |                                                    ~~~~~  ^
   net/mptcp/options.c:1482:31: error: no member named 'data_ack32' in 'struct mptcp_ext'
    1482 |                                 put_unaligned_be32(mpext->data_ack32, ptr);
         |                                                    ~~~~~  ^
   4 errors generated.


vim +607 net/mptcp/options.c

6d0060f600adfd Mat Martineau    2020-01-21  561  
6d0060f600adfd Mat Martineau    2020-01-21  562  static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
d87903b63e3ce1 Paolo Abeni      2021-02-19  563  					  bool snd_data_fin_enable,
6d0060f600adfd Mat Martineau    2020-01-21  564  					  unsigned int *size,
6d0060f600adfd Mat Martineau    2020-01-21  565  					  struct mptcp_out_options *opts)
6d0060f600adfd Mat Martineau    2020-01-21  566  {
6d0060f600adfd Mat Martineau    2020-01-21  567  	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
7279da6145bbb2 Mat Martineau    2020-07-28  568  	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
6d0060f600adfd Mat Martineau    2020-01-21  569  	unsigned int dss_size = 0;
6d0060f600adfd Mat Martineau    2020-01-21  570  	struct mptcp_ext *mpext;
6d0060f600adfd Mat Martineau    2020-01-21  571  	unsigned int ack_size;
d22f4988ffecbe Christoph Paasch 2020-01-21  572  	bool ret = false;
d87903b63e3ce1 Paolo Abeni      2021-02-19  573  	u64 ack_seq;
6d0060f600adfd Mat Martineau    2020-01-21  574  
c5b39e26d00364 Geliang Tang     2021-06-17  575  	opts->csum_reqd = READ_ONCE(msk->csum_enabled);
0bac966a1f2ae0 Mat Martineau    2020-07-28  576  	mpext = skb ? mptcp_get_ext(skb) : NULL;
6d0060f600adfd Mat Martineau    2020-01-21  577  
7279da6145bbb2 Mat Martineau    2020-07-28  578  	if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) {
c5b39e26d00364 Geliang Tang     2021-06-17  579  		unsigned int map_size = TCPOLEN_MPTCP_DSS_BASE + TCPOLEN_MPTCP_DSS_MAP64;
6d0060f600adfd Mat Martineau    2020-01-21  580  
c5b39e26d00364 Geliang Tang     2021-06-17  581  		if (mpext) {
c5b39e26d00364 Geliang Tang     2021-06-17  582  			if (opts->csum_reqd)
c5b39e26d00364 Geliang Tang     2021-06-17  583  				map_size += TCPOLEN_MPTCP_DSS_CHECKSUM;
6d0060f600adfd Mat Martineau    2020-01-21  584  
6d0060f600adfd Mat Martineau    2020-01-21  585  			opts->ext_copy = *mpext;
c5b39e26d00364 Geliang Tang     2021-06-17  586  		}
6d0060f600adfd Mat Martineau    2020-01-21  587  
c5b39e26d00364 Geliang Tang     2021-06-17  588  		dss_size = map_size;
7279da6145bbb2 Mat Martineau    2020-07-28  589  		if (skb && snd_data_fin_enable)
9c29e36152748f Paolo Abeni      2020-07-03  590  			mptcp_write_data_fin(subflow, skb, &opts->ext_copy);
1bff1e43a30e2f Paolo Abeni      2021-08-24  591  		opts->suboptions = OPTION_MPTCP_DSS;
d22f4988ffecbe Christoph Paasch 2020-01-21  592  		ret = true;
d22f4988ffecbe Christoph Paasch 2020-01-21  593  	}
d22f4988ffecbe Christoph Paasch 2020-01-21  594  
2398e3991bda7c Paolo Abeni      2020-03-04  595  	/* passive sockets msk will set the 'can_ack' after accept(), even
2398e3991bda7c Paolo Abeni      2020-03-04  596  	 * if the first subflow may have the already the remote key handy
2398e3991bda7c Paolo Abeni      2020-03-04  597  	 */
d22f4988ffecbe Christoph Paasch 2020-01-21  598  	opts->ext_copy.use_ack = 0;
dc093db5cc052b Paolo Abeni      2020-03-13  599  	if (!READ_ONCE(msk->can_ack)) {
d22f4988ffecbe Christoph Paasch 2020-01-21  600  		*size = ALIGN(dss_size, 4);
d22f4988ffecbe Christoph Paasch 2020-01-21  601  		return ret;
6d0060f600adfd Mat Martineau    2020-01-21  602  	}
6d0060f600adfd Mat Martineau    2020-01-21  603  
e3859603ba13e7 Paolo Abeni      2021-02-11  604  	ack_seq = READ_ONCE(msk->ack_seq);
37198e93ced707 Davide Caratti   2020-10-06  605  	if (READ_ONCE(msk->use_64bit_ack)) {
6d0060f600adfd Mat Martineau    2020-01-21  606  		ack_size = TCPOLEN_MPTCP_DSS_ACK64;
e3859603ba13e7 Paolo Abeni      2021-02-11 @607  		opts->ext_copy.data_ack = ack_seq;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  608  		opts->ext_copy.ack64 = 1;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  609  	} else {
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  610  		ack_size = TCPOLEN_MPTCP_DSS_ACK32;
e3859603ba13e7 Paolo Abeni      2021-02-11 @611  		opts->ext_copy.data_ack32 = (uint32_t)ack_seq;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  612  		opts->ext_copy.ack64 = 0;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  613  	}
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  614  	opts->ext_copy.use_ack = 1;
1bff1e43a30e2f Paolo Abeni      2021-08-24  615  	opts->suboptions = OPTION_MPTCP_DSS;
6d0060f600adfd Mat Martineau    2020-01-21  616  
6d0060f600adfd Mat Martineau    2020-01-21  617  	/* Add kind/length/subtype/flag overhead if mapping is not populated */
6d0060f600adfd Mat Martineau    2020-01-21  618  	if (dss_size == 0)
6d0060f600adfd Mat Martineau    2020-01-21  619  		ack_size += TCPOLEN_MPTCP_DSS_BASE;
6d0060f600adfd Mat Martineau    2020-01-21  620  
6d0060f600adfd Mat Martineau    2020-01-21  621  	dss_size += ack_size;
6d0060f600adfd Mat Martineau    2020-01-21  622  
6d0060f600adfd Mat Martineau    2020-01-21  623  	*size = ALIGN(dss_size, 4);
6d0060f600adfd Mat Martineau    2020-01-21  624  	return true;
6d0060f600adfd Mat Martineau    2020-01-21  625  }
6d0060f600adfd Mat Martineau    2020-01-21  626  

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
  2026-05-26  9:04 [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext Geliang Tang
  2026-05-26 10:41 ` MPTCP CI
  2026-05-26 15:13 ` kernel test robot
@ 2026-05-26 15:44 ` kernel test robot
  2026-05-27 11:44 ` Matthieu Baerts
  3 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-05-26 15:44 UTC (permalink / raw)
  To: Geliang Tang, mptcp
  Cc: oe-kbuild-all, Geliang Tang, Paolo Abeni, Matthieu Baerts

Hi Geliang,

kernel test robot noticed the following build errors:

[auto build test ERROR on mptcp/export]
[also build test ERROR on mptcp/export-net linus/master v7.1-rc5 next-20260525]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]

url:    https://github.com/intel-lab-lkp/linux/commits/Geliang-Tang/mptcp-remove-unused-data_ack-from-struct-mptcp_ext/20260526-174441
base:   https://github.com/multipath-tcp/mptcp_net-next.git export
patch link:    https://lore.kernel.org/r/59640df9a7c0528688419655e53cb4efc50aff41.1779786007.git.tanggeliang%40kylinos.cn
patch subject: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
config: s390-allnoconfig-bpf (https://download.01.org/0day-ci/archive/20260526/202605261720.YO4kQJsj-lkp@intel.com/config)
compiler: s390x-linux-gnu-gcc (Debian 14.2.0-19) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260526/202605261720.YO4kQJsj-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202605261720.YO4kQJsj-lkp@intel.com/

All errors (new ones prefixed by >>):

   net/mptcp/options.c: In function 'mptcp_established_options_dss':
>> net/mptcp/options.c:607:31: error: 'struct mptcp_ext' has no member named 'data_ack'
     607 |                 opts->ext_copy.data_ack = ack_seq;
         |                               ^
>> net/mptcp/options.c:611:31: error: 'struct mptcp_ext' has no member named 'data_ack32'
     611 |                 opts->ext_copy.data_ack32 = (uint32_t)ack_seq;
         |                               ^
   net/mptcp/options.c: In function 'mptcp_write_options':
   net/mptcp/options.c:1479:57: error: 'struct mptcp_ext' has no member named 'data_ack'
    1479 |                                 put_unaligned_be64(mpext->data_ack, ptr);
         |                                                         ^~
   net/mptcp/options.c:1482:57: error: 'struct mptcp_ext' has no member named 'data_ack32'
    1482 |                                 put_unaligned_be32(mpext->data_ack32, ptr);
         |                                                         ^~


vim +607 net/mptcp/options.c

6d0060f600adfd Mat Martineau    2020-01-21  561  
6d0060f600adfd Mat Martineau    2020-01-21  562  static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
d87903b63e3ce1 Paolo Abeni      2021-02-19  563  					  bool snd_data_fin_enable,
6d0060f600adfd Mat Martineau    2020-01-21  564  					  unsigned int *size,
6d0060f600adfd Mat Martineau    2020-01-21  565  					  struct mptcp_out_options *opts)
6d0060f600adfd Mat Martineau    2020-01-21  566  {
6d0060f600adfd Mat Martineau    2020-01-21  567  	struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
7279da6145bbb2 Mat Martineau    2020-07-28  568  	struct mptcp_sock *msk = mptcp_sk(subflow->conn);
6d0060f600adfd Mat Martineau    2020-01-21  569  	unsigned int dss_size = 0;
6d0060f600adfd Mat Martineau    2020-01-21  570  	struct mptcp_ext *mpext;
6d0060f600adfd Mat Martineau    2020-01-21  571  	unsigned int ack_size;
d22f4988ffecbe Christoph Paasch 2020-01-21  572  	bool ret = false;
d87903b63e3ce1 Paolo Abeni      2021-02-19  573  	u64 ack_seq;
6d0060f600adfd Mat Martineau    2020-01-21  574  
c5b39e26d00364 Geliang Tang     2021-06-17  575  	opts->csum_reqd = READ_ONCE(msk->csum_enabled);
0bac966a1f2ae0 Mat Martineau    2020-07-28  576  	mpext = skb ? mptcp_get_ext(skb) : NULL;
6d0060f600adfd Mat Martineau    2020-01-21  577  
7279da6145bbb2 Mat Martineau    2020-07-28  578  	if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) {
c5b39e26d00364 Geliang Tang     2021-06-17  579  		unsigned int map_size = TCPOLEN_MPTCP_DSS_BASE + TCPOLEN_MPTCP_DSS_MAP64;
6d0060f600adfd Mat Martineau    2020-01-21  580  
c5b39e26d00364 Geliang Tang     2021-06-17  581  		if (mpext) {
c5b39e26d00364 Geliang Tang     2021-06-17  582  			if (opts->csum_reqd)
c5b39e26d00364 Geliang Tang     2021-06-17  583  				map_size += TCPOLEN_MPTCP_DSS_CHECKSUM;
6d0060f600adfd Mat Martineau    2020-01-21  584  
6d0060f600adfd Mat Martineau    2020-01-21  585  			opts->ext_copy = *mpext;
c5b39e26d00364 Geliang Tang     2021-06-17  586  		}
6d0060f600adfd Mat Martineau    2020-01-21  587  
c5b39e26d00364 Geliang Tang     2021-06-17  588  		dss_size = map_size;
7279da6145bbb2 Mat Martineau    2020-07-28  589  		if (skb && snd_data_fin_enable)
9c29e36152748f Paolo Abeni      2020-07-03  590  			mptcp_write_data_fin(subflow, skb, &opts->ext_copy);
1bff1e43a30e2f Paolo Abeni      2021-08-24  591  		opts->suboptions = OPTION_MPTCP_DSS;
d22f4988ffecbe Christoph Paasch 2020-01-21  592  		ret = true;
d22f4988ffecbe Christoph Paasch 2020-01-21  593  	}
d22f4988ffecbe Christoph Paasch 2020-01-21  594  
2398e3991bda7c Paolo Abeni      2020-03-04  595  	/* passive sockets msk will set the 'can_ack' after accept(), even
2398e3991bda7c Paolo Abeni      2020-03-04  596  	 * if the first subflow may have the already the remote key handy
2398e3991bda7c Paolo Abeni      2020-03-04  597  	 */
d22f4988ffecbe Christoph Paasch 2020-01-21  598  	opts->ext_copy.use_ack = 0;
dc093db5cc052b Paolo Abeni      2020-03-13  599  	if (!READ_ONCE(msk->can_ack)) {
d22f4988ffecbe Christoph Paasch 2020-01-21  600  		*size = ALIGN(dss_size, 4);
d22f4988ffecbe Christoph Paasch 2020-01-21  601  		return ret;
6d0060f600adfd Mat Martineau    2020-01-21  602  	}
6d0060f600adfd Mat Martineau    2020-01-21  603  
e3859603ba13e7 Paolo Abeni      2021-02-11  604  	ack_seq = READ_ONCE(msk->ack_seq);
37198e93ced707 Davide Caratti   2020-10-06  605  	if (READ_ONCE(msk->use_64bit_ack)) {
6d0060f600adfd Mat Martineau    2020-01-21  606  		ack_size = TCPOLEN_MPTCP_DSS_ACK64;
e3859603ba13e7 Paolo Abeni      2021-02-11 @607  		opts->ext_copy.data_ack = ack_seq;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  608  		opts->ext_copy.ack64 = 1;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  609  	} else {
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  610  		ack_size = TCPOLEN_MPTCP_DSS_ACK32;
e3859603ba13e7 Paolo Abeni      2021-02-11 @611  		opts->ext_copy.data_ack32 = (uint32_t)ack_seq;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  612  		opts->ext_copy.ack64 = 0;
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  613  	}
a0c1d0eafd1ef1 Christoph Paasch 2020-05-14  614  	opts->ext_copy.use_ack = 1;
1bff1e43a30e2f Paolo Abeni      2021-08-24  615  	opts->suboptions = OPTION_MPTCP_DSS;
6d0060f600adfd Mat Martineau    2020-01-21  616  
6d0060f600adfd Mat Martineau    2020-01-21  617  	/* Add kind/length/subtype/flag overhead if mapping is not populated */
6d0060f600adfd Mat Martineau    2020-01-21  618  	if (dss_size == 0)
6d0060f600adfd Mat Martineau    2020-01-21  619  		ack_size += TCPOLEN_MPTCP_DSS_BASE;
6d0060f600adfd Mat Martineau    2020-01-21  620  
6d0060f600adfd Mat Martineau    2020-01-21  621  	dss_size += ack_size;
6d0060f600adfd Mat Martineau    2020-01-21  622  
6d0060f600adfd Mat Martineau    2020-01-21  623  	*size = ALIGN(dss_size, 4);
6d0060f600adfd Mat Martineau    2020-01-21  624  	return true;
6d0060f600adfd Mat Martineau    2020-01-21  625  }
6d0060f600adfd Mat Martineau    2020-01-21  626  

--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext
  2026-05-26  9:04 [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext Geliang Tang
                   ` (2 preceding siblings ...)
  2026-05-26 15:44 ` kernel test robot
@ 2026-05-27 11:44 ` Matthieu Baerts
  3 siblings, 0 replies; 5+ messages in thread
From: Matthieu Baerts @ 2026-05-27 11:44 UTC (permalink / raw)
  To: Geliang Tang, mptcp; +Cc: Geliang Tang, Paolo Abeni

Hi Geliang,

On 26/05/2026 19:04, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>
> 
> The data_ack and data_ack32 fields in struct mptcp_ext are no longer used
> anywhere. Remove them from the structure and update mptcp_dump_mpext()
> trace helper accordingly. Drop the data_ack field from the trace entry
> and the corresponding output in TP_printk().
Thank you for the follow-up patch!

Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>

New patches for t/upstream:
- f51ec6de6c5a: mptcp: remove unused data_ack from struct mptcp_ext
- Results: cde220b5fe28..2b800cf792ef (export)

Tests are now in progress:

- export:
https://github.com/multipath-tcp/mptcp_net-next/commit/8b808b715575367c7e00bcd76a597b7b57d674b8/checks

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2026-05-27 11:44 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-05-26  9:04 [PATCH mptcp-next] mptcp: remove unused data_ack from struct mptcp_ext Geliang Tang
2026-05-26 10:41 ` MPTCP CI
2026-05-26 15:13 ` kernel test robot
2026-05-26 15:44 ` kernel test robot
2026-05-27 11:44 ` Matthieu Baerts

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox