From: Andrey Konovalov <andreyknvl@google.com>
To: Dmitry Vyukov <dvyukov@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Alan Stern <stern@rowland.harvard.edu>,
Shuah Khan <shuah@kernel.org>,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Aleksandr Nogikh <nogikh@google.com>,
Nazime Hande Harputluoglu <handeharput@gmail.com>,
Andrey Konovalov <andreyknvl@google.com>,
Nazime Hande Harputluoglu <handeharputlu@google.com>
Subject: [PATCH v2] kcov, usbip: collect coverage from vhci_rx_loop
Date: Mon, 12 Oct 2020 19:10:21 +0200 [thread overview]
Message-ID: <c07a2deae7a75e394de272c1a33cfcc1f667af92.1602522185.git.andreyknvl@google.com> (raw)
Message-ID: <20201012171021.epBPN1jHgkT2EPDILdN_yHysvdVhfVhxVajr4o2hQkc@z> (raw)
From: Nazime Hande Harputluoglu <handeharputlu@google.com>
Add kcov_remote_start()/kcov_remote_stop() annotations to the
vhci_rx_loop() function, which is responsible for parsing USB/IP packets
coming into USB/IP client.
Since vhci_rx_loop() threads are spawned per vhci_hcd device instance, the
common kcov handle is used for kcov_remote_start()/stop() annotations
(see Documentation/dev-tools/kcov.rst for details). As the result kcov
can now be used to collect coverage from vhci_rx_loop() threads.
Signed-off-by: Nazime Hande Harputluoglu <handeharputlu@google.com>
---
Changes v1->v2:
- Fix spacing issues.
- Add ifdef CONFIG_KCOV around kcov_handle in usbip_device struct.
---
drivers/usb/usbip/usbip_common.h | 4 ++++
drivers/usb/usbip/vhci_rx.c | 3 +++
drivers/usb/usbip/vhci_sysfs.c | 12 +++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/usbip/usbip_common.h b/drivers/usb/usbip/usbip_common.h
index 8be857a4fa13..0906182011d6 100644
--- a/drivers/usb/usbip/usbip_common.h
+++ b/drivers/usb/usbip/usbip_common.h
@@ -277,6 +277,10 @@ struct usbip_device {
void (*reset)(struct usbip_device *);
void (*unusable)(struct usbip_device *);
} eh_ops;
+
+#ifdef CONFIG_KCOV
+ u64 kcov_handle;
+#endif
};
#define kthread_get_run(threadfn, data, namefmt, ...) \
diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
index 266024cbb64f..473f14587bd5 100644
--- a/drivers/usb/usbip/vhci_rx.c
+++ b/drivers/usb/usbip/vhci_rx.c
@@ -3,6 +3,7 @@
* Copyright (C) 2003-2008 Takahiro Hirofuchi
*/
+#include <linux/kcov.h>
#include <linux/kthread.h>
#include <linux/slab.h>
@@ -261,7 +262,9 @@ int vhci_rx_loop(void *data)
if (usbip_event_happened(ud))
break;
+ kcov_remote_start_common(ud->kcov_handle);
vhci_rx_pdu(ud);
+ kcov_remote_stop();
}
return 0;
diff --git a/drivers/usb/usbip/vhci_sysfs.c b/drivers/usb/usbip/vhci_sysfs.c
index be37aec250c2..966f1f5cafb1 100644
--- a/drivers/usb/usbip/vhci_sysfs.c
+++ b/drivers/usb/usbip/vhci_sysfs.c
@@ -4,6 +4,7 @@
* Copyright (C) 2015-2016 Nobuo Iwata
*/
+#include <linux/kcov.h>
#include <linux/kthread.h>
#include <linux/file.h>
#include <linux/net.h>
@@ -378,11 +379,12 @@ static ssize_t attach_store(struct device *dev, struct device_attribute *attr,
dev_info(dev, "devid(%u) speed(%u) speed_str(%s)\n",
devid, speed, usb_speed_string(speed));
- vdev->devid = devid;
- vdev->speed = speed;
- vdev->ud.sockfd = sockfd;
- vdev->ud.tcp_socket = socket;
- vdev->ud.status = VDEV_ST_NOTASSIGNED;
+ vdev->devid = devid;
+ vdev->speed = speed;
+ vdev->ud.sockfd = sockfd;
+ vdev->ud.tcp_socket = socket;
+ vdev->ud.status = VDEV_ST_NOTASSIGNED;
+ vdev->ud.kcov_handle = kcov_common_handle();
spin_unlock(&vdev->ud.lock);
spin_unlock_irqrestore(&vhci->lock, flags);
--
2.28.0.1011.ga647a8990f-goog
next reply other threads:[~2020-10-12 17:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 17:08 Andrey Konovalov [this message]
2020-10-12 17:10 ` [PATCH v2] kcov, usbip: collect coverage from vhci_rx_loop Andrey Konovalov
2020-10-13 17:28 ` Shuah Khan
2020-10-14 15:54 ` Andrey Konovalov
2020-10-16 14:18 ` Andrey Konovalov
2020-10-16 17:03 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c07a2deae7a75e394de272c1a33cfcc1f667af92.1602522185.git.andreyknvl@google.com \
--to=andreyknvl@google.com \
--cc=akpm@linux-foundation.org \
--cc=dvyukov@google.com \
--cc=elver@google.com \
--cc=glider@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=handeharput@gmail.com \
--cc=handeharputlu@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=nogikh@google.com \
--cc=shuah@kernel.org \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).