linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Ingo Molnar <mingo@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Michael Petlan <mpetlan@redhat.com>,
	Ian Rogers <irogers@google.com>,
	Stephane Eranian <eranian@google.com>,
	Alexei Budankov <abudankov@huawei.com>
Subject: [PATCH 15/24] perf daemon: Add ping command
Date: Sun, 31 Jan 2021 00:48:47 +0100	[thread overview]
Message-ID: <20210130234856.271282-16-jolsa@kernel.org> (raw)
In-Reply-To: <20210130234856.271282-1-jolsa@kernel.org>

Adding ping command to verify the perf record session
is up and operational.

It's used in following patches via test code to make
sure perf record is ready to receive signals.

Example:

  # cat ~/.perfconfig
  [daemon]
  base=/opt/perfdata

  [session-cycles]
  run = -m 10M -e cycles --overwrite --switch-output -a

  [session-sched]
  run = -m 20M -e sched:* --overwrite --switch-output -a

Starting the daemon:

  # perf daemon start

Ping all sessions:

  # perf daemon ping
  OK   cycles
  OK   sched

Ping specific session:

  # perf daemon ping --session sched
  OK   sched

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/builtin-daemon.c | 151 ++++++++++++++++++++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/tools/perf/builtin-daemon.c b/tools/perf/builtin-daemon.c
index d7b3dd1e96f9..a5a71e0a706c 100644
--- a/tools/perf/builtin-daemon.c
+++ b/tools/perf/builtin-daemon.c
@@ -469,6 +469,80 @@ static int daemon__wait(struct daemon *daemon, int secs)
 	return 0;
 }
 
+static int
+session__control(struct session *session, const char *msg, bool do_ack)
+{
+	struct pollfd pollfd = { 0, };
+	char control_path[PATH_MAX];
+	char ack_path[PATH_MAX];
+	int control, ack = -1, len;
+	char buf[20];
+	int ret = -1;
+	ssize_t err;
+
+	/* open the control file */
+	scnprintf(control_path, sizeof(control_path), "%s/%s",
+		  session->base, SESSION_CONTROL);
+
+	control = open(control_path, O_WRONLY|O_NONBLOCK);
+	if (!control)
+		return -1;
+
+	if (do_ack) {
+		/* open the ack file */
+		scnprintf(ack_path, sizeof(ack_path), "%s/%s",
+			  session->base, SESSION_ACK);
+
+		ack = open(ack_path, O_RDONLY, O_NONBLOCK);
+		if (!ack) {
+			close(control);
+			return -1;
+		}
+	}
+
+	/* write the command */
+	len = strlen(msg);
+
+	do {
+		err = write(control, msg, len);
+		if (err == -1 && errno != EAGAIN) {
+			pr_err("failed: write to control pipe: %d (%s)\n",
+			       errno, control_path);
+			goto out;
+		}
+	} while (err != len);
+
+	if (!do_ack)
+		goto out;
+
+	/* wait for an ack */
+	pollfd.fd = ack;
+	pollfd.events = POLLIN;
+
+	if (!poll(&pollfd, 1, 2000)) {
+		pr_err("failed: control ack timeout\n");
+		goto out;
+	}
+
+	if (!pollfd.revents & POLLIN) {
+		pr_err("failed: did not received an ack\n");
+		goto out;
+	}
+
+	err = read(ack, buf, sizeof(buf));
+	if (err > 0)
+		ret = strcmp(buf, "ack\n");
+	else
+		perror("failed: read ack %d\n");
+
+out:
+	if (ack != -1)
+		close(ack);
+
+	close(control);
+	return ret;
+}
+
 static int setup_server_socket(struct daemon *daemon)
 {
 	struct sockaddr_un addr;
@@ -508,6 +582,7 @@ enum {
 	CMD_LIST   = 0,
 	CMD_SIGNAL = 1,
 	CMD_STOP   = 2,
+	CMD_PING   = 3,
 	CMD_MAX,
 };
 
@@ -529,8 +604,25 @@ union cmd {
 		int	sig;
 		char	name[SESSION_MAX];
 	} signal;
+
+	/* CMD_PING */
+	struct {
+		int	cmd;
+		char	name[SESSION_MAX];
+	} ping;
+};
+
+enum {
+	PING_OK	  = 0,
+	PING_FAIL = 1,
+	PING_MAX,
 };
 
