Re: [Minios-devel] [UNIKRAFT PATCH v4 3/7] plat/kvm: Implement stub of ukplat_stack_set_current_thread for arm64

[Santiago Pagani <Santiago.Pagani@xxxxxxxxx>]

Hi Justin,

Thanks for the patch. It looks good.

Best,
Santiago

On 09.10.19, 15:30, "Jia He" <justin.he@xxxxxxx> wrote:

    This patch is to fix the compilation error when building arm64 kvm image
    build/unikraft_kvm-arm64.o: In function `schedcoop_schedule':
    lib/ukschedcoop/schedcoop.c:107: undefined reference to
    `ukplat_stack_set_current_thread'
    
    In commit 017fffd59ece ("plat/*: Set current thread on IRQ stack"), it
    introduce ukplat_stack_set_current_thread on x86 to set the thread_addr
    on cpu_intr_stack. There are no isolating stack for interrupt on arm64
    up to now. So make an empty stub here.
    
    Signed-off-by: Jia He <justin.he@xxxxxxx>
    ---
     plat/kvm/Makefile.uk  |  1 +
     plat/kvm/arm/memory.c | 39 +++++++++++++++++++++++++++++++++++++++
     2 files changed, 40 insertions(+)
     create mode 100644 plat/kvm/arm/memory.c
    
    diff --git a/plat/kvm/Makefile.uk b/plat/kvm/Makefile.uk
    index 68bcfd9..e391043 100644
    --- a/plat/kvm/Makefile.uk
    +++ b/plat/kvm/Makefile.uk
    @@ -79,6 +79,7 @@ LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/cache64.S|co
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/psci_arm64.S|common
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/time.c|common
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(UK_PLAT_COMMON_BASE)/arm/traps.c|common
    +LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(LIBKVMPLAT_BASE)/arm/memory.c|arm
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += $(LIBKVMPLAT_BASE)/arm/entry64.S
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(LIBKVMPLAT_BASE)/arm/exceptions.S
     LIBKVMPLAT_SRCS-$(CONFIG_ARCH_ARM_64) += 
$(LIBKVMPLAT_BASE)/arm/pagetable64.S
    diff --git a/plat/kvm/arm/memory.c b/plat/kvm/arm/memory.c
    new file mode 100644
    index 0000000..c40d213
    --- /dev/null
    +++ b/plat/kvm/arm/memory.c
    @@ -0,0 +1,39 @@
    +/* SPDX-License-Identifier: BSD-3-Clause */
    +/*
    + * Authors: Costin Lupu <costin.lupu@xxxxxxxxx>
    + *
    + * Copyright (c) 2019, University Politehnica of Bucharest. 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 <uk/essentials.h>
    +
    +void ukplat_stack_set_current_thread(void *thread_addr __unused)
    +{
    +}
    -- 
    2.17.1
    
    

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