Skip to content

XTF on arm #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
orzelmichal wants to merge 13 commits into
base: master
Choose a base branch
from
Open

XTF on arm #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7c6454f
build: Modify build system to support multiple architectures
orzelmichal May 21, 2021
ff0017f
arm: Add initial architecture code for arm64 and arm32
orzelmichal Nov 30, 2020
7b67c42
arm: Add build support for arm64/arm32
orzelmichal Jul 2, 2021
e110999
xtf: Make the common hypercall header arch independent
orzelmichal Mar 25, 2021
4bce24e
arm: Add the hypercall handling interfaces
orzelmichal Mar 25, 2021
31e12f6
arm64: Run hello-world test on arm64
orzelmichal Mar 25, 2021
13eddf5
arm: Add option to specify the load address
orzelmichal Jul 14, 2021
11bd786
arm: Add basic PL011 UART driver
orzelmichal Jul 14, 2021
0cb05ca
arm64: Add boot MMU support
orzelmichal Jul 14, 2021
309fd29
arm: Add MMU helpers
orzelmichal Aug 4, 2021
fcdf8db
xen/version: Add XENVER_get_features operation
orzelmichal Aug 5, 2021
ea0093e
arm: Add support for PV console
orzelmichal Aug 4, 2021
c14f7dd
xtf: Add arm support into xtf-runner
orzelmichal Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 45 additions & 0 deletions arch/arm/arm32/hypercall.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#include <xtf/asm_macros.h>
#include <xen/xen.h>

#define __HVC(imm16) .long \
((0xE1400070 | (((imm16) & 0xFFF0) << 4) | ((imm16) & 0x000F)) & 0xFFFFFFFF)

#define HYPERCALL_SIMPLE(hypercall) \

@jgrall jgrall Aug 18, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Both .S was borrowed from Linux right? If so, that's fine because the license is not GPL. But please retain the copyright from the author.

