Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/139137/?format=api
{ "id": 139137, "url": "http://patches.dpdk.org/api/patches/139137/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20240405165518.367503-4-stephen@networkplumber.org/", "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": "<20240405165518.367503-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20240405165518.367503-4-stephen@networkplumber.org", "date": "2024-04-05T16:53:14", "name": "[v4,03/30] ethdev: replace uses of rte_memcpy", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "cbd7cc619b3e5a634bb0ac22b36ac6df14914827", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "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/20240405165518.367503-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 31690, "url": "http://patches.dpdk.org/api/series/31690/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31690", "date": "2024-04-05T16:53:11", "name": "replace use of rte_memcpy with fixed sizes", "version": 4, "mbox": "http://patches.dpdk.org/series/31690/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/139137/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/139137/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 4F2D443E0C;\n\tFri, 5 Apr 2024 18:56:02 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 5253440697;\n\tFri, 5 Apr 2024 18:55:43 +0200 (CEST)", "from mail-pf1-f181.google.com (mail-pf1-f181.google.com\n [209.85.210.181])\n by mails.dpdk.org (Postfix) with ESMTP id 0F0FC4067B\n for <dev@dpdk.org>; Fri, 5 Apr 2024 18:55:40 +0200 (CEST)", "by mail-pf1-f181.google.com with SMTP id\n d2e1a72fcca58-6ed04c91ffcso493598b3a.1\n for <dev@dpdk.org>; Fri, 05 Apr 2024 09:55:39 -0700 (PDT)", "from hermes.local (204-195-96-226.wavecable.com. [204.195.96.226])\n by smtp.gmail.com with ESMTPSA id\n c2-20020aa781c2000000b006e6c0f8ce1bsm1728555pfn.47.2024.04.05.09.55.38\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 05 Apr 2024 09:55:38 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1712336139;\n x=1712940939; darn=dpdk.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=xunUODDUTHEH8MqFIV+5R9tfv8wlmNo4clzAhy6RGAs=;\n b=HqCX3ZeCIbrSXg/su8fvSSeIPWYt0aa2LrZC7JCKR8IbVLgDTf7Ds0vNsOnzjtc8gg\n 9f/3+tHStGFnzwoa9eL0AnLHdSPFaU+L1xVEXHmlghko1ss+SxX/UVywotMxpWecAhyP\n 7Ik/RELakOCPgKCGEjFDqnyx6HalUlqKbk0C4fmi4Xn49bdhvRkCk//+UnEj11CD0ExV\n 1Xd64sNQml64JU8Pp5UC8SXdnFVL+DTjxNbMXan5xC8+UxWExKmWaK4ug0VO6NnRlrQn\n NexEYIJx3qyIlbQPzjOsS+BxqLASfz5ycNicJrLTNxfblHa3MckRtBk7BlkaPeqx9d8C\n 2dPg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1712336139; x=1712940939;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=xunUODDUTHEH8MqFIV+5R9tfv8wlmNo4clzAhy6RGAs=;\n b=VFuPOxWtabYfsOPYFj2kVX1yMo24jMsOhai2BdrPqPGIesA84bVDxQolySSMwAVXDi\n cKrxHnXD8R3mWILQXFjIDqLa/MApQub5GekSDW9i0dUkoZLZC74mMwpfHksEseYaV1UF\n P3i38Oj1mKrSPyOmewJHTgkr8L7HneiRBG59A85FsbfeaMFWYGq1sa28e3ktXimBpRTP\n pb2+iWt93KZ6CvNzcPCu9Cz7sjxJEBlfqw4PVWS1L2S5Pix0+2CyLckggJiOP+dHCVwZ\n /vI/6q9wHkg4uLPOF6mqLMp4Zxs7S/5wrK6GHgzvBWudTX4j44cjz6pfBB/elI9xOj1f\n isbA==", "X-Gm-Message-State": "AOJu0YzuH3aqkJWqLHEPwR+ulvW0sf0G36f+J+1mfIPNzsC6Bo0QVYHA\n lP6989UaghjodEsz0gefHtjeLQ33d+xHDPcMNBGcUDeFKbnDAm7c9otQtNrvHH1GTvB0JsykEVs\n GVyM=", "X-Google-Smtp-Source": "\n AGHT+IEDLJtdhfnn78/xE26bWBBKcn5V6d+Na1UVRBsMJt5Vo8lzwZlYNRvQ/iJp1KN7n9BOO69naQ==", "X-Received": "by 2002:a05:6a20:9595:b0:1a7:427a:ecfd with SMTP id\n iu21-20020a056a20959500b001a7427aecfdmr2487642pzb.54.1712336139235;\n Fri, 05 Apr 2024 09:55:39 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Thomas Monjalon <thomas@monjalon.net>, Ferruh Yigit <ferruh.yigit@amd.com>,\n Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Ori Kam <orika@nvidia.com>", "Subject": "[PATCH v4 03/30] ethdev: replace uses of rte_memcpy", "Date": "Fri, 5 Apr 2024 09:53:14 -0700", "Message-ID": "<20240405165518.367503-4-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20240405165518.367503-1-stephen@networkplumber.org>", "References": "<20240403163432.437275-1-stephen@networkplumber.org>\n <20240405165518.367503-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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": "Replace use of rte_memcpy in ethdev. Most of these were\nfixed size, and the others were not in the fast path.\nWhere possible replace memcpy() with structure assignment\nwhich has same effect is type safe.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n\nethdev: struct assign\n---\n lib/ethdev/rte_ethdev.c | 12 ++---\n lib/ethdev/rte_flow.c | 101 +++++++++++++++++++---------------------\n 2 files changed, 53 insertions(+), 60 deletions(-)", "diff": "diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c\nindex f1c658f49e..27d2416466 100644\n--- a/lib/ethdev/rte_ethdev.c\n+++ b/lib/ethdev/rte_ethdev.c\n@@ -15,7 +15,6 @@\n #include <rte_log.h>\n #include <rte_interrupts.h>\n #include <rte_kvargs.h>\n-#include <rte_memcpy.h>\n #include <rte_common.h>\n #include <rte_mempool.h>\n #include <rte_malloc.h>\n@@ -618,7 +617,7 @@ rte_eth_dev_owner_get(const uint16_t port_id, struct rte_eth_dev_owner *owner)\n \trte_spinlock_lock(rte_mcfg_ethdev_get_lock());\n \n \tif (eth_dev_shared_data_prepare() != NULL) {\n-\t\trte_memcpy(owner, ðdev->data->owner, sizeof(*owner));\n+\t\t*owner = ethdev->data->owner;\n \t\tret = 0;\n \t} else {\n \t\tret = -ENOMEM;\n@@ -1316,15 +1315,14 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \tdev->data->dev_configured = 0;\n \n \t /* Store original config, as rollback required on failure */\n-\tmemcpy(&orig_conf, &dev->data->dev_conf, sizeof(dev->data->dev_conf));\n+\torig_conf = dev->data->dev_conf;\n \n \t/*\n \t * Copy the dev_conf parameter into the dev structure.\n \t * rte_eth_dev_info_get() requires dev_conf, copy it before dev_info get\n \t */\n \tif (dev_conf != &dev->data->dev_conf)\n-\t\tmemcpy(&dev->data->dev_conf, dev_conf,\n-\t\t sizeof(dev->data->dev_conf));\n+\t\tdev->data->dev_conf = *dev_conf;\n \n \t/* Backup mtu for rollback */\n \told_mtu = dev->data->mtu;\n@@ -1601,7 +1599,7 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q,\n \teth_dev_rx_queue_config(dev, 0);\n \teth_dev_tx_queue_config(dev, 0);\n rollback:\n-\tmemcpy(&dev->data->dev_conf, &orig_conf, sizeof(dev->data->dev_conf));\n+\tdev->data->dev_conf = orig_conf;\n \tif (old_mtu != dev->data->mtu)\n \t\tdev->data->mtu = old_mtu;\n \n@@ -3843,7 +3841,7 @@ rte_eth_dev_conf_get(uint16_t port_id, struct rte_eth_conf *dev_conf)\n \t\treturn -EINVAL;\n \t}\n \n-\tmemcpy(dev_conf, &dev->data->dev_conf, sizeof(struct rte_eth_conf));\n+\t*dev_conf = dev->data->dev_conf;\n \n \trte_ethdev_trace_conf_get(port_id, dev_conf);\n \ndiff --git a/lib/ethdev/rte_flow.c b/lib/ethdev/rte_flow.c\nindex 7ab1100ea0..776352b984 100644\n--- a/lib/ethdev/rte_flow.c\n+++ b/lib/ethdev/rte_flow.c\n@@ -62,7 +62,8 @@ rte_flow_conv_copy(void *buf, const void *data, const size_t size,\n \tsize_t sz = rte_type ? desc[type].size : sizeof(void *);\n \tif (buf == NULL || data == NULL)\n \t\treturn 0;\n-\trte_memcpy(buf, data, (size > sz ? sz : size));\n+\n+\tmemcpy(buf, data, (size > sz ? sz : size));\n \tif (rte_type && desc[type].desc_fn)\n \t\tsz += desc[type].desc_fn(size > 0 ? buf : NULL, data);\n \treturn sz;\n@@ -73,11 +74,10 @@ rte_flow_item_flex_conv(void *buf, const void *data)\n {\n \tstruct rte_flow_item_flex *dst = buf;\n \tconst struct rte_flow_item_flex *src = data;\n-\tif (buf) {\n-\t\tdst->pattern = rte_memcpy\n-\t\t\t((void *)((uintptr_t)(dst + 1)), src->pattern,\n-\t\t\t src->length);\n-\t}\n+\n+\tif (buf)\n+\t\tdst->pattern = memcpy((void *)((uintptr_t)(dst + 1)),\n+\t\t\t\t src->pattern, src->length);\n \treturn src->length;\n }\n \n@@ -643,16 +643,18 @@ rte_flow_conv_item_spec(void *buf, const size_t size,\n \t\tmask.raw = item->mask ? item->mask : &rte_flow_item_raw_mask;\n \t\tsrc.raw = data;\n \t\tdst.raw = buf;\n-\t\trte_memcpy(dst.raw,\n-\t\t\t (&(struct rte_flow_item_raw){\n-\t\t\t\t.relative = src.raw->relative,\n-\t\t\t\t.search = src.raw->search,\n-\t\t\t\t.reserved = src.raw->reserved,\n-\t\t\t\t.offset = src.raw->offset,\n-\t\t\t\t.limit = src.raw->limit,\n-\t\t\t\t.length = src.raw->length,\n-\t\t\t }),\n-\t\t\t size > sizeof(*dst.raw) ? sizeof(*dst.raw) : size);\n+\n+\t\tmemcpy(dst.raw,\n+\t\t (&(struct rte_flow_item_raw){\n+\t\t\t .relative = src.raw->relative,\n+\t\t\t .search = src.raw->search,\n+\t\t\t .reserved = src.raw->reserved,\n+\t\t\t .offset = src.raw->offset,\n+\t\t\t .limit = src.raw->limit,\n+\t\t\t .length = src.raw->length,\n+\t\t }),\n+\t\t size > sizeof(*dst.raw) ? sizeof(*dst.raw) : size);\n+\n \t\toff = sizeof(*dst.raw);\n \t\tif (type == RTE_FLOW_CONV_ITEM_SPEC ||\n \t\t (type == RTE_FLOW_CONV_ITEM_MASK &&\n@@ -664,9 +666,8 @@ rte_flow_conv_item_spec(void *buf, const size_t size,\n \t\tif (tmp) {\n \t\t\toff = RTE_ALIGN_CEIL(off, sizeof(*dst.raw->pattern));\n \t\t\tif (size >= off + tmp)\n-\t\t\t\tdst.raw->pattern = rte_memcpy\n-\t\t\t\t\t((void *)((uintptr_t)dst.raw + off),\n-\t\t\t\t\t src.raw->pattern, tmp);\n+\t\t\t\tdst.raw->pattern = memcpy((void *)((uintptr_t)dst.raw + off),\n+\t\t\t\t\t\t\t src.raw->pattern, tmp);\n \t\t\toff += tmp;\n \t\t}\n \t\tbreak;\n@@ -716,32 +717,31 @@ rte_flow_conv_action_conf(void *buf, const size_t size,\n \tcase RTE_FLOW_ACTION_TYPE_RSS:\n \t\tsrc.rss = action->conf;\n \t\tdst.rss = buf;\n-\t\trte_memcpy(dst.rss,\n-\t\t\t (&(struct rte_flow_action_rss){\n-\t\t\t\t.func = src.rss->func,\n-\t\t\t\t.level = src.rss->level,\n-\t\t\t\t.types = src.rss->types,\n-\t\t\t\t.key_len = src.rss->key_len,\n-\t\t\t\t.queue_num = src.rss->queue_num,\n-\t\t\t }),\n-\t\t\t size > sizeof(*dst.rss) ? sizeof(*dst.rss) : size);\n+\t\tmemcpy(dst.rss,\n+\t\t (&(struct rte_flow_action_rss){\n+\t\t\t .func = src.rss->func,\n+\t\t\t .level = src.rss->level,\n+\t\t\t .types = src.rss->types,\n+\t\t\t .key_len = src.rss->key_len,\n+\t\t\t .queue_num = src.rss->queue_num,\n+\t\t }),\n+\t\t size > sizeof(*dst.rss) ? sizeof(*dst.rss) : size);\n+\n \t\toff = sizeof(*dst.rss);\n \t\tif (src.rss->key_len && src.rss->key) {\n \t\t\toff = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->key));\n \t\t\ttmp = sizeof(*src.rss->key) * src.rss->key_len;\n \t\t\tif (size >= (uint64_t)off + (uint64_t)tmp)\n-\t\t\t\tdst.rss->key = rte_memcpy\n-\t\t\t\t\t((void *)((uintptr_t)dst.rss + off),\n-\t\t\t\t\t src.rss->key, tmp);\n+\t\t\t\tdst.rss->key = memcpy((void *)((uintptr_t)dst.rss + off),\n+\t\t\t\t\t\t src.rss->key, tmp);\n \t\t\toff += tmp;\n \t\t}\n \t\tif (src.rss->queue_num) {\n \t\t\toff = RTE_ALIGN_CEIL(off, sizeof(*dst.rss->queue));\n \t\t\ttmp = sizeof(*src.rss->queue) * src.rss->queue_num;\n \t\t\tif (size >= (uint64_t)off + (uint64_t)tmp)\n-\t\t\t\tdst.rss->queue = rte_memcpy\n-\t\t\t\t\t((void *)((uintptr_t)dst.rss + off),\n-\t\t\t\t\t src.rss->queue, tmp);\n+\t\t\t\tdst.rss->queue = memcpy((void *)((uintptr_t)dst.rss + off),\n+\t\t\t\t\t\t\tsrc.rss->queue, tmp);\n \t\t\toff += tmp;\n \t\t}\n \t\tbreak;\n@@ -983,20 +983,15 @@ rte_flow_conv_rule(struct rte_flow_conv_rule *dst,\n \tsize_t off;\n \tint ret;\n \n-\trte_memcpy(dst,\n-\t\t (&(struct rte_flow_conv_rule){\n-\t\t\t.attr = NULL,\n-\t\t\t.pattern = NULL,\n-\t\t\t.actions = NULL,\n-\t\t }),\n-\t\t size > sizeof(*dst) ? sizeof(*dst) : size);\n+\tmemcpy(dst, &(struct rte_flow_conv_rule) { },\n+\t size > sizeof(*dst) ? sizeof(*dst) : size);\n+\n \toff = sizeof(*dst);\n \tif (src->attr_ro) {\n \t\toff = RTE_ALIGN_CEIL(off, sizeof(double));\n \t\tif (size && size >= off + sizeof(*dst->attr))\n-\t\t\tdst->attr = rte_memcpy\n-\t\t\t\t((void *)((uintptr_t)dst + off),\n-\t\t\t\t src->attr_ro, sizeof(*dst->attr));\n+\t\t\tdst->attr = memcpy((void *)((uintptr_t)dst + off),\n+\t\t\t\t\t src->attr_ro, sizeof(*dst->attr));\n \t\toff += sizeof(*dst->attr);\n \t}\n \tif (src->pattern_ro) {\n@@ -1098,7 +1093,7 @@ rte_flow_conv(enum rte_flow_conv_op op,\n \t\tattr = src;\n \t\tif (size > sizeof(*attr))\n \t\t\tsize = sizeof(*attr);\n-\t\trte_memcpy(dst, attr, size);\n+\t\tmemcpy(dst, attr, size);\n \t\tret = sizeof(*attr);\n \t\tbreak;\n \tcase RTE_FLOW_CONV_OP_ITEM:\n@@ -1180,14 +1175,14 @@ rte_flow_copy(struct rte_flow_desc *desc, size_t len,\n \tif (ret < 0)\n \t\treturn 0;\n \tret += sizeof(*desc) - sizeof(*dst);\n-\trte_memcpy(desc,\n-\t\t (&(struct rte_flow_desc){\n-\t\t\t.size = ret,\n-\t\t\t.attr = *attr,\n-\t\t\t.items = dst_size ? dst->pattern : NULL,\n-\t\t\t.actions = dst_size ? dst->actions : NULL,\n-\t\t }),\n-\t\t len > sizeof(*desc) ? sizeof(*desc) : len);\n+\tmemcpy(desc,\n+\t (&(struct rte_flow_desc){\n+\t\t .size = ret,\n+\t\t .attr = *attr,\n+\t\t .items = dst_size ? dst->pattern : NULL,\n+\t\t .actions = dst_size ? dst->actions : NULL,\n+\t }),\n+\t len > sizeof(*desc) ? sizeof(*desc) : len);\n \n \trte_flow_trace_copy(desc, len, attr, items, actions, ret);\n \n", "prefixes": [ "v4", "03/30" ] }