From patchwork Wed Feb 19 09:37:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 11390809 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB75C159A for ; Wed, 19 Feb 2020 09:40:30 +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 9DB182464E for ; Wed, 19 Feb 2020 09:40:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amazon.com header.i=@amazon.com header.b="DL8th15k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9DB182464E Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=amazon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4LoA-00081f-JP; Wed, 19 Feb 2020 09:38:18 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1j4Lo9-00081V-Qx for xen-devel@lists.xenproject.org; Wed, 19 Feb 2020 09:38:17 +0000 X-Inumbo-ID: 8e72d5ee-52fb-11ea-831b-12813bfff9fa Received: from smtp-fw-6002.amazon.com (unknown [52.95.49.90]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 8e72d5ee-52fb-11ea-831b-12813bfff9fa; Wed, 19 Feb 2020 09:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1582105097; x=1613641097; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KgDugwK1H066Bhk84YAubijZr3a55GGl4cE9tezKyuQ=; b=DL8th15kffDHFLczyFkoYEerhpxO9TjyRvMCks4v/SxksOkfP/DjPcJp /4llDHDcLmhsAR8RySz5gosILrvNKmQm9d1XNyqljhIM2OWrqCHOMDjFs nf23fHErFqpogGJA+rxoAi6SagGTIyAlNdXmILlNLw7zn91C7Gro1rn+t M=; IronPort-SDR: NXqjEb5ye7ghgqh3CWCSGI4Nh5UBbkuO8w0/WDmM+SAARd/X8TCq4fxFy1XDK6kftxyHIRihqe gMfXknphcqzQ== X-IronPort-AV: E=Sophos;i="5.70,459,1574121600"; d="scan'208";a="17085159" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-1a-715bee71.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-out-6002.iad6.amazon.com with ESMTP; 19 Feb 2020 09:38:04 +0000 Received: from EX13MTAUEA002.ant.amazon.com (iad55-ws-svc-p15-lb9-vlan2.iad.amazon.com [10.40.159.162]) by email-inbound-relay-1a-715bee71.us-east-1.amazon.com (Postfix) with ESMTPS id 591C9A31A1; Wed, 19 Feb 2020 09:38:03 +0000 (UTC) Received: from EX13D32EUB004.ant.amazon.com (10.43.166.212) by EX13MTAUEA002.ant.amazon.com (10.43.61.77) with Microsoft SMTP Server (TLS) id 15.0.1236.3; Wed, 19 Feb 2020 09:38:02 +0000 Received: from EX13MTAUEB002.ant.amazon.com (10.43.60.12) by EX13D32EUB004.ant.amazon.com (10.43.166.212) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Wed, 19 Feb 2020 09:38:01 +0000 Received: from u2f063a87eabd5f.cbg10.amazon.com (10.125.106.135) by mail-relay.amazon.com (10.43.60.234) with Microsoft SMTP Server id 15.0.1367.3 via Frontend Transport; Wed, 19 Feb 2020 09:38:00 +0000 From: Paul Durrant To: Date: Wed, 19 Feb 2020 09:37:49 +0000 Message-ID: <20200219093754.2924-2-pdurrant@amazon.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200219093754.2924-1-pdurrant@amazon.com> References: <20200219093754.2924-1-pdurrant@amazon.com> MIME-Version: 1.0 Precedence: Bulk Subject: [Xen-devel] [PATCH v6 1/6] libxl: add infrastructure to track and query 'recent' domids X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Anthony PERARD , Paul Durrant , Ian Jackson , Wei Liu Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A domid is considered recent if the domain it represents was destroyed less than a specified number of seconds ago. For debugging and/or testing purposes the number can be set using the environment variable LIBXL_DOMID_REUSE_TIMEOUT. If the variable does not exist then a default value of 60s is used. Whenever a domain is destroyed, a time-stamped record will be written into a history file (/var/run/xen/domid-history). To avoid the history file growing too large, any records with time-stamps that indicate that the age of a domid has exceeded the re-use timeout will also be purged. A new utility function, libxl__is_recent_domid(), has been added. This function reads the same history file checking whether a specified domid has a record that does not exceed the re-use timeout. Since this utility function does not write to the file, no records are actually purged by it. NOTE: The history file is purged on boot to it is safe to use CLOCK_MONOTONIC as a time source. Signed-off-by: Paul Durrant --- Cc: Ian Jackson Cc: Wei Liu Cc: Anthony PERARD v6: _ Addressed further comments from Ian v5: - Re-work file manipulation some more - Add more error checks v4: - Use new generalised libxl__flock - Don't read and write the same file - Use 'recent' rather than 'retired' - Add code into xen-init-dom0 to delete an old history file at boot v2: - New in v2 --- tools/helpers/xen-init-dom0.c | 30 +++++ tools/libxl/libxl.h | 7 ++ tools/libxl/libxl_domain.c | 222 ++++++++++++++++++++++++++++++++++ tools/libxl/libxl_internal.c | 10 ++ tools/libxl/libxl_internal.h | 14 +++ 5 files changed, 283 insertions(+) diff --git a/tools/helpers/xen-init-dom0.c b/tools/helpers/xen-init-dom0.c index a1e5729458..56f69ab66f 100644 --- a/tools/helpers/xen-init-dom0.c +++ b/tools/helpers/xen-init-dom0.c @@ -12,6 +12,32 @@ #define DOMNAME_PATH "/local/domain/0/name" #define DOMID_PATH "/local/domain/0/domid" +int clear_domid_history(void) +{ + int rc = 1; + xentoollog_logger_stdiostream *logger; + libxl_ctx *ctx; + + logger = xtl_createlogger_stdiostream(stderr, XTL_ERROR, 0); + if (!logger) + return 1; + + if (libxl_ctx_alloc(&ctx, LIBXL_VERSION, 0, + (xentoollog_logger *)logger)) { + fprintf(stderr, "cannot init libxl context\n"); + goto outlog; + } + + if (!libxl_clear_domid_history(ctx)) + rc = 0; + + libxl_ctx_free(ctx); + +outlog: + xtl_logger_destroy((xentoollog_logger *)logger); + return rc; +} + int main(int argc, char **argv) { int rc; @@ -70,6 +96,10 @@ int main(int argc, char **argv) if (rc) goto out; + rc = clear_domid_history(); + if (rc) + goto out; + /* Write xenstore entries. */ if (!xs_write(xsh, XBT_NULL, DOMID_PATH, "0", strlen("0"))) { fprintf(stderr, "cannot set domid for Dom0\n"); diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index fde8548847..80ae110a52 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -2679,6 +2679,13 @@ static inline int libxl_qemu_monitor_command_0x041200(libxl_ctx *ctx, #include +/* + * This function is for use only during host initialisation. If it is + * invoked on a host with running domains, or concurrent libxl + * processes then the system may malfuntion. + */ +int libxl_clear_domid_history(libxl_ctx *ctx); + #endif /* LIBXL_H */ /* diff --git a/tools/libxl/libxl_domain.c b/tools/libxl/libxl_domain.c index 973fc1434d..53f90cb555 100644 --- a/tools/libxl/libxl_domain.c +++ b/tools/libxl/libxl_domain.c @@ -1268,6 +1268,226 @@ static void dm_destroy_cb(libxl__egc *egc, libxl__devices_destroy(egc, &dis->drs); } +static unsigned int libxl__get_domid_reuse_timeout(void) +{ + const char *env_timeout = getenv("LIBXL_DOMID_REUSE_TIMEOUT"); + + return env_timeout ? strtol(env_timeout, NULL, 0) : + LIBXL_DOMID_REUSE_TIMEOUT; +} + +char *libxl__domid_history_path(libxl__gc *gc, const char *suffix) +{ + return GCSPRINTF("%s/domid-history%s", libxl__run_dir_path(), + suffix ?: ""); +} + +int libxl_clear_domid_history(libxl_ctx *ctx) +{ + GC_INIT(ctx); + char *path; + int rc = ERROR_FAIL; + + path = libxl__domid_history_path(gc, NULL); + if (!path) + goto out; + + if (unlink(path) < 0 && errno != ENOENT) { + LOGE(ERROR, "failed to remove '%s'\n", path); + goto out; + } + + rc = 0; + +out: + GC_FREE; + return rc; +} + +static int libxl__read_recent(libxl__gc *gc, FILE *f, unsigned long *sec, + unsigned int *domid) +{ + if (!f) { + *domid = INVALID_DOMID; + return 0; + } + + for (;;) { + int n = fscanf(f, "%lu %u", sec, domid); + + if (n == EOF) { + if (ferror(f)) { + LOGE(ERROR, "failed"); + return ERROR_FAIL; + } + + *domid = INVALID_DOMID; + break; + } else if (n == 2 && libxl_domid_valid_guest(*domid)) { + break; + } + } + + return 0; +} + +static int libxl__write_recent(libxl__gc *gc, FILE *f, unsigned long sec, + unsigned int domid) +{ + int n = fprintf(f, "%lu %u\n", sec, domid); + + if (n >= 0) return 0; + + LOGE(ERROR, "failed"); + return ERROR_FAIL; +} + +static int libxl__open_domid_history(libxl__gc *gc, FILE **f) +{ + char *path = libxl__domid_history_path(gc, NULL); + + *f = fopen(path, "r"); + if (*f || errno == ENOENT) return 0; + + LOGE(ERROR, "failed to open '%s'", path); + return ERROR_FAIL; +} + +static int libxl__close_domid_history(libxl__gc *gc, FILE **f) +{ + int ret; + + if (!*f) return 0; + + ret = fclose(*f); + *f = NULL; + if (!ret) return 0; + + LOGE(ERROR, "failed"); + return ERROR_FAIL; +} + +static int libxl__replace_domid_history(libxl__gc *gc, char *new) +{ + char *path = libxl__domid_history_path(gc, NULL); + int ret = rename(new, path); + + if (!ret) return 0; + + LOGE(ERROR, "failed to rename '%s' -> '%s'", new, path); + return ERROR_FAIL; +} + +static int libxl__mark_domid_recent(libxl__gc *gc, uint32_t domid) +{ + long timeout = libxl__get_domid_reuse_timeout(); + libxl__flock *lock; + char *new; + FILE *of = NULL, *nf = NULL; + struct timespec ts; + int ret, rc; + + lock = libxl__lock_domid_history(gc); + if (!lock) { + LOGED(ERROR, domid, "failed to acquire lock"); + rc = ERROR_FAIL; + goto out; + } + + rc = libxl__open_domid_history(gc, &of); + if (rc) goto out; + + new = libxl__domid_history_path(gc, ".new"); + nf = fopen(new, "a"); + if (!nf) { + LOGED(ERROR, domid, "failed to open '%s'", new); + goto out; + } + + if (clock_gettime(CLOCK_MONOTONIC, &ts)) { + LOGED(ERROR, domid, "failed to get time"); + goto out; + } + + for (;;) { + unsigned long sec; + unsigned int val; + + rc = libxl__read_recent(gc, of, &sec, &val); + if (rc) goto out; + + if (val == INVALID_DOMID) /* EOF */ + break; + + if (ts.tv_sec - sec > timeout) + continue; /* Ignore expired entries */ + + rc = libxl__write_recent(gc, nf, sec, val); + if (rc) goto out; + } + + rc = libxl__write_recent(gc, nf, ts.tv_sec, domid); + if (rc) goto out; + + ret = fclose(nf); + nf = NULL; + if (ret == EOF) { + LOGED(ERROR, domid, "failed to close '%s'", new); + goto out; + } + + rc = libxl__close_domid_history(gc, &of); + if (rc) goto out; + + rc = libxl__replace_domid_history(gc, new); + +out: + if (nf) fclose(nf); + if (of) fclose(of); + if (lock) libxl__unlock_file(lock); + + return rc; +} + +int libxl__is_domid_recent(libxl__gc *gc, uint32_t domid, bool *recent) +{ + long timeout = libxl__get_domid_reuse_timeout(); + FILE *f; + struct timespec ts; + int rc; + + rc = libxl__open_domid_history(gc, &f); + if (rc) goto out; + + if (clock_gettime(CLOCK_MONOTONIC, &ts)) { + LOGED(ERROR, domid, "failed to get time"); + goto out; + } + + *recent = false; + for (;;) { + unsigned long sec; + unsigned int val; + + rc = libxl__read_recent(gc, f, &sec, &val); + if (rc) goto out; + + if (val == INVALID_DOMID) /* EOF */ + break; + + if (val == domid && ts.tv_sec - sec <= timeout) { + *recent = true; + break; + } + } + + rc = libxl__close_domid_history(gc, &f); + +out: + if (f) fclose(f); + return rc; +} + static void devices_destroy_cb(libxl__egc *egc, libxl__devices_remove_state *drs, int rc) @@ -1331,6 +1551,8 @@ static void devices_destroy_cb(libxl__egc *egc, if (!ctx->xch) goto badchild; if (!dis->soft_reset) { + rc = libxl__mark_domid_recent(gc, domid); + if (rc) goto badchild; rc = xc_domain_destroy(ctx->xch, domid); } else { rc = xc_domain_pause(ctx->xch, domid); diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 211236dc99..bbd4c6cba9 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -504,6 +504,16 @@ libxl__flock *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid) return lock; } +libxl__flock *libxl__lock_domid_history(libxl__gc *gc) +{ + const char *lockfile; + + lockfile = libxl__domid_history_path(gc, ".lock"); + if (!lockfile) return NULL; + + return libxl__lock_file(gc, lockfile); +} + int libxl__get_domain_configuration(libxl__gc *gc, uint32_t domid, libxl_domain_config *d_config) { diff --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index 4936446069..43e5885d1e 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -4263,6 +4263,8 @@ _hidden void libxl__remus_teardown(libxl__egc *egc, _hidden void libxl__remus_restore_setup(libxl__egc *egc, libxl__domain_create_state *dcs); +_hidden char *libxl__domid_history_path(libxl__gc *gc, + const char *suffix); /* * Convenience macros. @@ -4661,6 +4663,7 @@ libxl__flock *libxl__lock_file(libxl__gc *gc, const char *filename); void libxl__unlock_file(libxl__flock *lock); libxl__flock *libxl__lock_domain_userdata(libxl__gc *gc, uint32_t domid); +libxl__flock *libxl__lock_domid_history(libxl__gc *gc); /* * Retrieve / store domain configuration from / to libxl private @@ -4799,6 +4802,17 @@ _hidden int libxl__domain_pvcontrol(libxl__egc *egc, libxl__xswait_state *pvcontrol, domid_t domid, const char *cmd); +/* + * Maximum number of seconds after desctruction then a domid remains + * 'recent'. Recent domids are not allowed to be re-used. This can be + * overidden, for debugging purposes, by the environment variable of the + * same name. + */ +#define LIBXL_DOMID_REUSE_TIMEOUT 60 + +/* Check whether a domid is recent */ +int libxl__is_domid_recent(libxl__gc *gc, uint32_t domid, bool *recent); + #endif /*