ENTRY(hypercall_##hypercall) \
mov r12, #__HYPERVISOR_##hypercall; \
__HVC(XEN_HYPERCALL_TAG); \
mov pc ,lr; \
ENDFUNC(hypercall_##hypercall)

#define HYPERCALL0 HYPERCALL_SIMPLE
#define HYPERCALL1 HYPERCALL_SIMPLE
#define HYPERCALL2 HYPERCALL_SIMPLE
#define HYPERCALL3 HYPERCALL_SIMPLE
#define HYPERCALL4 HYPERCALL_SIMPLE

#define HYPERCALL5(hypercall) \
ENTRY(hypercall_##hypercall) \
stmdb sp!, {r4}; \
ldr r4, [sp, #4]; \
mov r12, #__HYPERVISOR_##hypercall; \
__HVC(XEN_HYPERCALL_TAG); \
ldm sp!, {r4}; \
mov pc ,lr; \
ENDFUNC(hypercall_##hypercall)

.text

HYPERCALL2(xen_version);
HYPERCALL3(console_io);
HYPERCALL3(grant_table_op);
HYPERCALL2(sched_op);
HYPERCALL2(event_channel_op);
HYPERCALL2(hvm_op);
HYPERCALL2(memory_op);
HYPERCALL2(physdev_op);
HYPERCALL3(vcpu_op);
HYPERCALL1(tmem_op);
HYPERCALL2(multicall);
HYPERCALL2(vm_assist);
HYPERCALL1(sysctl);
HYPERCALL1(domctl);

@dozylynx dozylynx Aug 17, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this hypercall list in any specific order?
If not, it should be sorted into an order (eg. alphabetical, or by ascending hypercall number).
A comment should be added to state what the order is, so that any future additions will be inserted into the correct place.

@dozylynx dozylynx Aug 17, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HYPERCALL5(argo_op);
would be nice (or it can go in when a test that exercises Argo goes in).

@orzelmichal orzelmichal Aug 20, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The wrappers were borrowed from Linux(with little modifications) and the list is not sorted.
It does not really matter what the order is. Preferable way is to insert additions at the end of list.
argo_op hypercall should be added together with public interface argo.h. So this should come together with a test.

33 changes: 33 additions & 0 deletions arch/arm/arm64/hypercall.S
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#include <xtf/asm_macros.h>
#include <xen/xen.h>

#define HYPERCALL_SIMPLE(hypercall) \
ENTRY(hypercall_##hypercall) \
mov x16, #__HYPERVISOR_##hypercall; \
hvc XEN_HYPERCALL_TAG; \
ret; \
ENDFUNC(hypercall_##hypercall)

#define HYPERCALL0 HYPERCALL_SIMPLE
#define HYPERCALL1 HYPERCALL_SIMPLE
#define HYPERCALL2 HYPERCALL_SIMPLE
#define HYPERCALL3 HYPERCALL_SIMPLE
#define HYPERCALL4 HYPERCALL_SIMPLE
#define HYPERCALL5 HYPERCALL_SIMPLE

.text

HYPERCALL2(xen_version);
HYPERCALL3(console_io);
HYPERCALL3(grant_table_op);
HYPERCALL2(sched_op);
HYPERCALL2(event_channel_op);
HYPERCALL2(hvm_op);
HYPERCALL2(memory_op);
HYPERCALL2(physdev_op);
HYPERCALL3(vcpu_op);
HYPERCALL1(tmem_op);
HYPERCALL2(multicall);
HYPERCALL2(vm_assist);
HYPERCALL1(sysctl);
HYPERCALL1(domctl);

@dozylynx dozylynx Aug 17, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same comments as for the 32-bit version

@orzelmichal orzelmichal Aug 20, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please check my comment for arm32

43 changes: 21 additions & 22 deletions arch/arm/include/arch/hypercall.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@
#define XTF_ARM_HYPERCALL_H

#include <xtf/lib.h>
#include <arch/desc.h>
#include <arch/page.h>
#include <xen/sysctl.h>

#define _hypercall_1(type, hcall, a1) \
({ \
UNIMPLEMENTED(); \
(type)0; \
})
int hypercall_memory_op(unsigned int cmd, void *arg);
int hypercall_domctl(unsigned long op);
int hypercall_sched_op(int cmd, void *arg);
int hypercall_console_io(int cmd, int count, char *str);
int hypercall_xen_version(int cmd, void *arg);
int hypercall_event_channel_op(int cmd, void *op);
int hypercall_physdev_op(void *physdev_op);
int hypercall_sysctl(xen_sysctl_t *arg);
int hypercall_hvm_op(unsigned long op, void *arg);
int hypercall_grant_table_op(unsigned int cmd, void *uop, unsigned int count);
int hypercall_vcpu_op(int cmd, int vcpuid, void *extra_args);

@dozylynx dozylynx Aug 17, 2021

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

+int hypercall_argo_op(unsigned int cmd, void *arg1, void *arg2,
+                      unsigned long arg3, unsigned long arg4);

@orzelmichal orzelmichal Aug 20, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hypercall_argo_op should be added together with argo.h public interface. This shall be added when adding a test for argo.


#define _hypercall_2(type, hcall, a1, a2) \
({ \
UNIMPLEMENTED(); \
(type)0; \
})

#define _hypercall_3(type, hcall, a1, a2, a3) \
({ \
UNIMPLEMENTED(); \
(type)0; \
})

#define _hypercall_5(type, hcall, a1, a2, a3, a4, a5) \
({ \
UNIMPLEMENTED(); \
(type)0; \
})
/*
* Higher level hypercall helpers
*/
static inline void hypercall_console_write(const char *buf, size_t count)
{
(void)hypercall_console_io(CONSOLEIO_write, count, (char *)buf);
}

#endif /* XTF_ARM_HYPERCALL_H */

Expand Down
2 changes: 1 addition & 1 deletion build/arm32/arch-files.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
include $(ROOT)/build/arm-common/arch-files.mk

# Specific files for arm32
obj-perenv +=
obj-perenv += $(ROOT)/arch/arm/arm32/hypercall.o
1 change: 1 addition & 0 deletions build/arm64/arch-files.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ include $(ROOT)/build/arm-common/arch-files.mk

# Specific files for arm64
obj-perenv += $(ROOT)/arch/arm/arm64/cache.o
obj-perenv += $(ROOT)/arch/arm/arm64/hypercall.o