* [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups @ 2021-05-06 7:48 Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang ` (2 more replies) 0 siblings, 3 replies; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang v2: - add two new squash-to patches to rename the mib DSSCSUMERR to DATACSUMERR. Please insert patch 4 (mptcp: dump csum fields in mptcp_dump_mpext) between the commits "mptcp: add a new sysctl checksum_enabled" and "selftests: mptcp: enable checksum in mptcp_connect.sh". Geliang Tang (5): Squash to "mptcp: add csum_reqd in mptcp_out_options" Squash to "mptcp: add the mib for data checksum" Squash to "mptcp: add a new sysctl checksum_enabled" mptcp: dump csum fields in mptcp_dump_mpext Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" Documentation/networking/mptcp-sysctl.rst | 2 +- include/net/mptcp.h | 4 ++-- include/trace/events/mptcp.h | 17 +++++++++++------ net/mptcp/ctrl.c | 8 +++++--- net/mptcp/mib.c | 2 +- net/mptcp/mib.h | 2 +- net/mptcp/subflow.c | 2 +- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 8 files changed, 24 insertions(+), 17 deletions(-) -- 2.31.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" 2021-05-06 7:48 [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Geliang Tang @ 2021-05-06 7:48 ` Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 2021-05-06 13:09 ` [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Paolo Abeni 2021-05-06 14:28 ` Matthieu Baerts 2 siblings, 1 reply; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang Update this patch as Mat suggested in the "MP_CAPABLE C flag" series. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- include/net/mptcp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index bd272c34b53c..d61bbbf11979 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -65,8 +65,8 @@ struct mptcp_out_options { struct mptcp_rm_list rm_list; u8 join_id; u8 backup; - u8 reset_reason:4; - u8 reset_transient:1, + u8 reset_reason:4, + reset_transient:1, csum_reqd:1; u32 nonce; u64 thmac; -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang @ 2021-05-06 7:48 ` Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 3/5] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang 2021-05-07 2:50 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 0 siblings, 2 replies; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang Rename DSSCSUM to DATACSUM. Please update the commit log too: ''' This patch added the mib for the data checksum, MPTCP_MIB_DATACSUMERR. ''' Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- net/mptcp/mib.c | 2 +- net/mptcp/mib.h | 2 +- net/mptcp/subflow.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index c7042e3317b5..e7e60bc1fb96 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -25,7 +25,7 @@ static const struct snmp_mib mptcp_snmp_list[] = { SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), - SNMP_MIB_ITEM("DSSCsumErr", MPTCP_MIB_DSSCSUMERR), + SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR), SNMP_MIB_ITEM("OFOQueueTail", MPTCP_MIB_OFOQUEUETAIL), SNMP_MIB_ITEM("OFOQueue", MPTCP_MIB_OFOQUEUE), SNMP_MIB_ITEM("OFOMerge", MPTCP_MIB_OFOMERGE), diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index c407358eced8..92e56c0cfbdd 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -18,7 +18,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the previous one */ MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ - MPTCP_MIB_DSSCSUMERR, /* The DSS checksum fail */ + MPTCP_MIB_DATACSUMERR, /* The data checksum fail */ MPTCP_MIB_OFOQUEUETAIL, /* Segments inserted into OoO queue tail */ MPTCP_MIB_OFOQUEUE, /* Segments inserted into OoO queue */ MPTCP_MIB_OFOMERGE, /* Segments merged in OoO queue */ diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index f60a2fe1a2cf..c8968038174f 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -902,7 +902,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * csum = csum_partial(&header, sizeof(header), subflow->map_data_csum); if (unlikely(csum_fold(csum))) { - MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCSUMERR); + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; } -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [MPTCP][PATCH v2 mptcp-next 3/5] Squash to "mptcp: add a new sysctl checksum_enabled" 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang @ 2021-05-06 7:48 ` Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang 2021-05-07 2:50 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 1 sibling, 1 reply; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang Update this patch as Florian suggested in the "MP_CAPABLE C flag" series. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- Documentation/networking/mptcp-sysctl.rst | 2 +- net/mptcp/ctrl.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/networking/mptcp-sysctl.rst b/Documentation/networking/mptcp-sysctl.rst index 901fa3e4650f..ee06fd782465 100644 --- a/Documentation/networking/mptcp-sysctl.rst +++ b/Documentation/networking/mptcp-sysctl.rst @@ -25,7 +25,7 @@ add_addr_timeout - INTEGER (seconds) Default: 120 -checksum_enabled - INTEGER +checksum_enabled - BOOLEAN Control whether DSS checksum can be enabled. DSS checksum can be enabled if the value is nonzero. This is a diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 014752c481d0..b5ff77dae503 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -23,7 +23,7 @@ struct mptcp_pernet { u8 mptcp_enabled; unsigned int add_addr_timeout; - int checksum_enabled; + u8 checksum_enabled; }; static struct mptcp_pernet *mptcp_get_pernet(struct net *net) @@ -74,9 +74,11 @@ static struct ctl_table mptcp_sysctl_table[] = { }, { .procname = "checksum_enabled", - .maxlen = sizeof(int), + .maxlen = sizeof(u8), .mode = 0644, - .proc_handler = proc_dointvec, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE }, {} }; -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 3/5] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang @ 2021-05-06 7:48 ` Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 5/5] Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" Geliang Tang 2021-05-06 13:08 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Paolo Abeni 0 siblings, 2 replies; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang In mptcp_dump_mpext, dump the csum fields, csum and csum_reqd in struct mptcp_dump_mpext too. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- include/trace/events/mptcp.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h index 775a46d0b0f0..c853849692af 100644 --- a/include/trace/events/mptcp.h +++ b/include/trace/events/mptcp.h @@ -73,6 +73,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, __field(u64, data_seq) __field(u32, subflow_seq) __field(u16, data_len) + __field(u16, csum) __field(u8, use_map) __field(u8, dsn64) __field(u8, data_fin) @@ -82,6 +83,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, __field(u8, frozen) __field(u8, reset_transient) __field(u8, reset_reason) + __field(u8, csum_reqd) ), TP_fast_assign( @@ -89,6 +91,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, __entry->data_seq = mpext->data_seq; __entry->subflow_seq = mpext->subflow_seq; __entry->data_len = mpext->data_len; + __entry->csum = (__force u16)mpext->csum; __entry->use_map = mpext->use_map; __entry->dsn64 = mpext->dsn64; __entry->data_fin = mpext->data_fin; @@ -98,16 +101,18 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, __entry->frozen = mpext->frozen; __entry->reset_transient = mpext->reset_transient; __entry->reset_reason = mpext->reset_reason; + __entry->csum_reqd = mpext->csum_reqd; ), - TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u", + TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u csum=%u 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", __entry->data_ack, __entry->data_seq, __entry->subflow_seq, __entry->data_len, - __entry->use_map, __entry->dsn64, - __entry->data_fin, __entry->use_ack, - __entry->ack64, __entry->mpc_map, - __entry->frozen, __entry->reset_transient, - __entry->reset_reason) + __entry->csum, __entry->use_map, + __entry->dsn64, __entry->data_fin, + __entry->use_ack, __entry->ack64, + __entry->mpc_map, __entry->frozen, + __entry->reset_transient, __entry->reset_reason, + __entry->csum_reqd) ); DEFINE_EVENT(mptcp_dump_mpext, get_mapping_status, -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [MPTCP][PATCH v2 mptcp-next 5/5] Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang @ 2021-05-06 7:48 ` Geliang Tang 2021-05-06 13:08 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Paolo Abeni 1 sibling, 0 replies; 11+ messages in thread From: Geliang Tang @ 2021-05-06 7:48 UTC (permalink / raw) To: mptcp; +Cc: Geliang Tang Rename MPTcpExtDSSCsumErr to MPTcpExtDataCsumErr. Signed-off-by: Geliang Tang <geliangtang@gmail.com> --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index ef8341c851f7..523c7797f30a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -503,7 +503,7 @@ chk_csum_nr() echo -n " " fi printf " %-36s %s" "$msg" "sum" - count=`ip netns exec $ns1 nstat -as | grep MPTcpExtDSSCsumErr | awk '{print $2}'` + count=`ip netns exec $ns1 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}'` [ -z "$count" ] && count=0 if [ "$count" != 0 ]; then echo "[fail] got $count data checksum error[s] expected 0" @@ -513,7 +513,7 @@ chk_csum_nr() echo -n "[ ok ]" fi echo -n " - csum " - count=`ip netns exec $ns2 nstat -as | grep MPTcpExtDSSCsumErr | awk '{print $2}'` + count=`ip netns exec $ns2 nstat -as | grep MPTcpExtDataCsumErr | awk '{print $2}'` [ -z "$count" ] && count=0 if [ "$count" != 0 ]; then echo "[fail] got $count data checksum error[s] expected 0" -- 2.31.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 5/5] Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" Geliang Tang @ 2021-05-06 13:08 ` Paolo Abeni 1 sibling, 0 replies; 11+ messages in thread From: Paolo Abeni @ 2021-05-06 13:08 UTC (permalink / raw) To: Geliang Tang, mptcp On Thu, 2021-05-06 at 15:48 +0800, Geliang Tang wrote: > In mptcp_dump_mpext, dump the csum fields, csum and csum_reqd in struct > mptcp_dump_mpext too. > > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > include/trace/events/mptcp.h | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/include/trace/events/mptcp.h b/include/trace/events/mptcp.h > index 775a46d0b0f0..c853849692af 100644 > --- a/include/trace/events/mptcp.h > +++ b/include/trace/events/mptcp.h > @@ -73,6 +73,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, > __field(u64, data_seq) > __field(u32, subflow_seq) > __field(u16, data_len) > + __field(u16, csum) > __field(u8, use_map) > __field(u8, dsn64) > __field(u8, data_fin) > @@ -82,6 +83,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, > __field(u8, frozen) > __field(u8, reset_transient) > __field(u8, reset_reason) > + __field(u8, csum_reqd) > ), > > TP_fast_assign( > @@ -89,6 +91,7 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, > __entry->data_seq = mpext->data_seq; > __entry->subflow_seq = mpext->subflow_seq; > __entry->data_len = mpext->data_len; > + __entry->csum = (__force u16)mpext->csum; > __entry->use_map = mpext->use_map; > __entry->dsn64 = mpext->dsn64; > __entry->data_fin = mpext->data_fin; > @@ -98,16 +101,18 @@ DECLARE_EVENT_CLASS(mptcp_dump_mpext, > __entry->frozen = mpext->frozen; > __entry->reset_transient = mpext->reset_transient; > __entry->reset_reason = mpext->reset_reason; > + __entry->csum_reqd = mpext->csum_reqd; > ), > > - TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u use_map=%u dsn64=%u data_fin=%u use_ack=%u ack64=%u mpc_map=%u frozen=%u reset_transient=%u reset_reason=%u", > + TP_printk("data_ack=%llu data_seq=%llu subflow_seq=%u data_len=%u csum=%u 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", Minor thing: I personally prefer %x for csum, but it's not a big deal. /P ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 3/5] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang @ 2021-05-07 2:50 ` Geliang Tang 2021-05-07 8:07 ` Matthieu Baerts 1 sibling, 1 reply; 11+ messages in thread From: Geliang Tang @ 2021-05-07 2:50 UTC (permalink / raw) To: Matthieu Baerts; +Cc: mptcp Hi Matt, Geliang Tang <geliangtang@gmail.com> 于2021年5月6日周四 下午3:48写道: > > Rename DSSCSUM to DATACSUM. > > Please update the commit log too: > > ''' > This patch added the mib for the data checksum, MPTCP_MIB_DATACSUMERR. > ''' > Thanks for apply this patch to the export branch, please update the commit log too: MPTCP_MIB_DSSCSUMERR -> MPTCP_MIB_DATACSUMERR Thanks. -Geliang > Signed-off-by: Geliang Tang <geliangtang@gmail.com> > --- > net/mptcp/mib.c | 2 +- > net/mptcp/mib.h | 2 +- > net/mptcp/subflow.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c > index c7042e3317b5..e7e60bc1fb96 100644 > --- a/net/mptcp/mib.c > +++ b/net/mptcp/mib.c > @@ -25,7 +25,7 @@ static const struct snmp_mib mptcp_snmp_list[] = { > SNMP_MIB_ITEM("MPJoinAckHMacFailure", MPTCP_MIB_JOINACKMAC), > SNMP_MIB_ITEM("DSSNotMatching", MPTCP_MIB_DSSNOMATCH), > SNMP_MIB_ITEM("InfiniteMapRx", MPTCP_MIB_INFINITEMAPRX), > - SNMP_MIB_ITEM("DSSCsumErr", MPTCP_MIB_DSSCSUMERR), > + SNMP_MIB_ITEM("DataCsumErr", MPTCP_MIB_DATACSUMERR), > SNMP_MIB_ITEM("OFOQueueTail", MPTCP_MIB_OFOQUEUETAIL), > SNMP_MIB_ITEM("OFOQueue", MPTCP_MIB_OFOQUEUE), > SNMP_MIB_ITEM("OFOMerge", MPTCP_MIB_OFOMERGE), > diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h > index c407358eced8..92e56c0cfbdd 100644 > --- a/net/mptcp/mib.h > +++ b/net/mptcp/mib.h > @@ -18,7 +18,7 @@ enum linux_mptcp_mib_field { > MPTCP_MIB_JOINACKMAC, /* HMAC was wrong on ACK + MP_JOIN */ > MPTCP_MIB_DSSNOMATCH, /* Received a new mapping that did not match the previous one */ > MPTCP_MIB_INFINITEMAPRX, /* Received an infinite mapping */ > - MPTCP_MIB_DSSCSUMERR, /* The DSS checksum fail */ > + MPTCP_MIB_DATACSUMERR, /* The data checksum fail */ > MPTCP_MIB_OFOQUEUETAIL, /* Segments inserted into OoO queue tail */ > MPTCP_MIB_OFOQUEUE, /* Segments inserted into OoO queue */ > MPTCP_MIB_OFOMERGE, /* Segments merged in OoO queue */ > diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c > index f60a2fe1a2cf..c8968038174f 100644 > --- a/net/mptcp/subflow.c > +++ b/net/mptcp/subflow.c > @@ -902,7 +902,7 @@ static enum mapping_status validate_data_csum(struct sock *ssk, struct sk_buff * > > csum = csum_partial(&header, sizeof(header), subflow->map_data_csum); > if (unlikely(csum_fold(csum))) { > - MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DSSCSUMERR); > + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); > return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; > } > > -- > 2.31.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" 2021-05-07 2:50 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang @ 2021-05-07 8:07 ` Matthieu Baerts 0 siblings, 0 replies; 11+ messages in thread From: Matthieu Baerts @ 2021-05-07 8:07 UTC (permalink / raw) To: Geliang Tang; +Cc: mptcp Hi Geliang, On 07/05/2021 04:50, Geliang Tang wrote: > Hi Matt, > > Geliang Tang <geliangtang@gmail.com> 于2021年5月6日周四 下午3:48写道: >> >> Rename DSSCSUM to DATACSUM. >> >> Please update the commit log too: >> >> ''' >> This patch added the mib for the data checksum, MPTCP_MIB_DATACSUMERR. >> ''' >> > > Thanks for apply this patch to the export branch, please update the commit > log too: > > MPTCP_MIB_DSSCSUMERR -> MPTCP_MIB_DATACSUMERR Thank you for the reminder. Indeed, I missed this one! Fixed now (but not yet in the export branch) - a1c71b9ff8ec: tg:msg: MIB has been renamed - Results: 3ad3c4cba5ea..37818f5e301f Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups 2021-05-06 7:48 [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang @ 2021-05-06 13:09 ` Paolo Abeni 2021-05-06 14:28 ` Matthieu Baerts 2 siblings, 0 replies; 11+ messages in thread From: Paolo Abeni @ 2021-05-06 13:09 UTC (permalink / raw) To: Geliang Tang, mptcp On Thu, 2021-05-06 at 15:48 +0800, Geliang Tang wrote: > v2: > - add two new squash-to patches to rename the mib DSSCSUMERR to > DATACSUMERR. > > Please insert patch 4 (mptcp: dump csum fields in mptcp_dump_mpext) between the > commits "mptcp: add a new sysctl checksum_enabled" and "selftests: mptcp: > enable checksum in mptcp_connect.sh". > > Geliang Tang (5): > Squash to "mptcp: add csum_reqd in mptcp_out_options" > Squash to "mptcp: add the mib for data checksum" > Squash to "mptcp: add a new sysctl checksum_enabled" > mptcp: dump csum fields in mptcp_dump_mpext > Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" > > Documentation/networking/mptcp-sysctl.rst | 2 +- > include/net/mptcp.h | 4 ++-- > include/trace/events/mptcp.h | 17 +++++++++++------ > net/mptcp/ctrl.c | 8 +++++--- > net/mptcp/mib.c | 2 +- > net/mptcp/mib.h | 2 +- > net/mptcp/subflow.c | 2 +- > tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++-- > 8 files changed, 24 insertions(+), 17 deletions(-) > I had a very minor comment on patch 4/5, but I think this can be merged as is and ev. squash an additional change later, if needed/there is agreement. Cheers, Paolo ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups 2021-05-06 7:48 [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang 2021-05-06 13:09 ` [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Paolo Abeni @ 2021-05-06 14:28 ` Matthieu Baerts 2 siblings, 0 replies; 11+ messages in thread From: Matthieu Baerts @ 2021-05-06 14:28 UTC (permalink / raw) To: Geliang Tang; +Cc: mptcp Hi Geliang, Paolo, On 06/05/2021 09:48, Geliang Tang wrote: > v2: > - add two new squash-to patches to rename the mib DSSCSUMERR to > DATACSUMERR. > > Please insert patch 4 (mptcp: dump csum fields in mptcp_dump_mpext) between the > commits "mptcp: add a new sysctl checksum_enabled" and "selftests: mptcp: > enable checksum in mptcp_connect.sh". > > Geliang Tang (5): > Squash to "mptcp: add csum_reqd in mptcp_out_options" > Squash to "mptcp: add the mib for data checksum" > Squash to "mptcp: add a new sysctl checksum_enabled" > mptcp: dump csum fields in mptcp_dump_mpext > Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" Thank you for the patches and the review! - c5be02caa9e6: "squashed" patch 1/5 in "mptcp: add csum_reqd in mptcp_out_options" - 29f92324f1c2: "squashed" patch 2/5 in "mptcp: add the mib for data checksum" - ad81f7fdc6f9: "squashed" patch 3/5 in "mptcp: add a new sysctl checksum_enabled" - e2cc6a7fbd2e: mptcp: dump csum fields in mptcp_dump_mpext - d92aa7cd0a27: "squashed" patch 5/5 in "selftests: mptcp: enable checksum in mptcp_join.sh" - Results: dd923e74b091..9e9ac1620af0 Builds and tests will be launched after having squashed an extra patch Geliang just shared. Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-05-07 8:07 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-05-06 7:48 [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 1/5] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 3/5] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang 2021-05-06 7:48 ` [MPTCP][PATCH v2 mptcp-next 5/5] Squash to "selftests: mptcp: enable checksum in mptcp_join.sh" Geliang Tang 2021-05-06 13:08 ` [MPTCP][PATCH v2 mptcp-next 4/5] mptcp: dump csum fields in mptcp_dump_mpext Paolo Abeni 2021-05-07 2:50 ` [MPTCP][PATCH v2 mptcp-next 2/5] Squash to "mptcp: add the mib for data checksum" Geliang Tang 2021-05-07 8:07 ` Matthieu Baerts 2021-05-06 13:09 ` [MPTCP][PATCH v2 mptcp-next 0/5] data checksum support cleanups Paolo Abeni 2021-05-06 14:28 ` Matthieu Baerts
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.