[PATCH net-next] Squash-to: "mptcp: add netlink-based PM"
by Paolo Abeni
Let user space set a single limit at once and drop bogus
NL extack error message.
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/options.c | 4 +++-
net/mptcp/pm_netlink.c | 8 ++++----
net/mptcp/protocol.c | 6 +++++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index bd220ee4aac9..cc58059cdd6b 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -715,7 +715,9 @@ static bool check_fully_established(struct mptcp_sock *msk, struct sock *sk,
goto fully_established;
}
- WARN_ON_ONCE(subflow->can_ack);
+ if (WARN_ON_ONCE(subflow->can_ack))
+ printk(KERN_ERR "server side=%d dss=%d cap=%d seq_off=%d ssn=%d", msk->pm.server_side,
+ mp_opt->dss, mp_opt->mp_capable, TCP_SKB_CB(skb)->seq - subflow->ssn_offset, subflow->ssn_offset);
/* If the first established packet does not contain MP_CAPABLE + data
* then fallback to TCP
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 743c3c58f826..caad73dfda64 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -702,10 +702,8 @@ static int parse_limit(struct genl_info *info, int id, unsigned int *limit)
{
struct nlattr *attr = info->attrs[id];
- if (!attr) {
- GENL_SET_ERR_MSG(info, "missing announce accept limit");
- return -EINVAL;
- }
+ if (!attr)
+ return 0;
*limit = nla_get_u32(attr);
if (*limit > MPTCP_PM_ADDR_MAX) {
@@ -723,10 +721,12 @@ mptcp_nl_cmd_set_limits(struct sk_buff *skb, struct genl_info *info)
unsigned int rcv_addrs, subflows;
int ret;
+ rcv_addrs = pernet->add_addr_accept_max;
ret = parse_limit(info, MPTCP_PM_ATTR_RCV_ADD_ADDRS, &rcv_addrs);
if (ret)
return ret;
+ subflows = pernet->subflows_max;
ret = parse_limit(info, MPTCP_PM_ATTR_SUBFLOWS, &subflows);
if (ret)
return ret;
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index 2035bf15b886..bc18ac926a4f 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -197,8 +197,12 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
seq += len;
moved += len;
- if (WARN_ON_ONCE(map_remaining < len))
+ if (WARN_ON_ONCE(map_remaining < len)) {
+ printk(KERN_ERR "map_remaining: %d len %ld copied_seq=%d offset=%d map len=%d map_seq=%d ssn offset=%d ssn delta=%d",
+ map_remaining, len, seq, offset, subflow->map_data_len,
+ subflow->map_subflow_seq, subflow->ssn_offset, seq - subflow->ssn_offset);
break;
+ }
} else {
WARN_ON_ONCE(!fin);
sk_eat_skb(ssk, skb);
--
2.21.1
6 months
BUSINESS PROPOSAL !!!
by Abdul Kareem
Dearest Friend
I am Mr Abdul Kareem working with Emirate NBD Bank Dubai,United Arab Emirate as Finance Manager.
I have a very profitable Business that relate to you and will benefit both of us after completion.
Kindly get back to me for more details.
Awaiting your response.
Regards
Abdul Kareem
6 months
[PATCH 0/3] mptcp: fix "fn parameter not described" warnings
by Matthieu Baerts
When checking for extra warnings using 'make W=1' [1], I saw this:
$ make W=1 net/mptcp/token.o
net/mptcp/token.c:53: warning: Function parameter or member 'req' not described in 'mptcp_token_new_request'
net/mptcp/token.c:98: warning: Function parameter or member 'sk' not described in 'mptcp_token_new_connect'
net/mptcp/token.c:133: warning: Function parameter or member 'conn' not described in 'mptcp_token_new_accept'
net/mptcp/token.c:153: warning: Function parameter or member 'token' not described in 'mptcp_token_get_sock'
net/mptcp/token.c:178: warning: Function parameter or member 'token' not described in 'mptcp_token_destroy_request'
net/mptcp/token.c:191: warning: Function parameter or member 'token' not described in 'mptcp_token_destroy'
This doesn't stop the build if KCFLAGS='-Werror' is used but better to fix them.
One of these warnings has been introduced in commits from the 'export' branch
but the rest is from two already published commits.
[1] https://github.com/multipath-tcp/mptcp_net-next/commit/2069cff66f186b0d4e...
Matthieu Baerts (3):
mptcp: fix "fn parameter not described" warning
mptcp: fix "fn parameter not described" warnings
mptcp: fix "fn parameter not described" warning
net/mptcp/token.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
--
2.25.1
6 months
Your Fund...
by Mr. Samuel Chukwuyem Okojere
Attention:
In consonance with the Central (Apex) Banks of West African countries (BENIN, BURKINA FASO, CAPE VERDE, COTE D'IVOIRE, GAMBIA, GHANA, GUINEA, GUINEA BISSAU, LIBERIA, MALI, NIGER, NIGERIA, SENEGAL, SIERRA LEONE,TOGO),we are committed to identifying beneficiaries/payments for eventual unconditional transfer to beneficiaries.
I, respectfully wish to draw your attention to the following that you have been identified as a beneficiary of outstanding Fund currently long overdue and to help / facilitate our on going exercise, preparing to the unconditional transfer of your funds, You need to urgently reconfirm your details and requisite information viz,
(a) Full names and address and telephone.
(b) Copy of your identity.
(c) Essential documents pertaining to your funds and your claim for payment.
Note: You are quickly advised to stop communication with any other person whatsoever.Finally, endeavor to treat this mail as imperative and urgent and also to maintain confidentiality on it at all times and in all places until you have received your funds.
Finally, endeavor to treat this mail as imperative and urgent and also to maintain confidentiality on it at all times and in all places until you have received your funds.
Sincerely Yours,
Mr. Samuel Chukwuyem Okojere
Director,Payment Systems Management Department
Central Bank of Nigeria
Plot 33,Abubakar Tafawa Balewa Way
Central Business District,Cadastral Zone,
Abuja,Federal Capital Territory,Nigeria
P.M.B. 0187,Garki Abuja.
Nigeria
6 months
Your Fund.
by Mr. Samuel Chukwuyem Okojere
Attention:
In consonance with the Central (Apex) Banks of West African
countries (BENIN, BURKINA FASO, CAPE VERDE, COTE D'IVOIRE,
GAMBIA, GHANA, GUINEA, GUINEA BISSAU, LIBERIA, MALI, NIGER,
NIGERIA, SENEGAL, SIERRA LEONE,TOGO),we are committed to
identifying beneficiaries/payments for eventual unconditional
transfer to beneficiaries.
I, respectfully wish to draw your attention to the following that
you have been identified as a beneficiary of outstanding Fund
currently long overdue and to help / facilitate our on going
exercise, preparing to the unconditional transfer of your funds,
You need to urgently reconfirm your details and requisite
information viz,
(a) Full names and address and telephone.
(b) Copy of your identity.
(c) Essential documents pertaining to your funds and your claim
for payment.
Note: You are quickly advised to stop communication with any
other person whatsoever.Finally, endeavor to treat this mail as
imperative and urgent and also to maintain confidentiality on it
at all times and in all places until you have received your
funds.
Finally, endeavor to treat this mail as imperative and urgent and
also to maintain confidentiality on it at all times and in all
places until you have received your funds.
Sincerely Yours,
Mr. Samuel Chukwuyem Okojere
Director,Payment Systems Management Department
Central Bank of Nigeria
Plot 33,Abubakar Tafawa Balewa Way
Central Business District,Cadastral Zone,
Abuja,Federal Capital Territory,Nigeria
P.M.B. 0187,Garki Abuja.
Nigeria
6 months
[PATCH] mptcp:netlink: fix compilation warning
by Matthieu Baerts
net/mptcp/pm_netlink.c: In function ‘mptcp_pm_nl_add_addr_received’:
net/mptcp/pm_netlink.c:238:23: warning: variable ‘pernet’ set but not used [-Wunused-but-set-variable]
238 | struct pm_nl_pernet *pernet;
| ^~~~~~
Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net>
---
Notes:
to be squashed in "mptcp: add netlink-based PM"
net/mptcp/pm_netlink.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c
index 4bab1b32f932..743c3c58f826 100644
--- a/net/mptcp/pm_netlink.c
+++ b/net/mptcp/pm_netlink.c
@@ -235,9 +235,6 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)
struct sock *sk = (struct sock *)msk;
struct mptcp_addr_info remote;
struct mptcp_addr_info local;
- struct pm_nl_pernet *pernet;
-
- pernet = net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id);
pr_debug("accepted %d:%d remote family %d",
msk->pm.add_addr_accepted, msk->pm.add_addr_accept_max,
--
2.25.1
6 months
[GIT] Sync with net-next on 20200324: conflicts
by Matthieu Baerts
Hello,
Recently, MPTCP-related patch from Davide has been applied in 'net-next'
repo:
- 767d3ded5fb8 (net: mptcp: don't hang before sending 'MP capable with
data')
This created conflicts:
- 02366081040c: conflict in t/mptcp-Add-path-manager-interface
- fc3cbf097321: conflict in
t/mptcp-Add-handling-of-outgoing-MP_JOIN-requests
- 501e7cf63225: conflict in
t/mptcp-update-per-unacked-sequence-on-pkt-reception
- 6ed26433863c..844c9c9ed5a1 -- net/mptcp: result
I hope they have been resolved as expected.
Tests are in progress. The "export" branch will be updated after the tests.
Cheers,
Matt
--
Matthieu Baerts | R&D Engineer
matthieu.baerts(a)tessares.net
Tessares SA | Hybrid Access Solutions
www.tessares.net
1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
6 months
[PATCH net-next] net: mptcp: don't hang in mptcp_sendmsg() after TCP fallback
by Davide Caratti
it's still possible for packetdrill to hang in mptcp_sendmsg(), when the
MPTCP socket falls back to regular TCP (e.g. after receiving unsupported
flags/version during the three-way handshake). Adjust MPTCP socket state
earlier, to ensure correct functionality of mptcp_sendmsg() even in case
of TCP fallback.
Fixes: 767d3ded5fb8 ("net: mptcp: don't hang before sending 'MP capable with data'")
Fixes: 1954b86016cf ("mptcp: Check connection state before attempting send")
Signed-off-by: Davide Caratti <dcaratti(a)redhat.com>
---
net/mptcp/protocol.c | 4 ----
net/mptcp/subflow.c | 6 ++++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index e959104832ef..92d5382e71f4 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -1055,10 +1055,6 @@ void mptcp_finish_connect(struct sock *ssk)
WRITE_ONCE(msk->write_seq, subflow->idsn + 1);
WRITE_ONCE(msk->ack_seq, ack_seq);
WRITE_ONCE(msk->can_ack, 1);
- if (inet_sk_state_load(sk) != TCP_ESTABLISHED) {
- inet_sk_state_store(sk, TCP_ESTABLISHED);
- sk->sk_state_change(sk);
- }
}
static void mptcp_sock_graft(struct sock *sk, struct socket *parent)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 052d72a1d3a2..06b9075333c5 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -109,9 +109,15 @@ static void subflow_v6_init_req(struct request_sock *req,
static void subflow_finish_connect(struct sock *sk, const struct sk_buff *skb)
{
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
+ struct sock *parent = subflow->conn;
subflow->icsk_af_ops->sk_rx_dst_set(sk, skb);
+ if (inet_sk_state_load(parent) != TCP_ESTABLISHED) {
+ inet_sk_state_store(parent, TCP_ESTABLISHED);
+ parent->sk_state_change(parent);
+ }
+
if (!subflow->conn_finished) {
pr_debug("subflow=%p, remote_key=%llu", mptcp_subflow_ctx(sk),
subflow->remote_key);
--
2.24.1
6 months
Additional part 3 squash suggestion
by Mat Martineau
Florian and Matthieu -
From the meeting notes, it looks like "subflow: place further subflows on
new 'join_list'" is the commit that you're planning to squash.
What do you think about also squashing "mptcp: increment MIB counters in a
few places" in to the previous MIB commit? Seems like our patch count for
part 3 is still kind of high.
--
Mat Martineau
Intel
6 months