+static int session__ping(struct session *session)
+{
+	return session__control(session, "ping", true) ?  PING_FAIL : PING_OK;
+}
+
 static int cmd_session_list(struct daemon *daemon, union cmd *cmd, FILE *out)
 {
 	char csv_sep = cmd->list.csv_sep;
@@ -627,6 +719,34 @@ static int cmd_session_kill(struct daemon *daemon, union cmd *cmd, FILE *out)
 	return 0;
 }
 
+static const char *ping_str[PING_MAX] = {
+	[PING_OK]   = "OK",
+	[PING_FAIL] = "FAIL",
+};
+
+static int cmd_session_ping(struct daemon *daemon, union cmd *cmd, FILE *out)
+{
+	struct session *session;
+	bool all = false, found = false;
+
+	all = !strcmp(cmd->ping.name, "all");
+
+	list_for_each_entry(session, &daemon->sessions, list) {
+		if (all || !strcmp(cmd->ping.name, session->name)) {
+			int state = session__ping(session);
+
+			fprintf(out, "%-4s %s\n", ping_str[state], session->name);
+			found = true;
+		}
+	}
+
+	if (!found && !all) {
+		fprintf(out, "%-4s %s (not found)\n",
+			ping_str[PING_FAIL], cmd->ping.name);
+	}
+	return 0;
+}
+
 static int handle_server_socket(struct daemon *daemon, int sock_fd)
 {
 	int ret = -EINVAL, fd;
@@ -661,6 +781,9 @@ static int handle_server_socket(struct daemon *daemon, int sock_fd)
 		done = 1;
 		pr_debug("perf daemon is exciting\n");
 		break;
+	case CMD_PING:
+		ret = cmd_session_ping(daemon, &cmd, out);
+		break;
 	default:
 		break;
 	}
