From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 1234BA0093 for ; Tue, 19 May 2020 14:59:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 089381C1E4; Tue, 19 May 2020 14:59:28 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 3B89F1D619 for ; Tue, 19 May 2020 14:59:26 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id j5so15853965wrq.2 for ; Tue, 19 May 2020 05:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lOcG6ysXoZuEv8gfIBQ+HP+LksOmvGuS1arjSJLSP30=; b=lPGEHImxmQOvkpOyIVtBFu8FJwaQozsqNYkzkusir5NEEXPoQ/lUfvjP7DeJHHC6xm zRSbTw5bw4c/R3r7PkAI5/Pr/gqX54jKcGkmJxL0z+zUzkWR1LFWrXwiPffN5qdy5tLI Tk3txdp7ftVA02Ts02UyETiwQbR331wW7ZxRDrS+zXbZZcrB5AqjwH7BwPh+cfOxY5DE i0khsqwEgAhKIHtC9lEwdrDcBrdFxfdY7YrwW34Wz922/o5kUIzBEm7IG84hjPFNDpw8 rDFUGgxrfRNroRvjVvHK1oRGYk206KWQmNDmE7xP2vqLIJvPBvA7HjgLtBKeM83nVpFa t0SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lOcG6ysXoZuEv8gfIBQ+HP+LksOmvGuS1arjSJLSP30=; b=eUncVb5DOF/SnYS+s43oK4P1DR+u6oBz6QiINuD2psiH/PuGAcl+Xqac7D8ZoaxTc+ XCn2Udic4YMUM1sW9me4yGhdina0LQelO9ONkjfNWGOdH0LqnnVzjUmMYWmuPLPwqjZB TcYhtWKCQF4LzktmYF022OI/r/G4X/tJI8+vMacUuH3FgDnwXmumduIGd/oHlROuIlCo 6j/iN2PG+xqzbg1fXhf49smrH6g+v2se33hqkHqtRJKezcIVA51ASgVATsYDslvfWrNT XlYkVLJVO8koXmKJ1pt2ut+3e1fpRnTXnrLdqb4UsLVYgjF0BU4Q4T75Y9Pcb85BwJYR Lfdg== X-Gm-Message-State: AOAM531sFOwmHJEV02YOy0tkoV+aXzsZBz4sR+iUaFzBZ9pdxp24s2kS JmyvXgP1dwa4iMVazR9ivv4= X-Google-Smtp-Source: ABdhPJwVSgX1AgSxXXM9TK9aBxL6Q56P1csDYDG2hjxAPaNmwhsF2GlVsdkULmo+Bs5GwrYFg8unFw== X-Received: by 2002:a5d:5503:: with SMTP id b3mr25590075wrv.272.1589893165868; Tue, 19 May 2020 05:59:25 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y4sm21506967wro.91.2020.05.19.05.59.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 05:59:25 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?J=C3=BAlius=20Milan?= Cc: Jakub Grajciar , dpdk stable Date: Tue, 19 May 2020 13:53:43 +0100 Message-Id: <20200519125804.104349-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519125804.104349-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/memif: fix init when already connected' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From d40bcdfb5953ddaa03f5a75b730addab36738ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlius=20Milan?= Date: Wed, 19 Feb 2020 09:19:16 +0100 Subject: [PATCH] net/memif: fix init when already connected MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 06123fdd6063e411ea78ed353f0d6114e500b1b3 ] 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 Reviewed-by: Jakub Grajciar --- 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 ad5e30b96e..c1967c67bf 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) { + 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)); @@ -765,6 +766,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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 13:56:20.185689821 +0100 +++ 0033-net-memif-fix-init-when-already-connected.patch 2020-05-19 13:56:18.227501963 +0100 @@ -1,4 +1,4 @@ -From 06123fdd6063e411ea78ed353f0d6114e500b1b3 Mon Sep 17 00:00:00 2001 +From d40bcdfb5953ddaa03f5a75b730addab36738ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlius=20Milan?= Date: Wed, 19 Feb 2020 09:19:16 +0100 Subject: [PATCH] net/memif: fix init when already connected @@ -6,6 +6,8 @@ Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +[ upstream commit 06123fdd6063e411ea78ed353f0d6114e500b1b3 ] + 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 @@ -13,7 +15,6 @@ while old connection remains functional. Fixes: 09c7e63a71f9 ("net/memif: introduce memory interface PMD") -Cc: stable@dpdk.org Signed-off-by: Július Milan Reviewed-by: Jakub Grajciar @@ -22,13 +23,13 @@ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c -index 8ce2cc9faf..67794cb6fa 100644 +index ad5e30b96e..c1967c67bf 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)) { + pmd->id == i->id) { + if (pmd->flags & (ETH_MEMIF_FLAG_CONNECTING | + ETH_MEMIF_FLAG_CONNECTED)) { + memif_msg_enq_disconnect(cc, @@ -52,7 +53,7 @@ strlcpy(pmd->remote_name, (char *)i->name, sizeof(pmd->remote_name)); -@@ -772,6 +773,7 @@ memif_intr_handler(void *arg) +@@ -765,6 +766,7 @@ memif_intr_handler(void *arg) ret = memif_msg_receive(cc); /* if driver failed to assign device */ if (cc->dev == NULL) {