From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFD1BC433DB for ; Fri, 15 Jan 2021 22:59:10 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6079223128 for ; Fri, 15 Jan 2021 22:59:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6079223128 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.68781.123272 (Exim 4.92) (envelope-from ) id 1l0Y3W-0003GP-IS; Fri, 15 Jan 2021 22:58:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 68781.123272; Fri, 15 Jan 2021 22:58:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Y3W-0003GF-Ee; Fri, 15 Jan 2021 22:58:58 +0000 Received: by outflank-mailman (input) for mailman id 68781; Fri, 15 Jan 2021 22:58:56 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l0Xyl-0001Wj-2P for xen-devel@lists.xenproject.org; Fri, 15 Jan 2021 22:54:03 +0000 Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id b9bc6017-c10f-4e6e-875b-1fa39ef27fcc; Fri, 15 Jan 2021 22:52:47 +0000 (UTC) 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: b9bc6017-c10f-4e6e-875b-1fa39ef27fcc DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1610751167; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GR5nos0MMBWS+VeXIkwq9oyfeOPL+We9fK2nz1YJlUY=; b=E1pwfgQneTWJ+dYwf4isRtck0pSJjSnmqB6r4BSQFe9FnrSn3u7gZfMY P19NqWzYYbL3iUVgAPmSQ8j5+Fx++ZXjiu8kF5HmI2qelIcFkeWnfwuCe JiEWVfiCUbbLumUmALO8OSmLD5ibXNjTe26NdVekGYYn8JftoQ1bH3J1x s=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none IronPort-SDR: 1GHynBy4xQn5N9BIsfVxB8CceneT7m1uaMP8C4WcFPZx1yzEsRQ93kSHlmxCs9KXoTlhboMjFo cn4yFcUDpuNuqMK793/76itPtSa0DEPrhP14zyOYMNPakpieXvYyHA/bgcCm8VhtCg8aZoxOGR G6mlFjRO7E+h9e4+7MtaV67K8S2Jf7JpDaPgwMNwg/Zfgv9pxy3i8DdH37ZRTF/mLhqC1QHWxb tQkb3qtByc5/NbtmmWve4afMq2TmEJ3S1yhn1aU37AeZbGb8SLF5zzbim8UlmgrXiLsl7sJtou e0A= X-SBRS: 5.1 X-MesageID: 35206340 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.79,350,1602561600"; d="scan'208";a="35206340" 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 4/5] tools/ocaml/xenstored: add support for binary format Date: Fri, 15 Jan 2021 22:29:03 +0000 Message-ID: <52d3a36208ed7a31355b289acb323255ed365ef8.1610748224.git.edvin.torok@citrix.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit Signed-off-by: Edwin Török --- tools/ocaml/xenstored/perms.ml | 2 + tools/ocaml/xenstored/xenstored.ml | 201 ++++++++++++++++++++++++----- 2 files changed, 173 insertions(+), 30 deletions(-) diff --git a/tools/ocaml/xenstored/perms.ml b/tools/ocaml/xenstored/perms.ml index e8a16221f8..61c1c60083 100644 --- a/tools/ocaml/xenstored/perms.ml +++ b/tools/ocaml/xenstored/perms.ml @@ -69,6 +69,8 @@ let remove_domid ~domid perm = let default0 = create 0 NONE [] +let acls t = (t.owner, t.other) :: t.acl + let perm_of_string s = let ty = permty_of_char s.[0] and id = int_of_string (String.sub s 1 (String.length s - 1)) in diff --git a/tools/ocaml/xenstored/xenstored.ml b/tools/ocaml/xenstored/xenstored.ml index e25b407303..9338190804 100644 --- a/tools/ocaml/xenstored/xenstored.ml +++ b/tools/ocaml/xenstored/xenstored.ml @@ -141,7 +141,8 @@ exception Bad_format of string let dump_format_header = "$xenstored-dump-format" -let from_channel_f chan global_f socket_f domain_f watch_f store_f = +(* for backwards compatibility with already released live-update *) +let from_channel_f_compat chan global_f socket_f domain_f watch_f store_f = let unhexify s = Utils.unhexify s in let getpath s = let u = Utils.unhexify s in @@ -186,7 +187,7 @@ let from_channel_f chan global_f socket_f domain_f watch_f store_f = done; info "Completed loading xenstore dump" -let from_channel store cons doms chan = +let from_channel_compat ~live store cons doms chan = (* don't let the permission get on our way, full perm ! *) let op = Store.get_ops store Perms.Connection.full_rights in let rwro = ref (None) in @@ -226,43 +227,183 @@ let from_channel store cons doms chan = op.Store.write path value; op.Store.setperms path perms in - from_channel_f chan global_f socket_f domain_f watch_f store_f; + from_channel_f_compat chan global_f socket_f domain_f watch_f store_f; !rwro -let from_file store cons doms file = - info "Loading xenstore dump from %s" file; - let channel = open_in file in - finally (fun () -> from_channel store doms cons channel) +module LR = Disk.LiveRecord + +let from_channel_f_bin chan on_global_data on_connection_data on_watch_data on_transaction_data on_node_data = + Disk.BinaryIn.read_header chan; + let quit = ref false in + let on_end () = quit := true in + let errors = ref 0 in + while not !quit + do + try + LR.read_record chan ~on_end ~on_global_data ~on_connection_data ~on_watch_data ~on_transaction_data ~on_node_data + with exn -> + let bt = Printexc.get_backtrace () in + incr errors; + Logging.warn "xenstored" "restoring: ignoring faulty record (exception: %s): %s" (Printexc.to_string exn) bt + done; + info "Completed loading xenstore dump"; + !errors + + +let from_channel_bin ~live store cons doms chan = + (* don't let the permission get on our way, full perm ! *) + let maintx = Transaction.make ~internal:true Transaction.none store in + let fullperm = Perms.Connection.full_rights in + let fds = ref None in + let allcons = Hashtbl.create 1021 in + let contxid_to_op = Hashtbl.create 1021 in + let global_f ~rw_sock = + (* file descriptors are only valid on a live-reload, a cold restart won't have them *) + if live then + fds := Some rw_sock + in + let domain_f ~conid ~conn ~in_data ~out_data ~out_resp_len = + let con = match conn with + | LR.Domain { LR.id = 0; _ } -> + (* Dom0 is precreated *) + Connections.find_domain cons 0 + | LR.Domain d -> + debug "Recreating domain %d, port %d" d.id d.remote_port; + (* FIXME: gnttab *) + Domains.create doms d.id 0n d.remote_port + |> Connections.add_domain cons; + Connections.find_domain cons d.id + | LR.Socket fd -> + debug "Recreating open socket"; + (* TODO: rw/ro flag *) + Connections.add_anonymous cons fd; + Connections.find cons fd + in + Hashtbl.add allcons conid con + in + let watch_f ~conid ~wpath ~token = + let con = Hashtbl.find allcons conid in + ignore (Connections.add_watch cons con wpath token); + () + in + let transaction_f ~conid ~txid = + let con = Hashtbl.find allcons conid in + con.Connection.next_tid <- txid; + let id = Connection.start_transaction con store in + assert (id = txid); + let txn = Connection.get_transaction con txid in + Hashtbl.add contxid_to_op (conid, txid) txn + in + let store_f ~txaccess ~perms ~path ~value = + let txn, op = match txaccess with + | None -> maintx, LR.W + | Some (conid, txid, op) -> + let (txn, _) as r = Hashtbl.find contxid_to_op (conid, txid), op in + (* make sure this doesn't commit, even as RO *) + Transaction.mark_failed txn; + r + in + let get_con id = + if id < 0 then Connections.find cons (Utils.FD.of_int (-id)) + else Connections.find_domain cons id + in + let watch_f id path token = + ignore (Connections.add_watch cons (get_con id) path token) + in + let path = Store.Path.of_string path in + try match op with + | LR.R -> + Logging.debug "xenstored" "TR %s %S" (Store.Path.to_string path) value; + (* these are values read by the tx, potentially + no write access here. Make the tree match. *) + Transaction.write txn fullperm path value; + Transaction.setperms txn fullperm path perms; + | LR.W | LR.RW -> + Logging.debug "xenstored" "TW %d %s %S" (Transaction.get_id txn) (Store.Path.to_string path) value; + (* We started with empty tree, create parents. + All the implicit mkdirs from the original tx should be explicit already for quota purposes. + *) + Process.create_implicit_path txn fullperm path; + Transaction.write txn fullperm path value; + Transaction.setperms txn fullperm path perms; + Logging.debug "xenstored" "TWdone %s %S" (Store.Path.to_string path) value; + | LR.Del -> + Logging.debug "xenstored" "TDel %s " (Store.Path.to_string path); + Transaction.rm txn fullperm path + with Not_found|Define.Doesnt_exist|Define.Lookup_Doesnt_exist _ -> () + in + (* make sure we got a quota entry for Dom0, so that setperms on / doesn't cause quota to be off-by-one *) + Transaction.mkdir maintx fullperm (Store.Path.of_string "/local"); + let errors = from_channel_f_bin chan global_f domain_f watch_f transaction_f store_f in + (* do not fire any watches, but this makes a tx RO *) +(* Transaction.clear_wops maintx; *) + let errors = if not @@ Transaction.commit ~con:"live-update" maintx then begin + Logging.warn "xenstored" "live-update: failed to commit main transaction"; + errors + 1 + end else errors + in + !fds, errors + +let from_channel = from_channel_bin (* TODO: detect and accept text format *) + +let from_file ~live store cons doms file = + let channel = open_in_bin file in + finally (fun () -> from_channel_bin ~live store doms cons channel) (fun () -> close_in channel) -let to_channel store cons rw chan = - let hexify s = Utils.hexify s in +let to_channel rw_sock store cons chan = + let t = Disk.BinaryOut.write_header chan in - fprintf chan "%s\n" dump_format_header; - let fdopt = function None -> -1 | Some fd -> - (* systemd and utils.ml sets it close on exec *) - Unix.clear_close_on_exec fd; - Utils.FD.to_int fd in - fprintf chan "global,%d\n" (fdopt rw); - - (* dump connections related to domains: domid, mfn, eventchn port/ sockets, and watches *) - Connections.iter cons (fun con -> Connection.dump con chan); + (match rw_sock with + | Some rw_sock -> + LR.write_global_data t ~rw_sock + | _ -> ()); (* dump the store *) Store.dump_fct store (fun path node -> - let name, perms, value = Store.Node.unpack node in - let fullpath = Store.Path.to_string (Store.Path.of_path_and_name path name) in - let permstr = Perms.Node.to_string perms in - fprintf chan "store,%s,%s,%s\n" (hexify fullpath) (hexify permstr) (hexify value) + Transaction.write_node t None path node ); + + (* dump connections related to domains and sockets; domid, mfn, eventchn port, watches *) + Connections.iter cons (fun con -> Connection.dump con store t); + + LR.write_end t; flush chan; () +let validate_f ch = + let conids = Hashtbl.create 1021 in + let txids = Hashtbl.create 1021 in + let global_f ~rw_sock = () in + let domain_f ~conid ~conn ~in_data ~out_data ~out_resp_len = + Hashtbl.add conids conid () + in + let watch_f ~conid ~wpath ~token = + Hashtbl.find conids conid + in + let transaction_f ~conid ~txid = + Hashtbl.find conids conid; + Hashtbl.add txids (conid, txid) () + in + let store_f ~txaccess ~perms ~path ~value = + match txaccess with + | None -> () + | Some (conid, txid, _) -> + Hashtbl.find conids conid; + Hashtbl.find txids (conid, txid) + in + let errors = from_channel_f_bin ch global_f domain_f watch_f transaction_f store_f in + if errors > 0 then + failwith (Printf.sprintf "Failed to re-read dump: %d errors" errors) -let to_file store cons fds file = - let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; ] 0o600 file in - finally (fun () -> to_channel store cons fds channel) - (fun () -> close_out channel) +let to_file fds store cons file = + let channel = open_out_gen [ Open_wronly; Open_creat; Open_trunc; Open_binary ] 0o600 file in + finally (fun () -> to_channel fds store cons channel) + (fun () -> close_out channel); + let channel = open_in_bin file in + finally (fun () -> validate_f channel) + (fun () -> close_in channel) + end let main () = @@ -329,8 +470,8 @@ let main () = let rw_sock = if cf.restart && Sys.file_exists Disk.xs_daemon_database then ( - let rwro = DB.from_file store domains cons Disk.xs_daemon_database in - info "Live reload: database loaded"; + let rwro, errors = DB.from_file ~live:cf.live_reload store domains cons Disk.xs_daemon_database in + info "Live reload: database loaded (%d errors)" errors; Event.bind_dom_exc_virq eventchn; Process.LiveUpdate.completed (); rwro @@ -367,7 +508,7 @@ let main () = Sys.set_signal Sys.sigpipe Sys.Signal_ignore; if cf.activate_access_log then begin - let post_rotate () = DB.to_file store cons (None) Disk.xs_daemon_database in + let post_rotate () = DB.to_file None store cons Disk.xs_daemon_database in Logging.init_access_log post_rotate end; @@ -528,7 +669,7 @@ let main () = live_update := Process.LiveUpdate.should_run cons; if !live_update || !quit then begin (* don't initiate live update if saving state fails *) - DB.to_file store cons (rw_sock) Disk.xs_daemon_database; + DB.to_file rw_sock store cons Disk.xs_daemon_database; quit := true; end with exc -> -- 2.29.2