From patchwork Tue Aug 30 19:27:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 12959778 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F223ECAAD5 for ; Tue, 30 Aug 2022 19:28:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661887711; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=LO5EK8vkN9+qXwAjB/nMkTQM/ueyWKyg2Q0BRnxJLhI=; b=Jb0suru8Tj33Xmu1kfucPFQFuVO/F4CFOtJfgRgnz7bfYsLRJZ3chQEbVylb7Xd4zLgxdq F6tBwA7XV3xqO6wKc/phtrXbpd+tW4N4KOY6tm2cufWx/okoXonmTbE/+SeorUJLTdTau1 t+1KGxgjEVZ8CcmavF6kVmfIouAEcxI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-90-nLYbWINBOjCIJEp-kg7WJw-1; Tue, 30 Aug 2022 15:28:28 -0400 X-MC-Unique: nLYbWINBOjCIJEp-kg7WJw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C7FA819705AA; Tue, 30 Aug 2022 19:28:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B7CD44010E3C; Tue, 30 Aug 2022 19:28:25 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A5F921946A42; Tue, 30 Aug 2022 19:28:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 75B211946A69 for ; Tue, 30 Aug 2022 19:28:19 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 594722026D64; Tue, 30 Aug 2022 19:28:19 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 557A62026D4C for ; Tue, 30 Aug 2022 19:28:19 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 37B933C4CA86 for ; Tue, 30 Aug 2022 19:28:19 +0000 (UTC) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-621-YkfO0MNvOEaTz899fSTa6A-1; Tue, 30 Aug 2022 15:28:15 -0400 X-MC-Unique: YkfO0MNvOEaTz899fSTa6A-1 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id AB7AD21E8C; Tue, 30 Aug 2022 19:28:12 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 7852413B0C; Tue, 30 Aug 2022 19:28:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id uEmhG8xkDmO5GgAAMHmgww (envelope-from ); Tue, 30 Aug 2022 19:28:12 +0000 From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Tue, 30 Aug 2022 21:27:11 +0200 Message-Id: <20220830192713.19778-11-mwilck@suse.com> In-Reply-To: <20220830192713.19778-1-mwilck@suse.com> References: <20220830192713.19778-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Subject: [dm-devel] [PATCH v4 10/12] multipathd: exec multipathc in interactive mode X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dm-devel@redhat.com, Martin Wilck Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com From: Martin Wilck A previous patch disabled interactive mode in multipathd, because uxclnt() would return immediately without an input command. With this patch, we reinstate interactive mode for "multipath -k", by just exec()ing the multipathc client. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- multipathd/Makefile | 3 ++- multipathd/main.c | 15 +++++++++++++-- multipathd/multipathc.c | 25 +++++++++++++++++++++---- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/multipathd/Makefile b/multipathd/Makefile index 19ab2e9..8a56304 100644 --- a/multipathd/Makefile +++ b/multipathd/Makefile @@ -17,7 +17,8 @@ endif CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathpersistdir) -I$(mpathcmddir) -I$(thirdpartydir) \ $(shell $(PKGCONFIG) --modversion liburcu 2>/dev/null | \ - awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }') + awk -F. '{ printf("-DURCU_VERSION=0x%06x", 256 * ( 256 * $$1 + $$2) + $$3); }') \ + -DBINDIR='"$(bindir)"' CFLAGS += $(BIN_CFLAGS) LDFLAGS += $(BIN_LDFLAGS) diff --git a/multipathd/main.c b/multipathd/main.c index 5a40894..66177cd 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -3616,7 +3616,7 @@ main (int argc, char *argv[]) extern char *optarg; extern int optind; int arg; - int err; + int err = 0; int foreground = 0; struct config *conf; char *opt_k_arg = NULL; @@ -3710,7 +3710,18 @@ main (int argc, char *argv[]) } c += snprintf(c, s + CMDSIZE - c, "\n"); } - err = uxclnt(s, uxsock_timeout + 100); + if (!s) { + char tmo_buf[16]; + + snprintf(tmo_buf, sizeof(tmo_buf), "%d", + uxsock_timeout + 100); + if (execl(BINDIR "/multipathc", "multipathc", + tmo_buf, NULL) == -1) { + condlog(0, "ERROR: failed to execute multipathc: %m"); + err = 1; + } + } else + err = uxclnt(s, uxsock_timeout + 100); free_config(conf); return err; } diff --git a/multipathd/multipathc.c b/multipathd/multipathc.c index a4f9023..9d49655 100644 --- a/multipathd/multipathc.c +++ b/multipathd/multipathc.c @@ -246,14 +246,31 @@ static void process(int fd, unsigned int timeout) } } -int main (void) +int main (int argc, const char * const argv[]) { - int fd = mpath_connect(); + int fd; + int tmo = DEFAULT_REPLY_TIMEOUT + 100; + char *ep; - if (fd == -1) + if (argc > 2) { + fprintf(stderr, "Usage: %s [timeout]\n", argv[0]); return 1; + } + if (argc == 2) { + tmo = strtol(argv[1], &ep, 10); + if (*argv[1] == '\0' || *ep != '\0' || tmo < 0) { + fprintf(stderr, "ERROR: invalid timeout value\n"); + return 1; + } + } - process(fd, DEFAULT_REPLY_TIMEOUT + 100); + fd = mpath_connect(); + if (fd == -1) { + fprintf(stderr, "ERROR: failed to connect to multipathd\n"); + return 1; + } + + process(fd, tmo); mpath_disconnect(fd); return 0; }