From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top
Subject: Re: [PATCH 09/14] nstool: Add nstool exec command to execute commands in an nstool namespace
Date: Thu, 6 Apr 2023 10:59:37 +1000 [thread overview]
Message-ID: <ZC4ZeYLHYf/qMaN3@yekko> (raw)
In-Reply-To: <20230405135854.15e988a7@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 4407 bytes --]
On Wed, Apr 05, 2023 at 01:58:54PM +0200, Stefano Brivio wrote:
> On Tue, 4 Apr 2023 11:46:33 +1000
> David Gibson <david@gibson.dropbear.id.au> wrote:
>
> > This combines nstool info -pw <sock> with nsenter with various options for
> > a more convenient and less verbose of entering existing nstool managed
> > namespaces.
> >
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > ---
> > test/nstool.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++-
> > 1 file changed, 137 insertions(+), 2 deletions(-)
> >
> > diff --git a/test/nstool.c b/test/nstool.c
> > index 5681ce8..25079aa 100644
> > --- a/test/nstool.c
> > +++ b/test/nstool.c
> > @@ -17,7 +17,9 @@
> > #include <unistd.h>
> > #include <getopt.h>
> > #include <stdarg.h>
> > +#include <fcntl.h>
> > #include <sys/socket.h>
> > +#include <sys/wait.h>
> > #include <linux/un.h>
> > #include <linux/limits.h>
> > #include <sched.h>
> > @@ -75,6 +77,9 @@ static void usage(void)
> > " socket at SOCK\n"
> > " -p Print just the holder's PID as seen by the caller\n"
> > " -w Retry connecting to SOCK until it is ready\n"
> > + " nstool exec SOCK [COMMAND [ARGS...]]\n"
> > + " Execute command or shell in the namespaces of the nstool hold\n"
> > + " with control socket at SOCK\n"
> > " nstool stop SOCK\n"
> > " Instruct the nstool hold with control socket at SOCK to\n"
> > " terminate.\n");
> > @@ -84,7 +89,7 @@ static int connect_ctl(const char *sockpath, bool wait,
> > struct holder_info *info,
> > struct ucred *peercred)
> > {
> > - int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
> > + int fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, PF_UNIX);
> > struct sockaddr_un addr = {
> > .sun_family = AF_UNIX,
> > };
> > @@ -132,7 +137,7 @@ static int connect_ctl(const char *sockpath, bool wait,
> >
> > static void cmd_hold(int argc, char *argv[])
> > {
> > - int fd = socket(AF_UNIX, SOCK_STREAM, PF_UNIX);
> > + int fd = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, PF_UNIX);
> > struct sockaddr_un addr = {
> > .sun_family = AF_UNIX,
> > };
> > @@ -301,6 +306,134 @@ static void cmd_info(int argc, char *argv[])
> > }
> > }
> >
> > +static int openns(const char *fmt, ...)
> > +{
> > + char nspath[PATH_MAX];
> > + va_list ap;
> > + int fd;
> > +
> > + va_start(ap, fmt);
> > + if (vsnprintf(nspath, sizeof(nspath), fmt, ap) >= PATH_MAX)
> > + die("Truncated path \"%s\"\n", nspath);
> > + va_end(ap);
> > +
> > + fd = open(nspath, O_RDONLY | O_CLOEXEC);
> > + if (fd < 0)
> > + die("open() %s: %s\n", nspath, strerror(errno));
> > +
> > + return fd;
> > +}
> > +
> > +static void wait_for_child(pid_t pid)
> > +{
> > + int status;
> > +
> > + /* Match the child's exit status, if possible */
> > + for (;;) {
> > + pid_t rc;
> > +
> > + rc = waitpid(pid, &status, WUNTRACED);
> > + if (rc < 0)
> > + die("waitpid() on %d: %s\n", pid, strerror(errno));
> > + if (rc != pid)
> > + die("waitpid() on %d returned %d", pid, rc);
> > + if (WIFSTOPPED(status)) {
> > + /* Stop the parent to patch */
> > + kill(getpid(), SIGSTOP);
> > + /* We must have resumed, resume the child */
> > + kill(pid, SIGCONT);
> > + continue;
> > + }
> > +
> > + break;
> > + }
> > +
> > + if (WIFEXITED(status))
> > + exit(WEXITSTATUS(status));
> > + else if (WIFSIGNALED(status))
> > + kill(getpid(), WTERMSIG(status));
>
> An alternative could be what pasta_child_handler() does on
> WIFSIGNALED(status) -- I don't actually have a preference between the
> two.
Right. The idiom above I copied from unshare and nsenter in
util-linux. Seems marginally more thorough than the 128+ trick.
> > +
> > + die("Unexpected status for child %d\n", pid);
>
> Weird indentation in this function.
Ugh, yes. I think I did a copy paste at some point that introduced a
bunch of spaces where there should be tabs. Fixing.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2023-04-06 2:50 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-04 1:46 [PATCH 00/14] Improved tool for testing across multiple namespaces David Gibson
2023-04-04 1:46 ` [PATCH 01/14] nstool: Rename nsholder to nstool David Gibson
2023-04-04 1:46 ` [PATCH 02/14] nstool: Reverse parameters " David Gibson
2023-04-04 1:46 ` [PATCH 03/14] nstool: Move description of its operation modes from comment to usage David Gibson
2023-04-05 11:56 ` Stefano Brivio
2023-04-06 0:10 ` David Gibson
2023-04-04 1:46 ` [PATCH 04/14] nstool: Split some command line parsing and socket setup to subcommands David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 2:31 ` David Gibson
2023-04-06 6:47 ` Stefano Brivio
2023-04-06 10:35 ` David Gibson
2023-04-04 1:46 ` [PATCH 05/14] nstool: Replace "pid" subcommand with "info" subcommand David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:13 ` David Gibson
2023-04-04 1:46 ` [PATCH 06/14] nstool: Detect what namespaces target is in David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:15 ` David Gibson
2023-04-04 1:46 ` [PATCH 07/14] nstool: Add magic number to advertized information David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:18 ` David Gibson
2023-04-04 1:46 ` [PATCH 08/14] nstool: Helpers to iterate through namespace types David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:55 ` David Gibson
2023-04-04 1:46 ` [PATCH 09/14] nstool: Add nstool exec command to execute commands in an nstool namespace David Gibson
2023-04-05 11:58 ` Stefano Brivio
2023-04-06 0:59 ` David Gibson [this message]
2023-04-04 1:46 ` [PATCH 10/14] nstool: Add --keep-caps option to nstool exec David Gibson
2023-04-05 11:59 ` Stefano Brivio
2023-04-06 1:11 ` David Gibson
2023-04-04 1:46 ` [PATCH 11/14] test: Initialise ${TRACE} properly David Gibson
2023-04-04 1:46 ` [PATCH 12/14] test: Use "nstool exec" to slightly simplify tests David Gibson
2023-04-05 11:59 ` Stefano Brivio
2023-04-06 1:14 ` David Gibson
2023-04-04 1:46 ` [PATCH 13/14] nstool: Advertise the holder's cwd (in its mountns) across the socket David Gibson
2023-04-04 1:46 ` [PATCH 14/14] nstool: Enter holder's cwd when changing mount ns with nstool exec David Gibson
2023-04-05 12:01 ` [PATCH 00/14] Improved tool for testing across multiple namespaces Stefano Brivio
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=ZC4ZeYLHYf/qMaN3@yekko \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/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.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
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 IMAP folder(s).