Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/55090/?format=api
{ "id": 55090, "url": "http://patches.dpdk.org/api/patches/55090/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20190619185746.26866-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": "<20190619185746.26866-4-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190619185746.26866-4-stephen@networkplumber.org", "date": "2019-06-19T18:57:41", "name": "[v3,3/8] kni: don't keep stats in kni_net", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "572d3357da1370fdc855e8ab2112a6837f4c29a2", "submitter": { "id": 27, "url": "http://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20190619185746.26866-4-stephen@networkplumber.org/mbox/", "series": [ { "id": 5090, "url": "http://patches.dpdk.org/api/series/5090/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=5090", "date": "2019-06-19T18:57:38", "name": "kni: cleanups and fixes", "version": 3, "mbox": "http://patches.dpdk.org/series/5090/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/55090/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/55090/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 392701D107;\n\tWed, 19 Jun 2019 20:58:07 +0200 (CEST)", "from mail-pf1-f195.google.com (mail-pf1-f195.google.com\n\t[209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 4AC771D0DB\n\tfor <dev@dpdk.org>; Wed, 19 Jun 2019 20:57:59 +0200 (CEST)", "by mail-pf1-f195.google.com with SMTP id q10so129231pff.9\n\tfor <dev@dpdk.org>; Wed, 19 Jun 2019 11:57:59 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\tb8sm24774858pff.20.2019.06.19.11.57.57\n\t(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);\n\tWed, 19 Jun 2019 11:57:57 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=5KQLa8JXU7iYjmTO14hFZMlxbnfGbb4eamPcVTXkkaE=;\n\tb=nKzDgGixkSqTch8bSDg5/OKwMe8lBRYiJjQp1BkEYJCl0Zg1rb4/0KvrH4eH6Ccd5g\n\tbyhF0SQkEA7fuEk9C42KG/SxOUTcW7NTuuUWhHv++/dg9HXUlZHFq01lods+Kx/lbqY2\n\tkvm0y/cEIKlCU89c0RiZP3hW9oJfO7jF58mmXZ7Cqxwj4pL5kfwPRKbQC3cX973GyesV\n\tFqqWhjDSFi7ehgJJT2Rshhuxb9fa+fjYJOUnXKVjGt+3IvrEhcTASRAI7M60+DR0z06X\n\tygE5Yyok01uvdLp6wg9vlqZhD4uJro0GsbF1MAFLtEK4Z31xEHa6nQKtFamfb4qVQq/P\n\tOI7Q==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=5KQLa8JXU7iYjmTO14hFZMlxbnfGbb4eamPcVTXkkaE=;\n\tb=W69W2i4UfUzaON7tycqxoZbcqbYB0jwQsg1yf4xvtAwIs3XqcYleAVBpjp92mAPEqJ\n\t6bDi/BrUkxExAhfTNcEPxn3CthWHTABkMO401c/Z74i/KFQ2zXQWKzq9fnAIkpwjQ/MD\n\t18V6VcTwjZgjUsbGMu3kFyRf0FmKGywnwWyEN0UM7XYUuiCMYaNgDD1KIhY52QT5HXlq\n\tfWDJMBJJAQgvvtoMIF+1m5VK8q7FI7m2NGprVn3UFB8n/k7jfz7tPJk0c1PxUeSBV71b\n\t5leO9ungZIg8uHioz2+qsoc2l6wDsZXLKwXeyVKkvcoKfKi/5uOHh0+riOWuL/+Fyyht\n\tWTAQ==", "X-Gm-Message-State": "APjAAAUmuBoRrlb7PT04E2G348kOL4UXiyowovUcXI/P9ezb2li66s5g\n\tojxAjEMDVxzihNKI7TIqgbqHSqmICiU=", "X-Google-Smtp-Source": "APXvYqwE/RwftLmSgemp0LqaoN+N7i9kfj30TmjsFUo0cahJPCbYM5KG0iK0rCqPOpAr8yjUxu6A/A==", "X-Received": "by 2002:a17:90a:9291:: with SMTP id\n\tn17mr12382766pjo.66.1560970678258; \n\tWed, 19 Jun 2019 11:57:58 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <sthemmin@microsoft.com>,\n\tStephen Hemminger <stephen@networkplumber.org>", "Date": "Wed, 19 Jun 2019 11:57:41 -0700", "Message-Id": "<20190619185746.26866-4-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190619185746.26866-1-stephen@networkplumber.org>", "References": "<20190610175155.21374-1-stephen@networkplumber.org>\n\t<20190619185746.26866-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 3/8] kni: don't keep stats in kni_net", "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": "From: Stephen Hemminger <sthemmin@microsoft.com>\n\nSince kernel 2.6.28 the network subsystem has provided\ndev->stats for devices to use statistics handling and is the\ndefault if no ndo_get_stats is provided.\n\nThis allow allows for 64 bit (rather than just 32 bit)\nstatistics with KNI.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n kernel/linux/kni/kni_dev.h | 1 -\n kernel/linux/kni/kni_net.c | 43 +++++++++++++-------------------------\n 2 files changed, 15 insertions(+), 29 deletions(-)", "diff": "diff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h\nindex d57bce647e4a..21e4b0d92368 100644\n--- a/kernel/linux/kni/kni_dev.h\n+++ b/kernel/linux/kni/kni_dev.h\n@@ -39,7 +39,6 @@ struct kni_dev {\n \t/* kni list */\n \tstruct list_head list;\n \n-\tstruct net_device_stats stats;\n \tint status;\n \tuint16_t group_id; /* Group ID of a group of KNI devices */\n \tuint32_t core_id; /* Core ID to bind */\ndiff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c\nindex cce5e7eb991f..06310fec57bb 100644\n--- a/kernel/linux/kni/kni_net.c\n+++ b/kernel/linux/kni/kni_net.c\n@@ -291,15 +291,15 @@ kni_net_tx(struct sk_buff *skb, struct net_device *dev)\n \n \t/* Free skb and update statistics */\n \tdev_kfree_skb(skb);\n-\tkni->stats.tx_bytes += len;\n-\tkni->stats.tx_packets++;\n+\tdev->stats.tx_bytes += len;\n+\tdev->stats.tx_packets++;\n \n \treturn NETDEV_TX_OK;\n \n drop:\n \t/* Free skb and update statistics */\n \tdev_kfree_skb(skb);\n-\tkni->stats.tx_dropped++;\n+\tdev->stats.tx_dropped++;\n \n \treturn NETDEV_TX_OK;\n }\n@@ -343,7 +343,7 @@ kni_net_rx_normal(struct kni_dev *kni)\n \t\tskb = netdev_alloc_skb(dev, len);\n \t\tif (!skb) {\n \t\t\t/* Update statistics */\n-\t\t\tkni->stats.rx_dropped++;\n+\t\t\tdev->stats.rx_dropped++;\n \t\t\tcontinue;\n \t\t}\n \n@@ -372,8 +372,8 @@ kni_net_rx_normal(struct kni_dev *kni)\n \t\tnetif_rx_ni(skb);\n \n \t\t/* Update statistics */\n-\t\tkni->stats.rx_bytes += len;\n-\t\tkni->stats.rx_packets++;\n+\t\tdev->stats.rx_bytes += len;\n+\t\tdev->stats.rx_packets++;\n \t}\n \n \t/* Burst enqueue mbufs into free_q */\n@@ -396,6 +396,7 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)\n \tvoid *data_kva;\n \tstruct rte_kni_mbuf *alloc_kva;\n \tvoid *alloc_data_kva;\n+\tstruct net_device *dev = kni->net_dev;\n \n \t/* Get the number of entries in rx_q */\n \tnum_rq = kni_fifo_count(kni->rx_q);\n@@ -443,8 +444,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)\n \t\t\talloc_kva->pkt_len = len;\n \t\t\talloc_kva->data_len = len;\n \n-\t\t\tkni->stats.tx_bytes += len;\n-\t\t\tkni->stats.rx_bytes += len;\n+\t\t\tdev->stats.tx_bytes += len;\n+\t\t\tdev->stats.rx_bytes += len;\n \t\t}\n \n \t\t/* Burst enqueue mbufs into tx_q */\n@@ -464,8 +465,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)\n \t * Update statistic, and enqueue/dequeue failure is impossible,\n \t * as all queues are checked at first.\n \t */\n-\tkni->stats.tx_packets += num;\n-\tkni->stats.rx_packets += num;\n+\tdev->stats.tx_packets += num;\n+\tdev->stats.rx_packets += num;\n }\n \n /*\n@@ -518,7 +519,7 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)\n \t\t/* Simulate real usage, allocate/copy skb twice */\n \t\tskb = netdev_alloc_skb(dev, len);\n \t\tif (skb == NULL) {\n-\t\t\tkni->stats.rx_dropped++;\n+\t\t\tdev->stats.rx_dropped++;\n \t\t\tcontinue;\n \t\t}\n \n@@ -542,8 +543,8 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)\n \n \t\tskb->ip_summed = CHECKSUM_UNNECESSARY;\n \n-\t\tkni->stats.rx_bytes += len;\n-\t\tkni->stats.rx_packets++;\n+\t\tdev->stats.rx_bytes += len;\n+\t\tdev->stats.rx_packets++;\n \n \t\t/* call tx interface */\n \t\tkni_net_tx(skb, dev);\n@@ -573,12 +574,10 @@ kni_net_rx(struct kni_dev *kni)\n static void\n kni_net_tx_timeout(struct net_device *dev)\n {\n-\tstruct kni_dev *kni = netdev_priv(dev);\n-\n \tpr_debug(\"Transmit timeout at %ld, latency %ld\\n\", jiffies,\n \t\t\tjiffies - dev_trans_start(dev));\n \n-\tkni->stats.tx_errors++;\n+\tdev->stats.tx_errors++;\n \tnetif_wake_queue(dev);\n }\n \n@@ -627,17 +626,6 @@ kni_net_poll_resp(struct kni_dev *kni)\n \t\twake_up_interruptible(&kni->wq);\n }\n \n-/*\n- * Return statistics to the caller\n- */\n-static struct net_device_stats *\n-kni_net_stats(struct net_device *dev)\n-{\n-\tstruct kni_dev *kni = netdev_priv(dev);\n-\n-\treturn &kni->stats;\n-}\n-\n /*\n * Fill the eth header\n */\n@@ -730,7 +718,6 @@ static const struct net_device_ops kni_net_netdev_ops = {\n \t.ndo_change_rx_flags = kni_net_set_promiscusity,\n \t.ndo_start_xmit = kni_net_tx,\n \t.ndo_change_mtu = kni_net_change_mtu,\n-\t.ndo_get_stats = kni_net_stats,\n \t.ndo_tx_timeout = kni_net_tx_timeout,\n \t.ndo_set_mac_address = kni_net_set_mac,\n #ifdef HAVE_CHANGE_CARRIER_CB\n", "prefixes": [ "v3", "3/8" ] }