Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/16137/?format=api
{ "id": 16137, "url": "http://patches.dpdk.org/api/patches/16137/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20160926153938.7575-17-ferruh.yigit@intel.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": "<20160926153938.7575-17-ferruh.yigit@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20160926153938.7575-17-ferruh.yigit@intel.com", "date": "2016-09-26T15:39:35", "name": "[dpdk-dev,v3,16/19] kni: remove compile time debug configuration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "830c6c027449dcd69975605681870cf98c0ec888", "submitter": { "id": 324, "url": "http://patches.dpdk.org/api/people/324/?format=api", "name": "Ferruh Yigit", "email": "ferruh.yigit@intel.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/20160926153938.7575-17-ferruh.yigit@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/16137/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/16137/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 [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id AD4447E6A;\n\tMon, 26 Sep 2016 17:43:58 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 704496CD4\n\tfor <dev@dpdk.org>; Mon, 26 Sep 2016 17:43:56 +0200 (CEST)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby orsmga103.jf.intel.com with ESMTP; 26 Sep 2016 08:43:55 -0700", "from sivswdev02.ir.intel.com ([10.237.217.46])\n\tby fmsmga006.fm.intel.com with ESMTP; 26 Sep 2016 08:43:53 -0700" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.30,400,1470726000\"; d=\"scan'208\";a=\"13327759\"", "From": "Ferruh Yigit <ferruh.yigit@intel.com>", "To": "dev@dpdk.org", "Cc": "Ferruh Yigit <ferruh.yigit@intel.com>", "Date": "Mon, 26 Sep 2016 16:39:35 +0100", "Message-Id": "<20160926153938.7575-17-ferruh.yigit@intel.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20160926153938.7575-1-ferruh.yigit@intel.com>", "References": "<1474043212-15663-1-git-send-email-ferruh.yigit@intel.com>\n\t<20160926153938.7575-1-ferruh.yigit@intel.com>", "Subject": "[dpdk-dev] [PATCH v3 16/19] kni: remove compile time debug\n\tconfiguration", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Since switched to kernel dynamic debugging it is possible to remove\ncompile time debug log configuration.\n\nSigned-off-by: Ferruh Yigit <ferruh.yigit@intel.com>\n---\n config/common_base | 3 ---\n lib/librte_eal/linuxapp/kni/kni_dev.h | 18 -------------\n lib/librte_eal/linuxapp/kni/kni_misc.c | 8 +++---\n lib/librte_eal/linuxapp/kni/kni_net.c | 8 +++---\n lib/librte_eal/linuxapp/kni/kni_vhost.c | 46 ++++++++++++++++-----------------\n 5 files changed, 31 insertions(+), 52 deletions(-)", "diff": "diff --git a/config/common_base b/config/common_base\nindex 7830535..4a9e5b0 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -533,12 +533,9 @@ CONFIG_RTE_PIPELINE_STATS_COLLECT=n\n CONFIG_RTE_LIBRTE_KNI=n\n CONFIG_RTE_KNI_KMOD=n\n CONFIG_RTE_KNI_PREEMPT_DEFAULT=y\n-CONFIG_RTE_KNI_KO_DEBUG=n\n CONFIG_RTE_KNI_VHOST=n\n CONFIG_RTE_KNI_VHOST_MAX_CACHE_SIZE=1024\n CONFIG_RTE_KNI_VHOST_VNET_HDR_EN=n\n-CONFIG_RTE_KNI_VHOST_DEBUG_RX=n\n-CONFIG_RTE_KNI_VHOST_DEBUG_TX=n\n \n #\n # Compile the pdump library\ndiff --git a/lib/librte_eal/linuxapp/kni/kni_dev.h b/lib/librte_eal/linuxapp/kni/kni_dev.h\nindex f48c228..2771138 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_dev.h\n+++ b/lib/librte_eal/linuxapp/kni/kni_dev.h\n@@ -118,12 +118,6 @@ struct kni_dev {\n \tvoid *alloc_va[MBUF_BURST_SZ];\n };\n \n-#ifdef RTE_KNI_KO_DEBUG\n-\t#define KNI_DBG(args...) pr_debug(args)\n-#else\n-\t#define KNI_DBG(args...)\n-#endif\n-\n #ifdef RTE_KNI_VHOST\n unsigned int\n kni_poll(struct file *file, struct socket *sock, poll_table * wait);\n@@ -155,16 +149,4 @@ void ixgbe_kni_remove(struct pci_dev *pdev);\n int igb_kni_probe(struct pci_dev *pdev, struct net_device **lad_dev);\n void igb_kni_remove(struct pci_dev *pdev);\n \n-#ifdef RTE_KNI_VHOST_DEBUG_RX\n-\t#define KNI_DBG_RX(args...) pr_debug(args)\n-#else\n-\t#define KNI_DBG_RX(args...)\n-#endif\n-\n-#ifdef RTE_KNI_VHOST_DEBUG_TX\n-\t#define KNI_DBG_TX(args...) pr_debug(args)\n-#else\n-\t#define KNI_DBG_TX(args...)\n-#endif\n-\n #endif\ndiff --git a/lib/librte_eal/linuxapp/kni/kni_misc.c b/lib/librte_eal/linuxapp/kni/kni_misc.c\nindex 9296a8e..bc43e5f 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_misc.c\n+++ b/lib/librte_eal/linuxapp/kni/kni_misc.c\n@@ -410,7 +410,7 @@ kni_ioctl_create(struct net *net,\n \t\t(unsigned long long) dev_info.resp_phys, kni->resp_q);\n \tpr_debug(\"mbuf_size: %u\\n\", kni->mbuf_size);\n \n-\tKNI_DBG(\"PCI: %02x:%02x.%02x %04x:%04x\\n\",\n+\tpr_debug(\"PCI: %02x:%02x.%02x %04x:%04x\\n\",\n \t\t\t\t\tdev_info.bus,\n \t\t\t\t\tdev_info.devid,\n \t\t\t\t\tdev_info.function,\n@@ -438,7 +438,7 @@ kni_ioctl_create(struct net *net,\n \t\t\telse\n \t\t\t\tret = -1;\n \n-\t\t\tKNI_DBG(\"PCI found: pci=0x%p, lad_dev=0x%p\\n\",\n+\t\t\tpr_debug(\"PCI found: pci=0x%p, lad_dev=0x%p\\n\",\n \t\t\t\t\t\t\tpci, lad_dev);\n \t\t\tif (ret == 0) {\n \t\t\t\tkni->lad_dev = lad_dev;\n@@ -547,7 +547,7 @@ kni_ioctl(struct inode *inode,\n \tint ret = -EINVAL;\n \tstruct net *net = current->nsproxy->net_ns;\n \n-\tKNI_DBG(\"IOCTL num=0x%0x param=0x%0lx\\n\", ioctl_num, ioctl_param);\n+\tpr_debug(\"IOCTL num=0x%0x param=0x%0lx\\n\", ioctl_num, ioctl_param);\n \n \t/*\n \t * Switch according to the ioctl called\n@@ -563,7 +563,7 @@ kni_ioctl(struct inode *inode,\n \t\tret = kni_ioctl_release(net, ioctl_num, ioctl_param);\n \t\tbreak;\n \tdefault:\n-\t\tKNI_DBG(\"IOCTL default\\n\");\n+\t\tpr_debug(\"IOCTL default\\n\");\n \t\tbreak;\n \t}\n \ndiff --git a/lib/librte_eal/linuxapp/kni/kni_net.c b/lib/librte_eal/linuxapp/kni/kni_net.c\nindex d447d3a..dfc6b37 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_net.c\n+++ b/lib/librte_eal/linuxapp/kni/kni_net.c\n@@ -573,7 +573,7 @@ kni_net_tx_timeout(struct net_device *dev)\n {\n \tstruct kni_dev *kni = netdev_priv(dev);\n \n-\tKNI_DBG(\"Transmit timeout at %ld, latency %ld\\n\", jiffies,\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@@ -586,7 +586,7 @@ kni_net_tx_timeout(struct net_device *dev)\n static int\n kni_net_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)\n {\n-\tKNI_DBG(\"kni_net_ioctl %d\\n\",\n+\tpr_debug(\"kni_net_ioctl %d\\n\",\n \t\t((struct kni_dev *)netdev_priv(dev))->group_id);\n \n \treturn 0;\n@@ -604,7 +604,7 @@ kni_net_change_mtu(struct net_device *dev, int new_mtu)\n \tstruct rte_kni_request req;\n \tstruct kni_dev *kni = netdev_priv(dev);\n \n-\tKNI_DBG(\"kni_net_change_mtu new mtu %d to be set\\n\", new_mtu);\n+\tpr_debug(\"kni_net_change_mtu new mtu %d to be set\\n\", new_mtu);\n \n \tmemset(&req, 0, sizeof(req));\n \treq.req_id = RTE_KNI_REQ_CHANGE_MTU;\n@@ -730,7 +730,7 @@ kni_net_init(struct net_device *dev)\n {\n \tstruct kni_dev *kni = netdev_priv(dev);\n \n-\tKNI_DBG(\"kni_net_init\\n\");\n+\tpr_debug(\"kni_net_init\\n\");\n \n \tinit_waitqueue_head(&kni->wq);\n \tmutex_init(&kni->sync_lock);\ndiff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c\nindex f4f6f10..947341e 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_vhost.c\n+++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c\n@@ -75,7 +75,7 @@ kni_vhost_net_tx(struct kni_dev *kni, struct msghdr *m,\n \tstruct rte_kni_mbuf *pkt_va = NULL;\n \tint ret;\n \n-\tKNI_DBG_TX(\"tx offset=%d, len=%d, iovlen=%d\\n\",\n+\tpr_debug(\"tx offset=%d, len=%d, iovlen=%d\\n\",\n #ifdef HAVE_IOV_ITER_MSGHDR\n \t\t offset, len, (int)m->msg_iter.iov->iov_len);\n #else\n@@ -177,7 +177,7 @@ kni_vhost_net_rx(struct kni_dev *kni, struct msghdr *m,\n \tif (unlikely(pkt_len > len))\n \t\tgoto drop;\n \n-\tKNI_DBG_RX(\"rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\\n\",\n+\tpr_debug(\"rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\\n\",\n #ifdef HAVE_IOV_ITER_MSGHDR\n \t\t offset, len, pkt_len, (int)m->msg_iter.iov->iov_len);\n #else\n@@ -202,7 +202,7 @@ kni_vhost_net_rx(struct kni_dev *kni, struct msghdr *m,\n \t\t/* Failing should not happen */\n \t\tpr_err(\"Fail to enqueue entries into free_q\\n\");\n \n-\tKNI_DBG_RX(\"receive done %d\\n\", pkt_len);\n+\tpr_debug(\"receive done %d\\n\", pkt_len);\n \n \treturn pkt_len;\n \n@@ -226,10 +226,10 @@ kni_sock_poll(struct file *file, struct socket *sock, poll_table *wait)\n \n \tkni = q->kni;\n #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)\n-\tKNI_DBG(\"start kni_poll on group %d, wq 0x%16llx\\n\",\n+\tpr_debug(\"start kni_poll on group %d, wq 0x%16llx\\n\",\n \t\t kni->group_id, (uint64_t)sock->wq);\n #else\n-\tKNI_DBG(\"start kni_poll on group %d, wait at 0x%16llx\\n\",\n+\tpr_debug(\"start kni_poll on group %d, wait at 0x%16llx\\n\",\n \t\t kni->group_id, (uint64_t)&sock->wait);\n #endif\n \n@@ -332,7 +332,7 @@ kni_chk_vhost_rx(struct kni_dev *kni)\n \t ((nb_mbuf < RX_BURST_SZ) && (nb_mbuf != 0))) {\n \t\twake_up_interruptible_poll(sk_sleep(&q->sk),\n \t\t\t\t POLLIN | POLLRDNORM | POLLRDBAND);\n-\t\tKNI_DBG_RX(\"RX CHK KICK nb_mbuf %d, nb_skb %d, nb_in %d\\n\",\n+\t\tpr_debug(\"RX CHK KICK nb_mbuf %d, nb_skb %d, nb_in %d\\n\",\n \t\t\t nb_mbuf, nb_skb, nb_in);\n \t}\n \n@@ -363,7 +363,7 @@ kni_sock_sndmsg(struct socket *sock,\n \tif (unlikely(q == NULL || q->kni == NULL))\n \t\treturn 0;\n \n-\tKNI_DBG_TX(\"kni_sndmsg len %ld, flags 0x%08x, nb_iov %d\\n\",\n+\tpr_debug(\"kni_sndmsg len %ld, flags 0x%08x, nb_iov %d\\n\",\n #ifdef HAVE_IOV_ITER_MSGHDR\n \t\t len, q->flags, (int)m->msg_iter.iov->iov_len);\n #else\n@@ -431,7 +431,7 @@ kni_sock_rcvmsg(struct socket *sock,\n #endif /* HAVE_IOV_ITER_MSGHDR */\n \t\treturn -EFAULT;\n #endif /* RTE_KNI_VHOST_VNET_HDR_EN */\n-\tKNI_DBG_RX(\"kni_rcvmsg expect_len %ld, flags 0x%08x, pkt_len %d\\n\",\n+\tpr_debug(\"kni_rcvmsg expect_len %ld, flags 0x%08x, pkt_len %d\\n\",\n \t\t (unsigned long)len, q->flags, pkt_len);\n \n \treturn pkt_len + vnet_hdr_len;\n@@ -453,11 +453,11 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \tint s;\n \tint ret;\n \n-\tKNI_DBG(\"tap ioctl cmd 0x%08x\\n\", cmd);\n+\tpr_debug(\"tap ioctl cmd 0x%08x\\n\", cmd);\n \n \tswitch (cmd) {\n \tcase TUNSETIFF:\n-\t\tKNI_DBG(\"TUNSETIFF\\n\");\n+\t\tpr_debug(\"TUNSETIFF\\n\");\n \t\t/* ignore the name, just look at flags */\n \t\tif (get_user(u, &ifr->ifr_flags))\n \t\t\treturn -EFAULT;\n@@ -471,7 +471,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \t\treturn ret;\n \n \tcase TUNGETIFF:\n-\t\tKNI_DBG(\"TUNGETIFF\\n\");\n+\t\tpr_debug(\"TUNGETIFF\\n\");\n \t\trcu_read_lock_bh();\n \t\tkni = rcu_dereference_bh(q->kni);\n \t\tif (kni)\n@@ -489,7 +489,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \t\treturn ret;\n \n \tcase TUNGETFEATURES:\n-\t\tKNI_DBG(\"TUNGETFEATURES\\n\");\n+\t\tpr_debug(\"TUNGETFEATURES\\n\");\n \t\tu = IFF_TAP | IFF_NO_PI;\n #ifdef RTE_KNI_VHOST_VNET_HDR_EN\n \t\tu |= IFF_VNET_HDR;\n@@ -499,7 +499,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \t\treturn 0;\n \n \tcase TUNSETSNDBUF:\n-\t\tKNI_DBG(\"TUNSETSNDBUF\\n\");\n+\t\tpr_debug(\"TUNSETSNDBUF\\n\");\n \t\tif (get_user(u, up))\n \t\t\treturn -EFAULT;\n \n@@ -510,7 +510,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \t\ts = q->vnet_hdr_sz;\n \t\tif (put_user(s, sp))\n \t\t\treturn -EFAULT;\n-\t\tKNI_DBG(\"TUNGETVNETHDRSZ %d\\n\", s);\n+\t\tpr_debug(\"TUNGETVNETHDRSZ %d\\n\", s);\n \t\treturn 0;\n \n \tcase TUNSETVNETHDRSZ:\n@@ -519,12 +519,12 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n \t\tif (s < (int)sizeof(struct virtio_net_hdr))\n \t\t\treturn -EINVAL;\n \n-\t\tKNI_DBG(\"TUNSETVNETHDRSZ %d\\n\", s);\n+\t\tpr_debug(\"TUNSETVNETHDRSZ %d\\n\", s);\n \t\tq->vnet_hdr_sz = s;\n \t\treturn 0;\n \n \tcase TUNSETOFFLOAD:\n-\t\tKNI_DBG(\"TUNSETOFFLOAD %lx\\n\", arg);\n+\t\tpr_debug(\"TUNSETOFFLOAD %lx\\n\", arg);\n #ifdef RTE_KNI_VHOST_VNET_HDR_EN\n \t\t/* not support any offload yet */\n \t\tif (!(q->flags & IFF_VNET_HDR))\n@@ -536,7 +536,7 @@ kni_sock_ioctl(struct socket *sock, unsigned int cmd,\n #endif\n \n \tdefault:\n-\t\tKNI_DBG(\"NOT SUPPORT\\n\");\n+\t\tpr_debug(\"NOT SUPPORT\\n\");\n \t\treturn -EINVAL;\n \t}\n }\n@@ -584,7 +584,7 @@ kni_sock_release(struct socket *sock)\n \n \tsock_put(&q->sk);\n \n-\tKNI_DBG(\"dummy sock release done\\n\");\n+\tpr_debug(\"dummy sock release done\\n\");\n \n \treturn 0;\n }\n@@ -593,7 +593,7 @@ int\n kni_sock_getname(struct socket *sock, struct sockaddr *addr,\n \t\tint *sockaddr_len, int peer)\n {\n-\tKNI_DBG(\"dummy sock getname\\n\");\n+\tpr_debug(\"dummy sock getname\\n\");\n \t((struct sockaddr_ll *)addr)->sll_family = AF_PACKET;\n \treturn 0;\n }\n@@ -731,11 +731,11 @@ kni_vhost_backend_init(struct kni_dev *kni)\n \tkni->vq_status = BE_START;\n \n #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)\n-\tKNI_DBG(\"backend init sockfd=%d, sock->wq=0x%16llx,sk->sk_wq=0x%16llx\",\n+\tpr_debug(\"backend init sockfd=%d, sock->wq=0x%16llx,sk->sk_wq=0x%16llx\",\n \t\t q->sockfd, (uint64_t)q->sock->wq,\n \t\t (uint64_t)q->sk.sk_wq);\n #else\n-\tKNI_DBG(\"backend init sockfd=%d, sock->wait at 0x%16llx,sk->sk_sleep=0x%16llx\",\n+\tpr_debug(\"backend init sockfd=%d, sock->wait at 0x%16llx,sk->sk_sleep=0x%16llx\",\n \t\t q->sockfd, (uint64_t)&q->sock->wait,\n \t\t (uint64_t)q->sk.sk_sleep);\n #endif\n@@ -828,7 +828,7 @@ kni_vhost_backend_release(struct kni_dev *kni)\n \t/* dettach from kni */\n \tq->kni = NULL;\n \n-\tKNI_DBG(\"release backend done\\n\");\n+\tpr_debug(\"release backend done\\n\");\n \n \treturn 0;\n }\n@@ -843,7 +843,7 @@ kni_vhost_init(struct kni_dev *kni)\n \n \tkni->vq_status = BE_STOP;\n \n-\tKNI_DBG(\"kni_vhost_init done\\n\");\n+\tpr_debug(\"kni_vhost_init done\\n\");\n \n \treturn 0;\n }\n", "prefixes": [ "dpdk-dev", "v3", "16/19" ] }