From patchwork Tue Jun 18 14:39:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Slavomir Kaslev X-Patchwork-Id: 11001889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10B8614BB for ; Tue, 18 Jun 2019 14:40:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00C3A28470 for ; Tue, 18 Jun 2019 14:40:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E9316286DA; Tue, 18 Jun 2019 14:40:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B6BC28470 for ; Tue, 18 Jun 2019 14:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729386AbfFROkV (ORCPT ); Tue, 18 Jun 2019 10:40:21 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:53254 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729204AbfFROkV (ORCPT ); Tue, 18 Jun 2019 10:40:21 -0400 Received: by mail-wm1-f67.google.com with SMTP id x15so3586513wmj.3 for ; Tue, 18 Jun 2019 07:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XApiP+OIlkdKJZK+FAewYYlbfnTXOGInFV7ZMbKcgOs=; b=YdNIrEXOP5g7lzvAqUsg0hg+ERUA/GZ7APhQp9IJqN+i7wL/P2dG/DC3/hkCbCOxK3 hk3QCGlIbgh9j3Felr5vhTCYb872bHVZpUtmehRKS7I7cS6KndMz49e1McrKMno3TemB oK6WeRnRW/yxLqXz4GsNzE3LIQr1IN5qupFD3TuGpb7L6O4Hppqy7VZs/wAS7ukOimQG Zt3wCiJKkLRaeCvVrYKN48w2pw9E68uolFD3vCD9QBo9CmwY+GK9oq7KKUTVMsk29SxO rWPLFsLruteRs42th75R4Nf8AQmMDM2ZUMnDesuko60lLJdl6271dhESbBUIyD2Prb6s /l1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XApiP+OIlkdKJZK+FAewYYlbfnTXOGInFV7ZMbKcgOs=; b=Dz/56CvPRcKm1fxji+lWwuSb2Se7vErchyWDInXdrbQDv88HcYEzTlketyf0tpg2At 7lUiuXQ3EWImm2B79me+S30GtKxbCmErliJltmnbtieQi+fD0hV5N2RGUldFJGAzifhN YNryF2JC4Ivzw6pLNuAzutgFrobC5yySYaFotKXnBVYAJ6CXGuNVv167J0RFbGd/DRD9 QCsJOAHnA4GKL2BFdoCd4Syd9X90O8GvCVW1PVDHPogNVSgcE5+NN9euR+GUuvEbZdHm 68dwOT7IDE1Knt2g8R8MuusLPU48n/DyY5UaSF3svWEvcuJvx6+tuTRcxgtWmB4LVk4w LMug== X-Gm-Message-State: APjAAAVIpKJy1P86UphivX+NxJznq/Oq3jK+KxUZljXrebjN7EELKEB6 ita67tKNslMqBl9uTxNfJ4Z2rBg= X-Google-Smtp-Source: APXvYqy89aXTITYyY/jTRg3AUkGp5PxHn4JIJe+yiBYLZ3/bOUb2j550mq/HgboeHATg1bof2pUamw== X-Received: by 2002:a1c:eb0a:: with SMTP id j10mr4297016wmh.1.1560868818739; Tue, 18 Jun 2019 07:40:18 -0700 (PDT) Received: from box.eng.vmware.com ([146.247.46.5]) by smtp.gmail.com with ESMTPSA id y1sm2411808wma.32.2019.06.18.07.40.17 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 07:40:17 -0700 (PDT) From: "Slavomir Kaslev (VMware)" To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v11 11/13] trace-cmd: Add setup-guest flag for attaching FIFOs to the guest VM config Date: Tue, 18 Jun 2019 17:39:56 +0300 Message-Id: <20190618143958.2865-12-slavomir.kaslev@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190618143958.2865-1-slavomir.kaslev@gmail.com> References: <20190618143958.2865-1-slavomir.kaslev@gmail.com> MIME-Version: 1.0 Sender: linux-trace-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-trace-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Slavomir Kaslev This patch adds a flag for attaching the newly created FIFOs for guest tracing as virtio serial devices to libvirt managed guests. Signed-off-by: Slavomir Kaslev Signed-off-by: Slavomir Kaslev (VMware) --- tracecmd/trace-setup-guest.c | 54 ++++++++++++++++++++++++++++++++++-- tracecmd/trace-usage.c | 3 +- 2 files changed, 53 insertions(+), 4 deletions(-) diff --git a/tracecmd/trace-setup-guest.c b/tracecmd/trace-setup-guest.c index a55a37d..ae2fecb 100644 --- a/tracecmd/trace-setup-guest.c +++ b/tracecmd/trace-setup-guest.c @@ -111,7 +111,45 @@ static int get_guest_cpu_count(const char *guest) return nr_cpus; } -static void do_setup_guest(const char *guest, int nr_cpus, mode_t mode, gid_t gid) +static int attach_guest_fifos(const char *guest, int nr_cpus) +{ + const char *cmd_fmt = + "virsh attach-device --config '%s' '%s' >/dev/null 2>/dev/null"; + const char *xml_fmt = + "\n" + " \n" + " \n" + ""; + char tmp_path[PATH_MAX], path[PATH_MAX]; + char cmd[PATH_MAX], xml[PATH_MAX]; + int i, fd, ret = 0; + + strcpy(tmp_path, "/tmp/pipexmlXXXXXX"); + fd = mkstemp(tmp_path); + if (fd < 0) + return fd; + + for (i = 0; i < nr_cpus; i++) { + snprintf(path, sizeof(path), GUEST_FIFO_FMT, guest, i); + snprintf(xml, sizeof(xml), xml_fmt, path, GUEST_PIPE_NAME, i); + pwrite(fd, xml, strlen(xml), 0); + + snprintf(cmd, sizeof(cmd), cmd_fmt, guest, tmp_path); + errno = 0; + if (system(cmd) != 0) { + ret = -errno; + break; + } + } + + close(fd); + unlink(tmp_path); + + return ret; +} + +static void do_setup_guest(const char *guest, int nr_cpus, + mode_t mode, gid_t gid, bool attach) { gid_t save_egid; int ret; @@ -131,6 +169,12 @@ static void do_setup_guest(const char *guest, int nr_cpus, mode_t mode, gid_t gi if (ret < 0) pdie("failed to create FIFOs for %s", guest); + if (attach) { + ret = attach_guest_fifos(guest, nr_cpus); + if (ret < 0) + pdie("failed to attach FIFOs to %s", guest); + } + if (gid != -1) { ret = setegid(save_egid); if (ret < 0) @@ -140,6 +184,7 @@ static void do_setup_guest(const char *guest, int nr_cpus, mode_t mode, gid_t gi void trace_setup_guest(int argc, char **argv) { + bool attach = false; struct group *group; mode_t mode = 0660; int nr_cpus = -1; @@ -159,7 +204,7 @@ void trace_setup_guest(int argc, char **argv) {NULL, 0, NULL, 0} }; - c = getopt_long(argc-1, argv+1, "+hc:p:g:", + c = getopt_long(argc-1, argv+1, "+hc:p:g:a", long_options, &option_index); if (c == -1) break; @@ -179,6 +224,9 @@ void trace_setup_guest(int argc, char **argv) pdie("group %s does not exist", optarg); gid = group->gr_gid; break; + case 'a': + attach = true; + break; default: usage(argv); } @@ -195,5 +243,5 @@ void trace_setup_guest(int argc, char **argv) if (nr_cpus <= 0) pdie("invalid number of cpus for guest %s", guest); - do_setup_guest(guest, nr_cpus, mode, gid); + do_setup_guest(guest, nr_cpus, mode, gid, attach); } diff --git a/tracecmd/trace-usage.c b/tracecmd/trace-usage.c index a2a520c..ef709cf 100644 --- a/tracecmd/trace-usage.c +++ b/tracecmd/trace-usage.c @@ -251,10 +251,11 @@ static struct usage_help usage_help[] = { { "setup-guest", "create FIFOs for tracing guest VMs", - " %s setup-guest [-c cpus][-p perm][-g group] guest\n" + " %s setup-guest [-c cpus][-p perm][-g group][-a] guest\n" " -c number of guest virtual CPUs\n" " -p FIFOs permissions (default: 0660)\n" " -g FIFOs group owner\n" + " -a Attach FIFOs to guest VM config\n" }, #endif {