* [PATCH v2 1/2] mptcp: add MSG_PEEK support
@ 2021-04-15 3:19 Yonglong Li
2021-04-15 3:19 ` [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK Yonglong Li
2021-04-15 11:54 ` [PATCH v2 1/2] mptcp: add MSG_PEEK support Paolo Abeni
0 siblings, 2 replies; 8+ messages in thread
From: Yonglong Li @ 2021-04-15 3:19 UTC (permalink / raw)
To: mptcp, mptcp
Cc: mathew.j.martineau, matthieu.baerts, fw, pabeni, wujianguo, Yonglong Li
This patch adds support for MSG_PEEK flag. Packets are not removed
from the receive_queue if MSG_PEEK set in recv() system call.
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
---
net/mptcp/protocol.c | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 0437fe4..521e67b 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1739,12 +1739,12 @@ static void mptcp_wait_data(struct sock *sk, long *timeo)
static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
struct msghdr *msg,
- size_t len)
+ size_t len, int flags)
{
- struct sk_buff *skb;
+ struct sk_buff *skb, *tmp;
int copied = 0;
- while ((skb = skb_peek(&msk->receive_queue)) != NULL) {
+ skb_queue_walk_safe(&msk->receive_queue, skb, tmp) {
u32 offset = MPTCP_SKB_CB(skb)->offset;
u32 data_len = skb->len - offset;
u32 count = min_t(size_t, len - copied, data_len);
@@ -1760,15 +1760,18 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
copied += count;
if (count < data_len) {
- MPTCP_SKB_CB(skb)->offset += count;
+ if (!(flags & MSG_PEEK))
+ MPTCP_SKB_CB(skb)->offset += count;
break;
}
- /* we will bulk release the skb memory later */
- skb->destructor = NULL;
- msk->rmem_released += skb->truesize;
- __skb_unlink(skb, &msk->receive_queue);
- __kfree_skb(skb);
+ if (!(flags & MSG_PEEK)) {
+ /* we will bulk release the skb memory later */
+ skb->destructor = NULL;
+ msk->rmem_released += skb->truesize;
+ __skb_unlink(skb, &msk->receive_queue);
+ __kfree_skb(skb);
+ }
if (copied >= len)
break;
@@ -1945,7 +1948,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
int target;
long timeo;
- if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT))
+ if (flags & ~(MSG_PEEK | MSG_WAITALL | MSG_DONTWAIT))
return -EOPNOTSUPP;
mptcp_lock_sock(sk, __mptcp_splice_receive_queue(sk));
@@ -1962,7 +1965,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
while (copied < len) {
int bytes_read;
- bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied);
+ bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags);
if (unlikely(bytes_read < 0)) {
if (!copied)
copied = bytes_read;
@@ -2046,7 +2049,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
pr_debug("msk=%p data_ready=%d rx queue empty=%d copied=%d",
msk, test_bit(MPTCP_DATA_READY, &msk->flags),
skb_queue_empty_lockless(&sk->sk_receive_queue), copied);
- mptcp_rcv_space_adjust(msk, copied);
+ if (!(flags & MSG_PEEK))
+ mptcp_rcv_space_adjust(msk, copied);
release_sock(sk);
return copied;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK
2021-04-15 3:19 [PATCH v2 1/2] mptcp: add MSG_PEEK support Yonglong Li
@ 2021-04-15 3:19 ` Yonglong Li
2021-04-15 9:42 ` Paolo Abeni
2021-04-15 11:54 ` [PATCH v2 1/2] mptcp: add MSG_PEEK support Paolo Abeni
1 sibling, 1 reply; 8+ messages in thread
From: Yonglong Li @ 2021-04-15 3:19 UTC (permalink / raw)
To: mptcp, mptcp
Cc: mathew.j.martineau, matthieu.baerts, fw, pabeni, wujianguo, Yonglong Li
Extend mptcp_connect tool with MSG_PEEK support and add a test case in
mptcp_connect.sh that checks the data recvived from/after recv() with
MSG_PEEK.
eg: sh mptcp_connect.sh -4 -m poll -P
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
---
tools/testing/selftests/net/mptcp/mptcp_connect.c | 45 +++++++++++++++++++-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 49 +++++++++++++++++++++-
2 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 2f207cf..668a041 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -45,7 +45,14 @@ enum cfg_mode {
CFG_MODE_SENDFILE,
};
+enum cfg_peek {
+ CFG_NONE_PEEK,
+ CFG_WITH_PEEK,
+ CFG_AFTER_PEEK,
+};
+
static enum cfg_mode cfg_mode = CFG_MODE_POLL;
+static enum cfg_peek cfg_peek = CFG_NONE_PEEK;
static const char *cfg_host;
static const char *cfg_port = "12000";
static int cfg_sock_proto = IPPROTO_MPTCP;
@@ -73,6 +80,7 @@ static void die_usage(void)
fprintf(stderr, "\t-M mark -- set socket packet mark\n");
fprintf(stderr, "\t-u -- check mptcp ulp\n");
fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n");
+ fprintf(stderr, "\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket \n");
exit(1);
}
@@ -331,6 +339,8 @@ static size_t do_write(const int fd, char *buf, const size_t len)
static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
{
+ int ret = 0;
+ char tmp[16384];
size_t cap = rand();
cap &= 0xffff;
@@ -340,7 +350,17 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
else if (cap > len)
cap = len;
- return read(fd, buf, cap);
+ if (cfg_peek == CFG_WITH_PEEK) {
+ ret = recv(fd, buf, cap, MSG_PEEK);
+ ret = (ret < 0) ? ret : read(fd, tmp, ret);
+ } else if (cfg_peek == CFG_AFTER_PEEK) {
+ ret = recv(fd, buf, cap, MSG_PEEK);
+ ret = (ret < 0) ? ret : read(fd, buf, cap);
+ } else {
+ ret = read(fd, buf, cap);
+ }
+
+ return ret;
}
static void set_nonblock(int fd)
@@ -819,6 +839,24 @@ int parse_mode(const char *mode)
return 0;
}
+int parse_peek(const char *mode)
+{
+ if (!strcasecmp(mode, "saveWithPeek"))
+ return CFG_WITH_PEEK;
+ if (!strcasecmp(mode, "saveAfterPeek"))
+ return CFG_AFTER_PEEK;
+
+ fprintf(stderr, "Unknown: %s\n", mode);
+ fprintf(stderr, "Supported MSG_PEEK mode are:\n");
+ fprintf(stderr, "\t\t\"saveWithPeek\" - recv data with flags 'MSG_PEEK' and save the peek data into file \n");
+ fprintf(stderr, "\t\t\"saveAfterPeek\" - read data form socket and save it into file after recv with flags 'MSG_PEEK' \n");
+
+ die_usage();
+
+ /* silence compiler warning */
+ return 0;
+}
+
static int parse_int(const char *size)
{
unsigned long s;
@@ -846,7 +884,7 @@ static void parse_opts(int argc, char **argv)
{
int c;
- while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:M:")) != -1) {
+ while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:M:P:")) != -1) {
switch (c) {
case 'j':
cfg_join = true;
@@ -899,6 +937,9 @@ static void parse_opts(int argc, char **argv)
case 'M':
cfg_mark = strtol(optarg, NULL, 0);
break;
+ case 'P':
+ cfg_peek = parse_peek(optarg);
+ break;
}
}
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 385cdc9..aa267f3 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -3,7 +3,7 @@
time_start=$(date +%s)
-optstring="S:R:d:e:l:r:h4cm:f:t"
+optstring="S:R:d:e:l:r:h4cm:f:tP"
ret=0
sin=""
sout=""
@@ -23,6 +23,8 @@ rcvbuf=0
options_log=true
do_tcp=0
filesize=0
+testpeek=false
+peekmode=""
if [ $tc_loss -eq 100 ];then
tc_loss=1%
@@ -47,6 +49,7 @@ usage() {
echo -e "\t-R: set rcvbuf value (default: use kernel default)"
echo -e "\t-m: test mode (poll, sendfile; default: poll)"
echo -e "\t-t: also run tests with TCP (use twice to non-fallback tcp)"
+ echo -e "\t-P: test MSG_PEEK flags of recv() function"
}
while getopts "$optstring" option;do
@@ -104,6 +107,10 @@ while getopts "$optstring" option;do
"t")
do_tcp=$((do_tcp+1))
;;
+ "P")
+ testpeek=true
+ peekmode="saveWithPeek"
+ ;;
"?")
usage $0
exit 1
@@ -393,6 +400,10 @@ do_transfer()
extra_args="$extra_args -m $testmode"
fi
+ if $testpeek; then
+ extra_args="$extra_args -P $peekmode"
+ fi
+
if [ -n "$extra_args" ] && $options_log; then
options_log=false
echo "INFO: extra options: $extra_args"
@@ -734,7 +745,41 @@ done
time_end=$(date +%s)
time_run=$((time_end-time_start))
-
echo "Time: ${time_run} seconds"
+# if testpeek enable, set peekmode="saveAfterPeek" and test again
+if $testpeek; then
+ time_start=$(date +%s)
+ peekmode="saveAfterPeek"
+ options_log=true
+ for sender in $ns1 $ns2 $ns3 $ns4;do
+ run_tests_lo "$ns1" "$sender" 10.0.1.1 1
+ if [ $ret -ne 0 ] ;then
+ echo "FAIL: Could not even run loopback test" 1>&2
+ exit $ret
+ fi
+ run_tests_lo "$ns1" $sender dead:beef:1::1 1
+ if [ $ret -ne 0 ] ;then
+ echo "FAIL: Could not even run loopback v6 test" 2>&1
+ exit $ret
+ fi
+
+ run_tests "$ns2" $sender 10.0.1.2
+ run_tests "$ns2" $sender dead:beef:1::2
+ run_tests "$ns2" $sender 10.0.2.1
+ run_tests "$ns2" $sender dead:beef:2::1
+
+ run_tests "$ns3" $sender 10.0.2.2
+ run_tests "$ns3" $sender dead:beef:2::2
+ run_tests "$ns3" $sender 10.0.3.2
+ run_tests "$ns3" $sender dead:beef:3::2
+
+ run_tests "$ns4" $sender 10.0.3.1
+ run_tests "$ns4" $sender dead:beef:3::1
+ done
+ time_end=$(date +%s)
+ time_run=$((time_end-time_start))
+ echo "Time: ${time_run} seconds"
+fi
+
exit $ret
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK
2021-04-15 3:19 ` [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK Yonglong Li
@ 2021-04-15 9:42 ` Paolo Abeni
2021-04-15 10:20 ` Matthieu Baerts
0 siblings, 1 reply; 8+ messages in thread
From: Paolo Abeni @ 2021-04-15 9:42 UTC (permalink / raw)
To: Yonglong Li, mptcp, mptcp
Cc: mathew.j.martineau, matthieu.baerts, fw, wujianguo
On Thu, 2021-04-15 at 11:19 +0800, Yonglong Li wrote:
> Extend mptcp_connect tool with MSG_PEEK support and add a test case in
> mptcp_connect.sh that checks the data recvived from/after recv() with
> MSG_PEEK.
>
> eg: sh mptcp_connect.sh -4 -m poll -P
>
> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
> ---
> tools/testing/selftests/net/mptcp/mptcp_connect.c | 45 +++++++++++++++++++-
> tools/testing/selftests/net/mptcp/mptcp_connect.sh | 49 +++++++++++++++++++++-
> 2 files changed, 90 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
> index 2f207cf..668a041 100644
> --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
> +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
> @@ -45,7 +45,14 @@ enum cfg_mode {
> CFG_MODE_SENDFILE,
> };
>
> +enum cfg_peek {
> + CFG_NONE_PEEK,
> + CFG_WITH_PEEK,
> + CFG_AFTER_PEEK,
> +};
> +
> static enum cfg_mode cfg_mode = CFG_MODE_POLL;
> +static enum cfg_peek cfg_peek = CFG_NONE_PEEK;
> static const char *cfg_host;
> static const char *cfg_port = "12000";
> static int cfg_sock_proto = IPPROTO_MPTCP;
> @@ -73,6 +80,7 @@ static void die_usage(void)
> fprintf(stderr, "\t-M mark -- set socket packet mark\n");
> fprintf(stderr, "\t-u -- check mptcp ulp\n");
> fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n");
> + fprintf(stderr, "\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket \n");
> exit(1);
> }
>
> @@ -331,6 +339,8 @@ static size_t do_write(const int fd, char *buf, const size_t len)
>
> static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
> {
> + int ret = 0;
> + char tmp[16384];
> size_t cap = rand();
>
> cap &= 0xffff;
> @@ -340,7 +350,17 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
> else if (cap > len)
> cap = len;
>
> - return read(fd, buf, cap);
> + if (cfg_peek == CFG_WITH_PEEK) {
> + ret = recv(fd, buf, cap, MSG_PEEK);
> + ret = (ret < 0) ? ret : read(fd, tmp, ret);
> + } else if (cfg_peek == CFG_AFTER_PEEK) {
> + ret = recv(fd, buf, cap, MSG_PEEK);
> + ret = (ret < 0) ? ret : read(fd, buf, cap);
> + } else {
> + ret = read(fd, buf, cap);
> + }
> +
> + return ret;
> }
>
> static void set_nonblock(int fd)
> @@ -819,6 +839,24 @@ int parse_mode(const char *mode)
> return 0;
> }
>
> +int parse_peek(const char *mode)
> +{
> + if (!strcasecmp(mode, "saveWithPeek"))
> + return CFG_WITH_PEEK;
> + if (!strcasecmp(mode, "saveAfterPeek"))
> + return CFG_AFTER_PEEK;
> +
> + fprintf(stderr, "Unknown: %s\n", mode);
> + fprintf(stderr, "Supported MSG_PEEK mode are:\n");
> + fprintf(stderr, "\t\t\"saveWithPeek\" - recv data with flags 'MSG_PEEK' and save the peek data into file \n");
> + fprintf(stderr, "\t\t\"saveAfterPeek\" - read data form socket and save it into file after recv with flags 'MSG_PEEK' \n");
> +
> + die_usage();
> +
> + /* silence compiler warning */
> + return 0;
> +}
> +
> static int parse_int(const char *size)
> {
> unsigned long s;
> @@ -846,7 +884,7 @@ static void parse_opts(int argc, char **argv)
> {
> int c;
>
> - while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:M:")) != -1) {
> + while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:M:P:")) != -1) {
> switch (c) {
> case 'j':
> cfg_join = true;
> @@ -899,6 +937,9 @@ static void parse_opts(int argc, char **argv)
> case 'M':
> cfg_mark = strtol(optarg, NULL, 0);
> break;
> + case 'P':
> + cfg_peek = parse_peek(optarg);
> + break;
> }
> }
>
> diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> index 385cdc9..aa267f3 100755
> --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
> @@ -3,7 +3,7 @@
>
> time_start=$(date +%s)
>
> -optstring="S:R:d:e:l:r:h4cm:f:t"
> +optstring="S:R:d:e:l:r:h4cm:f:tP"
> ret=0
> sin=""
> sout=""
> @@ -23,6 +23,8 @@ rcvbuf=0
> options_log=true
> do_tcp=0
> filesize=0
> +testpeek=false
> +peekmode=""
>
> if [ $tc_loss -eq 100 ];then
> tc_loss=1%
> @@ -47,6 +49,7 @@ usage() {
> echo -e "\t-R: set rcvbuf value (default: use kernel default)"
> echo -e "\t-m: test mode (poll, sendfile; default: poll)"
> echo -e "\t-t: also run tests with TCP (use twice to non-fallback tcp)"
> + echo -e "\t-P: test MSG_PEEK flags of recv() function"
> }
>
> while getopts "$optstring" option;do
> @@ -104,6 +107,10 @@ while getopts "$optstring" option;do
> "t")
> do_tcp=$((do_tcp+1))
> ;;
> + "P")
> + testpeek=true
> + peekmode="saveWithPeek"
> + ;;
> "?")
> usage $0
> exit 1
> @@ -393,6 +400,10 @@ do_transfer()
> extra_args="$extra_args -m $testmode"
> fi
>
> + if $testpeek; then
> + extra_args="$extra_args -P $peekmode"
> + fi
> +
> if [ -n "$extra_args" ] && $options_log; then
> options_log=false
> echo "INFO: extra options: $extra_args"
> @@ -734,7 +745,41 @@ done
>
> time_end=$(date +%s)
> time_run=$((time_end-time_start))
> -
Very minor nit: please don't introduce unneeded whitespace changes.
> echo "Time: ${time_run} seconds"
>
> +# if testpeek enable, set peekmode="saveAfterPeek" and test again
> +if $testpeek; then
> + time_start=$(date +%s)
> + peekmode="saveAfterPeek"
> + options_log=true
> + for sender in $ns1 $ns2 $ns3 $ns4;do
> + run_tests_lo "$ns1" "$sender" 10.0.1.1 1
> + if [ $ret -ne 0 ] ;then
> + echo "FAIL: Could not even run loopback test" 1>&2
> + exit $ret
> + fi
> + run_tests_lo "$ns1" $sender dead:beef:1::1 1
> + if [ $ret -ne 0 ] ;then
> + echo "FAIL: Could not even run loopback v6 test" 2>&1
> + exit $ret
> + fi
> +
> + run_tests "$ns2" $sender 10.0.1.2
> + run_tests "$ns2" $sender dead:beef:1::2
> + run_tests "$ns2" $sender 10.0.2.1
> + run_tests "$ns2" $sender dead:beef:2::1
> +
> + run_tests "$ns3" $sender 10.0.2.2
> + run_tests "$ns3" $sender dead:beef:2::2
> + run_tests "$ns3" $sender 10.0.3.2
> + run_tests "$ns3" $sender dead:beef:3::2
> +
> + run_tests "$ns4" $sender 10.0.3.1
> + run_tests "$ns4" $sender dead:beef:3::1
> + done
> + time_end=$(date +%s)
> + time_run=$((time_end-time_start))
> + echo "Time: ${time_run} seconds"
> +fi
> +
> exit $ret
The code LGTM overall. I would prever having the peek test enabled by
default, and I think that covering all the netns matrix is a bit
overkill.
What about running a single saveWithPeek and a single saveAfterPeek on
loopback before the main loop?
Thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK
2021-04-15 9:42 ` Paolo Abeni
@ 2021-04-15 10:20 ` Matthieu Baerts
2021-04-16 1:31 ` Yonglong Li
0 siblings, 1 reply; 8+ messages in thread
From: Matthieu Baerts @ 2021-04-15 10:20 UTC (permalink / raw)
To: Paolo Abeni, Yonglong Li, mptcp; +Cc: mathew.j.martineau, fw, wujianguo
Hello,
Thank you for the patches and the review!
On 15/04/2021 11:42, Paolo Abeni wrote:
> On Thu, 2021-04-15 at 11:19 +0800, Yonglong Li wrote:
>> Extend mptcp_connect tool with MSG_PEEK support and add a test case in
>> mptcp_connect.sh that checks the data recvived from/after recv() with
>> MSG_PEEK.
>>
>> eg: sh mptcp_connect.sh -4 -m poll -P
>
> The code LGTM overall. I would prever having the peek test enabled by
> default, and I think that covering all the netns matrix is a bit
> overkill.
>
> What about running a single saveWithPeek and a single saveAfterPeek on
> loopback before the main loop?
Yes, good idea otherwise I'm not sure it will be tested often.
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] mptcp: add MSG_PEEK support
2021-04-15 3:19 [PATCH v2 1/2] mptcp: add MSG_PEEK support Yonglong Li
2021-04-15 3:19 ` [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK Yonglong Li
@ 2021-04-15 11:54 ` Paolo Abeni
2021-04-16 1:30 ` Yonglong Li
1 sibling, 1 reply; 8+ messages in thread
From: Paolo Abeni @ 2021-04-15 11:54 UTC (permalink / raw)
To: Yonglong Li, mptcp, mptcp
Cc: mathew.j.martineau, matthieu.baerts, fw, wujianguo
On Thu, 2021-04-15 at 11:19 +0800, Yonglong Li wrote:
> This patch adds support for MSG_PEEK flag. Packets are not removed
> from the receive_queue if MSG_PEEK set in recv() system call.
>
> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
> ---
> net/mptcp/protocol.c | 28 ++++++++++++++++------------
> 1 file changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
> index 0437fe4..521e67b 100644
> --- a/net/mptcp/protocol.c
> +++ b/net/mptcp/protocol.c
> @@ -1739,12 +1739,12 @@ static void mptcp_wait_data(struct sock *sk, long *timeo)
>
> static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
> struct msghdr *msg,
> - size_t len)
> + size_t len, int flags)
> {
> - struct sk_buff *skb;
> + struct sk_buff *skb, *tmp;
> int copied = 0;
>
> - while ((skb = skb_peek(&msk->receive_queue)) != NULL) {
> + skb_queue_walk_safe(&msk->receive_queue, skb, tmp) {
> u32 offset = MPTCP_SKB_CB(skb)->offset;
> u32 data_len = skb->len - offset;
> u32 count = min_t(size_t, len - copied, data_len);
> @@ -1760,15 +1760,18 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
> copied += count;
>
> if (count < data_len) {
> - MPTCP_SKB_CB(skb)->offset += count;
> + if (!(flags & MSG_PEEK))
> + MPTCP_SKB_CB(skb)->offset += count;
> break;
> }
>
> - /* we will bulk release the skb memory later */
> - skb->destructor = NULL;
> - msk->rmem_released += skb->truesize;
> - __skb_unlink(skb, &msk->receive_queue);
> - __kfree_skb(skb);
> + if (!(flags & MSG_PEEK)) {
> + /* we will bulk release the skb memory later */
> + skb->destructor = NULL;
> + msk->rmem_released += skb->truesize;
> + __skb_unlink(skb, &msk->receive_queue);
> + __kfree_skb(skb);
> + }
>
> if (copied >= len)
> break;
> @@ -1945,7 +1948,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
> int target;
> long timeo;
>
> - if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT))
> + if (flags & ~(MSG_PEEK | MSG_WAITALL | MSG_DONTWAIT))
> return -EOPNOTSUPP;
Ooops... the existing code (prior to your patch) is pure nonsense here.
Is probably better just drop this check entirely.
Thanks!
Paolo
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/2] mptcp: add MSG_PEEK support
2021-04-15 11:54 ` [PATCH v2 1/2] mptcp: add MSG_PEEK support Paolo Abeni
@ 2021-04-16 1:30 ` Yonglong Li
0 siblings, 0 replies; 8+ messages in thread
From: Yonglong Li @ 2021-04-16 1:30 UTC (permalink / raw)
To: Paolo Abeni, mptcp; +Cc: mathew.j.martineau, matthieu.baerts, fw, wujianguo
On 2021/4/15 19:54, Paolo Abeni wrote:
> On Thu, 2021-04-15 at 11:19 +0800, Yonglong Li wrote:
>> This patch adds support for MSG_PEEK flag. Packets are not removed
>> from the receive_queue if MSG_PEEK set in recv() system call.
>>
>> Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
>> ---
>> net/mptcp/protocol.c | 28 ++++++++++++++++------------
>> 1 file changed, 16 insertions(+), 12 deletions(-)
>>
>> diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
>> index 0437fe4..521e67b 100644
>> --- a/net/mptcp/protocol.c
>> +++ b/net/mptcp/protocol.c
>> @@ -1739,12 +1739,12 @@ static void mptcp_wait_data(struct sock *sk, long *timeo)
>>
>> static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
>> struct msghdr *msg,
>> - size_t len)
>> + size_t len, int flags)
>> {
>> - struct sk_buff *skb;
>> + struct sk_buff *skb, *tmp;
>> int copied = 0;
>>
>> - while ((skb = skb_peek(&msk->receive_queue)) != NULL) {
>> + skb_queue_walk_safe(&msk->receive_queue, skb, tmp) {
>> u32 offset = MPTCP_SKB_CB(skb)->offset;
>> u32 data_len = skb->len - offset;
>> u32 count = min_t(size_t, len - copied, data_len);
>> @@ -1760,15 +1760,18 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
>> copied += count;
>>
>> if (count < data_len) {
>> - MPTCP_SKB_CB(skb)->offset += count;
>> + if (!(flags & MSG_PEEK))
>> + MPTCP_SKB_CB(skb)->offset += count;
>> break;
>> }
>>
>> - /* we will bulk release the skb memory later */
>> - skb->destructor = NULL;
>> - msk->rmem_released += skb->truesize;
>> - __skb_unlink(skb, &msk->receive_queue);
>> - __kfree_skb(skb);
>> + if (!(flags & MSG_PEEK)) {
>> + /* we will bulk release the skb memory later */
>> + skb->destructor = NULL;
>> + msk->rmem_released += skb->truesize;
>> + __skb_unlink(skb, &msk->receive_queue);
>> + __kfree_skb(skb);
>> + }
>>
>> if (copied >= len)
>> break;
>> @@ -1945,7 +1948,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
>> int target;
>> long timeo;
>>
>> - if (msg->msg_flags & ~(MSG_WAITALL | MSG_DONTWAIT))
>> + if (flags & ~(MSG_PEEK | MSG_WAITALL | MSG_DONTWAIT))
>> return -EOPNOTSUPP;
>
> Ooops... the existing code (prior to your patch) is pure nonsense here.
>
> Is probably better just drop this check entirely.
>
ok, I will drop this check entirely in next patch.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK
2021-04-15 10:20 ` Matthieu Baerts
@ 2021-04-16 1:31 ` Yonglong Li
0 siblings, 0 replies; 8+ messages in thread
From: Yonglong Li @ 2021-04-16 1:31 UTC (permalink / raw)
To: Matthieu Baerts, Paolo Abeni, mptcp; +Cc: mathew.j.martineau, fw, wujianguo
ok, I will prepare a v3 patch as your suggestion.
On 2021/4/15 18:20, Matthieu Baerts wrote:
> Hello,
>
> Thank you for the patches and the review!
>
> On 15/04/2021 11:42, Paolo Abeni wrote:
>> On Thu, 2021-04-15 at 11:19 +0800, Yonglong Li wrote:
>>> Extend mptcp_connect tool with MSG_PEEK support and add a test case in
>>> mptcp_connect.sh that checks the data recvived from/after recv() with
>>> MSG_PEEK.
>>>
>>> eg: sh mptcp_connect.sh -4 -m poll -P
>>
>> The code LGTM overall. I would prever having the peek test enabled by
>> default, and I think that covering all the netns matrix is a bit
>> overkill.
>>
>> What about running a single saveWithPeek and a single saveAfterPeek on
>> loopback before the main loop?
>
> Yes, good idea otherwise I'm not sure it will be tested often.
>
> Cheers,
> Matt
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK
2021-04-15 1:58 Yonglong Li
@ 2021-04-15 1:58 ` Yonglong Li
0 siblings, 0 replies; 8+ messages in thread
From: Yonglong Li @ 2021-04-15 1:58 UTC (permalink / raw)
To: mptcp, liyonglong
Extend mptcp_connect tool with MSG_PEEK support and add a test case in
mptcp_connect.sh that checks the data recvived from/after recv() with
MSG_PEEK.
eg: sh mptcp_connect.sh -4 -m poll -P
Signed-off-by: Yonglong Li <liyonglong@chinatelecom.cn>
---
tools/testing/selftests/net/mptcp/mptcp_connect.c | 45 +++++++++++++++++++-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 49 +++++++++++++++++++++-
2 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c
index 69d89b5..3e348e2 100644
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.c
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c
@@ -45,7 +45,14 @@ enum cfg_mode {
CFG_MODE_SENDFILE,
};
+enum cfg_peek {
+ CFG_NONE_PEEK,
+ CFG_WITH_PEEK,
+ CFG_AFTER_PEEK,
+};
+
static enum cfg_mode cfg_mode = CFG_MODE_POLL;
+static enum cfg_peek cfg_peek = CFG_NONE_PEEK;
static const char *cfg_host;
static const char *cfg_port = "12000";
static int cfg_sock_proto = IPPROTO_MPTCP;
@@ -71,6 +78,7 @@ static void die_usage(void)
fprintf(stderr, "\t-m [poll|mmap|sendfile] -- use poll(default)/mmap+write/sendfile\n");
fprintf(stderr, "\t-u -- check mptcp ulp\n");
fprintf(stderr, "\t-w num -- wait num sec before closing the socket\n");
+ fprintf(stderr, "\t-P [saveWithPeek|saveAfterPeek] -- save data with/after MSG_PEEK form tcp socket \n");
exit(1);
}
@@ -315,6 +323,8 @@ static size_t do_write(const int fd, char *buf, const size_t len)
static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
{
+ int ret = 0;
+ char tmp[16384];
size_t cap = rand();
cap &= 0xffff;
@@ -324,7 +334,17 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len)
else if (cap > len)
cap = len;
- return read(fd, buf, cap);
+ if (cfg_peek == CFG_WITH_PEEK) {
+ ret = recv(fd, buf, cap, MSG_PEEK);
+ ret = (ret < 0) ? ret : read(fd, tmp, ret);
+ } else if (cfg_peek == CFG_AFTER_PEEK) {
+ ret = recv(fd, buf, cap, MSG_PEEK);
+ ret = (ret < 0) ? ret : read(fd, buf, cap);
+ } else {
+ ret = read(fd, buf, cap);
+ }
+
+ return ret;
}
static void set_nonblock(int fd)
@@ -803,6 +823,24 @@ int parse_mode(const char *mode)
return 0;
}
+int parse_peek(const char *mode)
+{
+ if (!strcasecmp(mode, "saveWithPeek"))
+ return CFG_WITH_PEEK;
+ if (!strcasecmp(mode, "saveAfterPeek"))
+ return CFG_AFTER_PEEK;
+
+ fprintf(stderr, "Unknown: %s\n", mode);
+ fprintf(stderr, "Supported MSG_PEEK mode are:\n");
+ fprintf(stderr, "\t\t\"saveWithPeek\" - recv data with flags 'MSG_PEEK' and save the peek data into file \n");
+ fprintf(stderr, "\t\t\"saveAfterPeek\" - read data form socket and save it into file after recv with flags 'MSG_PEEK' \n");
+
+ die_usage();
+
+ /* silence compiler warning */
+ return 0;
+}
+
static int parse_int(const char *size)
{
unsigned long s;
@@ -830,7 +868,7 @@ static void parse_opts(int argc, char **argv)
{
int c;
- while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:")) != -1) {
+ while ((c = getopt(argc, argv, "6jr:lp:s:hut:m:S:R:w:P:")) != -1) {
switch (c) {
case 'j':
cfg_join = true;
@@ -880,6 +918,9 @@ static void parse_opts(int argc, char **argv)
case 'w':
cfg_wait = atoi(optarg)*1000000;
break;
+ case 'P':
+ cfg_peek = parse_peek(optarg);
+ break;
}
}
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.sh b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
index 385cdc9..c07ea4f 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
@@ -3,7 +3,7 @@
time_start=$(date +%s)
-optstring="S:R:d:e:l:r:h4cm:f:t"
+optstring="S:R:d:e:l:r:h4cm:f:tp"
ret=0
sin=""
sout=""
@@ -23,6 +23,8 @@ rcvbuf=0
options_log=true
do_tcp=0
filesize=0
+testpeek=false
+peekmode=""
if [ $tc_loss -eq 100 ];then
tc_loss=1%
@@ -47,6 +49,7 @@ usage() {
echo -e "\t-R: set rcvbuf value (default: use kernel default)"
echo -e "\t-m: test mode (poll, sendfile; default: poll)"
echo -e "\t-t: also run tests with TCP (use twice to non-fallback tcp)"
+ echo -e "\t-P: test MSG_PEEK flags of recv() function"
}
while getopts "$optstring" option;do
@@ -104,6 +107,10 @@ while getopts "$optstring" option;do
"t")
do_tcp=$((do_tcp+1))
;;
+ "P")
+ testpeek=true
+ peekmode="saveWithPeek"
+ ;;
"?")
usage $0
exit 1
@@ -393,6 +400,10 @@ do_transfer()
extra_args="$extra_args -m $testmode"
fi
+ if $testpeek; then
+ extra_args="$extra_args -P $peekmode"
+ fi
+
if [ -n "$extra_args" ] && $options_log; then
options_log=false
echo "INFO: extra options: $extra_args"
@@ -734,7 +745,41 @@ done
time_end=$(date +%s)
time_run=$((time_end-time_start))
-
echo "Time: ${time_run} seconds"
+# if testpeek enable, set peekmode="saveAfterPeek" and test again
+if $testpeek; then
+ time_start=$(date +%s)
+ peekmode="saveAfterPeek"
+ options_log=true
+ for sender in $ns1 $ns2 $ns3 $ns4;do
+ run_tests_lo "$ns1" "$sender" 10.0.1.1 1
+ if [ $ret -ne 0 ] ;then
+ echo "FAIL: Could not even run loopback test" 1>&2
+ exit $ret
+ fi
+ run_tests_lo "$ns1" $sender dead:beef:1::1 1
+ if [ $ret -ne 0 ] ;then
+ echo "FAIL: Could not even run loopback v6 test" 2>&1
+ exit $ret
+ fi
+
+ run_tests "$ns2" $sender 10.0.1.2
+ run_tests "$ns2" $sender dead:beef:1::2
+ run_tests "$ns2" $sender 10.0.2.1
+ run_tests "$ns2" $sender dead:beef:2::1
+
+ run_tests "$ns3" $sender 10.0.2.2
+ run_tests "$ns3" $sender dead:beef:2::2
+ run_tests "$ns3" $sender 10.0.3.2
+ run_tests "$ns3" $sender dead:beef:3::2
+
+ run_tests "$ns4" $sender 10.0.3.1
+ run_tests "$ns4" $sender dead:beef:3::1
+ done
+ time_end=$(date +%s)
+ time_run=$((time_end-time_start))
+ echo "Time: ${time_run} seconds"
+fi
+
exit $ret
--
1.8.3.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-04-16 1:40 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-15 3:19 [PATCH v2 1/2] mptcp: add MSG_PEEK support Yonglong Li
2021-04-15 3:19 ` [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK Yonglong Li
2021-04-15 9:42 ` Paolo Abeni
2021-04-15 10:20 ` Matthieu Baerts
2021-04-16 1:31 ` Yonglong Li
2021-04-15 11:54 ` [PATCH v2 1/2] mptcp: add MSG_PEEK support Paolo Abeni
2021-04-16 1:30 ` Yonglong Li
-- strict thread matches above, loose matches on Subject: below --
2021-04-15 1:58 Yonglong Li
2021-04-15 1:58 ` [PATCH v2 2/2] selftests: mptcp: add a test case for MSG_PEEK Yonglong Li
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.