Re: [Minios-devel] [PATCH v2 05/16] Save/Restore Support: Add kernel shutdown logic to shutdown.c

[Juergen Gross <jgross@xxxxxxxx>]

On 14/02/18 03:27, Bruno Alvisio wrote:
> Created shutdown.c for the shutdown thread and all the shutdown related
> functions.
> 
> Signed-off-by: Bruno Alvisio <bruno.alvisio@xxxxxxxxx>
> ---
> Changesd since v1:
>    * Updated license to a BSD 3-clause. This license was taken
> from the updated original file. (Repo: sysml/mini-os)
> ---
>  Makefile           |   1 +
>  include/shutdown.h |  11 ++++
>  shutdown.c         | 188 
> +++++++++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 200 insertions(+)
>  create mode 100644 include/shutdown.h
>  create mode 100644 shutdown.c
> 
> diff --git a/Makefile b/Makefile
> index 88315c4..6a05de6 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -53,6 +53,7 @@ src-y += mm.c
>  src-$(CONFIG_NETFRONT) += netfront.c
>  src-$(CONFIG_PCIFRONT) += pcifront.c
>  src-y += sched.c
> +src-y += shutdown.c
>  src-$(CONFIG_TEST) += test.c
>  src-$(CONFIG_BALLOON) += balloon.c
>  
> diff --git a/include/shutdown.h b/include/shutdown.h
> new file mode 100644
> index 0000000..a5ec019
> --- /dev/null
> +++ b/include/shutdown.h
> @@ -0,0 +1,11 @@
> +#ifndef _SHUTDOWN_H_
> +#define _SHUTDOWN_H_
> +
> +#include <mini-os/hypervisor.h>
> +
> +void init_shutdown(start_info_t *si);
> +
> +void kernel_shutdown(int reason) __attribute__((noreturn));
> +void kernel_suspend(void);
> +
> +#endif
> diff --git a/shutdown.c b/shutdown.c
> new file mode 100644
> index 0000000..aba146e
> --- /dev/null
> +++ b/shutdown.c
> @@ -0,0 +1,188 @@
> +/*
> + *          MiniOS
> + *
> + *   file: fromdevice.cc

shutdown.c?

> + *
> + * Authors: Joao Martins <joao.martins@xxxxxxxxx>
> + *
> + *
> + * Copyright (c) 2014, NEC Europe Ltd., NEC Corporation. All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + *
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 3. Neither the name of the copyright holder nor the names of its
> + *    contributors may be used to endorse or promote products derived from
> + *    this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
> IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
> + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
> + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
> + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
> + * POSSIBILITY OF SUCH DAMAGE.
> + *
> + * THIS HEADER MAY NOT BE EXTRACTED OR MODIFIED IN ANY WAY.
> + */
> +
> +#include <mini-os/os.h>
> +#include <mini-os/events.h>
> +#include <mini-os/kernel.h>
> +#include <mini-os/sched.h>
> +#include <mini-os/shutdown.h>
> +#include <mini-os/lib.h>
> +#include <mini-os/xenbus.h>
> +#include <mini-os/xmalloc.h>
> +
> +
> +static start_info_t *start_info_ptr;
> +
> +static const char *path = "control/shutdown";
> +static const char *token = "control/shutdown";
> +static xenbus_event_queue events = NULL;
> +static int end_shutdown_thread = 0;
> +
> +#ifdef CONFIG_XENBUS
> +/* This should be overridden by the application we are linked against. */
> +__attribute__((weak)) void app_shutdown(unsigned reason)
> +{
> +    printk("Shutdown requested: %d\n", reason);
> +    if (reason == SHUTDOWN_suspend) {
> +        kernel_suspend();
> +    } else {
> +        struct sched_shutdown sched_shutdown = { .reason = reason };
> +        HYPERVISOR_sched_op(SCHEDOP_shutdown, &sched_shutdown);
> +    }
> +}
> +
> +static void shutdown_thread(void *p)
> +{
> +    char *shutdown, *err;
> +    unsigned int shutdown_reason;
> +
> +    xenbus_watch_path_token(XBT_NIL, path, token, &events);
> +
> +    for ( ;; ) {
> +        xenbus_wait_for_watch(&events);
> +        if ((err = xenbus_read(XBT_NIL, path, &shutdown))) {
> +            free(err);
> +            do_exit();
> +        }
> +
> +        if (end_shutdown_thread)
> +            break;
> +
> +        if (!strcmp(shutdown, "")) {
> +            /* Avoid spurious event on xenbus */
> +            /* FIXME: investigate the reason of the spurious event */

Remove the FIXME, please.

Watches will fire e.g. directly after setting them up once.


With above issues fixed you can add my:

Reviewed-by: Juergen Gross <jgross@xxxxxxxx>


Juergen

_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel