* [MPTCP][PATCH mptcp-next 0/3] data checksum support cleanups
@ 2021-05-06 4:32 Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 1/3] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang
0 siblings, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2021-05-06 4:32 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Please insert patch 3 between commits "mptcp: add a new sysctl
checksum_enabled" and "selftests: mptcp: enable checksum in
mptcp_connect.sh".
Geliang Tang (3):
Squash to "mptcp: add csum_reqd in mptcp_out_options"
Squash to "mptcp: add a new sysctl checksum_enabled"
mptcp: dump csum fields in mptcp_dump_mpext
Documentation/networking/mptcp-sysctl.rst | 2 +-
include/net/mptcp.h | 4 ++--
include/trace/events/mptcp.h | 17 +++++++++++------
net/mptcp/ctrl.c | 8 +++++---
4 files changed, 19 insertions(+), 12 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [MPTCP][PATCH mptcp-next 1/3] Squash to "mptcp: add csum_reqd in mptcp_out_options"
2021-05-06 4:32 [MPTCP][PATCH mptcp-next 0/3] data checksum support cleanups Geliang Tang
@ 2021-05-06 4:32 ` Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 2/3] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang
0 siblings, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2021-05-06 4:32 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] 4+ messages in thread
* [MPTCP][PATCH mptcp-next 2/3] Squash to "mptcp: add a new sysctl checksum_enabled"
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 1/3] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang
@ 2021-05-06 4:32 ` Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 3/3] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang
0 siblings, 1 reply; 4+ messages in thread
From: Geliang Tang @ 2021-05-06 4:32 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] 4+ messages in thread
* [MPTCP][PATCH mptcp-next 3/3] mptcp: dump csum fields in mptcp_dump_mpext
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 2/3] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang
@ 2021-05-06 4:32 ` Geliang Tang
0 siblings, 0 replies; 4+ messages in thread
From: Geliang Tang @ 2021-05-06 4:32 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] 4+ messages in thread
end of thread, other threads:[~2021-05-06 4:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-06 4:32 [MPTCP][PATCH mptcp-next 0/3] data checksum support cleanups Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 1/3] Squash to "mptcp: add csum_reqd in mptcp_out_options" Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 2/3] Squash to "mptcp: add a new sysctl checksum_enabled" Geliang Tang
2021-05-06 4:32 ` [MPTCP][PATCH mptcp-next 3/3] mptcp: dump csum fields in mptcp_dump_mpext Geliang Tang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).