Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp580766ybg; Mon, 1 Jun 2020 08:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw504Fezf4yUwa1PkMwlNhK3LAHXhjlohe5VPzy1qiAGqOk/T04ygfEUIJAg54spixmkh+H X-Received: by 2002:a17:907:2486:: with SMTP id zg6mr20582022ejb.225.1591026910926; Mon, 01 Jun 2020 08:55:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591026910; cv=none; d=google.com; s=arc-20160816; b=Nz4o+C19yt4ySvfaVXAt7WXzxTf6lQBIUm3C4IXzTuDlu2N+VD057KkCXClftU6TbI NSASeLqfqo4FmsEcgOl3e1NL5hupBgpGJJbGDGf98HEoiRYK3gd38l+cyOOcO1gRmvXV XFhc5zJUMprvLKjgiybxODTmLHNYcwcWJD9iB2hdG2NnucXM3Ai/q0DxvjUhLoP7nVHJ I1PDwdNSPJO36X3++VDWi+UxupGLbLzS2J8VuKBhAceX/Dr4XMVGcuKFNYcE1XxQtpev rVlsvpI0dUGMSVuV1GTpDAQdbmCKk6FsA8t5CPBHlCiXGYZZfy7rcu0ilmDIAnn98LB6 +eCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:organization:references:cc:to:from:subject:ironport-sdr :ironport-sdr; bh=cqbZ8niBjfgiZerBrHxtZrMBJdq7gCBPbWhR88hUglc=; b=E9xdjo7Vu0CQM8zhty2q/HKarW6EDTHxPobFb5RNzd4/WO/3WvtHVF7kIz+4dkXXTF Z+TemiOcNI7tirE81GqCzFxe/1lEnjc0AYtessVuVDfmtO3chLmFX/QiAqbZqcddRMnp FAgiT/0Ao+9KZLsyV+esVTVc1lnVGTOghSPhfvCee+olS6E9k6RwRwW2SRDBHm/GDHsI No0sx8lMkJo2a17iRvYZJ+n1/zbAd6rwwUc88S4S8IpezJmZE0yru29ReRnI8Ql7IvDg lxGmxAlSh5jqlRuquruu1h0fptjqLpOxf1iTMuf60cYdYOHx/z8sIQIsAkIWyMJ5uBB6 2BZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g8si10953249ejb.85.2020.06.01.08.54.46; Mon, 01 Jun 2020 08:55:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727957AbgFAPwl (ORCPT + 99 others); Mon, 1 Jun 2020 11:52:41 -0400 Received: from mga12.intel.com ([192.55.52.136]:56667 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726075AbgFAPwl (ORCPT ); Mon, 1 Jun 2020 11:52:41 -0400 IronPort-SDR: EgweRMxqxtXHh3xzelKwVhbiK6ksoXalnoP7HDGM3IrMPxOHjSFfCqsqIML4qxkS4Zae4+Z07c ML4/MLF38S+g== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2020 08:52:40 -0700 IronPort-SDR: gclG7MoISragIicCrde/gBTu8DM5781F+LYst/OcJDQrn3z6/yTHwQQDo+TVZQDnuFCfQe0RtQ 21u9eQyJcM0w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,461,1583222400"; d="scan'208";a="257999783" Received: from linux.intel.com ([10.54.29.200]) by fmsmga008.fm.intel.com with ESMTP; 01 Jun 2020 08:52:39 -0700 Received: from [10.249.230.65] (abudanko-mobl.ccr.corp.intel.com [10.249.230.65]) by linux.intel.com (Postfix) with ESMTP id AD1AC580378; Mon, 1 Jun 2020 08:52:37 -0700 (PDT) Subject: [PATCH v5 03/13] perf evlist: implement control command handling functions From: Alexey Budankov To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Ingo Molnar , Andi Kleen , linux-kernel References: Organization: Intel Corp. Message-ID: <49357264-5f6f-ca48-784b-f7e21b23551c@linux.intel.com> Date: Mon, 1 Jun 2020 18:52:36 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Implement functions of initialization, finalization and processing of control commands coming from control file descriptors. Signed-off-by: Alexey Budankov --- tools/perf/util/evlist.c | 128 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/evlist.h | 17 ++++++ 2 files changed, 145 insertions(+) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 47541b5cab46..fbd98f741af9 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1718,3 +1718,131 @@ struct evsel *perf_evlist__reset_weak_group(struct evlist *evsel_list, } return leader; } + +int evlist__initialize_ctlfd(struct evlist *evlist, int fd, int ack) +{ + if (fd == -1) { + pr_debug("Control descriptor is not initialized\n"); + return 0; + } + + evlist->ctl_fd.pos = perf_evlist__add_pollfd_stat(&evlist->core, fd, POLLIN); + if (evlist->ctl_fd.pos < 0) { + evlist->ctl_fd.pos = -1; + pr_err("Failed to add ctl fd entry: %m\n"); + return -1; + } + + evlist->ctl_fd.fd = fd; + evlist->ctl_fd.ack = ack; + + return 0; +} + +int evlist__finalize_ctlfd(struct evlist *evlist) +{ + if (evlist->ctl_fd.pos == -1) + return 0; + + evlist->core.pollfd.stat_entries[evlist->ctl_fd.pos].fd = -1; + evlist->ctl_fd.pos = -1; + evlist->ctl_fd.ack = -1; + evlist->ctl_fd.fd = -1; + + return 0; +} + +static int evlist__ctlfd_recv(struct evlist *evlist, enum evlist_ctl_cmd *cmd, + char *cmd_data, size_t data_size) +{ + int err; + char c; + size_t bytes_read = 0; + + memset(cmd_data, 0, data_size--); + + do { + err = read(evlist->ctl_fd.fd, &c, 1); + if (err > 0) { + if (c == '\n' || c == '\0') + break; + cmd_data[bytes_read++] = c; + if (bytes_read == data_size) + break; + } else { + if (err == -1) + pr_err("Failed to read from ctlfd %d: %m\n", evlist->ctl_fd.fd); + break; + } + } while (1); + + pr_debug("Message from ctl_fd: \"%s%s\"\n", cmd_data, + bytes_read == data_size ? "" : c == '\n' ? "\\n" : "\\0"); + + if (err > 0) { + if (!strncmp(cmd_data, EVLIST_CTL_CMD_ENABLE_TAG, + strlen(EVLIST_CTL_CMD_ENABLE_TAG))) { + *cmd = EVLIST_CTL_CMD_ENABLE; + } else if (!strncmp(cmd_data, EVLIST_CTL_CMD_DISABLE_TAG, + strlen(EVLIST_CTL_CMD_DISABLE_TAG))) { + *cmd = EVLIST_CTL_CMD_DISABLE; + } + } + + return err; +} + +static int evlist__ctlfd_ack(struct evlist *evlist) +{ + int err; + + if (evlist->ctl_fd.ack == -1) + return 0; + + err = write(evlist->ctl_fd.ack, EVLIST_CTL_CMD_ACK_TAG, + sizeof(EVLIST_CTL_CMD_ACK_TAG)); + if (err == -1) + pr_err("failed to write to ctl_ack_fd %d: %m\n", evlist->ctl_fd.ack); + + return err; +} + +int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd) +{ + int err = 0; + char cmd_data[EVLIST_CTL_CMD_MAX_LEN]; + int ctlfd_pos = evlist->ctl_fd.pos; + struct pollfd *stat_entries = evlist->core.pollfd.stat_entries; + + if (ctlfd_pos == -1 || !stat_entries[ctlfd_pos].revents) + return 0; + + if (stat_entries[ctlfd_pos].revents & POLLIN) { + err = evlist__ctlfd_recv(evlist, cmd, cmd_data, + EVLIST_CTL_CMD_MAX_LEN); + if (err > 0) { + switch (*cmd) { + case EVLIST_CTL_CMD_ENABLE: + evlist__enable(evlist); + break; + case EVLIST_CTL_CMD_DISABLE: + evlist__disable(evlist); + break; + case EVLIST_CTL_CMD_ACK: + case EVLIST_CTL_CMD_UNSUPPORTED: + default: + pr_debug("ctlfd: unsupported %d\n", *cmd); + break; + } + if (!(*cmd == EVLIST_CTL_CMD_ACK || *cmd == EVLIST_CTL_CMD_UNSUPPORTED)) + evlist__ctlfd_ack(evlist); + } + } + + if (stat_entries[ctlfd_pos].revents & (POLLHUP | POLLERR)) + evlist__finalize_ctlfd(evlist); + else + stat_entries[ctlfd_pos].revents = 0; + + return err; +} diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 0d8b361f1c8e..bccf0a970371 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -360,4 +360,21 @@ void perf_evlist__force_leader(struct evlist *evlist); struct evsel *perf_evlist__reset_weak_group(struct evlist *evlist, struct evsel *evsel, bool close); +#define EVLIST_CTL_CMD_ENABLE_TAG "enable" +#define EVLIST_CTL_CMD_DISABLE_TAG "disable" +#define EVLIST_CTL_CMD_ACK_TAG "ack\n" + +#define EVLIST_CTL_CMD_MAX_LEN 64 + +enum evlist_ctl_cmd { + EVLIST_CTL_CMD_UNSUPPORTED = 0, + EVLIST_CTL_CMD_ENABLE, + EVLIST_CTL_CMD_DISABLE, + EVLIST_CTL_CMD_ACK +}; + +int evlist__initialize_ctlfd(struct evlist *evlist, int ctl_fd, int ctl_fd_ack); +int evlist__finalize_ctlfd(struct evlist *evlist); +int evlist__ctlfd_process(struct evlist *evlist, enum evlist_ctl_cmd *cmd); + #endif /* __PERF_EVLIST_H */ -- 2.24.1