Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4312593pxb; Mon, 8 Feb 2021 13:13:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzYzWhYeHF6n016OVK9ccfhbaI7pNs2h5VJ56xsgzjP6UJtmfKmHbcX9kzzpkOOL4PkKO9D X-Received: by 2002:a17:906:2743:: with SMTP id a3mr19527394ejd.378.1612818791821; Mon, 08 Feb 2021 13:13:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612818791; cv=none; d=google.com; s=arc-20160816; b=KDZVisTZgtpsKJQHKhlaArDew2l9rc5isGvvIX7qAC7M4lQM2D6Gi2W4W4wW3Rji3W 1lQNSrzp/WCOa6Ng6/lUml+zXus+AZ8RK/uXMFZx8VpSeojvCXZ+45oKB4s1mwzjbTyK 8I7sUYD6dakoueGbw0nv6D0a8YfV0RAR2z0MrE6vvgLI8UjAk9Iog/ODVCPNyOoowsSW Yv6srMMFYMXyl57ddEhrjfSiL7HBoxNupcVI/p7OmRp92dzeDZy0LIRURKkYd+RRgEQ3 drZ+CI1DB/v8iToEXVZKK3mgVc88TWHh3vBzh7uBEPZWD14hJmkdq5XCjwYJFS/PchrN DKrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=C9xMUzsqtnu8yrAktBx8YI+nBbJK/GOiDFyNYoKYeWo=; b=mCy5kdCrIVA0UU9SIMy2Eo0oltEjWRp6qoH2LRRwZQgdSm1o8ecQ0FHP4gqy+O4lkZ 255H/+qiEtLl9F796Pim+1qx4ySRE8sokN4s3/czWH+5WzmYn4LceeYpDzccAUDAFixt iLm+hFwh0dxIIkGSmQwfEesYbiP8M2lY2bqNFbKz2vSQ6w/reTCM/dNCPJnvzUrKKan4 vnp2dm4dwV0Mwv0hAhHnxVaSUB18UXkQBQMiwqPGji8oN9YTKCCjEon+/Iql25nCRNpo /PNg1bGBtSxUg2N1XKb40+7D2JPrTIrr9ByqrgQcjTLzs9q0h92U4zfI7q0eCWBqoFra BlPw== 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id jx12si11514076ejc.173.2021.02.08.13.12.38; Mon, 08 Feb 2021 13:13:11 -0800 (PST) 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=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235388AbhBHVLy convert rfc822-to-8bit (ORCPT + 99 others); Mon, 8 Feb 2021 16:11:54 -0500 Received: from us-smtp-delivery-44.mimecast.com ([207.211.30.44]:23084 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236627AbhBHUKX (ORCPT ); Mon, 8 Feb 2021 15:10:23 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-153-Zw6Wzt_xNweLRKVKlItphQ-1; Mon, 08 Feb 2021 15:09:26 -0500 X-MC-Unique: Zw6Wzt_xNweLRKVKlItphQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 29B381005501; Mon, 8 Feb 2021 20:09:25 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.194.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id E046D19C59; Mon, 8 Feb 2021 20:09:22 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Peter Zijlstra , Ingo Molnar , Mark Rutland , Namhyung Kim , Alexander Shishkin , Michael Petlan , Ian Rogers , Alexei Budankov Subject: [PATCH 05/24] perf daemon: Add client socket support Date: Mon, 8 Feb 2021 21:08:49 +0100 Message-Id: <20210208200908.1019149-6-jolsa@kernel.org> In-Reply-To: <20210208200908.1019149-1-jolsa@kernel.org> References: <20210208200908.1019149-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jolsa@kernel.org X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Transfer-Encoding: 8BIT Content-Type: text/plain; charset=WINDOWS-1252 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding support for client socket side that will be used to send commands to daemon server socket. This patch adds only the core support, all commands using this functionality are coming in following patches. Signed-off-by: Jiri Olsa --- tools/perf/builtin-daemon.c | 135 ++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c index 495e4ff120ed..e0880c5ee39c 100644 --- a/tools/perf/builtin-daemon.c +++ b/tools/perf/builtin-daemon.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include "builtin.h" #include "perf.h" @@ -44,6 +45,67 @@ static void sig_handler(int sig __maybe_unused) done = true; } +static int client_config(const char *var, const char *value, void *cb) +{ + struct daemon *daemon = cb; + + if (!strcmp(var, "daemon.base") && !daemon->base_user) { + daemon->base = strdup(value); + if (!daemon->base) + return -ENOMEM; + } + + return 0; +} + +static int check_base(struct daemon *daemon) +{ + struct stat st; + + if (!daemon->base) { + pr_err("failed: base not defined\n"); + return -EINVAL; + } + + if (stat(daemon->base, &st)) { + switch (errno) { + case EACCES: + pr_err("failed: permission denied for '%s' base\n", + daemon->base); + return -EACCES; + case ENOENT: + pr_err("failed: base '%s' does not exists\n", + daemon->base); + return -EACCES; + default: + pr_err("failed: can't access base '%s': %s\n", + daemon->base, strerror(errno)); + return -errno; + } + } + + if ((st.st_mode & S_IFMT) != S_IFDIR) { + pr_err("failed: base '%s' is not directory\n", + daemon->base); + return -EINVAL; + } + + return 0; +} + +static int setup_client_config(struct daemon *daemon) +{ + struct perf_config_set *set = perf_config_set__load_file(daemon->config_real); + int err = -ENOMEM; + + if (set) { + err = perf_config_set(set, client_config, daemon); + perf_config_set__delete(set); + } + + return err ?: check_base(daemon); +} + static int setup_server_socket(struct daemon *daemon) { struct sockaddr_un addr; @@ -130,6 +192,38 @@ static int handle_server_socket(struct daemon *daemon __maybe_unused, int sock_f return ret; } +static int setup_client_socket(struct daemon *daemon) +{ + struct sockaddr_un addr; + char path[PATH_MAX]; + int fd = socket(AF_UNIX, SOCK_STREAM, 0); + + if (fd == -1) { + perror("failed: socket"); + return -1; + } + + scnprintf(path, sizeof(path), "%s/control", daemon->base); + + if (strlen(path) + 1 >= sizeof(addr.sun_path)) { + pr_err("failed: control path too long '%s'\n", path); + close(fd); + return -1; + } + + memset(&addr, 0, sizeof(addr)); + addr.sun_family = AF_UNIX; + strlcpy(addr.sun_path, path, sizeof(addr.sun_path) - 1); + + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) { + perror("failed: connect"); + close(fd); + return -1; + } + + return fd; +} + static void daemon__exit(struct daemon *daemon) { free(daemon->config_real); @@ -222,6 +316,47 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], return err; } +__maybe_unused +static int send_cmd(struct daemon *daemon, union cmd *cmd) +{ + int ret = -1, fd; + char *line = NULL; + size_t len = 0; + ssize_t nread; + FILE *in = NULL; + + if (setup_client_config(daemon)) + return -1; + + fd = setup_client_socket(daemon); + if (fd < 0) + return -1; + + if (sizeof(*cmd) != writen(fd, cmd, sizeof(*cmd))) { + perror("failed: write"); + goto out; + } + + in = fdopen(fd, "r"); + if (!in) { + perror("failed: fdopen"); + goto out; + } + + while ((nread = getline(&line, &len, in)) != -1) { + fwrite(line, nread, 1, stdout); + fflush(stdout); + } + + ret = 0; + fclose(in); +out: + /* If in is defined, then fd is closed via fclose. */ + if (!in) + close(fd); + return ret; +} + int cmd_daemon(int argc, const char **argv) { struct option daemon_options[] = { -- 2.29.2