Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/46524/?format=api
{ "id": 46524, "url": "http://patches.dpdk.org/api/patches/46524/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20181010221131.12371-1-johndale@cisco.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": "<20181010221131.12371-1-johndale@cisco.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20181010221131.12371-1-johndale@cisco.com", "date": "2018-10-10T22:11:31", "name": "[v2] net/enic: fix counter action", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "692f09a17860ebed65a97eb3ac911c741eb70ebd", "submitter": { "id": 359, "url": "http://patches.dpdk.org/api/people/359/?format=api", "name": "John Daley (johndale)", "email": "johndale@cisco.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20181010221131.12371-1-johndale@cisco.com/mbox/", "series": [ { "id": 1820, "url": "http://patches.dpdk.org/api/series/1820/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=1820", "date": "2018-10-10T22:11:31", "name": "[v2] net/enic: fix counter action", "version": 2, "mbox": "http://patches.dpdk.org/series/1820/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/46524/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/46524/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6784C1B4F2;\n\tThu, 11 Oct 2018 00:11:36 +0200 (CEST)", "from alln-iport-3.cisco.com (alln-iport-3.cisco.com\n\t[173.37.142.90]) by dpdk.org (Postfix) with ESMTP id 345121B4E9\n\tfor <dev@dpdk.org>; Thu, 11 Oct 2018 00:11:34 +0200 (CEST)", "from rcdn-core-3.cisco.com ([173.37.93.154])\n\tby alln-iport-3.cisco.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t10 Oct 2018 22:11:33 +0000", "from cisco.com (savbu-usnic-a.cisco.com [10.193.184.48])\n\tby rcdn-core-3.cisco.com (8.15.2/8.15.2) with ESMTP id w9AMBXma002274;\n\tWed, 10 Oct 2018 22:11:33 GMT", "by cisco.com (Postfix, from userid 392789)\n\tid 76C2620F2001; Wed, 10 Oct 2018 15:11:33 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n\td=cisco.com; i=@cisco.com; l=7322; q=dns/txt; s=iport;\n\tt=1539209495; x=1540419095;\n\th=from:to:cc:subject:date:message-id:in-reply-to: references;\n\tbh=IFztyYYPFWes2fUUCiqUVUTXwlE5bwauRz0D+0JNnDA=;\n\tb=AFIPTiBl2+FAqoj/iQsFZy8NL8GC8u49RU0os/ecKQs8RI6W05yr7uuD\n\t3u0SVMusIjnVLlIE0iv4+nOkNCq0689vA7v4QBuITQEUZyEeB7wpIHAaE\n\tbb0x8DPWSPBuVKJXI06jT5D7x/jKpCnLCRFniY8oz3d2l2MvHYnN71jiq 4=;", "X-IronPort-AV": "E=Sophos;i=\"5.54,366,1534809600\"; d=\"scan'208\";a=\"184464555\"", "From": "John Daley <johndale@cisco.com>", "To": "ferruh.yigit@intel.com", "Cc": "dev@dpdk.org, John Daley <johndale@cisco.com>", "Date": "Wed, 10 Oct 2018 15:11:31 -0700", "Message-Id": "<20181010221131.12371-1-johndale@cisco.com>", "X-Mailer": "git-send-email 2.16.2", "In-Reply-To": "<20181010025258.9822-1-johndale@cisco.com>", "References": "<20181010025258.9822-1-johndale@cisco.com>", "X-Outbound-SMTP-Client": "10.193.184.48, savbu-usnic-a.cisco.com", "X-Outbound-Node": "rcdn-core-3.cisco.com", "Subject": "[dpdk-dev] [PATCH v2] net/enic: fix counter action", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "- track whether counter DMAs are active or not so they can be stopped if\n needed before DMA memory is freed\n- fix counter DMA shut-down by changing vnic_dev_counter_dma_cfg() to\n take the number of counters to DMA instead of high counter index and\n use num counters = 0 to shut off DMAs\n- remove unnecessary checks that DMA counter memory is valid and that\n counter DMAs are in use\n- change the minimum DMA period to match what 1400 series adapter is\n capable of\n- fix comments and change a couple variable names to make more sense\n\nFixes: fc6dec87f4cb (\"net/enic: support flow counter action\")\n\nSigned-off-by: John Daley <johndale@cisco.com>\nReviewed-by: Hyong Youb Kim <hyonkim@cisco.com>\n---\nv2 - fix typo\n\n drivers/net/enic/base/vnic_dev.c | 40 ++++++++++++++++++++++++-------------\n drivers/net/enic/base/vnic_dev.h | 2 +-\n drivers/net/enic/base/vnic_devcmd.h | 1 +\n drivers/net/enic/enic.h | 4 +++-\n drivers/net/enic/enic_flow.c | 4 ++--\n drivers/net/enic/enic_main.c | 2 +-\n 6 files changed, 34 insertions(+), 19 deletions(-)", "diff": "diff --git a/drivers/net/enic/base/vnic_dev.c b/drivers/net/enic/base/vnic_dev.c\nindex 1a3656f87..fd303fece 100644\n--- a/drivers/net/enic/base/vnic_dev.c\n+++ b/drivers/net/enic/base/vnic_dev.c\n@@ -59,6 +59,7 @@ struct vnic_dev {\n \t\tdma_addr_t dma_handle);\n \tstruct vnic_counter_counts *flow_counters;\n \tdma_addr_t flow_counters_pa;\n+\tu8 flow_counters_dma_active;\n };\n \n #define VNIC_MAX_RES_HDR_SIZE \\\n@@ -618,18 +619,30 @@ int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats)\n /*\n * Configure counter DMA\n */\n-int vnic_dev_counter_dma_cfg(struct vnic_dev *vdev, u32 period, u32 counter_idx)\n+int vnic_dev_counter_dma_cfg(struct vnic_dev *vdev, u32 period,\n+\t\t\t u32 num_counters)\n {\n \tu64 args[3];\n \tint wait = 1000;\n+\tint err;\n \n-\tif (!vdev->flow_counters || counter_idx >= VNIC_MAX_FLOW_COUNTERS)\n+\tif (num_counters > VNIC_MAX_FLOW_COUNTERS)\n \t\treturn -ENOMEM;\n+\tif (period > 0 && (period < VNIC_COUNTER_DMA_MIN_PERIOD ||\n+\t num_counters == 0))\n+\t\treturn -EINVAL;\n \n-\targs[0] = counter_idx + 1;\n+\targs[0] = num_counters;\n \targs[1] = vdev->flow_counters_pa;\n \targs[2] = period;\n-\treturn vnic_dev_cmd_args(vdev, CMD_COUNTER_DMA_CONFIG, args, 3, wait);\n+\terr = vnic_dev_cmd_args(vdev, CMD_COUNTER_DMA_CONFIG, args, 3, wait);\n+\n+\t/* record if DMAs need to be stopped on close */\n+\tif (!err)\n+\t\tvdev->flow_counters_dma_active = (num_counters != 0 &&\n+\t\t\t\t\t\t period != 0);\n+\n+\treturn err;\n }\n \n int vnic_dev_close(struct vnic_dev *vdev)\n@@ -974,6 +987,7 @@ int vnic_dev_alloc_counter_mem(struct vnic_dev *vdev)\n \t\t\t\t\t * VNIC_MAX_FLOW_COUNTERS,\n \t\t\t\t\t &vdev->flow_counters_pa,\n \t\t\t\t\t (u8 *)name);\n+\tvdev->flow_counters_dma_active = 0;\n \treturn vdev->flow_counters == NULL ? -ENOMEM : 0;\n }\n \n@@ -991,7 +1005,8 @@ void vnic_dev_unregister(struct vnic_dev *vdev)\n \t\t\t\tvdev->stats, vdev->stats_pa);\n \t\tif (vdev->flow_counters) {\n \t\t\t/* turn off counter DMAs before freeing memory */\n-\t\t\tvnic_dev_counter_dma_cfg(vdev, 0, 0);\n+\t\t\tif (vdev->flow_counters_dma_active)\n+\t\t\t\tvnic_dev_counter_dma_cfg(vdev, 0, 0);\n \n \t\t\tvdev->free_consistent(vdev->priv,\n \t\t\t\tsizeof(struct vnic_counter_counts)\n@@ -1171,19 +1186,16 @@ bool vnic_dev_counter_query(struct vnic_dev *vdev, uint32_t idx,\n \tu64 a1 = reset ? 1 : 0;\n \tint wait = 1000;\n \n-\tif (vdev->flow_counters) {\n-\t\t/* Using counter DMA API, so counters avail in host memory */\n-\t\t*packets = vdev->flow_counters[idx].vcc_packets;\n-\t\t*bytes = vdev->flow_counters[idx].vcc_bytes;\n-\t\tif (reset)\n-\t\t\tif (vnic_dev_cmd(vdev, CMD_COUNTER_QUERY, &a0, &a1,\n-\t\t\t wait))\n-\t\t\t\treturn false;\n-\t} else {\n+\tif (reset) {\n+\t\t/* query/reset returns updated counters */\n \t\tif (vnic_dev_cmd(vdev, CMD_COUNTER_QUERY, &a0, &a1, wait))\n \t\t\treturn false;\n \t\t*packets = a0;\n \t\t*bytes = a1;\n+\t} else {\n+\t\t/* Get values DMA'd from the adapter */\n+\t\t*packets = vdev->flow_counters[idx].vcc_packets;\n+\t\t*bytes = vdev->flow_counters[idx].vcc_bytes;\n \t}\n \treturn true;\n }\ndiff --git a/drivers/net/enic/base/vnic_dev.h b/drivers/net/enic/base/vnic_dev.h\nindex 63751d8c5..de2645c43 100644\n--- a/drivers/net/enic/base/vnic_dev.h\n+++ b/drivers/net/enic/base/vnic_dev.h\n@@ -119,7 +119,7 @@ int vnic_dev_spec(struct vnic_dev *vdev, unsigned int offset, size_t size,\n int vnic_dev_stats_clear(struct vnic_dev *vdev);\n int vnic_dev_stats_dump(struct vnic_dev *vdev, struct vnic_stats **stats);\n int vnic_dev_counter_dma_cfg(struct vnic_dev *vdev, u32 period,\n-\t\t\t u32 counter_idx);\n+\t\t\t u32 num_counters);\n int vnic_dev_hang_notify(struct vnic_dev *vdev);\n int vnic_dev_packet_filter(struct vnic_dev *vdev, int directed, int multicast,\n \tint broadcast, int promisc, int allmulti);\ndiff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h\nindex 0efcee2ff..3aad2dbd5 100644\n--- a/drivers/net/enic/base/vnic_devcmd.h\n+++ b/drivers/net/enic/base/vnic_devcmd.h\n@@ -634,6 +634,7 @@ enum vnic_devcmd_cmd {\n \t * (u32) a2 = DMA period in milliseconds (0 to disable)\n \t */\n \tCMD_COUNTER_DMA_CONFIG = _CMDC(_CMD_DIR_WRITE, _CMD_VTYPE_ENET, 88),\n+#define VNIC_COUNTER_DMA_MIN_PERIOD 500\n \n \t/*\n \t * Clear all counters on a vnic\ndiff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h\nindex e5f4d3b26..7bca3cad2 100644\n--- a/drivers/net/enic/enic.h\n+++ b/drivers/net/enic/enic.h\n@@ -38,7 +38,9 @@\n #define ENIC_PAGE_SIZE 4096\n #define PAGE_ROUND_UP(x) \\\n \t((((unsigned long)(x)) + ENIC_PAGE_SIZE-1) & (~(ENIC_PAGE_SIZE-1)))\n-#define VNIC_FLOW_COUNTER_UPDATE_MSECS 100\n+\n+/* must be >= VNIC_COUNTER_DMA_MIN_PERIOD */\n+#define VNIC_FLOW_COUNTER_UPDATE_MSECS 500\n \n #define ENICPMD_VFIO_PATH \"/dev/vfio/vfio\"\n /*#define ENIC_DESC_COUNT_MAKE_ODD (x) do{if ((~(x)) & 1) { (x)--; } }while(0)*/\ndiff --git a/drivers/net/enic/enic_flow.c b/drivers/net/enic/enic_flow.c\nindex 04fc351b3..bb9ed037a 100644\n--- a/drivers/net/enic/enic_flow.c\n+++ b/drivers/net/enic/enic_flow.c\n@@ -1444,7 +1444,7 @@ enic_flow_add_filter(struct enic *enic, struct filter_v2 *enic_filter,\n \t\tif (ctr_idx > enic->max_flow_counter) {\n \t\t\terr = vnic_dev_counter_dma_cfg(enic->vdev,\n \t\t\t\t\t\t VNIC_FLOW_COUNTER_UPDATE_MSECS,\n-\t\t\t\t\t\t ctr_idx);\n+\t\t\t\t\t\t ctr_idx + 1);\n \t\t\tif (err) {\n \t\t\t\trte_flow_error_set(error, -err,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF,\n@@ -1477,7 +1477,7 @@ enic_flow_add_filter(struct enic *enic, struct filter_v2 *enic_filter,\n \t\t/* reduce counter DMA size */\n \t\tvnic_dev_counter_dma_cfg(enic->vdev,\n \t\t\t\t\t VNIC_FLOW_COUNTER_UPDATE_MSECS,\n-\t\t\t\t\t last_max_flow_ctr);\n+\t\t\t\t\t last_max_flow_ctr + 1);\n \t\tenic->max_flow_counter = last_max_flow_ctr;\n \t}\n unwind_ctr_alloc:\ndiff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c\nindex 3eced2ce2..b2581322d 100644\n--- a/drivers/net/enic/enic_main.c\n+++ b/drivers/net/enic/enic_main.c\n@@ -1766,7 +1766,7 @@ int enic_probe(struct enic *enic)\n \n \t/*\n \t * Allocate the consistent memory for stats and counters upfront so\n-\t * both primary and secondary processes can dump stats.\n+\t * both primary and secondary processes can access them.\n \t */\n \terr = vnic_dev_alloc_stats_mem(enic->vdev);\n \tif (err) {\n", "prefixes": [ "v2" ] }