From patchwork Thu Oct 17 17:44:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11196501 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CE641912 for ; Thu, 17 Oct 2019 17:44:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AD8FD21A49 for ; Thu, 17 Oct 2019 17:44:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Q1zp2EAe" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436836AbfJQRoa (ORCPT ); Thu, 17 Oct 2019 13:44:30 -0400 Received: from mail-wm1-f74.google.com ([209.85.128.74]:40511 "EHLO mail-wm1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436698AbfJQRo3 (ORCPT ); Thu, 17 Oct 2019 13:44:29 -0400 Received: by mail-wm1-f74.google.com with SMTP id o188so1488741wmo.5 for ; Thu, 17 Oct 2019 10:44:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=Zd3UN9zj2SRTHAHyqFE8cwUhiGg9Ar8y6WSvk5Ep4Jk=; b=Q1zp2EAe5BhHQV8QkifUBjlziwXk67WUG2YNifCFUAx5IK3xHOz5v/UgLmDMMOwmO4 qd6jdxNsYepFmbN1fbfDZals8/HHWEKEza2A4sjJWSVO6ZCN+WKHxqzQ/k7QQc6IxOst LIrxj7s9dLj87ugnrTc8I23h4uxILDe5fw7CacavgsS/ZTnYYcG56kQTGkyABVRTpshS hyMUQZYCLURuM79VtykzhI88iasvt/ENgYmhHbyejw7OqrLNUPmsyOMHMsQRfdMXgZex UB+yQspHdV4/RgkMd2E+eqh6uDrBq0A/+XL2xEH3FpZAf0SY99GbSD7M8ZTfH8+xm2v2 cN5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=Zd3UN9zj2SRTHAHyqFE8cwUhiGg9Ar8y6WSvk5Ep4Jk=; b=je62iDJaKHggWUBs/x/UTlV3JFM59MhzJk5X+i+4IUuZD1wxVTUgAIputQcWxuWMK2 +TWifk+uzlJ1CVSe36FTFERa2+aN0N04eIHOeDDzJCMESBPWHVdwtLq3xaduGl4vFiyV JJfyLYTJNbdG7R78XnP19HJi3sr4TBFyAeRWb3k1i1qZlaXT2CBb0K5PHm9obyyufiMF 24/BwGcFqhq3vb9H953gohryQlQjjN1c2hAAPDr4/xh/sNNvKBtew9nSQxtzUdPRkagd QJBvvwtbGshaQiy2Jq5HhqjJq3qKq0e7NjUJIN4NbJpYk4NZ/dpdvpjfAPTGXvCyY6gq xa/Q== X-Gm-Message-State: APjAAAWkvCA4Kw0jcEcajFncjdCQ3DlLis/q+/WWXpoOmLRRBnweIJaA lIgI9SpTdupGjpZHs1UCfG2Oc1B5capVfzWw X-Google-Smtp-Source: APXvYqwPbc0HszLZCUbWsoFAApUOTC3ojb+0uPqAUeUTVYCTxoTQacwVoD4Ct1vAVwfHyC9LzISFTizsELobTjWq X-Received: by 2002:adf:9f08:: with SMTP id l8mr3900073wrf.325.1571334265559; Thu, 17 Oct 2019 10:44:25 -0700 (PDT) Date: Thu, 17 Oct 2019 19:44:14 +0200 In-Reply-To: Message-Id: <1b30d1c9e7f86c25425c5ee53d7facede289608e.1571333592.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH RFC 2/3] usb, kcov: collect coverage from hub_event From: Andrey Konovalov To: linux-usb@vger.kernel.org, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Vyukov , Greg Kroah-Hartman , Alan Stern , "Michael S . Tsirkin" , Jason Wang Cc: Andrew Morton , Arnd Bergmann , Steven Rostedt , David Windsor , Elena Reshetova , Anders Roxell , Andrey Konovalov Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org This patch adds kcov_remote_start/kcov_remote_stop annotations to the hub_event function, which is responsible for processing events on USB buses, in particular events that happen during USB device enumeration. Each USB bus gets a unique id, which can be used to attach a kcov device to a particular USB bus for coverage collection. Signed-off-by: Andrey Konovalov --- drivers/usb/core/hub.c | 4 ++++ include/linux/kcov.h | 1 + include/uapi/linux/kcov.h | 7 +++++++ 3 files changed, 12 insertions(+) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 236313f41f4a..03a40e41b099 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -5374,6 +5374,8 @@ static void hub_event(struct work_struct *work) hub_dev = hub->intfdev; intf = to_usb_interface(hub_dev); + kcov_remote_start(kcov_remote_handle_usb(hdev->bus->busnum)); + dev_dbg(hub_dev, "state %d ports %d chg %04x evt %04x\n", hdev->state, hdev->maxchild, /* NOTE: expects max 15 ports... */ @@ -5480,6 +5482,8 @@ static void hub_event(struct work_struct *work) /* Balance the stuff in kick_hub_wq() and allow autosuspend */ usb_autopm_put_interface(intf); kref_put(&hub->kref, hub_release); + + kcov_remote_stop(); } static const struct usb_device_id hub_id_table[] = { diff --git a/include/linux/kcov.h b/include/linux/kcov.h index 702672d98d35..38a47e0b67c2 100644 --- a/include/linux/kcov.h +++ b/include/linux/kcov.h @@ -30,6 +30,7 @@ void kcov_task_exit(struct task_struct *t); /* * Reserved handle ranges: * 0000000000000000 - 0000ffffffffffff : common handles + * 0001000000000000 - 0001ffffffffffff : USB subsystem handles */ void kcov_remote_start(u64 handle); void kcov_remote_stop(void); diff --git a/include/uapi/linux/kcov.h b/include/uapi/linux/kcov.h index 46f78f716ca9..45c9ae59cebc 100644 --- a/include/uapi/linux/kcov.h +++ b/include/uapi/linux/kcov.h @@ -43,4 +43,11 @@ enum { #define KCOV_CMP_SIZE(n) ((n) << 1) #define KCOV_CMP_MASK KCOV_CMP_SIZE(3) +#define KCOV_REMOTE_HANDLE_USB 0x0001000000000000ull + +static inline __u64 kcov_remote_handle_usb(unsigned int bus) +{ + return KCOV_REMOTE_HANDLE_USB + (__u64)bus; +} + #endif /* _LINUX_KCOV_IOCTLS_H */