From nobody Fri May 3 08:27:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1601654854; cv=none; d=zohomail.com; s=zohoarc; b=QNCPv154AUstUkNZO0s539LHM2Adp/R7WFGxgzi39+DRzYKqlnMA4qoBc6RHwOWzmBKn2e4avDED0UScyHZsTBWfjXu+X4VxTpQ1jFFyVTFDuxAO0Dhg6pWgZziL4DlzWNoNtwMVAF1TdmYjymwy+RcFKP5xB3Cf97fX5mhUn6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601654854; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UCak0RtGm13PKqPK+OFPe7Tstz5fXLYb7y20CLuoq3E=; b=DxSEtsXXDFSK2QbrjlLdUcUNEVvjeVsDue5kE1X09RvYX6wFpluIfHMU6li+btLUFJyjBeGUbV7tugYy2gugTeCF0Hk0sWrEypH9vyalCYscrUPdQfVzKLY0vfhUjHxXRnQrYGO3mlkMsnFFUktIXCBl52EIcKjPQRx8Py7sz+0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1601654854453234.8800079011893; Fri, 2 Oct 2020 09:07:34 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.2251.6680 (Exim 4.92) (envelope-from ) id 1kONaF-0001fo-5f; Fri, 02 Oct 2020 16:06:59 +0000 Received: by outflank-mailman (output) from mailman id 2251.6680; Fri, 02 Oct 2020 16:06:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kONaF-0001fh-2f; Fri, 02 Oct 2020 16:06:59 +0000 Received: by outflank-mailman (input) for mailman id 2251; Fri, 02 Oct 2020 16:06:57 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kONaC-0001fb-Tm for xen-devel@lists.xenproject.org; Fri, 02 Oct 2020 16:06:56 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 67ec1aad-eedb-4650-b28c-667b475d21ed; Fri, 02 Oct 2020 16:06:55 +0000 (UTC) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kONaC-0001fb-Tm for xen-devel@lists.xenproject.org; Fri, 02 Oct 2020 16:06:56 +0000 Received: from esa6.hc3370-68.iphmx.com (unknown [216.71.155.175]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 67ec1aad-eedb-4650-b28c-667b475d21ed; Fri, 02 Oct 2020 16:06:55 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 67ec1aad-eedb-4650-b28c-667b475d21ed DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1601654815; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kWlD97+J77zfqraf9mQurnjq4WYZN4aMKHgQBs/w+3g=; b=L9KoOo44yexTKWWhspGx3mWDy5U9kR7PLBi/YL2esN66A2m/axn/DtNb BmGHwAcZvlTDB3+1PomwLlHoD+1wki1RS9Odyf0ta+aMiMKKVEvVXY4Wq 2dUo9w2E3QhHo6c6h2sKZzuGLNYegqKmrVZP0wCjvzFWSEjOuaS5XX+QW 0=; Authentication-Results: esa6.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 9DTmAvoikkF1lSy5cgeBhWYvScaBL9pRd6NMkUNF6NQJ5LGerhEoKwSwPDX9GUeSnVgZxIlmTG CoQg4Duw0oDF4o7zGAUtNdbkaHZUSBYAXGBWJWMviJJXfBZ+4qqOJD5sAG1oj/AIzh2WH6vkh8 ztNg4/Y7PE2LcgZRKO7eTBlsBD/GgbhSj4t3tcmq+kfWxA/M9GvgsBa648ZpRGW2vaPbeDucdz 5ydJQMxcoyYduMp7B25mXxxn+VzC3Qmx4txheLHmL+S+LTgvo/dtxmiUMHxowq/k5PwtGb5Xx7 W0Q= X-SBRS: None X-MesageID: 28442812 X-Ironport-Server: esa6.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.77,328,1596513600"; d="scan'208";a="28442812" From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= To: CC: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , "Christian Lindig" , David Scott , "Ian Jackson" , Wei Liu Subject: [PATCH v1 1/1] tools/ocaml/xenstored: drop the creation of the RO socket Date: Fri, 2 Oct 2020 17:06:32 +0100 Message-ID: <0cc19ced022e2a302fccf42bf9521c61dd0dca8a.1601654648.git.edvin.torok@citrix.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) The readonly flag was propagated but ignored, so this was essentially equivalent to a RW socket. C xenstored is dropping the RO socket too, so drop it from oxenstored too. Signed-off-by: Edwin T=C3=B6r=C3=B6k Acked-by: Christian Lindig Acked-by: Juergen Gross --- tools/ocaml/xenstored/connections.ml | 2 +- tools/ocaml/xenstored/define.ml | 1 - tools/ocaml/xenstored/xenstored.ml | 15 ++++++--------- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tools/ocaml/xenstored/connections.ml b/tools/ocaml/xenstored/c= onnections.ml index f02ef6b526..f2c4318c88 100644 --- a/tools/ocaml/xenstored/connections.ml +++ b/tools/ocaml/xenstored/connections.ml @@ -31,7 +31,7 @@ let create () =3D { watches =3D Trie.create () } =20 -let add_anonymous cons fd _can_write =3D +let add_anonymous cons fd =3D let xbcon =3D Xenbus.Xb.open_fd fd in let con =3D Connection.create xbcon None in Hashtbl.add cons.anonymous (Xenbus.Xb.get_fd xbcon) con diff --git a/tools/ocaml/xenstored/define.ml b/tools/ocaml/xenstored/define= .ml index 2965c08534..ea9e1b7620 100644 --- a/tools/ocaml/xenstored/define.ml +++ b/tools/ocaml/xenstored/define.ml @@ -18,7 +18,6 @@ let xenstored_major =3D 1 let xenstored_minor =3D 0 =20 let xs_daemon_socket =3D Paths.xen_run_stored ^ "/socket" -let xs_daemon_socket_ro =3D Paths.xen_run_stored ^ "/socket_ro" =20 let default_config_dir =3D Paths.xen_config_dir =20 diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xen= stored.ml index 5b96f1852a..7e7824761b 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -242,12 +242,11 @@ let _ =3D () ); =20 - let rw_sock, ro_sock =3D + let rw_sock =3D if cf.disable_socket then - None, None + None else - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_= socket), - Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_= socket_ro) + Some (Unix.handle_unix_error Utils.create_unix_socket Define.xs_daemon_= socket) in =20 if cf.daemonize then @@ -320,15 +319,14 @@ let _ =3D =20 let spec_fds =3D (match rw_sock with None -> [] | Some x -> [ x ]) @ - (match ro_sock with None -> [] | Some x -> [ x ]) @ (if cf.domain_init then [ Event.fd eventchn ] else []) in =20 let process_special_fds rset =3D - let accept_connection can_write fd =3D + let accept_connection fd =3D let (cfd, _addr) =3D Unix.accept fd in debug "new connection through socket"; - Connections.add_anonymous cons cfd can_write + Connections.add_anonymous cons cfd and handle_eventchn _fd =3D let port =3D Event.pending eventchn in debug "pending port %d" (Xeneventchn.to_int port); @@ -348,8 +346,7 @@ let _ =3D if List.mem fd set then fct fd in =20 - maybe (fun fd -> do_if_set fd rset (accept_connection true)) rw_sock; - maybe (fun fd -> do_if_set fd rset (accept_connection false)) ro_sock; + maybe (fun fd -> do_if_set fd rset accept_connection) rw_sock; do_if_set (Event.fd eventchn) rset (handle_eventchn) in =20 --=20 2.25.1