From: Shuah Khan <skhan@linuxfoundation.org>
To: Andrey Konovalov <andreyknvl@google.com>, Shuah Khan <shuah@kernel.org>
Cc: Dmitry Vyukov <dvyukov@google.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Alexander Potapenko <glider@google.com>,
Marco Elver <elver@google.com>,
Aleksandr Nogikh <nogikh@google.com>,
Nazime Hande Harputluoglu <handeharput@gmail.com>,
Nazime Hande Harputluoglu <handeharputlu@google.com>,
Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: [PATCH v3] kcov, usbip: collect coverage from vhci_rx_loop
Date: Mon, 19 Oct 2020 12:52:30 -0600 [thread overview]
Message-ID: <2ee45dd7-0735-fcbb-545c-352d9c5d8689@linuxfoundation.org> (raw)
In-Reply-To: <ca9c83b0-364a-6a26-4539-e38373a455aa@linuxfoundation.org>
On 10/19/20 12:49 PM, Shuah Khan wrote:
> On 10/19/20 11:20 AM, Andrey Konovalov wrote:
>> 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>
>> Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
>> ---
>>
>> Changes v2->v3:
>> - Fix build without KCOV enabled.
>>
>> ---
>> drivers/usb/usbip/usbip_common.h | 4 ++++
>> drivers/usb/usbip/vhci_rx.c | 7 +++++++
>> drivers/usb/usbip/vhci_sysfs.c | 4 ++++
>> 3 files changed, 15 insertions(+)
>>
>> 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..68ec0aa64f69 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,13 @@ int vhci_rx_loop(void *data)
>> if (usbip_event_happened(ud))
>> break;
>> +#ifdef CONFIG_KCOV
>> + kcov_remote_start_common(ud->kcov_handle);
>> +#endif
>> vhci_rx_pdu(ud);
>> +#ifdef CONFIG_KCOV
>> + kcov_remote_stop();
>> +#endif
>> }
>
> Let's move these into usbip_common.h as inline functions along
> the line of
>
> #ifdef CONFIG_KCOV
> usbip_kcov_remote_start_common(ud)
> {
> kcov_remote_start_common(ud->kcov_handle);
> }
>
> usbip_kcov_remote_stop_common(ud)
> {
> kcov_remote_stop_common(ud->kcov_handle);
> }
> #else
> stubs that do nothing
> #endif
>
>> return 0;
>> diff --git a/drivers/usb/usbip/vhci_sysfs.c
>> b/drivers/usb/usbip/vhci_sysfs.c
>> index be37aec250c2..e167b8a445ad 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>
>> @@ -383,6 +384,9 @@ static ssize_t attach_store(struct device *dev,
>> struct device_attribute *attr,
>> vdev->ud.sockfd = sockfd;
>> vdev->ud.tcp_socket = socket;
>> vdev->ud.status = VDEV_ST_NOTASSIGNED;
>> +#ifdef CONFIG_KCOV
>> + vdev->ud.kcov_handle = kcov_common_handle();
>> +#endif
>
>
> Same here add a usbip_kcov_handle_init(ud)
>
btw - I am seeing bounces on handeharputlu@google.com address.
thanks,
-- Shuah
next prev parent reply other threads:[~2020-10-19 18:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 17:20 [PATCH v3] kcov, usbip: collect coverage from vhci_rx_loop Andrey Konovalov
2020-10-19 18:49 ` Shuah Khan
2020-10-19 18:52 ` Shuah Khan [this message]
2020-11-23 23:41 ` Andrey Konovalov
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=2ee45dd7-0735-fcbb-545c-352d9c5d8689@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=andreyknvl@google.com \
--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 \
/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