From: "Július Milan" <jmilan.dev@gmail.com>
To: dev@dpdk.org, jgrajcia@cisco.com
Subject: [dpdk-dev] [PATCH 2/2] net/memif: fix init handling when already connected
Date: Wed, 19 Feb 2020 09:19:16 +0100 [thread overview]
Message-ID: <20200219081916.GA11931@vbox> (raw)
This patch fixes the situation when there is already connected pair of
memif interfaces and another slave tries to initiate the connection with
(already occupied) master. Expected behavior is that the second slave
is refused and gets disconnect message with reason: "Already connected",
while old connection remains functional.
Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD")
Signed-off-by: Július Milan <jmilan.dev@gmail.com>
---
drivers/net/memif/memif_socket.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c
index 553f8b004..1a06c6850 100644
--- a/drivers/net/memif/memif_socket.c
+++ b/drivers/net/memif/memif_socket.c
@@ -204,6 +204,13 @@ memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg)
pmd = dev->data->dev_private;
if (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) &&
(pmd->id == i->id) && (pmd->role == MEMIF_ROLE_MASTER)) {
+ if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING |
+ ETH_MEMIF_FLAG_CONNECTED)) {
+ memif_msg_enq_disconnect(cc,
+ "Already connected", 0);
+ return -1;
+ }
+
/* assign control channel to device */
cc->dev = dev;
pmd->cc = cc;
@@ -215,12 +222,6 @@ memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg)
return -1;
}
- if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING |
- ETH_MEMIF_FLAG_CONNECTED)) {
- memif_msg_enq_disconnect(pmd->cc,
- "Already connected", 0);
- return -1;
- }
strlcpy(pmd->remote_name, (char *)i->name,
sizeof(pmd->remote_name));
@@ -772,6 +773,7 @@ memif_intr_handler(void *arg)
ret = memif_msg_receive(cc);
/* if driver failed to assign device */
if (cc->dev == NULL) {
+ memif_msg_send_from_queue(cc);
ret = rte_intr_callback_unregister_pending(&cc->intr_handle,
memif_intr_handler,
cc,
--
2.17.1
next reply other threads:[~2020-02-19 8:19 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 8:19 Július Milan [this message]
2020-02-19 13:06 ` Jakub Grajciar -X (jgrajcia - PANTHEON TECH SRO at Cisco)
2020-03-09 14:44 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200219081916.GA11931@vbox \
--to=jmilan.dev@gmail.com \
--cc=dev@dpdk.org \
--cc=jgrajcia@cisco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).