Received: by 2002:a25:2c96:0:0:0:0:0 with SMTP id s144csp1108039ybs; Mon, 25 May 2020 07:22:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJym8xVqff+SNa2+gqvrwhfacgAMq7evmwEXY4ojKDs0u6qaNCxDGoaKRNYxoXjMyby3KPyG X-Received: by 2002:a05:6402:3185:: with SMTP id di5mr15490139edb.330.1590416559166; Mon, 25 May 2020 07:22:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590416559; cv=none; d=google.com; s=arc-20160816; b=tMYbIAculc5/4Yry7a9cEG93QVkVY2s46F0vQ/iRqBnXuTT6O6D4Cu5FwLFoTyERLI vAy76WOCkRPY7C2ERyH8jaXlhgM6Vxf61C2+Xk8fdJUcpsz5wgVlGiRLs0W/TYC63EV2 7mzzsqbGK0tQLBBOzP/FFbXYASWL+IMBvOBVfg0zEbc9Q5j7Fdye3egoVpqKhMHSjvWb ZKm5nn+FY2OYnz5mMvR661svQuNRCxugiBWIQc5QtqPBLsABqzi/E2ZKAMm8YvB4MPRO V91AOBrDavlWW3pRoItu+zjGj11YxQcFeY7dyf6+hT1OU6rMndr8lDuRMtZnZSx+JfFq u37g== 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=4hn/+GDXg1SU4G2nldre7DbUCBLNx5u4qmqu0y5E8/M=; b=jm/BEphqKLHv6bMChsyxfmbShyvZEQZ+FSOofNqIENpuibil2WAajp7hccD8f8+hJY cMGhoFxwoirBGHMvuBMRMEJMEn32ef01SKHujWjqlj3H3VTsEcLaM6N07v8082z9mIqT PA1p+qem4RXAbG6UFNkukthNOE5K/9149eePtZ9p1fu0HC3ZZh5XTroUCXk2/6rdw3DW X4aNezvUzOyKJexbi8k0VoA93Gmoqbiu78M885/DsjXCRx7y8DVRg2TAjYsYR3yQz1jG kVgESFB/6NEe/PMBzlpoZEN7YPiu5HLsBS5F2ImSmdOcdwJobbVfhJRN6Yg0YcnSTUp6 YDCA== 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 y13si9879707edm.63.2020.05.25.07.22.16; Mon, 25 May 2020 07:22:39 -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 S2391003AbgEYOTU (ORCPT + 99 others); Mon, 25 May 2020 10:19:20 -0400 Received: from mga17.intel.com ([192.55.52.151]:54701 "EHLO mga17.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390831AbgEYOTT (ORCPT ); Mon, 25 May 2020 10:19:19 -0400 IronPort-SDR: +ExWdYhqIM2R5Umnm0Icz3h8PiFCwI2GuyZHXJ4TLOLMC74hXdtCLVBJlGOc/K/xBNd1spTZKF SNfBzSKzvtPQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 May 2020 07:19:18 -0700 IronPort-SDR: tYWPkctz75dfWIwPfH6nxDSMMYGi7Xc/JeixWB2vOhmr+IXyheWjOQmCa3C9G80Y6ajl128j4R 4+IYqXxNP69A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,433,1583222400"; d="scan'208";a="284147370" Received: from linux.intel.com ([10.54.29.200]) by orsmga002.jf.intel.com with ESMTP; 25 May 2020 07:19:16 -0700 Received: from [10.249.227.191] (abudanko-mobl.ccr.corp.intel.com [10.249.227.191]) by linux.intel.com (Postfix) with ESMTP id 6630D580101; Mon, 25 May 2020 07:19:14 -0700 (PDT) Subject: [PATCH v4 03/10] 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: <653fe5f3-c986-a841-1ed8-0a7d2fa24c00@linux.intel.com> Organization: Intel Corp. Message-ID: Date: Mon, 25 May 2020 17:19:13 +0300 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <653fe5f3-c986-a841-1ed8-0a7d2fa24c00@linux.intel.com> 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 0872b0b04a42..0834ff24122e 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -1707,3 +1707,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