Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/125760/?format=api
{ "id": 125760, "url": "http://patches.dpdk.org/api/patches/125760/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230404124840.1898-10-david.marchand@redhat.com/", "project": { "id": 1, "url": "http://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": "<20230404124840.1898-10-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230404124840.1898-10-david.marchand@redhat.com", "date": "2023-04-04T12:48:33", "name": "[v3,09/16] net/sfc: rework locking in proxy code", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "22b4d0ba06aacfdbe71dea337ed2d047d886e114", "submitter": { "id": 1173, "url": "http://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230404124840.1898-10-david.marchand@redhat.com/mbox/", "series": [ { "id": 27617, "url": "http://patches.dpdk.org/api/series/27617/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=27617", "date": "2023-04-04T12:48:24", "name": "Enable lock annotations on most libraries and drivers", "version": 3, "mbox": "http://patches.dpdk.org/series/27617/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/125760/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/125760/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 8672D428CD;\n\tTue, 4 Apr 2023 14:49:45 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 13EE442D3B;\n\tTue, 4 Apr 2023 14:49:25 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id B238342D0B\n for <dev@dpdk.org>; Tue, 4 Apr 2023 14:49:23 +0200 (CEST)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-444-yMhnlYhNODyOJdfvGq80iA-1; Tue, 04 Apr 2023 08:49:20 -0400", "from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com\n [10.11.54.6])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91E51801779;\n Tue, 4 Apr 2023 12:49:20 +0000 (UTC)", "from dmarchan.redhat.com (unknown [10.45.225.38])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 93CE22166B26;\n Tue, 4 Apr 2023 12:49:19 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1680612563;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=Zs3hxWmKhTOXWkESvyRvQItu4YlI3r4m21ZEPZCidSo=;\n b=U+BgbkwnXqSNbtLTj5LX6xYQkiI0AIGKXMLHSDt5GdZjn2HMhMAIBOM3NBV3eCpdO9KVSF\n 28cashD9C/LYDIRjgkkwk+ILyNW8qHX3fggyHmxh+ihAF8KYmRZFdy3GIMPeNu/bGkz5vk\n ig2YG2P+Ym8fYiXQwnvvvJrhiDzSsW4=", "X-MC-Unique": "yMhnlYhNODyOJdfvGq80iA-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "thomas@monjalon.net,\n\tAndrew Rybchenko <andrew.rybchenko@oktetlabs.ru>", "Subject": "[PATCH v3 09/16] net/sfc: rework locking in proxy code", "Date": "Tue, 4 Apr 2023 14:48:33 +0200", "Message-Id": "<20230404124840.1898-10-david.marchand@redhat.com>", "In-Reply-To": "<20230404124840.1898-1-david.marchand@redhat.com>", "References": "<20230224081642.2566619-1-david.marchand@redhat.com>\n <20230404124840.1898-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.6", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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" }, "content": "Remove one extra layer for proxy code: sfc_get_adapter_by_pf_port_id()\nnow only resolves the sa object. sfc_adapter_(|un)lock() are added\nwere necessary.\n\nThis will simplify lock checks later.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/net/sfc/sfc_repr_proxy.c | 59 ++++++++++++++++----------------\n 1 file changed, 30 insertions(+), 29 deletions(-)", "diff": "diff --git a/drivers/net/sfc/sfc_repr_proxy.c b/drivers/net/sfc/sfc_repr_proxy.c\nindex 4b958ced61..4ba7683370 100644\n--- a/drivers/net/sfc/sfc_repr_proxy.c\n+++ b/drivers/net/sfc/sfc_repr_proxy.c\n@@ -51,17 +51,9 @@ sfc_get_adapter_by_pf_port_id(uint16_t pf_port_id)\n \tdev = &rte_eth_devices[pf_port_id];\n \tsa = sfc_adapter_by_eth_dev(dev);\n \n-\tsfc_adapter_lock(sa);\n-\n \treturn sa;\n }\n \n-static void\n-sfc_put_adapter(struct sfc_adapter *sa)\n-{\n-\tsfc_adapter_unlock(sa);\n-}\n-\n static struct sfc_repr_proxy_port *\n sfc_repr_proxy_find_port(struct sfc_repr_proxy *rp, uint16_t repr_id)\n {\n@@ -1289,6 +1281,7 @@ sfc_repr_proxy_add_port(uint16_t pf_port_id, uint16_t repr_id,\n \tint rc;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1341,7 +1334,7 @@ sfc_repr_proxy_add_port(uint16_t pf_port_id, uint16_t repr_id,\n \t}\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n \n@@ -1352,7 +1345,7 @@ sfc_repr_proxy_add_port(uint16_t pf_port_id, uint16_t repr_id,\n fail_alloc_port:\n fail_port_exists:\n \tsfc_log_init(sa, \"failed: %s\", rte_strerror(rc));\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn rc;\n }\n@@ -1366,6 +1359,7 @@ sfc_repr_proxy_del_port(uint16_t pf_port_id, uint16_t repr_id)\n \tint rc;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1393,14 +1387,14 @@ sfc_repr_proxy_del_port(uint16_t pf_port_id, uint16_t repr_id)\n \n \tsfc_log_init(sa, \"done\");\n \n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n \n fail_port_remove:\n fail_no_port:\n \tsfc_log_init(sa, \"failed: %s\", rte_strerror(rc));\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn rc;\n }\n@@ -1416,6 +1410,7 @@ sfc_repr_proxy_add_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \tstruct sfc_adapter *sa;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1423,14 +1418,14 @@ sfc_repr_proxy_add_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port\", __func__);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn ENOENT;\n \t}\n \n \trxq = &port->rxq[queue_id];\n \tif (rp->dp_rxq[queue_id].mp != NULL && rp->dp_rxq[queue_id].mp != mp) {\n \t\tsfc_err(sa, \"multiple mempools per queue are not supported\");\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn ENOTSUP;\n \t}\n \n@@ -1440,7 +1435,7 @@ sfc_repr_proxy_add_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \trp->dp_rxq[queue_id].ref_count++;\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n }\n@@ -1455,6 +1450,7 @@ sfc_repr_proxy_del_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \tstruct sfc_adapter *sa;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1462,7 +1458,7 @@ sfc_repr_proxy_del_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port\", __func__);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn;\n \t}\n \n@@ -1475,7 +1471,7 @@ sfc_repr_proxy_del_rxq(uint16_t pf_port_id, uint16_t repr_id,\n \t\trp->dp_rxq[queue_id].mp = NULL;\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n }\n \n int\n@@ -1489,6 +1485,7 @@ sfc_repr_proxy_add_txq(uint16_t pf_port_id, uint16_t repr_id,\n \tstruct sfc_adapter *sa;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1496,7 +1493,7 @@ sfc_repr_proxy_add_txq(uint16_t pf_port_id, uint16_t repr_id,\n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port\", __func__);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn ENOENT;\n \t}\n \n@@ -1507,7 +1504,7 @@ sfc_repr_proxy_add_txq(uint16_t pf_port_id, uint16_t repr_id,\n \t*egress_mport = port->egress_mport;\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n }\n@@ -1522,6 +1519,7 @@ sfc_repr_proxy_del_txq(uint16_t pf_port_id, uint16_t repr_id,\n \tstruct sfc_adapter *sa;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1529,7 +1527,7 @@ sfc_repr_proxy_del_txq(uint16_t pf_port_id, uint16_t repr_id,\n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port\", __func__);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn;\n \t}\n \n@@ -1538,7 +1536,7 @@ sfc_repr_proxy_del_txq(uint16_t pf_port_id, uint16_t repr_id,\n \ttxq->ring = NULL;\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n }\n \n int\n@@ -1551,6 +1549,7 @@ sfc_repr_proxy_start_repr(uint16_t pf_port_id, uint16_t repr_id)\n \tint rc;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1594,7 +1593,7 @@ sfc_repr_proxy_start_repr(uint16_t pf_port_id, uint16_t repr_id)\n \t}\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n \n@@ -1606,7 +1605,7 @@ sfc_repr_proxy_start_repr(uint16_t pf_port_id, uint16_t repr_id)\n fail_not_found:\n \tsfc_err(sa, \"failed to start repr %u proxy port: %s\", repr_id,\n \t\trte_strerror(rc));\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn rc;\n }\n@@ -1621,6 +1620,7 @@ sfc_repr_proxy_stop_repr(uint16_t pf_port_id, uint16_t repr_id)\n \tint rc;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tsfc_log_init(sa, \"entry\");\n@@ -1628,14 +1628,14 @@ sfc_repr_proxy_stop_repr(uint16_t pf_port_id, uint16_t repr_id)\n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port\", __func__);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn ENOENT;\n \t}\n \n \tif (!port->enabled) {\n \t\tsfc_log_init(sa, \"repr %u proxy port is not started - skip\",\n \t\t\t repr_id);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn 0;\n \t}\n \n@@ -1662,7 +1662,7 @@ sfc_repr_proxy_stop_repr(uint16_t pf_port_id, uint16_t repr_id)\n \t\t\tsfc_err(sa,\n \t\t\t\t\"failed to stop representor proxy TxQ %u: %s\",\n \t\t\t\trepr_id, rte_strerror(rc));\n-\t\t\tsfc_put_adapter(sa);\n+\t\t\tsfc_adapter_unlock(sa);\n \t\t\treturn rc;\n \t\t}\n \t}\n@@ -1670,7 +1670,7 @@ sfc_repr_proxy_stop_repr(uint16_t pf_port_id, uint16_t repr_id)\n \tport->enabled = false;\n \n \tsfc_log_init(sa, \"done\");\n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn 0;\n }\n@@ -1685,13 +1685,14 @@ sfc_repr_proxy_repr_entity_mac_addr_set(uint16_t pf_port_id, uint16_t repr_id,\n \tint rc;\n \n \tsa = sfc_get_adapter_by_pf_port_id(pf_port_id);\n+\tsfc_adapter_lock(sa);\n \trp = sfc_repr_proxy_by_adapter(sa);\n \n \tport = sfc_repr_proxy_find_port(rp, repr_id);\n \tif (port == NULL) {\n \t\tsfc_err(sa, \"%s() failed: no such port (repr_id=%u)\",\n \t\t\t__func__, repr_id);\n-\t\tsfc_put_adapter(sa);\n+\t\tsfc_adapter_unlock(sa);\n \t\treturn ENOENT;\n \t}\n \n@@ -1703,7 +1704,7 @@ sfc_repr_proxy_repr_entity_mac_addr_set(uint16_t pf_port_id, uint16_t repr_id,\n \t\t\t__func__, repr_id, rte_strerror(rc));\n \t}\n \n-\tsfc_put_adapter(sa);\n+\tsfc_adapter_unlock(sa);\n \n \treturn rc;\n }\n", "prefixes": [ "v3", "09/16" ] }