From nobody Mon Feb 9 04:04:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=oracle.com ARC-Seal: i=1; a=rsa-sha256; t=1567543829; cv=none; d=zoho.com; s=zohoarc; b=aZg2mzWvb0iXCOzsuSeFUg6j/eBu87k6mgtrfi+RQIt8/wFeXJJDM3BtR/b5NvtCOUW9fpWYjOVe3FGevjQu7goOQlXVMXyyz+XlMqGYgGg2U6OZYqcP3v4JCtjgR/eOEyiRLmz2T6phjbpR+5XRpC97qiZxQXBJcCsXb8R6KUY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567543829; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=7zDGOIXoDOxm5PMB7Fr+f1SykrhndE2bHYknbic9f8o=; b=hyBRFJdmHcucv+0ZZrkWMZUxzYMBhdvdVQp4ED96EgU/ubZtgFIiadjX1i1pUrmnbl7VClG0MMXYQ8nkbaGIV/xstGcbC0MW8TWO5Zn+oFoCi7H8yXXZOCmTEmSA5EN6kApUvGIoVTmzXGSx/+B2GUvHpoesSsOkS1Jgw3WsN4E= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567543829257929.9399834757697; Tue, 3 Sep 2019 13:50:29 -0700 (PDT) Received: from localhost ([::1]:51236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5Fkx-0008LD-6e for importer@patchew.org; Tue, 03 Sep 2019 16:50:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53251) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5FZo-0007Iy-38 for qemu-devel@nongnu.org; Tue, 03 Sep 2019 16:38:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5FZm-0000I3-PU for qemu-devel@nongnu.org; Tue, 03 Sep 2019 16:38:55 -0400 Received: from aserp2120.oracle.com ([141.146.126.78]:56830) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5FZm-0000HI-Ix for qemu-devel@nongnu.org; Tue, 03 Sep 2019 16:38:54 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x83KXpvk053643; Tue, 3 Sep 2019 20:38:48 GMT Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by aserp2120.oracle.com with ESMTP id 2usy6n01ys-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 03 Sep 2019 20:38:47 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x83KcZ6j178259; Tue, 3 Sep 2019 20:38:47 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by userp3020.oracle.com with ESMTP id 2us4wegqab-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 03 Sep 2019 20:38:46 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x83Kcjxe012307; Tue, 3 Sep 2019 20:38:45 GMT Received: from jaraman-bur-1.us.oracle.com (/10.152.33.39) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 03 Sep 2019 13:38:44 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : in-reply-to : references; s=corp-2019-08-05; bh=7zDGOIXoDOxm5PMB7Fr+f1SykrhndE2bHYknbic9f8o=; b=Rji2O74kPUr1gv2wAdaFaV9Uo7pEl6cIit35ruyk8sOT32yg6hc8xbX09a52XEmTRrKs FvcThNs68szBU2RLD8hIqg/I+YypO45oJJ+ZOkbJTJLaOlqCxxmnofq54g9dXXcqb2IR jU5tthB4KTHNCtQcH9YCTCtvmWMLSH7zkzd9DEs+Z2R1pZA8t8btAmAzyi/sh7ixZ5nm i44JG/fEYcJnlTjzVQydIO2SHD+ffD34Z2lHFIdFj6YSGQgcb4OZBA/lN6ACQzHOfqtZ NCjWEdepCv1Pyo60UpNSY7QEXMzK7OSztV0ae1Go412xI//bWBSqz5hNUHLXHHkclLGq IA== From: Jagannathan Raman To: qemu-devel@nongnu.org Date: Tue, 3 Sep 2019 16:37:40 -0400 Message-Id: X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9369 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=3 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909030207 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9369 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1909030206 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 141.146.126.78 Subject: [Qemu-devel] [RFC v3 PATCH 14/45] mutli-process: build remote command line args X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: elena.ufimtseva@oracle.com, fam@euphon.net, john.g.johnson@oracle.com, kraxel@redhat.com, jag.raman@oracle.com, quintela@redhat.com, mst@redhat.com, armbru@redhat.com, kanth.ghatraju@oracle.com, thuth@redhat.com, ehabkost@redhat.com, konrad.wilk@oracle.com, dgilbert@redhat.com, liran.alon@oracle.com, stefanha@redhat.com, rth@twiddle.net, kwolf@redhat.com, berrange@redhat.com, mreitz@redhat.com, ross.lagerwall@citrix.com, marcandre.lureau@gmail.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Elena Ufimtseva Signed-off-by: Elena Ufimtseva Signed-off-by: Jagannathan Raman Signed-off-by: John G Johnson --- New patch in v3 hw/proxy/qemu-proxy.c | 80 +++++++++++++++++++++++++++++++++------= ---- include/hw/proxy/qemu-proxy.h | 2 +- 2 files changed, 62 insertions(+), 20 deletions(-) diff --git a/hw/proxy/qemu-proxy.c b/hw/proxy/qemu-proxy.c index 0ec7bb6..e5fd4bb 100644 --- a/hw/proxy/qemu-proxy.c +++ b/hw/proxy/qemu-proxy.c @@ -45,47 +45,89 @@ =20 static void pci_proxy_dev_realize(PCIDevice *dev, Error **errp); =20 +static int add_argv(char *command_str, char **argv, int argc) +{ + int max_args =3D 64; + + if (argc < max_args - 1) { + argv[argc++] =3D command_str; + argv[argc] =3D 0; + } else { + return 0; + } + + return argc; +} + +static int make_argv(char *command_str, char **argv, int argc) +{ + int max_args =3D 64; + + char *p2 =3D strtok(command_str, " "); + while (p2 && argc < max_args - 1) { + argv[argc++] =3D p2; + p2 =3D strtok(0, " "); + } + argv[argc] =3D 0; + + return argc; +} + int remote_spawn(PCIProxyDev *pdev, const char *command, Error **errp) { - char *args[3]; pid_t rpid; int fd[2] =3D {-1, -1}; Error *local_error =3D NULL; + char *argv[64]; + int argc =3D 0, _argc; + char *sfd; + char *exec_dir; + int rc =3D -EINVAL; =20 if (pdev->managed) { /* Child is forked by external program (such as libvirt). */ - return -1; + return rc; } =20 if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd)) { error_setg(errp, "Unable to create unix socket."); - return -1; + return rc; } + exec_dir =3D g_strdup_printf("%s/%s", qemu_get_exec_dir(), "qemu-scsi-= dev"); + argc =3D add_argv(exec_dir, argv, argc); + sfd =3D g_strdup_printf("%d", fd[1]); + argc =3D add_argv(sfd, argv, argc); + _argc =3D argc; + argc =3D make_argv((char *)command, argv, argc); + /* TODO: Restrict the forked process' permissions and capabilities. */ rpid =3D qemu_fork(&local_error); =20 if (rpid =3D=3D -1) { error_setg(errp, "Unable to spawn emulation program."); close(fd[0]); - close(fd[1]); - return -1; + goto fail; } =20 if (rpid =3D=3D 0) { close(fd[0]); - - args[0] =3D g_strdup(command); - args[1] =3D g_strdup_printf("%d", fd[1]); - args[2] =3D NULL; - execvp(args[0], (char *const *)args); + execvp(argv[0], (char *const *)argv); exit(1); } pdev->remote_pid =3D rpid; - pdev->rsocket =3D fd[0]; + pdev->rsocket =3D fd[1]; + pdev->socket =3D fd[0]; =20 + rc =3D 0; + +fail: close(fd[1]); =20 - return 0; + for (int i =3D 0; i < _argc; i++) { + g_free(argv[i]); + } + + return rc; } =20 static int get_proxy_sock(PCIDevice *dev) @@ -94,7 +136,7 @@ static int get_proxy_sock(PCIDevice *dev) =20 pdev =3D PCI_PROXY_DEV(dev); =20 - return pdev->rsocket; + return pdev->socket; } =20 static void set_proxy_sock(PCIDevice *dev, int socket) @@ -103,7 +145,7 @@ static void set_proxy_sock(PCIDevice *dev, int socket) =20 pdev =3D PCI_PROXY_DEV(dev); =20 - pdev->rsocket =3D socket; + pdev->socket =3D socket; pdev->managed =3D true; =20 } @@ -198,16 +240,16 @@ static void pci_proxy_dev_register_types(void) =20 type_init(pci_proxy_dev_register_types) =20 -static void init_proxy(PCIDevice *dev, char *command, Error **errp) +static void init_proxy(PCIDevice *dev, char *command, bool need_spawn, Err= or **errp) { PCIProxyDev *pdev =3D PCI_PROXY_DEV(dev); Error *local_error =3D NULL; =20 if (!pdev->managed) { - if (command) { - remote_spawn(pdev, command, &local_error); - } else { - return; + if (need_spawn) { + if (!remote_spawn(pdev, command, &local_error)) { + return; + } } } else { pdev->remote_pid =3D atoi(pdev->rid); diff --git a/include/hw/proxy/qemu-proxy.h b/include/hw/proxy/qemu-proxy.h index ee21818..3b37b65 100644 --- a/include/hw/proxy/qemu-proxy.h +++ b/include/hw/proxy/qemu-proxy.h @@ -63,7 +63,7 @@ typedef struct PCIProxyDev { =20 void (*set_remote_opts) (PCIDevice *dev, QDict *qdict, unsigned int cm= d); void (*proxy_ready) (PCIDevice *dev); - void (*init_proxy) (PCIDevice *pdev, char *command, Error **errp); + void (*init_proxy) (PCIDevice *dev, char *command, bool need_spawn, Er= ror **errp); =20 } PCIProxyDev; =20 --=20 1.8.3.1