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 1EF7FA052E; Mon, 9 Mar 2020 13:22:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8B6C91C036; Mon, 9 Mar 2020 13:22:12 +0100 (CET) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 9E96C1C030 for ; Mon, 9 Mar 2020 13:22:11 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id 6so10824705wre.4 for ; Mon, 09 Mar 2020 05:22:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:subject:message-id:mime-version:content-disposition :content-transfer-encoding:user-agent; bh=HlecJhev1I7tRsYfze7w6hMqu3jP3Wtm9DWbgwF2Hyk=; b=MxrrE6lBDXYRsSeZQ7pnLt09z4SY7tFUXF6JMn7oliQnvIniL2wyuvrNsG8sL4Va2I rfvlyfxv5P48Ey8BCiVO8to6xmR4795dNvxh+mDlGeCm5EYkY7A47I7hV1k39TPaEOCC 6rI+RTohbzCiLt/CVpCV/u+gq40NlW7gObk3TELuTpBy/qAo8u+uEHh2kM8WykYv1bth R1Y/mAjFND5B7sNvOjKkZH/mbVut3+MVGLWmpHlbqNxtdXRDP6sBhdZwK3F5M20PcsOi w1IRiAdNtJ4hQcJYuSZ4NX7vX4xApjt7Y4LWIwAZKADZ2nypMzAyL2J4ZF0jB9zeBBKH B4uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:content-transfer-encoding:user-agent; bh=HlecJhev1I7tRsYfze7w6hMqu3jP3Wtm9DWbgwF2Hyk=; b=pkXDOrrCfBAPcSp5xRUOxY1S3jm4VWCTjJPGzb4UbhS7mav1p9lFQ1mOZ9gRkPQ93S W3bxY4o4+fjWX2osvWfkg8d7pT4N+c9cSikE6iU+AYSVJzKLIQ92DjmshXaGnIngM5AP BPtv8aj0WAbIME2LiuTPP0sIidFM/aGl0zUFmtMbVKh0VMONuWozPWJDANffKa41o0Wb cC0aWxP7Khj0s5nLlmWpdErgjQaIYnpkI3n1KMDiV+coPx08Yv3zu/7tOTUDhBz8UhJ2 Xu134CA8q9T7u775xJHpWT3pyh4udrRQEji11PccTvC5iy5+GdTT5Rs3ZIovn76AtSPX 1B6A== X-Gm-Message-State: ANhLgQ11+GGKvJhk58oIO6OD7H7n7ZF8UjSvLL/8LbEsVk4t53jh0NYE EE0Kb4ZYMJrEadfzqdLszu7MxdKi X-Google-Smtp-Source: ADFU+vvmpcJixDaLQwxpPwRk1BUvfylIbnXN+O09HjTzmptEBypD8W+DDowfoMiB6/o2dZPJ3KSpEw== X-Received: by 2002:a05:6000:1187:: with SMTP id g7mr20228495wrx.382.1583756530925; Mon, 09 Mar 2020 05:22:10 -0700 (PDT) Received: from vbox (81.89.53.154.host.vnet.sk. [81.89.53.154]) by smtp.gmail.com with ESMTPSA id a26sm26160883wmm.18.2020.03.09.05.22.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Mar 2020 05:22:10 -0700 (PDT) Date: Mon, 9 Mar 2020 15:22:08 +0100 From: =?iso-8859-1?Q?J=FAlius?= Milan To: dev@dpdk.org, jgrajcia@cisco.com, ferruh.yigit@intel.com Message-ID: <20200309142208.GA9634@vbox> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.9.4 (2018-02-28) Subject: [dpdk-dev] [PATCH v3 1/2] net/memif: enable loopback X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" With this patch it is possible to connect 2 DPDK memifs into loopback, i.e. when they have the same id and different roles, as for example: "--vdev=net_memif0,role=master,id=0" "--vdev=net_memif1,role=slave,id=0" Signed-off-by: Július Milan --- v2: changed log format string of size (type size_t) from %ld to %zu, to fix 32-bit build v3: changed log format string of size (type size_t) from %zu to %zd, as size can be a negative number drivers/net/memif/memif_socket.c | 30 ++++++++++++++---------------- drivers/net/memif/rte_eth_memif.c | 1 + drivers/net/memif/rte_eth_memif.h | 1 + 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c index ad5e30b96..553f8b004 100644 --- a/drivers/net/memif/memif_socket.c +++ b/drivers/net/memif/memif_socket.c @@ -203,7 +203,7 @@ memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg) dev = elt->dev; pmd = dev->data->dev_private; if (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) && - pmd->id == i->id) { + (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_MASTER)) { /* assign control channel to device */ cc->dev = dev; pmd->cc = cc; @@ -528,6 +528,7 @@ memif_disconnect(struct rte_eth_dev *dev) pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTING; pmd->flags &= ~ETH_MEMIF_FLAG_CONNECTED; + rte_spinlock_lock(&pmd->cc_lock); if (pmd->cc != NULL) { /* Clear control message queue (except disconnect message if any). */ for (elt = TAILQ_FIRST(&pmd->cc->msg_queue); elt != NULL; elt = next) { @@ -570,6 +571,7 @@ memif_disconnect(struct rte_eth_dev *dev) "Failed to unregister control channel callback."); } } + rte_spinlock_unlock(&pmd->cc_lock); /* unconfig interrupts */ for (i = 0; i < pmd->cfg.num_s2m_rings; i++) { @@ -612,7 +614,8 @@ memif_disconnect(struct rte_eth_dev *dev) /* reset connection configuration */ memset(&pmd->run, 0, sizeof(pmd->run)); - MIF_LOG(DEBUG, "Disconnected."); + MIF_LOG(DEBUG, "Disconnected, id: %d, role: %s.", pmd->id, + (pmd->role == MEMIF_ROLE_MASTER) ? "master" : "slave"); } static int @@ -642,8 +645,12 @@ memif_msg_receive(struct memif_control_channel *cc) size = recvmsg(cc->intr_handle.fd, &mh, 0); if (size != sizeof(memif_msg_t)) { - MIF_LOG(DEBUG, "Invalid message size."); - memif_msg_enq_disconnect(cc, "Invalid message size", 0); + MIF_LOG(DEBUG, "Invalid message size = %zd", size); + if (size > 0) + /* 0 means end-of-file, negative size means error, + * don't send further disconnect message in such cases. + */ + memif_msg_enq_disconnect(cc, "Invalid message size", 0); return -1; } MIF_LOG(DEBUG, "Received msg type: %u.", msg.type); @@ -965,20 +972,11 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename) } pmd->socket_filename = socket->filename; - if (socket->listener != 0 && pmd->role == MEMIF_ROLE_SLAVE) { - MIF_LOG(ERR, "Socket is a listener."); - return -1; - } else if ((socket->listener == 0) && (pmd->role == MEMIF_ROLE_MASTER)) { - MIF_LOG(ERR, "Socket is not a listener."); - return -1; - } - TAILQ_FOREACH(elt, &socket->dev_queue, next) { tmp_pmd = elt->dev->data->dev_private; - if (tmp_pmd->id == pmd->id) { - MIF_LOG(ERR, "Memif device with id %d already " - "exists on socket %s", - pmd->id, socket->filename); + if (tmp_pmd->id == pmd->id && tmp_pmd->role == pmd->role) { + MIF_LOG(ERR, "Two interfaces with the same id (%d) can " + "not have the same role.", pmd->id); return -1; } } diff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c index 27c0f0924..81d71c53a 100644 --- a/drivers/net/memif/rte_eth_memif.c +++ b/drivers/net/memif/rte_eth_memif.c @@ -1491,6 +1491,7 @@ memif_create(struct rte_vdev_device *vdev, enum memif_role_t role, pmd->cfg.num_m2s_rings = 0; pmd->cfg.pkt_buffer_size = pkt_buffer_size; + rte_spinlock_init(&pmd->cc_lock); data = eth_dev->data; data->dev_private = pmd; diff --git a/drivers/net/memif/rte_eth_memif.h b/drivers/net/memif/rte_eth_memif.h index 0d2566392..6f45b7072 100644 --- a/drivers/net/memif/rte_eth_memif.h +++ b/drivers/net/memif/rte_eth_memif.h @@ -94,6 +94,7 @@ struct pmd_internals { char secret[ETH_MEMIF_SECRET_SIZE]; /**< secret (optional security parameter) */ struct memif_control_channel *cc; /**< control channel */ + rte_spinlock_t cc_lock; /**< control channel lock */ /* remote info */ char remote_name[RTE_DEV_NAME_MAX_LEN]; /**< remote app name */ -- 2.17.1