Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp4313156pxb; Mon, 8 Feb 2021 13:14:08 -0800 (PST) X-Google-Smtp-Source: ABdhPJy4/GkmOEYFgFmFoBnHrlldZc0c6lPI8+icdUTbCaFIawHMPUCDrrMC/BurmjckH72x4snx X-Received: by 2002:a17:906:488:: with SMTP id f8mr18370499eja.311.1612818848710; Mon, 08 Feb 2021 13:14:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612818848; cv=none; d=google.com; s=arc-20160816; b=MhMDlSz8HamS73Ta0i2MCNRE5q0gYFhzM4rT2BIVDr0nslSgx3VaI1ehXsxWzqBqKG t0DBAKUroJEaMQqsHY/bjjC8eI/MNdBg/4d5rYyYSw7BVMtjr/zK+mbcpuwbPLS5fnHd WNf2Eb1YE90FF2HaFu5ZAyf9SxLe+jVoccZvpSJRGJe56wciCgNriLnCYMBZiEOgGaj6 CTAT3li5lEp/HKCSRm5uLPYBh631MVvwl4/9A2Xbe0AmGUuyYz3L8XR6BEXd2gFQamB+ ANXE0Q3nqAUuUCviV6RQ3+g2po+XKxk4jceft2ozomuKRK/BDrF9fP/fBv6z2wINxY36 dDjA== 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=aJ9Yd1J3MDEHFWqO5UmrkjY6DOq9CnPVXaur8kuMtQA=; b=camTWIRLWjYNR6LMQhAlo6NU05G17UQ9aBttvRzB1Lf3HEB1kJS3uBx0ceEecBpz/5 k+xwS2XYg3WsqhfWbtMAzisFJxeEqU3CJYy0L3ysmzZQn6plc7JXGK+YIho22b4P3LH0 +ScG3k6sL6jJAhB3u5ajRH2U1tNPXNcPe3wllvUwdbJbDwlgmA6Y/boaPdz7pF3GaY05 zrPEWAtABlE1BQZFCkIZBHgdUHG+lPiJmJ2p8STV0JF/k7b0B/CaIBuGFiOwN8N+n1Cy mKmID7pjOp/sZfI43+4JBAbyXBzFHR+yUu06m7VxI+/0I9IiA7+yrhE1fV2OH0gx2FDa 655A== 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 f8si12243215edq.140.2021.02.08.13.13.43; Mon, 08 Feb 2021 13:14:08 -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 S231132AbhBHVKN convert rfc822-to-8bit (ORCPT + 99 others); Mon, 8 Feb 2021 16:10:13 -0500 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]:41186 "EHLO us-smtp-delivery-44.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236625AbhBHUKT (ORCPT ); Mon, 8 Feb 2021 15:10:19 -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-50-yb2a3I5pOryEHcePFiHNIw-1; Mon, 08 Feb 2021 15:09:24 -0500 X-MC-Unique: yb2a3I5pOryEHcePFiHNIw-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 8DA416D4E0; Mon, 8 Feb 2021 20:09:22 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.194.115]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F91019C59; Mon, 8 Feb 2021 20:09:20 +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 04/24] perf daemon: Add server socket support Date: Mon, 8 Feb 2021 21:08:48 +0100 Message-Id: <20210208200908.1019149-5-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 Add support to create server socket that listens for client commands and process them. 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 | 117 +++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c index ce0373f453d6..495e4ff120ed 100644 --- a/tools/perf/builtin-daemon.c +++ b/tools/perf/builtin-daemon.c @@ -1,12 +1,19 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include +#include #include +#include #include #include #include #include #include #include +#include +#include +#include +#include #include "builtin.h" #include "perf.h" #include "debug.h" @@ -37,6 +44,92 @@ static void sig_handler(int sig __maybe_unused) done = true; } +static int setup_server_socket(struct daemon *daemon) +{ + struct sockaddr_un addr; + char path[PATH_MAX]; + int fd = socket(AF_UNIX, SOCK_STREAM, 0); + + if (fd < 0) { + fprintf(stderr, "socket: %s\n", strerror(errno)); + return -1; + } + + if (fcntl(fd, F_SETFD, FD_CLOEXEC)) { + perror("failed: fcntl FD_CLOEXEC"); + close(fd); + 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); + unlink(path); + + if (bind(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) { + perror("failed: bind"); + close(fd); + return -1; + } + + if (listen(fd, 1) == -1) { + perror("failed: listen"); + close(fd); + return -1; + } + + return fd; +} + +union cmd { + int cmd; +}; + +static int handle_server_socket(struct daemon *daemon __maybe_unused, int sock_fd) +{ + int ret = -1, fd; + FILE *out = NULL; + union cmd cmd; + + fd = accept(sock_fd, NULL, NULL); + if (fd < 0) { + perror("failed: accept"); + return -1; + } + + if (sizeof(cmd) != readn(fd, &cmd, sizeof(cmd))) { + perror("failed: read"); + goto out; + } + + out = fdopen(fd, "w"); + if (!out) { + perror("failed: fdopen"); + goto out; + } + + switch (cmd.cmd) { + default: + break; + } + + fclose(out); +out: + /* If out is defined, then fd is closed via fclose. */ + if (!out) + close(fd); + return ret; +} + static void daemon__exit(struct daemon *daemon) { free(daemon->config_real); @@ -77,6 +170,9 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], OPT_PARENT(parent_options), OPT_END() }; + int sock_fd = -1; + int sock_pos; + struct fdarray fda; int err = 0; argc = parse_options(argc, argv, start_options, daemon_usage, 0); @@ -93,15 +189,34 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[], pr_info("daemon started (pid %d)\n", getpid()); + fdarray__init(&fda, 1); + + sock_fd = setup_server_socket(daemon); + if (sock_fd < 0) + goto out; + + sock_pos = fdarray__add(&fda, sock_fd, POLLIN|POLLERR|POLLHUP, 0); + if (sock_pos < 0) + goto out; + signal(SIGINT, sig_handler); signal(SIGTERM, sig_handler); while (!done && !err) { - sleep(1); + if (fdarray__poll(&fda, -1)) { + if (fda.entries[sock_pos].revents & POLLIN) + err = handle_server_socket(daemon, sock_fd); + } } +out: + fdarray__exit(&fda); + daemon__exit(daemon); + if (sock_fd != -1) + close(sock_fd); + pr_info("daemon exited\n"); fclose(daemon->out); return err; -- 2.29.2