@@ -1072,6 +1195,7 @@ static int __cmd_start(struct daemon *daemon, struct option parent_options[],
 
 	signal(SIGINT, sig_handler);
 	signal(SIGTERM, sig_handler);
+	signal(SIGPIPE, SIG_IGN);
 
 	while (!done && !err) {
 		err = daemon__reconfig(daemon);
@@ -1201,6 +1325,31 @@ static int __cmd_stop(struct daemon *daemon, struct option parent_options[],
 	return send_cmd(daemon, &cmd);
 }
 
+static int __cmd_ping(struct daemon *daemon, struct option parent_options[],
+		      int argc, const char **argv)
+{
+	const char *name = "all";
+	struct option ping_options[] = {
+		OPT_STRING(0, "session", &name, "session",
+			"Ping to specific session"),
+		OPT_PARENT(parent_options),
+		OPT_END()
+	};
+	union cmd cmd = { .cmd = CMD_PING, };
+
+	argc = parse_options(argc, argv, ping_options, daemon_usage, 0);
+	if (argc)
+		usage_with_options(daemon_usage, ping_options);
+
+	if (setup_config(daemon)) {
+		pr_err("failed: config not found\n");
+		return -1;
+	}
+
+	scnprintf(cmd.ping.name, sizeof(cmd.ping.name), "%s", name);
+	return send_cmd(daemon, &cmd);
+}
+
 int cmd_daemon(int argc, const char **argv)
 {
 	struct option daemon_options[] = {
@@ -1227,6 +1376,8 @@ int cmd_daemon(int argc, const char **argv)
 			return __cmd_signal(&__daemon, daemon_options, argc, argv);
 		else if (!strcmp(argv[0], "stop"))
 			return __cmd_stop(&__daemon, daemon_options, argc, argv);
+		else if (!strcmp(argv[0], "ping"))
+			return __cmd_ping(&__daemon, daemon_options, argc, argv);
 
 		pr_err("failed: unknown command '%s'\n", argv[0]);
 		return -1;
-- 
2.29.2


  parent reply	other threads:[~2021-01-30 23:57 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20210129134855.195810-1-jolsa@redhat.com>
2021-01-30 23:48 ` [PATCHv3 00/24] perf tools: Add daemon command Jiri Olsa
2021-01-30 23:48   ` [PATCH 01/24] perf daemon: " Jiri Olsa
2021-01-30 23:48   ` [PATCH 02/24] perf daemon: Add config option Jiri Olsa
2021-02-03 20:57     ` Arnaldo Carvalho de Melo
2021-02-04 14:42       ` Jiri Olsa
2021-01-30 23:48   ` [PATCH 03/24] perf daemon: Add base option Jiri Olsa
2021-02-03 20:57     ` Arnaldo Carvalho de Melo
2021-01-30 23:48   ` [PATCH 04/24] perf daemon: Add server socket support Jiri Olsa
2021-02-03 21:04     ` Arnaldo Carvalho de Melo
2021-02-04 14:49       ` Jiri Olsa
2021-02-04 15:53         ` Arnaldo Carvalho de Melo
2021-02-05 11:30     ` Namhyung Kim
2021-02-06 19:04       ` Jiri Olsa
2021-02-07  1:36         ` Namhyung Kim
2021-01-30 23:48   ` [PATCH 05/24] perf daemon: Add client " Jiri Olsa
2021-02-03 21:05     ` Arnaldo Carvalho de Melo
2021-02-04 14:50       ` Jiri Olsa
2021-02-05 11:39     ` Namhyung Kim
2021-01-30 23:48   ` [PATCH 06/24] perf daemon: Add config file support Jiri Olsa
2021-02-03 21:12     ` Arnaldo Carvalho de Melo
2021-02-04 15:08       ` Jiri Olsa
2021-02-06 20:25         ` Jiri Olsa
2021-02-04 12:42     ` Namhyung Kim
2021-02-04 12:58       ` Arnaldo Carvalho de Melo
2021-02-04 15:10         ` Jiri Olsa
2021-02-06  8:06           ` Namhyung Kim
2021-02-05 12:14     ` Namhyung Kim
2021-02-05 12:56       ` Jiri Olsa
2021-02-06  8:05         ` Namhyung Kim
2021-02-06 22:35           ` Jiri Olsa
2021-02-07  1:38             ` Namhyung Kim
2021-01-30 23:48   ` [PATCH 07/24] perf daemon: Add config file change check Jiri Olsa
2021-02-03 21:13     ` Arnaldo Carvalho de Melo
2021-02-04 14:51       ` Jiri Olsa
2021-01-30 23:48   ` [PATCH 08/24] perf daemon: Add background support Jiri Olsa
2021-02-03 21:16     ` Arnaldo Carvalho de Melo
2021-02-04 14:52       ` Jiri Olsa
2021-01-30 23:48   ` [PATCH 09/24] perf daemon: Add signalfd support Jiri Olsa
2021-02-03 21:24     ` Arnaldo Carvalho de Melo
2021-02-04 15:06       ` Jiri Olsa
2021-01-30 23:48   ` [PATCH 10/24] perf daemon: Add list command Jiri Olsa
2021-01-30 23:48   ` [PATCH 11/24] perf daemon: Add signal command Jiri Olsa
2021-01-30 23:48   ` [PATCH 12/24] perf daemon: Add stop command Jiri Olsa
2021-01-30 23:48   ` [PATCH 13/24] perf daemon: Allow only one daemon over base directory Jiri Olsa
2021-01-30 23:48   ` [PATCH 14/24] perf daemon: Set control fifo for session Jiri Olsa
2021-01-30 23:48   ` Jiri Olsa [this message]
2021-01-30 23:48   ` [PATCH 16/24] perf daemon: Use control to stop session Jiri Olsa
2021-01-30 23:48   ` [PATCH 17/24] perf daemon: Add up time for daemon/session list Jiri Olsa
2021-01-30 23:48   ` [PATCH 18/24] perf daemon: Add man page for perf-daemon Jiri Olsa
2021-02-03 21:17     ` Arnaldo Carvalho de Melo
2021-02-04 14:53       ` Jiri Olsa
2021-01-30 23:48   ` [PATCH 19/24] perf tests: Add daemon list command test Jiri Olsa
2021-01-30 23:48   ` [PATCH 20/24] perf tests: Add daemon reconfig test Jiri Olsa
2021-01-30 23:48   ` [PATCH 21/24] perf tests: Add daemon stop command test Jiri Olsa
2021-01-30 23:48   ` [PATCH 22/24] perf tests: Add daemon signal " Jiri Olsa
2021-01-30 23:48   ` [PATCH 23/24] perf tests: Add daemon ping " Jiri Olsa
2021-01-30 23:48   ` [PATCH 24/24] perf tests: Add daemon lock test Jiri Olsa
2021-02-08 20:08 [PATCHv4 00/24] perf tools: Add daemon command Jiri Olsa
2021-02-08 20:08 ` [PATCH 15/24] perf daemon: Add ping command Jiri Olsa
2021-02-10 12:51   ` Arnaldo Carvalho de Melo
2021-02-10 13:27     ` Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210130234856.271282-16-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=abudankov@huawei.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    --cc=mpetlan@redhat.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).