[xen stable-4.15] tools/xenstore: move the call of setup_structure() to dom0 introduction

[patchbot@xxxxxxx]

commit ccef72b6a885714dae0b6f1accb33042ee40e108
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Tue Sep 13 07:35:09 2022 +0200
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Nov 1 15:03:25 2022 +0000

    tools/xenstore: move the call of setup_structure() to dom0 introduction
    
    Setting up the basic structure when introducing dom0 has the advantage
    to be able to add proper node memory accounting for the added nodes
    later.
    
    This makes it possible to do proper node accounting, too.
    
    An additional requirement to make that work fine is to correct the
    owner of the created nodes to be dom0_domid instead of domid 0.
    
    This is part of XSA-326.
    
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    Acked-by: Julien Grall <jgrall@xxxxxxxxxx>
    (cherry picked from commit 60e2f6020dea7f616857b8fc1141b1c085d88761)
---
 tools/xenstore/xenstored_core.c   | 9 ++++-----
 tools/xenstore/xenstored_core.h   | 1 +
 tools/xenstore/xenstored_domain.c | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 050d6f651a..51af74390c 100644
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -1940,7 +1940,8 @@ static int tdb_flags;
 static void manual_node(const char *name, const char *child)
 {
        struct node *node;
-       struct xs_permissions perms = { .id = 0, .perms = XS_PERM_NONE };
+       struct xs_permissions perms = { .id = dom0_domid,
+                                       .perms = XS_PERM_NONE };
 
        node = talloc_zero(NULL, struct node);
        if (!node)
@@ -1979,7 +1980,7 @@ static void tdb_logger(TDB_CONTEXT *tdb, int level, const 
char * fmt, ...)
        }
 }
 
-static void setup_structure(bool live_update)
+void setup_structure(bool live_update)
 {
        char *tdbname;
 
@@ -2002,6 +2003,7 @@ static void setup_structure(bool live_update)
                manual_node("/", "tool");
                manual_node("/tool", "xenstored");
                manual_node("/tool/xenstored", NULL);
+               domain_entry_fix(dom0_domid, 3, true);
        }
 
        check_store();
@@ -2512,9 +2514,6 @@ int main(int argc, char *argv[])
 
        init_pipe(reopen_log_pipe);
 
-       /* Setup the database */
-       setup_structure(live_update);
-
        /* Listen to hypervisor. */
        if (!no_domain_init && !live_update) {
                domain_init(-1);
diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h
index 1b3bd5ca56..459698d840 100644
--- a/tools/xenstore/xenstored_core.h
+++ b/tools/xenstore/xenstored_core.h
@@ -224,6 +224,7 @@ int write_node_raw(struct connection *conn, TDB_DATA *key, 
struct node *node,
 struct node *read_node(struct connection *conn, const void *ctx,
                       const char *name);
 
+void setup_structure(bool live_update);
 struct connection *new_connection(connwritefn_t *write, connreadfn_t *read);
 struct connection *get_connection_by_id(unsigned int conn_id);
 void check_store(void);
diff --git a/tools/xenstore/xenstored_domain.c 
b/tools/xenstore/xenstored_domain.c
index 3c27973fb8..0dd75a6a21 100644
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -476,6 +476,9 @@ static struct domain *introduce_domain(const void *ctx,
                }
                domain->interface = interface;
 
+               if (is_master_domain)
+                       setup_structure(restore);
+
                /* Now domain belongs to its connection. */
                talloc_steal(domain->conn, domain);
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.15