* [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option"
@ 2021-05-07 1:12 Geliang Tang
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Geliang Tang @ 2021-05-07 1:12 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Keep mptcp_parse_option unchanged.
Please update the commit log too:
'''
mptcp: add sk parameter for mptcp_get_options
This patch added a new parameter name sk in mptcp_get_options().
'''
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
net/mptcp/options.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 8f768c517586..1d360639ca91 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -20,8 +20,7 @@ static bool mptcp_cap_flag_sha256(u8 flags)
return (flags & MPTCP_CAP_FLAG_MASK) == MPTCP_CAP_HMAC_SHA256;
}
-static void mptcp_parse_option(const struct sock *sk,
- const struct sk_buff *skb,
+static void mptcp_parse_option(const struct sk_buff *skb,
const unsigned char *ptr, int opsize,
struct mptcp_options_received *mp_opt)
{
@@ -365,7 +364,7 @@ void mptcp_get_options(const struct sock *sk,
if (opsize > length)
return; /* don't parse partial options */
if (opcode == TCPOPT_MPTCP)
- mptcp_parse_option(sk, skb, ptr, opsize, mp_opt);
+ mptcp_parse_option(skb, ptr, opsize, mp_opt);
ptr += opsize - 2;
length -= opsize;
}
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received"
2021-05-07 1:12 [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Geliang Tang
@ 2021-05-07 1:12 ` Geliang Tang
2021-05-11 0:48 ` Mat Martineau
2021-05-13 7:32 ` Matthieu Baerts
2021-05-11 0:47 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Mat Martineau
2021-05-13 7:29 ` Matthieu Baerts
2 siblings, 2 replies; 6+ messages in thread
From: Geliang Tang @ 2021-05-07 1:12 UTC (permalink / raw)
To: mptcp; +Cc: Geliang Tang
Init csum_reqd in mptcp_get_options, keep mptcp_parse_option unchanged.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
net/mptcp/options.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 4a74b8bb737f..527affbbeea9 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -24,8 +24,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
const unsigned char *ptr, int opsize,
struct mptcp_options_received *mp_opt)
{
- struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
- struct mptcp_sock *msk = mptcp_sk(subflow->conn);
u8 subtype = *ptr >> 4;
int expected_opsize;
u8 version;
@@ -74,7 +72,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
* negotiated, the receiver MUST close the subflow with a RST as
* it is considered broken."
*/
- mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
if (flags & MPTCP_CAP_CHECKSUM_REQD)
mp_opt->csum_reqd = 1;
@@ -329,6 +326,8 @@ void mptcp_get_options(const struct sock *sk,
const struct sk_buff *skb,
struct mptcp_options_received *mp_opt)
{
+ struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
+ struct mptcp_sock *msk = mptcp_sk(subflow->conn);
const struct tcphdr *th = tcp_hdr(skb);
const unsigned char *ptr;
int length;
@@ -344,7 +343,7 @@ void mptcp_get_options(const struct sock *sk,
mp_opt->dss = 0;
mp_opt->mp_prio = 0;
mp_opt->reset = 0;
- mp_opt->csum_reqd = 0;
+ mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
length = (th->doff * 4) - sizeof(struct tcphdr);
ptr = (const unsigned char *)(th + 1);
--
2.31.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option"
2021-05-07 1:12 [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Geliang Tang
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
@ 2021-05-11 0:47 ` Mat Martineau
2021-05-13 7:29 ` Matthieu Baerts
2 siblings, 0 replies; 6+ messages in thread
From: Mat Martineau @ 2021-05-11 0:47 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
On Fri, 7 May 2021, Geliang Tang wrote:
> Keep mptcp_parse_option unchanged.
>
> Please update the commit log too:
>
> '''
> mptcp: add sk parameter for mptcp_get_options
>
> This patch added a new parameter name sk in mptcp_get_options().
> '''
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> net/mptcp/options.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
Looks good to me, thanks Geliang.
-Mat
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 8f768c517586..1d360639ca91 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -20,8 +20,7 @@ static bool mptcp_cap_flag_sha256(u8 flags)
> return (flags & MPTCP_CAP_FLAG_MASK) == MPTCP_CAP_HMAC_SHA256;
> }
>
> -static void mptcp_parse_option(const struct sock *sk,
> - const struct sk_buff *skb,
> +static void mptcp_parse_option(const struct sk_buff *skb,
> const unsigned char *ptr, int opsize,
> struct mptcp_options_received *mp_opt)
> {
> @@ -365,7 +364,7 @@ void mptcp_get_options(const struct sock *sk,
> if (opsize > length)
> return; /* don't parse partial options */
> if (opcode == TCPOPT_MPTCP)
> - mptcp_parse_option(sk, skb, ptr, opsize, mp_opt);
> + mptcp_parse_option(skb, ptr, opsize, mp_opt);
> ptr += opsize - 2;
> length -= opsize;
> }
> --
> 2.31.1
>
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received"
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
@ 2021-05-11 0:48 ` Mat Martineau
2021-05-13 7:32 ` Matthieu Baerts
1 sibling, 0 replies; 6+ messages in thread
From: Mat Martineau @ 2021-05-11 0:48 UTC (permalink / raw)
To: Geliang Tang; +Cc: mptcp
On Fri, 7 May 2021, Geliang Tang wrote:
> Init csum_reqd in mptcp_get_options, keep mptcp_parse_option unchanged.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> net/mptcp/options.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
Looks good to me, thanks.
-Mat
>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index 4a74b8bb737f..527affbbeea9 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -24,8 +24,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> const unsigned char *ptr, int opsize,
> struct mptcp_options_received *mp_opt)
> {
> - struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
> - struct mptcp_sock *msk = mptcp_sk(subflow->conn);
> u8 subtype = *ptr >> 4;
> int expected_opsize;
> u8 version;
> @@ -74,7 +72,6 @@ static void mptcp_parse_option(const struct sk_buff *skb,
> * negotiated, the receiver MUST close the subflow with a RST as
> * it is considered broken."
> */
> - mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
> if (flags & MPTCP_CAP_CHECKSUM_REQD)
> mp_opt->csum_reqd = 1;
>
> @@ -329,6 +326,8 @@ void mptcp_get_options(const struct sock *sk,
> const struct sk_buff *skb,
> struct mptcp_options_received *mp_opt)
> {
> + struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
> + struct mptcp_sock *msk = mptcp_sk(subflow->conn);
> const struct tcphdr *th = tcp_hdr(skb);
> const unsigned char *ptr;
> int length;
> @@ -344,7 +343,7 @@ void mptcp_get_options(const struct sock *sk,
> mp_opt->dss = 0;
> mp_opt->mp_prio = 0;
> mp_opt->reset = 0;
> - mp_opt->csum_reqd = 0;
> + mp_opt->csum_reqd = READ_ONCE(msk->csum_enabled);
>
> length = (th->doff * 4) - sizeof(struct tcphdr);
> ptr = (const unsigned char *)(th + 1);
> --
> 2.31.1
>
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option"
2021-05-07 1:12 [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Geliang Tang
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
2021-05-11 0:47 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Mat Martineau
@ 2021-05-13 7:29 ` Matthieu Baerts
2 siblings, 0 replies; 6+ messages in thread
From: Matthieu Baerts @ 2021-05-13 7:29 UTC (permalink / raw)
To: Geliang Tang, mptcp
Hi Geliang, Mat,
On 07/05/2021 03:12, Geliang Tang wrote:
> Keep mptcp_parse_option unchanged.
>
> Please update the commit log too:
>
> '''
> mptcp: add sk parameter for mptcp_get_options
>
> This patch added a new parameter name sk in mptcp_get_options().
> '''
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Thank you for the patch!
Now in our tree:
- 079024ea2393: "squashed" in "mptcp: add sk parameter for
mptcp_parse_option"
- 31116dbd2a19: tg:msg: remove mptcp_parse_option
- Results: 0ebe24033a1a..bcf6675a2d3f
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210513T072854
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210513T072854
Cheers,
Mat
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received"
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
2021-05-11 0:48 ` Mat Martineau
@ 2021-05-13 7:32 ` Matthieu Baerts
1 sibling, 0 replies; 6+ messages in thread
From: Matthieu Baerts @ 2021-05-13 7:32 UTC (permalink / raw)
To: Geliang Tang, mptcp
Hi Geliang, Mat,
On 07/05/2021 03:12, Geliang Tang wrote:
> Init csum_reqd in mptcp_get_options, keep mptcp_parse_option unchanged.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Thank you for the patch and the review!
Now in our tree:
- 946635ce56b1: "squashed" in "mptcp: add csum_reqd in
mptcp_options_received"
- Results: bcf6675a2d3f..6628a7b4ea41
Builds and tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210513T073141
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210513T073141
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-05-13 7:32 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-07 1:12 [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Geliang Tang
2021-05-07 1:12 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add csum_reqd in mptcp_options_received" Geliang Tang
2021-05-11 0:48 ` Mat Martineau
2021-05-13 7:32 ` Matthieu Baerts
2021-05-11 0:47 ` [MPTCP][PATCH mptcp-next] Squash to "mptcp: add sk parameter for mptcp_parse_option" Mat Martineau
2021-05-13 7:29 ` 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.