Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/65890/?format=api
{ "id": 65890, "url": "https://patches.dpdk.org/api/patches/65890/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20200219081840.GA11729@vbox/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200219081840.GA11729@vbox>", "list_archive_url": "https://inbox.dpdk.org/dev/20200219081840.GA11729@vbox", "date": "2020-02-19T08:18:40", "name": "[1/2] net/memif: enable loopback", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "1984636c44e5e2debb5424eb6c933299c0c70f12", "submitter": { "id": 1360, "url": "https://patches.dpdk.org/api/people/1360/?format=api", "name": "Július Milan", "email": "jmilan.dev@gmail.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20200219081840.GA11729@vbox/mbox/", "series": [ { "id": 8598, "url": "https://patches.dpdk.org/api/series/8598/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=8598", "date": "2020-02-19T08:18:40", "name": "[1/2] net/memif: enable loopback", "version": 1, "mbox": "https://patches.dpdk.org/series/8598/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/65890/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/65890/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 91E20A0555;\n\tWed, 19 Feb 2020 09:18:44 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 5B06C1BF95;\n\tWed, 19 Feb 2020 09:18:44 +0100 (CET)", "from mail-wm1-f66.google.com (mail-wm1-f66.google.com\n [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id E4CB11BF7D\n for <dev@dpdk.org>; Wed, 19 Feb 2020 09:18:42 +0100 (CET)", "by mail-wm1-f66.google.com with SMTP id q9so5393036wmj.5\n for <dev@dpdk.org>; Wed, 19 Feb 2020 00:18:42 -0800 (PST)", "from vbox ([185.140.29.250])\n by smtp.gmail.com with ESMTPSA id x11sm1895525wmg.46.2020.02.19.00.18.41\n (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n Wed, 19 Feb 2020 00:18:41 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n h=date:from:to:subject:message-id:mime-version:content-disposition\n :content-transfer-encoding:user-agent;\n bh=9T53w6mRTVWwHcNk5HQ+oeH/t4VS4+Fi9j6h/h4YwxE=;\n b=HjOIevCh4jsOpbvVUa468e2p8AiOj3k66XOveNZLmPCkHoFXu4e7h1afeXxt7rmNie\n ZdwmsWT0HQTfpVNczoPkr5n2uWdCLEPbRhbLzBqAfODeo/vM/I/qOQJvBFsk3tdVzRBf\n yl/NFtRfGf5bSHnvct2dbMv6t32a2zUMpXcCF6F+1DOK5D/1/elbesYmA6R3f/NYYXe1\n ZUBI1MjBwCm5PkDRw4laGLhB2yi6g1QvRYXo4slaqA7KVPCOOtHTHhFjQJB2CLuua5F5\n yF9xK37ZzyNeeBmXasNZB9fybmM5FO7rMtImQxmEAwN3WHHElRwzUnIeh/kPOd5zk/Ke\n Tzug==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:date:from:to:subject:message-id:mime-version\n :content-disposition:content-transfer-encoding:user-agent;\n bh=9T53w6mRTVWwHcNk5HQ+oeH/t4VS4+Fi9j6h/h4YwxE=;\n b=JDsw7pQ4ICBypx97xd4KxN4m0pVSzpyDePuhxIwFfA2ZSK0eThL13heHcTrGNrVQrl\n nxudjg8M5y3ttPFXTorMc23qoojP6mHZlHWciRhSYEk06WsnXAvA12pAwY0JatiApNWZ\n GsJ26Z59TFeXinaFT8FMeEjwaHIMT/95K1V+dj7FIHzUJ7BpKn+u0bV7ucH79RGkKcmC\n bpeEzQ7qOwNpqQfZ5Z19F1QoMcRA82GrGECnoenkvcWm5U4GVcnBAXX3DvYf8ETFZEg9\n tafPa6JE+UpYBFbVHlaoYo1jBWhAjtSthEieqJElO2YGiVKOXXZWYRDct7u07es5+RWx\n QO0Q==", "X-Gm-Message-State": "APjAAAVGFzeHOo+Tst38F0lXr6yFlJcROYUQ2tV+/XVv7NY1CkGOLoHg\n tnyszgVAgINF3cmL7YB5KGHkzQRJPXs=", "X-Google-Smtp-Source": "\n APXvYqzHCCtG4Qd8/UmD53YvWT9bueJAHEsOJWTyZMwzjI2hgMszO9bof0HGP4hQzbxXNJBK4WNw8A==", "X-Received": "by 2002:a1c:df8b:: with SMTP id\n w133mr8086172wmg.184.1582100322304;\n Wed, 19 Feb 2020 00:18:42 -0800 (PST)", "Date": "Wed, 19 Feb 2020 09:18:40 +0100", "From": "=?iso-8859-1?q?J=FAlius?= Milan <jmilan.dev@gmail.com>", "To": "dev@dpdk.org, jgrajcia@cisco.com", "Message-ID": "<20200219081840.GA11729@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 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 <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "With this patch it is possible to connect 2 DPDK memifs into loopback,\ni.e. when they have the same id and different roles, as for example:\n \"--vdev=net_memif0,role=master,id=0\"\n \"--vdev=net_memif1,role=slave,id=0\"\n\nSigned-off-by: Július Milan <jmilan.dev@gmail.com>\n---\n drivers/net/memif/memif_socket.c | 30 ++++++++++++++----------------\n drivers/net/memif/rte_eth_memif.c | 1 +\n drivers/net/memif/rte_eth_memif.h | 1 +\n 3 files changed, 16 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/net/memif/memif_socket.c b/drivers/net/memif/memif_socket.c\nindex ad5e30b96..553f8b004 100644\n--- a/drivers/net/memif/memif_socket.c\n+++ b/drivers/net/memif/memif_socket.c\n@@ -203,7 +203,7 @@ memif_msg_receive_init(struct memif_control_channel *cc, memif_msg_t *msg)\n \t\tdev = elt->dev;\n \t\tpmd = dev->data->dev_private;\n \t\tif (((pmd->flags & ETH_MEMIF_FLAG_DISABLED) == 0) &&\n-\t\t pmd->id == i->id) {\n+\t\t (pmd->id == i->id) && (pmd->role == MEMIF_ROLE_MASTER)) {\n \t\t\t/* assign control channel to device */\n \t\t\tcc->dev = dev;\n \t\t\tpmd->cc = cc;\n@@ -528,6 +528,7 @@ memif_disconnect(struct rte_eth_dev *dev)\n \tpmd->flags &= ~ETH_MEMIF_FLAG_CONNECTING;\n \tpmd->flags &= ~ETH_MEMIF_FLAG_CONNECTED;\n \n+\trte_spinlock_lock(&pmd->cc_lock);\n \tif (pmd->cc != NULL) {\n \t\t/* Clear control message queue (except disconnect message if any). */\n \t\tfor (elt = TAILQ_FIRST(&pmd->cc->msg_queue); elt != NULL; elt = next) {\n@@ -570,6 +571,7 @@ memif_disconnect(struct rte_eth_dev *dev)\n \t\t\t\t\t\"Failed to unregister control channel callback.\");\n \t\t}\n \t}\n+\trte_spinlock_unlock(&pmd->cc_lock);\n \n \t/* unconfig interrupts */\n \tfor (i = 0; i < pmd->cfg.num_s2m_rings; i++) {\n@@ -612,7 +614,8 @@ memif_disconnect(struct rte_eth_dev *dev)\n \t/* reset connection configuration */\n \tmemset(&pmd->run, 0, sizeof(pmd->run));\n \n-\tMIF_LOG(DEBUG, \"Disconnected.\");\n+\tMIF_LOG(DEBUG, \"Disconnected, id: %d, role: %s.\", pmd->id,\n+\t\t(pmd->role == MEMIF_ROLE_MASTER) ? \"master\" : \"slave\");\n }\n \n static int\n@@ -642,8 +645,12 @@ memif_msg_receive(struct memif_control_channel *cc)\n \n \tsize = recvmsg(cc->intr_handle.fd, &mh, 0);\n \tif (size != sizeof(memif_msg_t)) {\n-\t\tMIF_LOG(DEBUG, \"Invalid message size.\");\n-\t\tmemif_msg_enq_disconnect(cc, \"Invalid message size\", 0);\n+\t\tMIF_LOG(DEBUG, \"Invalid message size = %ld\", size);\n+\t\tif (size > 0)\n+\t\t\t/* 0 means end-of-file, negative size means error,\n+\t\t\t * don't send further disconnect message in such cases.\n+\t\t\t */\n+\t\t\tmemif_msg_enq_disconnect(cc, \"Invalid message size\", 0);\n \t\treturn -1;\n \t}\n \tMIF_LOG(DEBUG, \"Received msg type: %u.\", msg.type);\n@@ -965,20 +972,11 @@ memif_socket_init(struct rte_eth_dev *dev, const char *socket_filename)\n \t}\n \tpmd->socket_filename = socket->filename;\n \n-\tif (socket->listener != 0 && pmd->role == MEMIF_ROLE_SLAVE) {\n-\t\tMIF_LOG(ERR, \"Socket is a listener.\");\n-\t\treturn -1;\n-\t} else if ((socket->listener == 0) && (pmd->role == MEMIF_ROLE_MASTER)) {\n-\t\tMIF_LOG(ERR, \"Socket is not a listener.\");\n-\t\treturn -1;\n-\t}\n-\n \tTAILQ_FOREACH(elt, &socket->dev_queue, next) {\n \t\ttmp_pmd = elt->dev->data->dev_private;\n-\t\tif (tmp_pmd->id == pmd->id) {\n-\t\t\tMIF_LOG(ERR, \"Memif device with id %d already \"\n-\t\t\t\t\"exists on socket %s\",\n-\t\t\t\tpmd->id, socket->filename);\n+\t\tif (tmp_pmd->id == pmd->id && tmp_pmd->role == pmd->role) {\n+\t\t\tMIF_LOG(ERR, \"Two interfaces with the same id (%d) can \"\n+\t\t\t\t\"not have the same role.\", pmd->id);\n \t\t\treturn -1;\n \t\t}\n \t}\ndiff --git a/drivers/net/memif/rte_eth_memif.c b/drivers/net/memif/rte_eth_memif.c\nindex 27c0f0924..81d71c53a 100644\n--- a/drivers/net/memif/rte_eth_memif.c\n+++ b/drivers/net/memif/rte_eth_memif.c\n@@ -1491,6 +1491,7 @@ memif_create(struct rte_vdev_device *vdev, enum memif_role_t role,\n \tpmd->cfg.num_m2s_rings = 0;\n \n \tpmd->cfg.pkt_buffer_size = pkt_buffer_size;\n+\trte_spinlock_init(&pmd->cc_lock);\n \n \tdata = eth_dev->data;\n \tdata->dev_private = pmd;\ndiff --git a/drivers/net/memif/rte_eth_memif.h b/drivers/net/memif/rte_eth_memif.h\nindex 0d2566392..6f45b7072 100644\n--- a/drivers/net/memif/rte_eth_memif.h\n+++ b/drivers/net/memif/rte_eth_memif.h\n@@ -94,6 +94,7 @@ struct pmd_internals {\n \tchar secret[ETH_MEMIF_SECRET_SIZE]; /**< secret (optional security parameter) */\n \n \tstruct memif_control_channel *cc;\t/**< control channel */\n+\trte_spinlock_t cc_lock;\t\t\t/**< control channel lock */\n \n \t/* remote info */\n \tchar remote_name[RTE_DEV_NAME_MAX_LEN];\t\t/**< remote app name */\n", "prefixes": [ "1/2" ] }