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=-18.8 required=3.0 tests=BAYES_00,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 12CDCC433DB for ; Fri, 22 Jan 2021 09:23:50 +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 96C1D238D7 for ; Fri, 22 Jan 2021 09:23:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 96C1D238D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.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.72608.130797 (Exim 4.92) (envelope-from ) id 1l2sfL-0003HF-BG; Fri, 22 Jan 2021 09:23:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72608.130797; Fri, 22 Jan 2021 09:23:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2sfL-0003H7-6h; Fri, 22 Jan 2021 09:23:39 +0000 Received: by outflank-mailman (input) for mailman id 72608; Fri, 22 Jan 2021 09:23:37 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2sfJ-00039U-MY for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 09:23:37 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 2f7368dd-0fd8-4b41-a6a3-c1320f9c17ce; Fri, 22 Jan 2021 09:23:26 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 25050B7DD; Fri, 22 Jan 2021 09:23:26 +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: 2f7368dd-0fd8-4b41-a6a3-c1320f9c17ce X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1611307406; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pcX+rWOqAhDGj65NpKjUEipsQKULXpFhZPvdYr1P+4c=; b=Ph8za9kR5TvLYIt/1l2GN9zKWTMy7V9Tw0E0idEywpAcKsXMPxA+AH7RVDG2e/BG2tpATI guKyJBEvcDtAmFG1+c4D0RFsXTfuIBBFXJu+qF1V9iFBRgKNIGVt87zwL8hNuvDlPYBj9L 97upBt5ZUFK3D10R2sHJqx3mLfUlSgs= From: Juergen Gross To: xen-devel@lists.xenproject.org Cc: Juergen Gross , Ian Jackson , Wei Liu Subject: [PATCH RFC 1/4] tools/xenstore: simplify xenstored main loop Date: Fri, 22 Jan 2021 10:23:21 +0100 Message-Id: <20210122092324.7178-2-jgross@suse.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210122092324.7178-1-jgross@suse.com> References: <20210122092324.7178-1-jgross@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The main loop of xenstored is rather complicated due to different handling of socket and ring-page interfaces. Unify that handling by introducing interface type specific functions can_read() and can_write(). Put the interface type specific functions in an own structure and let struct connection contain only a pointer to that new function vector. Signed-off-by: Juergen Gross --- tools/xenstore/xenstored_core.c | 118 +++++++++++++++++------------- tools/xenstore/xenstored_core.h | 16 ++-- tools/xenstore/xenstored_domain.c | 11 ++- 3 files changed, 85 insertions(+), 60 deletions(-) diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c index 65ecdd0568..c89f5202fe 100644 --- a/tools/xenstore/xenstored_core.c +++ b/tools/xenstore/xenstored_core.c @@ -226,8 +226,8 @@ static bool write_messages(struct connection *conn) sockmsg_string(out->hdr.msg.type), out->hdr.msg.len, out->buffer, conn); - ret = conn->write(conn, out->hdr.raw + out->used, - sizeof(out->hdr) - out->used); + ret = conn->funcs->write(conn, out->hdr.raw + out->used, + sizeof(out->hdr) - out->used); if (ret < 0) return false; @@ -243,8 +243,8 @@ static bool write_messages(struct connection *conn) return true; } - ret = conn->write(conn, out->buffer + out->used, - out->hdr.msg.len - out->used); + ret = conn->funcs->write(conn, out->buffer + out->used, + out->hdr.msg.len - out->used); if (ret < 0) return false; @@ -1520,8 +1520,8 @@ static void handle_input(struct connection *conn) /* Not finished header yet? */ if (in->inhdr) { if (in->used != sizeof(in->hdr)) { - bytes = conn->read(conn, in->hdr.raw + in->used, - sizeof(in->hdr) - in->used); + bytes = conn->funcs->read(conn, in->hdr.raw + in->used, + sizeof(in->hdr) - in->used); if (bytes < 0) goto bad_client; in->used += bytes; @@ -1546,8 +1546,8 @@ static void handle_input(struct connection *conn) in->inhdr = false; } - bytes = conn->read(conn, in->buffer + in->used, - in->hdr.msg.len - in->used); + bytes = conn->funcs->read(conn, in->buffer + in->used, + in->hdr.msg.len - in->used); if (bytes < 0) goto bad_client; @@ -1570,7 +1570,7 @@ static void handle_output(struct connection *conn) ignore_connection(conn); } -struct connection *new_connection(connwritefn_t *write, connreadfn_t *read) +struct connection *new_connection(struct interface_funcs *funcs) { struct connection *new; @@ -1580,8 +1580,7 @@ struct connection *new_connection(connwritefn_t *write, connreadfn_t *read) new->fd = -1; new->pollfd_idx = -1; - new->write = write; - new->read = read; + new->funcs = funcs; new->is_ignored = false; new->transaction_started = 0; INIT_LIST_HEAD(&new->out_list); @@ -1622,6 +1621,16 @@ int readfd(struct connection *conn, void *data, unsigned int len) errno = EBADF; return -1; } + +static bool socket_can_write(struct connection *conn) +{ + return false; +} + +static bool socket_can_read(struct connection *conn) +{ + return false; +} #else int writefd(struct connection *conn, const void *data, unsigned int len) { @@ -1661,6 +1670,32 @@ int readfd(struct connection *conn, void *data, unsigned int len) return rc; } +static bool socket_can_write(struct connection *conn) +{ + if (conn->pollfd_idx == -1) + return false; + + if (fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { + talloc_free(conn); + return false; + } + + return fds[conn->pollfd_idx].revents & POLLOUT; +} + +static bool socket_can_read(struct connection *conn) +{ + if (conn->pollfd_idx == -1) + return false; + + if (fds[conn->pollfd_idx].revents & ~(POLLIN | POLLOUT)) { + talloc_free(conn); + return false; + } + + return fds[conn->pollfd_idx].revents & POLLIN; +} + static void accept_connection(int sock) { int fd; @@ -1670,7 +1705,7 @@ static void accept_connection(int sock) if (fd < 0) return; - conn = new_connection(writefd, readfd); + conn = new_connection(&socket_funcs); if (conn) conn->fd = fd; else @@ -1678,6 +1713,13 @@ static void accept_connection(int sock) } #endif +struct interface_funcs socket_funcs = { + .write = writefd, + .read = readfd, + .can_write = socket_can_write, + .can_read = socket_can_read, +}; + static int tdb_flags; /* We create initial nodes manually. */ @@ -2280,47 +2322,19 @@ int main(int argc, char *argv[]) if (&next->list != &connections) talloc_increase_ref_count(next); - if (conn->domain) { - if (domain_can_read(conn)) - handle_input(conn); - if (talloc_free(conn) == 0) - continue; - - talloc_increase_ref_count(conn); - if (domain_can_write(conn) && - !list_empty(&conn->out_list)) - handle_output(conn); - if (talloc_free(conn) == 0) - continue; - } else { - if (conn->pollfd_idx != -1) { - if (fds[conn->pollfd_idx].revents - & ~(POLLIN|POLLOUT)) - talloc_free(conn); - else if ((fds[conn->pollfd_idx].revents - & POLLIN) && - !conn->is_ignored) - handle_input(conn); - } - if (talloc_free(conn) == 0) - continue; - - talloc_increase_ref_count(conn); - - if (conn->pollfd_idx != -1) { - if (fds[conn->pollfd_idx].revents - & ~(POLLIN|POLLOUT)) - talloc_free(conn); - else if ((fds[conn->pollfd_idx].revents - & POLLOUT) && - !conn->is_ignored) - handle_output(conn); - } - if (talloc_free(conn) == 0) - continue; + if (conn->funcs->can_read(conn)) + handle_input(conn); + if (talloc_free(conn) == 0) + continue; - conn->pollfd_idx = -1; - } + talloc_increase_ref_count(conn); + + if (conn->funcs->can_write(conn)) + handle_output(conn); + if (talloc_free(conn) == 0) + continue; + + conn->pollfd_idx = -1; } if (delayed_requests) { diff --git a/tools/xenstore/xenstored_core.h b/tools/xenstore/xenstored_core.h index 589699e833..84b364d82c 100644 --- a/tools/xenstore/xenstored_core.h +++ b/tools/xenstore/xenstored_core.h @@ -87,8 +87,13 @@ struct delayed_request { }; struct connection; -typedef int connwritefn_t(struct connection *, const void *, unsigned int); -typedef int connreadfn_t(struct connection *, void *, unsigned int); + +struct interface_funcs { + int (*write)(struct connection *, const void *, unsigned int); + int (*read)(struct connection *, void *, unsigned int); + bool (*can_write)(struct connection *); + bool (*can_read)(struct connection *); +}; struct connection { @@ -132,9 +137,8 @@ struct connection /* My watches. */ struct list_head watches; - /* Methods for communicating over this connection: write can be NULL */ - connwritefn_t *write; - connreadfn_t *read; + /* Methods for communicating over this connection. */ + struct interface_funcs *funcs; /* Support for live update: connection id. */ unsigned int conn_id; @@ -197,7 +201,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); -struct connection *new_connection(connwritefn_t *write, connreadfn_t *read); +struct connection *new_connection(struct interface_funcs *funcs); struct connection *get_connection_by_id(unsigned int conn_id); void check_store(void); void corrupt(struct connection *conn, const char *fmt, ...); diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c index 3d4d0649a2..04f2a974e4 100644 --- a/tools/xenstore/xenstored_domain.c +++ b/tools/xenstore/xenstored_domain.c @@ -172,6 +172,13 @@ static int readchn(struct connection *conn, void *data, unsigned int len) return len; } +static struct interface_funcs domain_funcs = { + .write = writechn, + .read = readchn, + .can_write = domain_can_write, + .can_read = domain_can_read, +}; + static void *map_interface(domid_t domid) { return xengnttab_map_grant_ref(*xgt_handle, domid, @@ -389,7 +396,7 @@ static int new_domain(struct domain *domain, int port, bool restore) domain->introduced = true; - domain->conn = new_connection(writechn, readchn); + domain->conn = new_connection(&domain_funcs); if (!domain->conn) { errno = ENOMEM; return errno; @@ -1288,7 +1295,7 @@ void read_state_connection(const void *ctx, const void *state) struct domain *domain, *tdomain; if (sc->conn_type == XS_STATE_CONN_TYPE_SOCKET) { - conn = new_connection(writefd, readfd); + conn = new_connection(&socket_funcs); if (!conn) barf("error restoring connection"); conn->fd = sc->spec.socket_fd; -- 2.26.2