Enable build of full Xen for RISC-V
v8 cover Enable build of full Xen for RISC-V
This patch series performs all of the additions necessary to drop the build overrides for RISCV and enable the full Xen build. Except in cases where compatibile implementations already exist (e.g. atomic.h and bitops.h), the newly added definitions are simple.
The patch series is based on the following patch series:
- [PATCH 0/7] xen/bitops: Reduce the mess, starting with ffs() [1]
- [PATCH] move __read_mostly to xen/cache.h [2]
Right now, the patch series doesn't have a direct dependency on [2] and it provides __read_mostly in the patch:
[PATCH v3 26/34] xen/riscv: add definition of __read_mostly
However, it will be dropped as soon as [2] is merged or at least when the final version of the patch [2] is provided.
As an option, it can be considered to merge arch-specific patch and then just rebase [2] and drop arch-specific changes.
[1] https://lore.kernel.org/xen-devel/[email protected]/T/#t
[2] https://lore.kernel.org/xen-devel/[email protected]/
---
Changes in V7:
- Patch was merged to staging:
- [PATCH v7 01/19] automation: introduce fixed randconfig for RISC-V
- [PATCH v7 03/19] xen/riscv: introduce extenstion support check by compiler
- Other changes are specific to specific patches. Please look at changes for specific patch.
- Update the commit message:
- drop the dependency from STATIC_ASSERT_UNREACHABLE() implementation.
- Add suggestion to merge arch-specific changes related to __read_mostly.
---
Changes in V7:
- Patch was merged to staging:
[PATCH v6 15/20] xen/riscv: add minimal stuff to processor.h to build full Xen.
- Other changes are specific to specific patches. Please look at changes for specific patch.
---
Changes in V6:
- Update the cover letter message: drop already merged dependecies and add
a new one.
- Patches were merged to staging:
- [PATCH v5 02/23] xen/riscv: use some asm-generic headers ( even v4 was merged to staging branch, I just wasn't apply changes on top of the latest staging branch )
- [PATCH v5 03/23] xen/riscv: introduce nospec.h
- [PATCH v5 10/23] xen/riscv: introduces acrquire, release and full barriers
- Introduce new patches:
- xen/riscv: introduce extenstion support check by compiler
- xen/bitops: put __ffs() and ffz() into linux compatible header
- xen/bitops: implement fls{l}() in common logic
- The following patches were dropped:
- drop some patches related to bitops operations as they were introduced in another
patch series [...]
- introduce new version for generic __ffs(), ffz() and fls{l}().
- Merge patch from patch series "[PATCH v9 0/7] Introduce generic headers" to this patch series as only one patch left in the generic headers patch series and it is more about RISC-V.
- Other changes are specific to specific patches. please look at specific patch.
---
Changes in V5:
- Update the cover letter as one of the dependencies were merged to staging.
- Was introduced asm-generic for atomic ops and separate patches for asm-generic bit ops
- Moved fence.h to separate patch to deal with some patches dependecies on fence.h
- Patches were dropped as they were merged to staging:
* [PATCH v4 03/30] xen: add support in public/hvm/save.h for PPC and RISC-V
* [PATCH v4 04/30] xen/riscv: introduce cpufeature.h
* [PATCH v4 05/30] xen/riscv: introduce guest_atomics.h
* [PATCH v4 06/30] xen: avoid generation of empty asm/iommu.h
* [PATCH v4 08/30] xen/riscv: introduce setup.h
* [PATCH v4 10/30] xen/riscv: introduce flushtlb.h
* [PATCH v4 11/30] xen/riscv: introduce smp.h
* [PATCH v4 15/30] xen/riscv: introduce irq.h
* [PATCH v4 16/30] xen/riscv: introduce p2m.h
* [PATCH v4 17/30] xen/riscv: introduce regs.h
* [PATCH v4 18/30] xen/riscv: introduce time.h
* [PATCH v4 19/30] xen/riscv: introduce event.h
* [PATCH v4 22/30] xen/riscv: define an address of frame table
- Other changes are specific to specific patches. please look at specific patch
---
Changes in V4:
- Update the cover letter message: new patch series dependencies.
- Some patches were merged to staging, so they were dropped in this patch series:
[PATCH v3 09/34] xen/riscv: introduce system.h
[PATCH v3 18/34] xen/riscv: introduce domain.h
[PATCH v3 19/34] xen/riscv: introduce guest_access.h
- Was sent out of this patch series:
[PATCH v3 16/34] xen/lib: introduce generic find next bit operations
- [PATCH v3 17/34] xen/riscv: add compilation of generic find-next-bit.c was droped as CONFIG_GENERIC_FIND_NEXT_BIT was dropped.
- All other changes are specific to a specific patch.
---
Changes in V3:
- Update the cover letter message
- The following patches were dropped as they were merged to staging:
[PATCH v2 03/39] xen/riscv:introduce asm/byteorder.h
[PATCH v2 04/39] xen/riscv: add public arch-riscv.h
[PATCH v2 05/39] xen/riscv: introduce spinlock.h
[PATCH v2 20/39] xen/riscv: define bug frame tables in xen.lds.S
[PATCH v2 34/39] xen: add RISCV support for pmu.h
[PATCH v2 35/39] xen: add necessary headers to common to build full Xen for RISC-V
- Instead of the following patches were introduced new:
[PATCH v2 10/39] xen/riscv: introduce asm/iommu.h
[PATCH v2 11/39] xen/riscv: introduce asm/nospec.h
- remove "asm/" for commit messages which start with "xen/riscv:"
- code style updates.
- add emulation of {cmp}xchg_* for 1 and 2 bytes types.
- code style fixes.
- add SPDX and footer for the newly added headers.
- introduce generic find-next-bit.c.
- some other mionor changes. ( details please find in a patch )
---
Changes in V2:
- Drop the following patches as they are the part of [2]:
[PATCH v1 06/57] xen/riscv: introduce paging.h
[PATCH v1 08/57] xen/riscv: introduce asm/device.h
[PATCH v1 10/57] xen/riscv: introduce asm/grant_table.h
[PATCH v1 12/57] xen/riscv: introduce asm/hypercall.h
[PATCH v1 13/57] xen/riscv: introduce asm/iocap.h
[PATCH v1 15/57] xen/riscv: introduce asm/mem_access.h
[PATCH v1 18/57] xen/riscv: introduce asm/random.h
[PATCH v1 21/57] xen/riscv: introduce asm/xenoprof.h
[PATCH v1 24/57] xen/riscv: introduce asm/percpu.h
[PATCH v1 29/57] xen/riscv: introduce asm/hardirq.h
[PATCH v1 33/57] xen/riscv: introduce asm/altp2m.h
[PATCH v1 38/57] xen/riscv: introduce asm/monitor.h
[PATCH v1 39/57] xen/riscv: introduce asm/numa.h
[PATCH v1 42/57] xen/riscv: introduce asm/softirq.h
- xen/lib.h in most of the cases were changed to xen/bug.h as
mostly functionilty of bug.h is used.
- align arch-riscv.h with Arm's version of it.
- change the Author of commit with introduction of asm/atomic.h.
- update some definition from spinlock.h.
- code style changes.
---
Oleksii Kurochko (17):
xen/riscv: disable unnecessary configs
xen: introduce generic non-atomic test_*bit() xen/bitops: implement fls{l}() in common logic xen/bitops: put __ffs() into linux compatible header xen/riscv: introduce bitops.h
xen/riscv: introduce cmpxchg.h
xen/riscv: introduce io.h
xen/riscv: introduce atomic.h
xen/riscv: introduce monitor.h
xen/riscv: add definition of __read_mostly xen/riscv: add required things to current.h xen/riscv: add minimal stuff to page.h to build full Xen xen/riscv: add minimal stuff to mm.h to build full Xen xen/riscv: introduce vm_event_*() functions xen/riscv: add minimal amount of stubs to build full Xen xen/riscv: enable full Xen build
xen/README: add compiler and binutils versions for RISC-V64
README | 4 + automation/gitlab-ci/build.yaml | 4 + xen/arch/arm/arm64/livepatch.c | 1 - xen/arch/arm/include/asm/arm32/bitops.h | 2 +- xen/arch/arm/include/asm/arm64/bitops.h | 27 +- xen/arch/arm/include/asm/bitops.h | 74 +---- xen/arch/ppc/include/asm/bitops.h | 76 ----- xen/arch/ppc/include/asm/page.h | 2 +- xen/arch/ppc/mm-radix.c | 2 +- xen/arch/riscv/Makefile | 18 +- xen/arch/riscv/arch.mk | 4 - xen/arch/riscv/configs/tiny64_defconfig | 12 +- xen/arch/riscv/early_printk.c | 168 ---------- xen/arch/riscv/include/asm/atomic.h | 281 ++++++++++++++++ xen/arch/riscv/include/asm/bitops.h | 137 ++++++++ xen/arch/riscv/include/asm/cache.h | 2 + xen/arch/riscv/include/asm/cmpxchg.h | 237 ++++++++++++++ xen/arch/riscv/include/asm/config.h | 2 + xen/arch/riscv/include/asm/current.h | 19 ++ xen/arch/riscv/include/asm/domain.h | 2 + xen/arch/riscv/include/asm/io.h | 168 ++++++++++ xen/arch/riscv/include/asm/mm.h | 240 ++++++++++++++ xen/arch/riscv/include/asm/monitor.h | 26 ++ xen/arch/riscv/include/asm/p2m.h | 2 + xen/arch/riscv/include/asm/page.h | 19 ++ xen/arch/riscv/include/asm/types.h | 4 + xen/arch/riscv/mm.c | 52 ++- xen/arch/riscv/setup.c | 10 +- xen/arch/riscv/stubs.c | 415 ++++++++++++++++++++++++ xen/arch/riscv/traps.c | 25 ++ xen/arch/riscv/vm_event.c | 19 ++ xen/arch/x86/include/asm/bitops.h | 36 +- xen/common/bitops.c | 22 ++ xen/drivers/passthrough/arm/smmu-v3.c | 2 + xen/include/asm-generic/atomic-ops.h | 97 ++++++ xen/include/xen/bitops.h | 151 +++++++++ xen/include/xen/linux-compat.h | 2 + xen/include/xen/types.h | 5 + xen/lib/find-next-bit.c | 3 + 39 files changed, 1992 insertions(+), 380 deletions(-) create mode 100644 xen/arch/riscv/include/asm/atomic.h create mode 100644 xen/arch/riscv/include/asm/bitops.h create mode 100644 xen/arch/riscv/include/asm/cmpxchg.h create mode 100644 xen/arch/riscv/include/asm/io.h create mode 100644 xen/arch/riscv/include/asm/monitor.h create mode 100644 xen/arch/riscv/stubs.c create mode 100644 xen/arch/riscv/vm_event.c create mode 100644 xen/include/asm-generic/atomic-ops.h
Signature · 1 line
2.44.0
PATCH v8 1/17 xen/riscv: disable unnecessary configs
Disables unnecessary configs for two cases:
1. By utilizing EXTRA_FIXED_RANDCONFIG for randconfig builds (GitLab CI jobs).
2. By using tiny64_defconfig for non-randconfig builds.
Only configs which lead to compilation issues were disabled.
Remove lines related to disablement of configs which aren't affected compilation:
-# CONFIG_SCHED_CREDIT is not set
-# CONFIG_SCHED_RTDS is not set
-# CONFIG_SCHED_NULL is not set
-# CONFIG_SCHED_ARINC653 is not set
-# CONFIG_TRACEBUFFER is not set
-# CONFIG_HYPFS is not set
-# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set
To allow CONFIG_ARGO build happy it was included <asm/p2m.h> to <asm/domain.h> as ARGO requires p2m_type_t ( p2m_ram_rw ) and declaration of check_get_page_from_gfn() from xen/p2m-common.h.
Also, it was included <xen/errno.h> to asm/p2m.h as after the latter was included to <asm/domain.h> the compilation error that EINVAL, EOPNOTSUPP aren't declared started to occur.
CONFIG_XSM=n as it requires an introduction of:
* boot_module_find_by_kind()
* BOOTMOD_XSM
* struct bootmodule
* copy_from_paddr()
The mentioned things aren't introduced now.
CPU_BOOT_TIME_CPUPOOLS requires an introduction of cpu_physical_id() and acpi_disabled, so it is disabled for now.
---
Changes in V8:
- disabled CPU_BOOT_TIME_CPUPOOLS as it requires an introduction of cpu_physical_id() and acpi_disabled.
- leave XSM disabled, add explanation in the commit message.
- drop HYPFS as the patch was provided to resolve compilation issue when this condif is enabled for RISC-V.
- include asm/p2m.h to asm/domain.h, and xen/errno.h to asm/p2m.h to drop ARGO config from tiny64_defconfing and build.yaml.
- update the commit message.
---
Changes in V7:
- Disable only configs which cause compilation issues.
- Update the commit message.
---
Changes in V6:
- Nothing changed. Only rebase.
---
Changes in V5:
- Rebase and drop duplicated configs in EXTRA_FIXED_RANDCONFIG list
- Update the commit message
---
Changes in V4:
- Nothing changed. Only rebase
---
Changes in V3:
- Remove EXTRA_FIXED_RANDCONFIG for non-randconfig jobs.
For non-randconfig jobs, it is sufficient to disable configs by using the defconfig.
- Remove double blank lines in build.yaml file before archlinux-current-gcc-riscv64-debug
---
Changes in V2:
- update the commit message.
- remove xen/arch/riscv/Kconfig changes.
--- automation/gitlab-ci/build.yaml | 4 ++++ xen/arch/riscv/configs/tiny64_defconfig | 12 +++++------- xen/arch/riscv/include/asm/domain.h | 2 ++ xen/arch/riscv/include/asm/p2m.h | 2 ++ 4 files changed, 13 insertions(+), 7 deletions(-)
automation/gitlab-ci/build.yaml +4 -0
@@ -515,10 +515,14 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools: .riscv-fixed-randconfig: variables: &riscv-fixed-randconfig EXTRA_FIXED_RANDCONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=n CONFIG_COVERAGE=n CONFIG_EXPERT=y CONFIG_GRANT_TABLE=n CONFIG_MEM_ACCESS=n + CONFIG_PERF_COUNTERS=n + CONFIG_LIVEPATCH=n + CONFIG_XSM=n archlinux-current-gcc-riscv64: extends: .gcc-riscv64-cross-build
xen/arch/riscv/configs/tiny64_defconfig +5 -7
@@ -1,12 +1,10 @@ -# CONFIG_SCHED_CREDIT is not set -# CONFIG_SCHED_RTDS is not set -# CONFIG_SCHED_NULL is not set -# CONFIG_SCHED_ARINC653 is not set -# CONFIG_TRACEBUFFER is not set -# CONFIG_HYPFS is not set +# CONFIG_BOOT_TIME_CPUPOOLS is not set # CONFIG_GRANT_TABLE is not set -# CONFIG_SPECULATIVE_HARDEN_ARRAY is not set # CONFIG_MEM_ACCESS is not set +# CONFIG_PERF_COUNTERS is not set +# CONFIG_COVERAGE is not set +# CONFIG_LIVEPATCH is not set +# CONFIG_XSM is not set CONFIG_RISCV_64=y CONFIG_DEBUG=y
xen/arch/riscv/include/asm/domain.h +2 -0
@@ -5,6 +5,8 @@#include <xen/xmalloc.h> #include <public/hvm/params.h> +#include <asm/p2m.h> +struct hvm_domain {uint64_t params[HVM_NR_PARAMS ];
xen/arch/riscv/include/asm/p2m.h +2 -0
@@ -2,6 +2,8 @@#ifndef __ASM_RISCV_P2M_H__#define __ASM_RISCV_P2M_H__ +#include <xen/errno.h> +#include <asm/page-bits.h> #define paddr_bits PADDR_BITS
Signature · 1 line
2.44.0
PATCH v8 2/17 xen: introduce generic non-atomic test_*bit()
In reply to Oleksii KurochkoThe following generic functions were introduced:
* test_bit
* generic__test_and_set_bit
* generic__test_and_clear_bit
* generic__test_and_change_bit
Also, the patch introduces the following generics which are used by the functions mentioned above:
* BITOP_BITS_PER_WORD
* BITOP_MASK
* BITOP_WORD
* BITOP_TYPE
These functions and macros can be useful for architectures that don't have corresponding arch-specific instructions.
Because of that x86 has the following check in the macros test_bit(), __test_and_set_bit(), __test_and_clear_bit(), __test_and_change_bit():
if ( bitop_bad_size(addr) ) __bitop_bad_size();
It was necessary to make bitop bad size check generic too, so arch_check_bitop_size() was introduced and defined as empty for other architectures except x86.
---
The context ("* Find First Set bit. Bits are labelled from 1." in xen/bitops.h )
suggests there's a dependency on an uncommitted patch. It happens becuase the current patch
series is based on Andrew's patch series ( https://lore.kernel.org/xen-devel/[email protected]/T/#t ), but if everything is okay with the current one patch it can be merged without Andrew's patch series being merged.
---
Changes in V8:
- drop __pure for function which uses volatile.
- drop unnessary () in generic__test_and_change_bit() for addr casting.
- update prototype of generic_test_bit() and test_bit(): now it returns bool
instead of int.
- update generic_test_bit() to use BITOP_MASK().
- Deal with fls{l} changes: it should be in the patch with introduced generic fls{l}.
- add a footer with explanation of dependency on an uncommitted patch after Signed-off.
- abstract bitop_size().
- move BITOP_TYPE define to <xen/types.h>.
---
Changes in V7:
- move everything to xen/bitops.h to follow the same approach for all generic
bit ops.
- put together BITOP_BITS_PER_WORD and bitops_uint_t.
- make BITOP_MASK more generic.
- drop #ifdef ... #endif around BITOP_MASK, BITOP_WORD as they are generic
enough.
- drop "_" for generic__{test_and_set_bit,...}().
- drop " != 0" for functions which return bool.
- add volatile during the cast for generic__{...}().
- update the commit message.
- update arch related code to follow the proposed generic approach.
---
Changes in V6:
- Nothing changed ( only rebase )
---
Changes in V5:
- new patch
--- xen/arch/arm/arm64/livepatch.c | 1 - xen/arch/arm/include/asm/bitops.h | 67 ---------------- xen/arch/ppc/include/asm/bitops.h | 52 ------------ xen/arch/ppc/include/asm/page.h | 2 +- xen/arch/ppc/mm-radix.c | 2 +- xen/arch/x86/include/asm/bitops.h | 30 +++---- xen/include/xen/bitops.h | 127 ++++++++++++++++++++++++++++++ xen/include/xen/types.h | 5 ++ 8 files changed, 145 insertions(+), 141 deletions(-)
xen/arch/arm/arm64/livepatch.c +0 -1
@@ -10,7 +10,6 @@#include <xen/mm.h> #include <xen/vmap.h> -#include <asm/bitops.h> #include <asm/byteorder.h> #include <asm/insn.h> #include <asm/livepatch.h>
xen/arch/arm/include/asm/bitops.h +0 -67
79 lines not on this page · raw message
xen/arch/ppc/include/asm/bitops.h +0 -52
70 lines not on this page · raw message
xen/arch/ppc/include/asm/page.h +1 -1
@@ -4,7 +4,7 @@#include <xen/types.h> -#include <asm/bitops.h> +#include <xen/bitops.h> #include <asm/byteorder.h> #define PDE_VALID PPC_BIT(0)
xen/arch/ppc/mm-radix.c +1 -1
@@ -1,11 +1,11 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <xen/bitops.h> #include <xen/init.h> #include <xen/kernel.h> #include <xen/mm.h> #include <xen/types.h> #include <xen/lib.h> -#include <asm/bitops.h> #include <asm/byteorder.h> #include <asm/early_printk.h> #include <asm/page.h>
xen/arch/x86/include/asm/bitops.h +11 -19
@@ -21,6 +21,8 @@extern void __bitop_bad_size (void );#define bitop_bad_size (addr) (sizeof(*(addr)) < 4) +#define arch_check_bitop_size (addr) \ + if ( bitop_bad_size(addr) ) __bitop_bad_size();/** * set_bit - Atomically set a bit in memory
@@ -175,7 +177,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) })/** -* __test_and_set_bit - Set a bit and return its old value +* arch__test_and_set_bit - Set a bit and return its old value * @nr: Bit to set * @addr: Address to count from *
@@ -183,7 +185,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr)* If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static inline int __test_and_set_bit (int nr,void *addr) +static inline int arch__test_and_set_bit (int nr,volatile void *addr) {int oldbit;
@@ -194,10 +196,7 @@ static inline int __test_and_set_bit(int nr, void *addr)return oldbit; } -#define __test_and_set_bit (nr, addr) ({ \ - if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ - __test_and_set_bit(nr, addr); \ -}) +#define arch__test_and_set_bit arch__test_and_set_bit/** * test_and_clear_bit - Clear a bit and return its old value
@@ -224,7 +223,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) })/** -* __test_and_clear_bit - Clear a bit and return its old value +* arch__test_and_clear_bit - Clear a bit and return its old value * @nr: Bit to set * @addr: Address to count from *
@@ -232,7 +231,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr)* If two examples of this operation race, one can appear to succeed * but actually fail. You must protect multiple accesses with a lock. */ -static inline int __test_and_clear_bit (int nr,void *addr) +static inline int arch__test_and_clear_bit (int nr,volatile void *addr) {int oldbit;
@@ -243,13 +242,10 @@ static inline int __test_and_clear_bit(int nr, void *addr)return oldbit; } -#define __test_and_clear_bit (nr, addr) ({ \ - if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ - __test_and_clear_bit(nr, addr); \ -}) +#define arch__test_and_clear_bit arch__test_and_clear_bit/* WARNING: non atomic and it can be reordered! */ -static inline int __test_and_change_bit (int nr,void *addr) +static inline int arch__test_and_change_bit (int nr,volatile void *addr) {int oldbit;
@@ -260,10 +256,7 @@ static inline int __test_and_change_bit(int nr, void *addr)return oldbit; } -#define __test_and_change_bit (nr, addr) ({ \ - if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ - __test_and_change_bit(nr, addr); \ -}) +#define arch__test_and_change_bit arch__test_and_change_bit/** * test_and_change_bit - Change a bit and return its new value
@@ -307,8 +300,7 @@ static inline int variable_test_bit(int nr, const volatile void *addr)return oldbit; } -#define test_bit (nr, addr) ({ \ - if ( bitop_bad_size(addr) ) __bitop_bad_size(); \ +#define arch_test_bit (nr, addr) ({ \ __builtin_constant_p(nr) ? \ constant_test_bit(nr, addr) : \ variable_test_bit(nr, addr); \
xen/include/xen/bitops.h +127 -0
137 lines not on this page · raw message
xen/include/xen/types.h +5 -0
@@ -64,6 +64,11 @@ typedef __u64 __be64; typedef unsigned int __attribute__((__mode__(__pointer__))) uintptr_t; +#ifndef BITOP_TYPE +#define BITOP_BITS_PER_WORD 32 +typedef uint32_t bitop_uint_t ; +#endif +#define test_and_set_bool (b) xchg(&(b), true)#define test_and_clear_bool (b) xchg(&(b), false)
Signature · 1 line
2.44.0
PATCH v8 4/17 xen/bitops: put __ffs() into linux compatible header
In reply to Oleksii KurochkoThe mentioned macros exist only because of Linux compatible purpose.
The patch defines __ffs() in terms of Xen bitops and it is safe to define in this way ( as __ffs() - 1 ) as considering that __ffs() was defined as __builtin_ctzl(x), which has undefined behavior when x=0, so it is assumed that such cases are not encountered in the current code.
To not include <xen/linux-compat.h> to Xen library files __ffs() and __ffz() were defined locally in find-next-bit.c.
Except __ffs() usage in find-next-bit.c only one usage of __ffs() leave in smmu-v3.c. It seems that it __ffs can be changed to ffsl(x)-1 in this file, but to keep smmu-v3.c looks close to linux it was deciced just to define __ffs() in xen/linux-compat.h and include it in smmu-v3.c
---
Changes in V8:
- drop ffz() for PPC as there is no any usage of it and it seems to me that it was introduced only because Arm has it, and Arm uses it only in find-next-bit.c where ffz() was moved to.
- add Acked-by: Shawn Anastasio <[email protected]> for PPC part.
---
Changes in V7:
- introduce ffz(),__ffs() locally in find-next-bit.c
- drop inclusion of <xen/linux-compat.h> in find-next-bit.c.
- update the commit message.
---
Changes in V6:
- new patch for the patch series.
--- xen/arch/arm/include/asm/arm64/bitops.h | 21 --------------------- xen/arch/ppc/include/asm/bitops.h | 21 --------------------- xen/drivers/passthrough/arm/smmu-v3.c | 2 ++ xen/include/xen/linux-compat.h | 2 ++ xen/lib/find-next-bit.c | 3 +++ 5 files changed, 7 insertions(+), 42 deletions(-)
xen/arch/arm/include/asm/arm64/bitops.h +0 -21
@@ -1,27 +1,6 @@#ifndef _ARM_ARM64_BITOPS_H#define _ARM_ARM64_BITOPS_H -/* Based on linux/include/asm-generic/bitops/builtin-__ffs.h */ -/** -* __ffs - find first bit in word. -* @word: The word to search -* -* Undefined if no bit exists, so code should check against 0 first. -*/ -static /*__*/ always_inline unsigned long __ffs (unsigned long word) -{ -return __builtin_ctzl (word); -} - -/* Based on linux/include/asm-generic/bitops/ffz.h */ -/* -* ffz - find first zero in word. -* @word: The word to search -* -* Undefined if no zero exists, so code should check against ~0UL first. -*/ -#define ffz (x) __ffs(~(x)) -static inline int arch_flsl (unsigned long x) {uint64_t ret;
xen/arch/ppc/include/asm/bitops.h +0 -21
@@ -119,15 +119,6 @@ static inline int test_and_set_bit(unsigned int nr, volatile void *addr) (volatile unsigned int *)addr + BITOP_WORD(nr)) != 0; } -/* Based on linux/include/asm-generic/bitops/ffz.h */ -/* -* ffz - find first zero in word. -* @word: The word to search -* -* Undefined if no zero exists, so code should check against ~0UL first. -*/ -#define ffz (x) __ffs(~(x)) -/** * hweightN - returns the hamming weight of a N-bit word * @x: the word to weigh
@@ -139,16 +130,4 @@ static inline int test_and_set_bit(unsigned int nr, volatile void *addr)#define hweight16 (x) __builtin_popcount((uint16_t)(x))#define hweight8 (x) __builtin_popcount((uint8_t)(x)) -/* Based on linux/include/asm-generic/bitops/builtin-__ffs.h */ -/** -* __ffs - find first bit in word. -* @word: The word to search -* -* Undefined if no bit exists, so code should check against 0 first. -*/ -static always_inline unsigned long __ffs (unsigned long word) -{ -return __builtin_ctzl (word); -} -#endif /* _ASM_PPC_BITOPS_H */
xen/drivers/passthrough/arm/smmu-v3.c +2 -0
@@ -72,12 +72,14 @@*/ #include <xen/acpi.h> +#include <xen/bitops.h> #include <xen/config.h> #include <xen/delay.h> #include <xen/errno.h> #include <xen/err.h> #include <xen/irq.h> #include <xen/lib.h> +#include <xen/linux-compat.h> #include <xen/list.h> #include <xen/mm.h> #include <xen/rbtree.h>
xen/include/xen/linux-compat.h +2 -0
@@ -19,4 +19,6 @@ typedef int64_t __s64;typedef paddr_t phys_addr_t ; +#define __ffs (x) (ffsl(x) - 1) +#endif /* __XEN_LINUX_COMPAT_H__ */
xen/lib/find-next-bit.c +3 -0
@@ -12,6 +12,9 @@#include <asm/byteorder.h> +#define __ffs (x) (ffsl(x) - 1) +#define ffz (x) __ffs(~(x)) +#ifndef find_next_bit/* * Find the next set bit in a memory region.
Signature · 1 line
2.44.0
PATCH v8 6/17 xen/riscv: introduce cmpxchg.h
In reply to Oleksii KurochkoThe header was taken from Linux kernl 6.4.0-rc1.
Addionally, were updated:
* add emulation of {cmp}xchg for 1/2 byte types using 32-bit atomic access.
* replace tabs with spaces
* replace __* variale with *__
* introduce generic version of xchg_* and cmpxchg_*.
* drop {cmp}xchg{release,relaxed,acquire} as Xen doesn't use them
* drop barries and use instruction suffixices instead ( .aq, .rl, .aqrl )
Implementation of 4- and 8-byte cases were updated according to the spec:
```
....
Linux Construct RVWMO AMO Mapping
...
atomic <op> amo<op>.{w|d}.aqrl
Linux Construct RVWMO LR/SC Mapping
...
atomic <op> loop: lr.{w|d}.aq; <op>; sc.{w|d}.aqrl; bnez loop
Table A.5: Mappings from Linux memory primitives to RISC-V primitives
```The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1].
RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions:
- .aq: The LR/SC sequence can be given acquire semantics by
setting the aq bit on the LR instruction.
- .rl: The LR/SC sequence can be given release semantics by
setting the rl bit on the SC instruction.
- .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart.
Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance.
Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2]
[1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
[2] https://lore.kernel.org/linux-riscv/[email protected]/
---
Changes in V8:
- use __bad_{xchg,cmpxch}(ptr,size) insetead of STATIC_ASSERT_UNREACHABLE() to
make this patch be independent from the macros that haven't been committed yet
and may never be.
---
Changes in V7:
- replace __*() -> _*() in cmpxchg.h
- add () around ptr in _amoswap_generic(), emulate_xchg_1_2()
- fix typos
- code style fixes.
- refactor emulate_xcgh_1_2():
- add parentheses for new argument.
- use instead of constant 0x4 -> sizeof(*aligned_ptr).
- add alignment_mask to save sizeof(*aligned_ptr) - sizeof(*(ptr));
- s/CONFIG_32BIT/CONFIG_RISCV_32
- drop unnecessary parentheses in xchg()
- drop register in _generic_cmpxchg()
- refactor and update prototype of _generic_cmpxchg():
add named operands, return value instead of passing ret as an argument, drop %z and J
constraints for mask operand as it can't be zero
- refactor and code style fixes in emulate_cmpxchg_1_2():
- add explanatory comment for emulate_cmpxchg_1_2().
- add parentheses for old and new arguments.
- use instead of constant 0x4 -> sizeof(*aligned_ptr).
- add alignment_mask to save sizeof(*aligned_ptr) - sizeof(*(ptr));
- drop unnessary parenthesses in cmpxchg().
- update the commit message.
- s/__asm__ __volatile__/asm volatile
---
Changes in V6:
- update the commit message? ( As before I don't understand this point. Can you give an example of what sort of opcode / instruction is missing?)
- Code style fixes
- change sizeof(*ptr) -> sizeof(*(ptr))
- update operands names and some local variables for macros emulate_xchg_1_2() and emulate_cmpxchg_1_2()
- drop {cmp}xchg_{relaxed,acquire,release) versions as they aren't needed for Xen
- update __amoswap_generic() prototype and defintion: drop pre and post barries.
- update emulate_xchg_1_2() prototype and definion: add lr_sfx, drop pre and post barries.
- rename __xchg_generic to __xchg(), make __xchg as static inline function to be able to "#ifndef CONFIG_32BIT case 8:... "
---
Changes in V5:
- update the commit message.
- drop ALIGN_DOWN().
- update the definition of emulate_xchg_1_2():
- lr.d -> lr.w, sc.d -> sc.w.
- drop ret argument.
- code style fixes around asm volatile.
- update prototype.
- use asm named operands.
- rename local variables.
- add comment above the macros
- update the definition of __xchg_generic:
- rename to __xchg()
- transform it to static inline
- code style fixes around switch()
- update prototype.
- redefine cmpxchg()
- update emulate_cmpxchg_1_2():
- update prototype
- update local variables names and usage of them
- use name asm operands.
- add comment above the macros
- drop pre and post, and use .aq,.rl, .aqrl suffixes.
- drop {cmp}xchg_{relaxed, aquire, release} as they are not used by Xen.
- drop unnessary details in comment above emulate_cmpxchg_1_2()
---
Changes in V4:
- Code style fixes.
- enforce in __xchg_*() has the same type for new and *ptr, also "\n"
was removed at the end of asm instruction.
- dependency from https://lore.kernel.org/xen-devel/[email protected]/
- switch from ASSERT_UNREACHABLE to STATIC_ASSERT_UNREACHABLE().
- drop xchg32(ptr, x) and xchg64(ptr, x) as they aren't used.
- drop cmpxcg{32,64}_{local} as they aren't used.
- introduce generic version of xchg_* and cmpxchg_*.
- update the commit message.
---
Changes in V3:
- update the commit message
- add emulation of {cmp}xchg_... for 1 and 2 bytes types
---
Changes in V2:
- update the comment at the top of the header.
- change xen/lib.h to xen/bug.h.
- sort inclusion of headers properly.
--- xen/arch/riscv/include/asm/cmpxchg.h | 237 +++++++++++++++++++++++++++ xen/arch/riscv/include/asm/config.h | 2 + 2 files changed, 239 insertions(+) create mode 100644 xen/arch/riscv/include/asm/cmpxchg.h
xen/arch/riscv/include/asm/cmpxchg.h new file +237 -0
@@ -0,0 +1,237 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2014 Regents of the University of California */ + +#ifndef _ASM_RISCV_CMPXCHG_H +#define _ASM_RISCV_CMPXCHG_H + +#include <xen/compiler.h> +#include <xen/lib.h> + +#include <asm/fence.h> +#include <asm/io.h> +#include <asm/system.h> + +#define _amoswap_generic (ptr, new, ret, sfx) \ + asm volatile ( \ + " amoswap" sfx " %0, %2, %1" \ + : "=r" (ret), "+A" (*(ptr)) \ + : "r" (new) \ + : "memory" ); + +/* +* For LR and SC, the A extension requires that the address held in rs1 be +* naturally aligned to the size of the operand (i.e., eight-byte aligned +* for 64-bit words and four-byte aligned for 32-bit words). +* If the address is not naturally aligned, an address-misaligned exception +* or an access-fault exception will be generated. +* +* Thereby: +* - for 1-byte xchg access the containing word by clearing low two bits. +* - for 2-byte xchg access the containing word by clearing bit 1. +* +* If resulting 4-byte access is still misalgined, it will fault just as +* non-emulated 4-byte access would. +*/ +#define emulate_xchg_1_2 (ptr, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + unsigned int new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)(ptr) & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[old], %[ptr_]\n" \ + " andn %[scratch], %[old], %[mask]\n" \ + " or %[scratch], %[scratch], %z[new_]\n" \ + " sc.w" sc_sfx " %[scratch], %[scratch], %[ptr_]\n" \ + " bnez %[scratch], 0b\n" \ + : [old] "=&r" (old), [scratch] "=&r" (scratch), \ + [ptr_] "+A" (*aligned_ptr) \ + : [new_] "rJ" (new_), [mask] "r" (mask) \ + : "memory" ); \ + \ + (__typeof__(*(ptr)))((old & mask) >> new_val_bit); \ +}) + +/* +* This function doesn't exist, so you'll get a linker error +* if something tries to do an invalid xchg(). +*/ +extern void __bad_xchg (volatile void *ptr,int size); + +static always_inline unsigned long __xchg (volatile void *ptr,unsigned long new,int size) +{ +unsigned long ret; + +switch ( size ) + { +case 1 : + ret =emulate_xchg_1_2 ((volatile uint8_t *)ptr, new,".aq" ,".aqrl" ); +break ; +case 2 : + ret =emulate_xchg_1_2 ((volatile uint16_t *)ptr, new,".aq" ,".aqrl" ); +break ; +case 4 : +_amoswap_generic ((volatile uint32_t *)ptr, new, ret,".w.aqrl" ); +break ; +#ifndef CONFIG_RISCV_32 +case 8 : +_amoswap_generic ((volatile uint64_t *)ptr, new, ret,".d.aqrl" ); +break ; +#endif +default : +__bad_xchg (ptr, size), ret =0 ; + } + +return ret; +} + +#define xchg (ptr, x) \ +({ \ + __typeof__(*(ptr)) n_ = (x); \ + (__typeof__(*(ptr))) \ + __xchg((ptr), (unsigned long)n_, sizeof(*(ptr))); \ +}) + +#define _generic_cmpxchg (ptr, old, new, lr_sfx, sc_sfx) \ + ({ \ + unsigned int rc; \ + unsigned long ret; \ + unsigned long mask = GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0); \ + asm volatile ( \ + "0: lr" lr_sfx " %[ret], %[ptr_]\n" \ + " and %[ret], %[ret], %[mask]\n" \ + " bne %[ret], %z[old_], 1f\n" \ + " sc" sc_sfx " %[rc], %z[new_], %[ptr_]\n" \ + " bnez %[rc], 0b\n" \ + "1:\n" \ + : [ret] "=&r" (ret), [rc] "=&r" (rc), [ptr_] "+A" (*ptr) \ + : [old_] "rJ" (old), [new_] "rJ" (new), [mask] "r" (mask) \ + : "memory" ); \ + ret; \ + }) + +/* +* For LR and SC, the A extension requires that the address held in rs1 be +* naturally aligned to the size of the operand (i.e., eight-byte aligned +* for 64-bit words and four-byte aligned for 32-bit words). +* If the address is not naturally aligned, an address-misaligned exception +* or an access-fault exception will be generated. +* +* Thereby: +* - for 1-byte xchg access the containing word by clearing low two bits +* - for 2-byte xchg ccess the containing word by clearing first bit. +* +* If resulting 4-byte access is still misalgined, it will fault just as +* non-emulated 4-byte access would. +* +* old_val was casted to unsigned long for cmpxchgptr() +*/ +#define emulate_cmpxchg_1_2 (ptr, old, new, lr_sfx, sc_sfx) \ +({ \ + uint32_t *aligned_ptr; \ + unsigned long alignment_mask = sizeof(*aligned_ptr) - sizeof(*(ptr)); \ + uint8_t new_val_bit = \ + ((unsigned long)(ptr) & alignment_mask) * BITS_PER_BYTE; \ + unsigned long mask = \ + GENMASK(((sizeof(*(ptr))) * BITS_PER_BYTE) - 1, 0) << new_val_bit; \ + unsigned int old_ = (old) << new_val_bit; \ + unsigned int new_ = (new) << new_val_bit; \ + unsigned int old_val; \ + unsigned int scratch; \ + \ + aligned_ptr = (uint32_t *)((unsigned long)ptr & ~alignment_mask); \ + \ + asm volatile ( \ + "0: lr.w" lr_sfx " %[scratch], %[ptr_]\n" \ + " and %[old_val], %[scratch], %[mask]\n" \ + " bne %[old_val], %z[old_], 1f\n" \ +/* the following line is an equivalent to: \ +* scratch = old_val & ~mask; \ +* And to elimanate one ( likely register ) input it was decided \ +* to use: \ +* scratch = old_val ^ scratch \ +*/ \ +" xor %[scratch], %[old_val], %[scratch]\n" \ +" or %[scratch], %[scratch], %z[new_]\n" \ +" sc.w" sc_sfx" %[scratch], %[scratch], %[ptr_]\n" \ +" bnez %[scratch], 0b\n" \ +"1:\n" \ + : [old_val] "=&r" (old_val), [scratch] "=&r" (scratch), \ +[ptr_] " +A " (*aligned_ptr) \ +: [old_] " rJ" (old_), [new_] " rJ" (new_), \ +[mask] " r" (mask) \ +: " memory" ); \ +\ +(__typeof__(*(ptr)))((unsigned long)old_val >> new_val_bit); \ +}) + +/* This function doesn't exist, so you'll get a linker error + if something tries to do an invalid cmpxchg(). */ +extern unsigned long __bad_cmpxchg(volatile void *ptr, int size); + +/* +* Atomic compare and exchange. Compare OLD with MEM, if identical, +* store NEW in MEM. Return the initial value in MEM. Success is +* indicated by comparing RETURN with OLD. +*/ +static always_inline unsigned long __cmpxchg (volatile void *ptr, +unsigned long old, +unsigned long new, +int size) +{ +unsigned long ret; + +switch ( size ) + { +case 1 : + ret =emulate_cmpxchg_1_2 ((volatile uint8_t *)ptr, old, new, +".aq" ,".aqrl" ); +break ; +case 2 : + ret =emulate_cmpxchg_1_2 ((volatile uint16_t *)ptr, old, new, +".aq" ,".aqrl" ); +break ; +case 4 : + ret =_generic_cmpxchg ((volatile uint32_t *)ptr, old, new, +".w.aq" ,".w.aqrl" ); +break ; +#ifndef CONFIG_32BIT +case 8 : + ret =_generic_cmpxchg ((volatile uint64_t *)ptr, old, new, +".d.aq" ,".d.aqrl" ); +break ; +#endif +default : +return __bad_cmpxchg (ptr, size); + } + +return ret; +} + +#define cmpxchg (ptr, o, n) \ +({ \ + __typeof__(*(ptr)) o_ = (o); \ + __typeof__(*(ptr)) n_ = (n); \ + (__typeof__(*(ptr))) \ + __cmpxchg((ptr), (unsigned long)o_, (unsigned long)n_, \ + sizeof(*(ptr))); \ +}) + +#endif /* _ASM_RISCV_CMPXCHG_H */ + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
xen/arch/riscv/include/asm/config.h +2 -0
@@ -119,6 +119,8 @@#define BITS_PER_LLONG 64 +#define BITS_PER_BYTE 8 +/* xen_ulong_t is always 64 bits */ #define BITS_PER_XEN_ULONG 64
Signature · 1 line
2.44.0
PATCH v8 8/17 xen/riscv: introduce atomic.h
In reply to Oleksii KurochkoInitially the patch was introduced by Bobby, who takes the header from Linux kernel.
The following changes were done on top of Bobby's changes:
- atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated to use__*xchg_generic()
- drop casts in write_atomic() as they are unnecessary
- drop introduction of WRITE_ONCE() and READ_ONCE().
Xen provides ACCESS_ONCE()
- remove zero-length array access in read_atomic()
- drop defines similar to pattern:
#define atomic_add_return_relaxed atomic_add_return_relaxed
- move not RISC-V specific functions to asm-generic/atomics-ops.h
- drop atomic##prefix##_{cmp}xchg_{release, aquire, release}() as they are not used in Xen.
- update the defintion of atomic##prefix##_{cmp}xchg according to {cmp}xchg() implementation in Xen.
- some ATOMIC_OP() macros were updated:
- drop size argument for ATOMIC_OP which defines atomic##prefix##_xchg()
and atomic##prefix##_cmpxchg().
- drop c_op argument for ATOMIC_OPS which defines ATOMIC_OPS(and, and), ATOMIC_OPS( or, or), ATOMIC_OPS(xor, xor), ATOMIC_OPS(add, add, +), ATOMIC_OPS(sub, add, -) as c_op is always "+" for them.
- drop "" from definition of __atomic_{acquire/release"}_fence.
The current implementation is the same with 8e86f0b409a4 ("arm64: atomics: fix use of acquire + release for full barrier semantics") [1].
RISC-V could combine acquire and release into the SC instructions and it could reduce a fence instruction to gain better performance. Here is related description from RISC-V ISA 10.2 Load-Reserved/Store-Conditional Instructions:
- .aq: The LR/SC sequence can be given acquire semantics by
setting the aq bit on the LR instruction.
- .rl: The LR/SC sequence can be given release semantics by
setting the rl bit on the SC instruction.
- .aqrl: Setting the aq bit on the LR instruction, and setting both the aq and the rl bit on the SC instruction makes the LR/SC sequence sequentially consistent, meaning that it cannot be reordered with earlier or later memory operations from the same hart.
Software should not set the rl bit on an LR instruction unless the aq bit is also set, nor should software set the aq bit on an SC instruction unless the rl bit is also set. LR.rl and SC.aq instructions are not guaranteed to provide any stronger ordering than those with both bits clear, but may result in lower performance.
Also, I way of transforming ".rl + full barrier" to ".aqrl" was approved by (the author of the RVWMO spec) [2]
[1] https://patchwork.kernel.org/project/linux-arm-kernel/patch/[email protected]/
[2] https://lore.kernel.org/linux-riscv/[email protected]/
---
Changes in V8:
- drop "" in __atomic_{acquire, release}_fence().
- code style fixes in atomic##prefix##_##op##_return(): indentation.
- drop an unary_op argument ("+") for ATOMIC_OPS(and, and), ATOMIC_OPS( or, or), ATOMIC_OPS(xor, xor) and use "+" directly inside definition of ATOMIC_OPS().
- drop c_op for ATOMIC_OPS(add, add, +) and ATOMIC_OPS(sub, add, -) as it is always "+" for now. Just use "+" inside definition of ATOMIC_OPS().
- drop size argument for ATOMIC_OP() defintions of atomic##prefix##_{xchg,cmpxchg}()
- update the commit message.
---
Changes in V7:
- drop relaxed version of atomic ops as they are not used.
- update the commit message
- code style fixes
- refactor functions write_atomic(), add_sized() to be able to use #ifdef CONFIG_RISCV_32 ... #endif for {write,read}q().
- update ATOMIC_OPS to receive unary operator.
- update the header on top of atomic-ops.h.
- some minor movements of function inside atomic-ops.h header.
---
Changes in V6:
- drop atomic##prefix##_{cmp}xchg_{release, aquire, relaxed} as they aren't used
by Xen
- code style fixes.
- %s/__asm__ __volatile__/asm volatile
- add explanational comments.
- move inclusion of "#include <asm-generic/atomic-ops.h>" further down in atomic.h header.
---
Changes in V5:
- fence.h changes were moved to separate patch as patches related to io.h and cmpxchg.h, which are dependecies for this patch, also needed changes in fence.h
- remove accessing of zero-length array
- drops cast in write_atomic()
- drop introduction of WRITE_ONCE() and READ_ONCE().
- drop defines similar to pattern #define atomic_add_return_relaxed atomic_add_return_relaxed
- Xen code style fixes
- move not RISC-V specific functions to asm-generic/atomics-ops.h
---
Changes in V4:
- do changes related to the updates of [PATCH v3 13/34] xen/riscv: introduce cmpxchg.h
- drop casts in read_atomic_size(), write_atomic(), add_sized()
- tabs -> spaces
- drop #ifdef CONFIG_SMP ... #endif in fence.ha as it is simpler to handle NR_CPUS=1 the same as NR_CPUS>1 with accepting less than ideal performance.
---
Changes in V3:
- update the commit message
- add SPDX for fence.h
- code style fixes
- Remove /* TODO: ... */ for add_sized macros. It looks correct to me.
- re-order the patch
- merge to this patch fence.h
---
Changes in V2:
- Change an author of commit. I got this header from Bobby's old repo.
---
xen/arch/riscv/include/asm/atomic.h | 281 +++++++++++++++++++++++++++ xen/include/asm-generic/atomic-ops.h | 97 +++++++++ 2 files changed, 378 insertions(+) create mode 100644 xen/arch/riscv/include/asm/atomic.h create mode 100644 xen/include/asm-generic/atomic-ops.h
xen/arch/riscv/include/asm/atomic.h new file +281 -0
@@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Taken and modified from Linux. +* +* The following changes were done: +* - * atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated +* to use__*xchg_generic() +* - drop casts in write_atomic() as they are unnecessary +* - drop introduction of WRITE_ONCE() and READ_ONCE(). +* Xen provides ACCESS_ONCE() +* - remove zero-length array access in read_atomic() +* - drop defines similar to pattern +* #define atomic_add_return_relaxed atomic_add_return_relaxed +* - move not RISC-V specific functions to asm-generic/atomics-ops.h +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Copyright (C) 2012 Regents of the University of California +* Copyright (C) 2017 SiFive +* Copyright (C) 2024 Vates SAS +*/ + +#ifndef _ASM_RISCV_ATOMIC_H +#define _ASM_RISCV_ATOMIC_H + +#include <xen/atomic.h> + +#include <asm/cmpxchg.h> +#include <asm/fence.h> +#include <asm/io.h> +#include <asm/system.h> + +void __bad_atomic_size (void ); + +/* +* Legacy from Linux kernel. For some reason they wanted to have ordered +* read/write access. Thereby read* is used instead of read*_cpu() +*/ +static always_inline void read_atomic_size(const volatile void *p, +void *res, +unsigned int size) +{ +switch ( size ) + { +case 1 : *(uint8_t *)res =readb (p);break ; +case 2 : *(uint16_t *)res =readw (p);break ; +case 4 : *(uint32_t *)res =readl (p);break ; +#ifndef CONFIG_RISCV_32 +case 8 : *(uint32_t *)res =readq (p);break ; +#endif +default :__bad_atomic_size ();break ; + } +} + +#define read_atomic (p) ({ \ + union { typeof(*(p)) val; char c[sizeof(*(p))]; } x_; \ + read_atomic_size(p, x_.c, sizeof(*(p))); \ + x_.val; \ +}) + +static always_inline void _write_atomic(volatile void *p, +unsigned long x,unsigned int size) +{ +switch ( size ) + { +case 1 :writeb (x, p);break ; +case 2 :writew (x, p);break ; +case 4 :writel (x, p);break ; +#ifndef CONFIG_RISCV_32 +case 8 :writeq (x, p);break ; +#endif +default :__bad_atomic_size ();break ; + } +} + +#define write_atomic (p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _write_atomic((p), x_, sizeof(*(p))); \ + x_; \ +}) + +static always_inline void _add_sized(volatile void *p, +unsigned long x,unsigned int size) +{ +switch ( size ) + { +case 1 : + { +volatile uint8_t *ptr = (volatile uint8_t *)p; +write_atomic (ptr,read_atomic (ptr) + x); +break ; + } +case 2 : + { +volatile uint16_t *ptr = (volatile uint16_t *)p; +write_atomic (ptr,read_atomic (ptr) + x); +break ; + } +case 4 : + { +volatile uint32_t *ptr = (volatile uint32_t *)p; +write_atomic (ptr,read_atomic (ptr) + x); +break ; + } +#ifndef CONFIG_RISCV_32 +case 8 : + { +volatile uint64_t *ptr = (volatile uint64_t *)p; +write_atomic (ptr,read_atomic (ptr) + x); +break ; + } +#endif +default :__bad_atomic_size ();break ; + } +} + +#define add_sized (p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _add_sized((p), x_, sizeof(*(p))); \ +}) + +#define __atomic_acquire_fence () \ + asm volatile ( RISCV_ACQUIRE_BARRIER ::: "memory" ) + +#define __atomic_release_fence () \ + asm volatile ( RISCV_RELEASE_BARRIER ::: "memory" ) + +/* +* First, the atomic ops that have no ordering constraints and therefor don't +* have the AQ or RL bits set. These don't return anything, so there's only +* one version to worry about. +*/ +#define ATOMIC_OP (op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +void atomic##prefix##_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + asm volatile ( \ + " amo" #asm_op "." #asm_type " zero, %1, %0" \ + : "+A" (v->counter) \ + : "r" (unary_op i) \ + : "memory" ); \ +} \ + +/* +* Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why +* last argument for ATOMIC_OP isn't used. +*/ +#define ATOMIC_OPS (op, asm_op, unary_op) \ + ATOMIC_OP (op, asm_op, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) +ATOMIC_OPS(and, and, +) +ATOMIC_OPS( or, or, +) +ATOMIC_OPS(xor, xor, +) + +#undef ATOMIC_OP +#undef ATOMIC_OPS + +#include <asm-generic/atomic-ops.h> + +/* + * Atomic ops that have ordered variant. + * There's two flavors of these: the arithmatic ops have both fetch and return + * versions, while the logical ops only have fetch versions. + */ +#define ATOMIC_FETCH_OP(op, asm_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_fetch_##op(c_type i, atomic##prefix##_t *v) \ +{ \ + register c_type ret; \ + asm volatile ( \ + " amo" #asm_op "." #asm_type ".aqrl %1, %2, %0" \ + : "+A" (v->counter), "=r" (ret) \ + : "r" (unary_op i) \ + : "memory" ); \ + return ret; \ +} + +#define ATOMIC_OP_RETURN(op, asm_op, c_op, unary_op, asm_type, c_type, prefix) \ +static inline \ +c_type atomic##prefix##_##op##_return(c_type i, atomic##prefix##_t *v) \ +{ \ + return atomic##prefix##_fetch_##op(i, v) c_op (unary_op i); \ +} + +/* + * Only CONFIG_GENERIC_ATOMIC64=y was ported to Xen that is the reason why + * last argument of ATOMIC_FETCH_OP, ATOMIC_OP_RETURN isn't used. + */ +#define ATOMIC_OPS(op, asm_op, unary_op) \ + ATOMIC_FETCH_OP( op, asm_op, unary_op, w, int, ) \ + ATOMIC_OP_RETURN(op, asm_op, +, unary_op, w, int, ) + +ATOMIC_OPS(add, add, +) +ATOMIC_OPS(sub, add, -) + +#undef ATOMIC_OPS + +#define ATOMIC_OPS(op, asm_op) \ + ATOMIC_FETCH_OP(op, asm_op, +, w, int, ) + +ATOMIC_OPS(and, and) +ATOMIC_OPS( or, or) +ATOMIC_OPS(xor, xor) + +#undef ATOMIC_OPS + +#undef ATOMIC_FETCH_OP +#undef ATOMIC_OP_RETURN + +/* This is required to provide a full barrier on success. */ +static inline int atomic_add_unless(atomic_t *v, int a, int u) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " beq %[p], %[u], 1f\n" + " add %[rc], %[p], %[a]\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [a] "r" (a), [u] "r" (u) + : "memory"); + return prev; +} + +static inline int atomic_sub_if_positive(atomic_t *v, int offset) +{ + int prev, rc; + + asm volatile ( + "0: lr.w %[p], %[c]\n" + " sub %[rc], %[p], %[o]\n" + " bltz %[rc], 1f\n" + " sc.w.aqrl %[rc], %[rc], %[c]\n" + " bnez %[rc], 0b\n" + "1:\n" + : [p] "=&r" (prev), [rc] "=&r" (rc), [c] "+A" (v->counter) + : [o] "r" (offset) + : "memory" ); + return prev - offset; +} + +/* + * atomic_{cmp,}xchg is required to have exactly the same ordering semantics as + * {cmp,}xchg and the operations that return. + */ +#define ATOMIC_OP(c_t, prefix) \ +static inline \ +c_t atomic##prefix##_xchg(atomic##prefix##_t *v, c_t n) \ +{ \ + return __xchg(&v->counter, n, sizeof(c_t)); \ +} \ +static inline \ +c_t atomic##prefix##_cmpxchg(atomic##prefix##_t *v, c_t o, c_t n) \ +{ \ + return __cmpxchg(&v->counter, o, n, sizeof(c_t)); \ +} + +#define ATOMIC_OPS () \ + ATOMIC_OP(int, ) + +ATOMIC_OPS() + +#undef ATOMIC_OPS +#undef ATOMIC_OP + +#endif /* _ASM_RISCV_ATOMIC_H */ + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
xen/include/asm-generic/atomic-ops.h new file +97 -0
97 lines not on this page · raw message
Signature · 1 line
2.44.0
PATCH v8 5/17 xen/riscv: introduce bitops.h
In reply to Oleksii KurochkoTaken from Linux-6.4.0-rc1
Xen's bitops.h consists of several Linux's headers:
* linux/arch/include/asm/bitops.h:
* The following function were removed as they aren't used in Xen:
* test_and_set_bit_lock
* clear_bit_unlock
* __clear_bit_unlock
* The following functions were renamed in the way how they are used by common code:
* __test_and_set_bit
* __test_and_clear_bit
* The declaration and implementation of the following functios were updated to make Xen build happy:
* clear_bit
* set_bit
* __test_and_clear_bit
* __test_and_set_bit
---
Changes in V8:
- define bitop_uint_t in <asm/types.h> after the changes in patch related to introduction of "introduce generic non-atomic test_*bit()".
- drop duplicated __set_bit() and __clear_bit().
- drop duplicated comment: /* Based on linux/arch/include/asm/bitops.h */.
- update type of res and mask in test_and_op_bit_ord(): unsigned long -> bitop_uint_t.
- drop 1 padding blank in test_and_op_bit_ord().
- update definition of test_and_set_bit(),test_and_clear_bit(),test_and_change_bit:
change return type to bool.
- change addr argument type of test_and_change_bit(): unsigned long * -> void *.
- move test_and_change_bit() closer to other test_and-s function.
- Code style fixes: tabs -> space.
- s/#undef __op_bit/#undef op_bit.
- update the commit message: delete information about generic-non-atomic.h changes as now it is a separate patch.
---
Changes in V7:
- Update the commit message.
- Drop "__" for __op_bit and __op_bit_ord as they are atomic.
- add comment above __set_bit and __clear_bit about why they are defined as atomic.
- align bitops_uint_t with __AMO().
- make changes after generic non-atomic test_*bit() were changed.
- s/__asm__ __volatile__/asm volatile
---
Changes in V6:
- rebase clean ups were done: drop unused asm-generic includes
---
Changes in V5:
- new patch
--- xen/arch/riscv/include/asm/bitops.h | 137 ++++++++++++++++++++++++++++ xen/arch/riscv/include/asm/types.h | 4 + 2 files changed, 141 insertions(+) create mode 100644 xen/arch/riscv/include/asm/bitops.h
xen/arch/riscv/include/asm/bitops.h new file +137 -0
@@ -0,0 +1,137 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* Copyright (C) 2012 Regents of the University of California */ + +#ifndef _ASM_RISCV_BITOPS_H +#define _ASM_RISCV_BITOPS_H + +#include <asm/system.h> + +#if BITS_PER_LONG ==64 +#define __AMO (op) "amo" #op ".d" +#elif BITS_PER_LONG ==32 +#define __AMO (op) "amo" #op ".w" +#else +#error "Unexpected BITS_PER_LONG" +#endif + +/* Based on linux/arch/include/asm/bitops.h */ + +/* +* Non-atomic bit manipulation. +* +* Implemented using atomics to be interrupt safe. Could alternatively +* implement with local interrupt masking. +*/ +#define __set_bit (n, p) set_bit(n, p) +#define __clear_bit (n, p) clear_bit(n, p) + +#define test_and_op_bit_ord (op, mod, nr, addr, ord) \ +({ \ + bitop_uint_t res, mask; \ + mask = BITOP_MASK(nr); \ + asm volatile ( \ + __AMO(op) #ord " %0, %2, %1" \ + : "=r" (res), "+A" (addr[BITOP_WORD(nr)]) \ + : "r" (mod(mask)) \ + : "memory"); \ + ((res & mask) != 0); \ +}) + +#define op_bit_ord (op, mod, nr, addr, ord) \ + asm volatile ( \ + __AMO(op) #ord " zero, %1, %0" \ + : "+A" (addr[BITOP_WORD(nr)]) \ + : "r" (mod(BITOP_MASK(nr))) \ + : "memory"); + +#define test_and_op_bit (op, mod, nr, addr) \ + test_and_op_bit_ord(op, mod, nr, addr, .aqrl) +#define op_bit (op, mod, nr, addr) \ + op_bit_ord(op, mod, nr, addr, ) + +/* Bitmask modifiers */ +#define NOP (x) (x) +#define NOT (x) (~(x)) + +/** +* test_and_set_bit - Set a bit and return its old value +* @nr: Bit to set +* @addr: Address to count from +*/ +static inline bool test_and_set_bit (int nr,volatile void *p) +{ +volatile bitop_uint_t *addr = p; + +return test_and_op_bit (or,NOP , nr, addr); +} + +/** +* test_and_clear_bit - Clear a bit and return its old value +* @nr: Bit to clear +* @addr: Address to count from +*/ +static inline bool test_and_clear_bit (int nr,volatile void *p) +{ +volatile bitop_uint_t *addr = p; + +return test_and_op_bit (and,NOT , nr, addr); +} + +/** +* test_and_change_bit - Toggle (change) a bit and return its old value +* @nr: Bit to change +* @addr: Address to count from +* +* This operation is atomic and cannot be reordered. +* It also implies a memory barrier. +*/ +static inline bool test_and_change_bit (int nr,volatile void *p) +{ +volatile bitop_uint_t *addr = p; + +return test_and_op_bit (xor,NOP , nr, addr); +} + +/** +* set_bit - Atomically set a bit in memory +* @nr: the bit to set +* @addr: the address to start counting from +* +* Note that @nr may be almost arbitrarily large; this function is not +* restricted to acting on a single-word quantity. +*/ +static inline void set_bit (int nr,volatile void *p) +{ +volatile bitop_uint_t *addr = p; + +op_bit (or,NOP , nr, addr); +} + +/** +* clear_bit - Clears a bit in memory +* @nr: Bit to clear +* @addr: Address to start counting from +*/ +static inline void clear_bit (int nr,volatile void *p) +{ +volatile bitop_uint_t *addr = p; + +op_bit (and,NOT , nr, addr); +} + +#undef test_and_op_bit +#undef op_bit +#undef NOP +#undef NOT +#undef __AMO + +#endif /* _ASM_RISCV_BITOPS_H */ + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
xen/arch/riscv/include/asm/types.h +4 -0
@@ -25,6 +25,10 @@ typedef u64 register_t;#endif +#define BITOP_TYPE +#define BITOP_BITS_PER_WORD BITS_PER_LONG +typedef unsigned long bitop_uint_t ; +#endif /* __RISCV_TYPES_H__ */ /* * Local variables:
Signature · 1 line
2.44.0
PATCH v8 7/17 xen/riscv: introduce io.h
In reply to Oleksii KurochkoThe header taken form Linux 6.4.0-rc1 and is based on arch/riscv/include/asm/mmio.h with the following changes:
- drop forcing of endianess for read*(), write*() functions as
no matter what CPU endianness, what endianness a particular device (and hence its MMIO region(s)) is using is entirely independent. Hence conversion, where necessary, needs to occur at a layer up. Another one reason to drop endianess conversion here is:
https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/
One of the answers of the author of the commit:
And we don't know if Linux will be around if that ever changes. The point is:
a) the current RISC-V spec is LE only
b) the current linux port is LE only except for this little bit
There is no point in leaving just this bitrotting code around. It just confuses developers, (very very slightly) slows down compiles and will bitrot. It also won't be any significant help to a future developer down the road doing a hypothetical BE RISC-V Linux port.
- drop unused argument of __io_ar() macros.
- drop "#define _raw_{read,write}{b,w,l,d,q} _raw_{read,write}{b,w,l,d,q}" as they are unnecessary.
- Adopt the Xen code style for this header, considering that significant changes are not anticipated in the future.
In the event of any issues, adapting them to Xen style should be easily manageable.
- drop unnecessary __r variables in macros read*_cpu()
- update inline assembler constraints for addr argument for __raw_read{b,w,l,q} and __raw_write{b,w,l,q} to tell a compiler that *addr will be accessed.
- add stubs for __raw_readq() and __raw_writeq() for RISCV_32
Addionally, to the header was added definions of ioremap_*().
---
Changes in V8:
- Add Acked-by: Jan Beulich <[email protected]>.
---
Changes in V7:
- update the comment message in riscv/io.h at the top.
- code style fixes.
- back const in places where it should be.
---
Changes in V6:
- drop unnecessary spaces and fix typos in the file comment.
- s/CONFIG_64BIT/CONFIG_RISCV_32 as .d suffix for instruction doesn't exist for RV32.
- add stubs for __raw_readq() and __raw_writeq() for RISCV_32
- update inline assembler constraints for addr argument for __raw_read{b,w,l,q} and __raw_write{b,w,l,q} to tell compiler that *addr will be accessed.
- s/u8/uint8_t
- update the commit message
---
Changes in V5:
- Xen code style related fixes
- drop #define _raw_{read,write}{b,w,l,d,q} _raw_{read,write}{b,w,l,d,q}
- drop cpu_to_le16()
- remove unuused argument in _io_ar()
- update the commit message
- drop unnessary __r variables in macros read*_cpu()
- update the comments at the top of the header.
---
Changes in V4:
- delete inner parentheses in macros.
- s/u<N>/uint<N>.
---
Changes in V3:
- re-sync with linux kernel
- update the commit message
---
Changes in V2:
- Nothing changed. Only rebase.
--- xen/arch/riscv/include/asm/io.h | 168 ++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) create mode 100644 xen/arch/riscv/include/asm/io.h
xen/arch/riscv/include/asm/io.h new file +168 -0
@@ -0,0 +1,168 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* The header taken form Linux 6.4.0-rc1 and is based on +* arch/riscv/include/asm/mmio.h with the following changes: +* - drop forcing of endianess for read*(), write*() functions as +* no matter what CPU endianness, what endianness a particular device +* (and hence its MMIO region(s)) is using is entirely independent. +* Hence conversion, where necessary, needs to occur at a layer up. +* Another one reason to drop endianess conversion is: +* https://patchwork.kernel.org/project/linux-riscv/patch/[email protected]/ +* One of the answers of the author of the commit: +* And we don't know if Linux will be around if that ever changes. +* The point is: +* a) the current RISC-V spec is LE only +* b) the current linux port is LE only except for this little bit +* There is no point in leaving just this bitrotting code around. It +* just confuses developers, (very very slightly) slows down compiles +* and will bitrot. It also won't be any significant help to a future +* developer down the road doing a hypothetical BE RISC-V Linux port. +* - drop unused argument of __io_ar() macros. +* - drop "#define _raw_{read,write}{b,w,l,q} _raw_{read,write}{b,w,l,q}" +* as they are unnecessary. +* - Adopt the Xen code style for this header, considering that significant +* changes are not anticipated in the future. +* In the event of any issues, adapting them to Xen style should be easily +* manageable. +* - drop unnecessary __r variables in macros read*_cpu() +* - update inline assembler constraints for addr argument for +* __raw_read{b,w,l,q} and __raw_write{b,w,l,q} to tell a compiler that +* *addr will be accessed. +* +* Copyright (C) 1996-2000 Russell King +* Copyright (C) 2012 ARM Ltd. +* Copyright (C) 2014 Regents of the University of California +* Copyright (C) 2024 Vates +*/ + +#ifndef _ASM_RISCV_IO_H +#define _ASM_RISCV_IO_H + +#include <asm/byteorder.h> + +/* +* The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't +* change the properties of memory regions. This should be fixed by the +* upcoming platform spec. +*/ +#define ioremap_nocache (addr, size) ioremap(addr, size) +#define ioremap_wc (addr, size) ioremap(addr, size) +#define ioremap_wt (addr, size) ioremap(addr, size) + +/* Generic IO read/write. These perform native-endian accesses. */ +static inline void __raw_writeb (uint8_t val,volatile void __iomem *addr) +{ + asmvolatile ("sb %1, %0" + :"=m" (*(volatile uint8_t __force *)addr) :"r" (val) ); +} + +static inline void __raw_writew (uint16_t val,volatile void __iomem *addr) +{ + asmvolatile ("sh %1, %0" + :"=m" (*(volatile uint16_t __force *)addr) :"r" (val) ); +} + +static inline void __raw_writel (uint32_t val,volatile void __iomem *addr) +{ + asmvolatile ("sw %1, %0" + :"=m" (*(volatile uint32_t __force *)addr) :"r" (val) ); +} + +static inline void __raw_writeq (uint64_t val,volatile void __iomem *addr) +{ +#ifdef CONFIG_RISCV_32 +BUILD_BUG_ON ("unimplemented" ); +#else + asmvolatile ("sd %1, %0" + :"=m" (*(volatile uint64_t __force *)addr) :"r" (val) ); +#endif +} + +static inline uint8_t __raw_readb (const volatile void __iomem *addr) +{ +uint8_t val; + + asmvolatile ("lb %0, %1" :"=r" (val) + :"m" (*(const volatile uint8_t __force *)addr) ); +return val; +} + +static inline uint16_t __raw_readw (const volatile void __iomem *addr) +{ +uint16_t val; + + asmvolatile ("lh %0, %1" :"=r" (val) + :"m" (*(const volatile uint16_t __force *)addr) ); +return val; +} + +static inline uint32_t __raw_readl (const volatile void __iomem *addr) +{ +uint32_t val; + + asmvolatile ("lw %0, %1" :"=r" (val) + :"m" (*(const volatile uint32_t __force *)addr) ); +return val; +} + +static inline uint64_t __raw_readq (const volatile void __iomem *addr) +{ +uint64_t val; + +#ifdef CONFIG_RISCV_32 +BUILD_BUG_ON ("unimplemented" ); +#else + asmvolatile ("ld %0, %1" :"=r" (val) + :"m" (*(const volatile uint64_t __force *)addr) ); +#endif + +return val; +} + + +/* +* Unordered I/O memory access primitives. These are even more relaxed than +* the relaxed versions, as they don't even order accesses between successive +* operations to the I/O regions. +*/ +#define readb_cpu (c) __raw_readb(c) +#define readw_cpu (c) __raw_readw(c) +#define readl_cpu (c) __raw_readl(c) +#define readq_cpu (c) __raw_readq(c) + +#define writeb_cpu (v, c) __raw_writeb(v, c) +#define writew_cpu (v, c) __raw_writew(v, c) +#define writel_cpu (v, c) __raw_writel(v, c) +#define writeq_cpu (v, c) __raw_writeq(v, c) + +/* +* I/O memory access primitives. Reads are ordered relative to any +* following Normal memory access. Writes are ordered relative to any prior +* Normal memory access. The memory barriers here are necessary as RISC-V +* doesn't define any ordering between the memory space and the I/O space. +*/ +#define __io_br () do { } while (0) +#define __io_ar () asm volatile ( "fence i,r" : : : "memory" ); +#define __io_bw () asm volatile ( "fence w,o" : : : "memory" ); +#define __io_aw () do { } while (0) + +#define readb (c) ({ uint8_t v_; __io_br(); v_ = readb_cpu(c); __io_ar(); v_; }) +#define readw (c) ({ uint16_t v_; __io_br(); v_ = readw_cpu(c); __io_ar(); v_; }) +#define readl (c) ({ uint32_t v_; __io_br(); v_ = readl_cpu(c); __io_ar(); v_; }) +#define readq (c) ({ uint64_t v_; __io_br(); v_ = readq_cpu(c); __io_ar(); v_; }) + +#define writeb (v, c) ({ __io_bw(); writeb_cpu(v, c); __io_aw(); }) +#define writew (v, c) ({ __io_bw(); writew_cpu(v, c); __io_aw(); }) +#define writel (v, c) ({ __io_bw(); writel_cpu(v, c); __io_aw(); }) +#define writeq (v, c) ({ __io_bw(); writeq_cpu(v, c); __io_aw(); }) + +#endif /* _ASM_RISCV_IO_H */ + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
Signature · 1 line
2.44.0
PATCH v8 9/17 xen/riscv: introduce monitor.h
In reply to Oleksii Kurochko---
Changes in V4-V8:
- Nothing changed. Only rebase.
---
Changes in V3:
- new patch.
--- xen/arch/riscv/include/asm/monitor.h | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 xen/arch/riscv/include/asm/monitor.h
xen/arch/riscv/include/asm/monitor.h new file +26 -0
@@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ASM_RISCV_MONITOR_H__ +#define __ASM_RISCV_MONITOR_H__ + +#include <xen/bug.h> + +#include <asm-generic/monitor.h> + +struct domain ; + +static inline uint32_t arch_monitor_get_capabilities (struct domain *d) +{ +BUG_ON ("unimplemented" ); +return 0 ; +} + +#endif /* __ASM_RISCV_MONITOR_H__ */ + +/* +* Local variables: +* mode: C +* c-file-style: "BSD" +* c-basic-offset: 4 +* indent-tabs-mode: nil +* End: +*/
Signature · 1 line
2.44.0
PATCH v8 10/17 xen/riscv: add definition of __read_mostly
In reply to Oleksii KurochkoThe definition of __read_mostly should be removed in:
https://lore.kernel.org/xen-devel/[email protected]/
The patch introduces it in arch-specific header to not block enabling of full Xen build for RISC-V.
---
- [PATCH] move __read_mostly to xen/cache.h [2]
Right now, the patch series doesn't have a direct dependency on [2] and it provides __read_mostly in the patch:
[PATCH v3 26/34] xen/riscv: add definition of __read_mostly
However, it will be dropped as soon as [2] is merged or at least when the final version of the patch [2] is provided.
Considering that there is still no still final decision regarding patch [2] my suggestion is to merge RISC-V specific patch and just drop the changes in patch [2].
[2] https://lore.kernel.org/xen-devel/[email protected]/
---
Change in V8:
- update the footer after Signed-off.
---
Changes in V4-V7:
- Nothing changed. Only rebase.
--- xen/arch/riscv/include/asm/cache.h | 2 ++ 1 file changed, 2 insertions(+)
xen/arch/riscv/include/asm/cache.h +2 -0
@@ -3,4 +3,6 @@#ifndef _ASM_RISCV_CACHE_H#define _ASM_RISCV_CACHE_H +#define __read_mostly __section(".data.read_mostly") +#endif /* _ASM_RISCV_CACHE_H */
Signature · 1 line
2.44.0
PATCH v8 11/17 xen/riscv: add required things to current.h
In reply to Oleksii KurochkoAdd minimal requied things to be able to build full Xen.
---
Changes in V5-V8:
- Nothing changed. Only rebase.
---
Changes in V4:
- BUG() was changed to BUG_ON("unimplemented");
- Change "xen/bug.h" to "xen/lib.h" as BUG_ON is defined in xen/lib.h.
- Add Acked-by: Jan Beulich <[email protected]>
---
Changes in V3:
- add SPDX
- drop a forward declaration of struct vcpu;
- update guest_cpu_user_regs() macros
- replace get_processor_id with smp_processor_id
- update the commit message
- code style fixes
---
Changes in V2:
- Nothing changed. Only rebase.
--- xen/arch/riscv/include/asm/current.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
xen/arch/riscv/include/asm/current.h +19 -0
@@ -3,6 +3,21 @@#ifndef __ASM_CURRENT_H#define __ASM_CURRENT_H +#include <xen/lib.h> +#include <xen/percpu.h> +#include <asm/processor.h> + +#ifndef __ASSEMBLY__ + +/* Which VCPU is "current" on this PCPU. */ +DECLARE_PER_CPU(struct vcpu *, curr_vcpu); + +#define current this_cpu(curr_vcpu) +#define set_current (vcpu) do { current = (vcpu); } while (0) +#define get_cpu_current (cpu) per_cpu(curr_vcpu, cpu) + +#define guest_cpu_user_regs () ({ BUG_ON("unimplemented"); NULL; }) +#define switch_stack_and_jump (stack, fn) do { \ asm volatile ( \ "mv sp, %0\n" \
@@ -10,4 +25,8 @@unreachable (); \ } while ( false ) +#define get_per_cpu_offset () __per_cpu_offset[smp_processor_id()] + +#endif /* __ASSEMBLY__ */ +#endif /* __ASM_CURRENT_H */
Signature · 1 line
2.44.0
PATCH v8 12/17 xen/riscv: add minimal stuff to page.h to build full Xen
In reply to Oleksii Kurochko---
Changes in V5-V8:
- Nothing changed. Only rebase.
---
Changes in V4:
---
- Change message -> subject in "Changes in V3"
- s/BUG/BUG_ON("...")
- Do proper rebase ( pfn_to_paddr() and paddr_to_pfn() aren't removed ).
---
Changes in V3:
- update the commit subject
- add implemetation of PAGE_HYPERVISOR macros
- add Acked-by: Jan Beulich <[email protected]>
- drop definition of pfn_to_addr, and paddr_to_pfn in <asm/mm.h>
---
Changes in V2:
- Nothing changed. Only rebase.
--- xen/arch/riscv/include/asm/page.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
xen/arch/riscv/include/asm/page.h +19 -0
@@ -6,6 +6,7 @@#ifndef __ASSEMBLY__#include <xen/const.h> +#include <xen/bug.h> #include <xen/types.h> #include <asm/mm.h>
@@ -32,6 +33,10 @@#define PTE_LEAF_DEFAULT (PTE_VALID | PTE_READABLE | PTE_WRITABLE)#define PTE_TABLE (PTE_VALID) +#define PAGE_HYPERVISOR_RW (PTE_VALID | PTE_READABLE | PTE_WRITABLE) + +#define PAGE_HYPERVISOR PAGE_HYPERVISOR_RW +/* Calculate the offsets into the pagetables for a given VA */ #define pt_linear_offset (lvl, va) ((va) >> XEN_PT_LEVEL_SHIFT(lvl))
@@ -62,6 +67,20 @@ static inline bool pte_is_valid(pte_t p)return p.pte &PTE_VALID ; } +static inline void invalidate_icache (void ) +{ +BUG_ON ("unimplemented" ); +} + +#define clear_page (page) memset((void *)(page), 0, PAGE_SIZE) +#define copy_page (dp, sp) memcpy(dp, sp, PAGE_SIZE) + +/* TODO: Flush the dcache for an entire page. */ +static inline void flush_page_to_ram (unsigned long mfn,bool sync_icache) +{ +BUG_ON ("unimplemented" ); +} +#endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_PAGE_H */
Signature · 1 line
2.44.0
PATCH v8 13/17 xen/riscv: add minimal stuff to mm.h to build full Xen
In reply to Oleksii Kurochko---
Changes in V8:
- Nothing changed only rebase.
---
Changes in V7:
- update argument type of maddr_to_virt() function: unsigned long -> paddr_t
- rename argument of PFN_ORDER(): pfn -> pg.
- add Acked-by: Jan Beulich <[email protected]>
---
Changes in V6:
- drop __virt_to_maddr() ( transform to macro ) and __maddr_to_virt ( rename to maddr_to_virt ).
- parenthesize va in definition of vmap_to_mfn().
- Code style fixes.
---
Changes in V5:
- update the comment around "struct domain *domain;" : zero -> NULL
- fix ident. for unsigned long val;
- put page_to_virt() and virt_to_page() close to each other.
- drop unnessary leading underscore
- drop a space before the comment: /* Count of uses of this frame as its current type. */
- drop comment about a page 'not as a shadow'. it is not necessary for RISC-V
---
Changes in V4:
- update an argument name of PFN_ORDERN macros.
- drop pad at the end of 'struct page_info'.
- Change message -> subject in "Changes in V3"
- delete duplicated macros from riscv/mm.h
- fix identation in struct page_info
- align comment for PGC_ macros
- update definitions of domain_set_alloc_bitsize() and domain_clamp_alloc_bitsize()
- drop unnessary comments.
- s/BUG/BUG_ON("...")
- define __virt_to_maddr, __maddr_to_virt as stubs
- add inclusion of xen/mm-frame.h for mfn_x and others
- include "xen/mm.h" instead of "asm/mm.h" to fix compilation issues:
In file included from arch/riscv/setup.c:7:
./arch/riscv/include/asm/mm.h:60:28: error: field 'list' has incomplete type
60 | struct page_list_entry list;
| ^~~~
./arch/riscv/include/asm/mm.h:81:43: error: 'MAX_ORDER' undeclared here (not in a function)
81 | unsigned long first_dirty:MAX_ORDER + 1;
| ^~~~~~~~~
./arch/riscv/include/asm/mm.h:81:31: error: bit-field 'first_dirty' width not an integer constant
81 | unsigned long first_dirty:MAX_ORDER + 1;
- Define __virt_to_mfn() and __mfn_to_virt() using maddr_to_mfn() and mfn_to_maddr().
---
Changes in V3:
- update the commit title
- introduce DIRECTMAP_VIRT_START.
- drop changes related pfn_to_paddr() and paddr_to_pfn as they were remvoe in
[PATCH v2 32/39] xen/riscv: add minimal stuff to asm/page.h to build full Xen
- code style fixes.
- drop get_page_nr and put_page_nr as they don't need for time being
- drop CONFIG_STATIC_MEMORY related things
- code style fixes
---
Changes in V2:
- define stub for arch_get_dma_bitsize(void)
--- xen/arch/riscv/include/asm/mm.h | 240 ++++++++++++++++++++++++++++++++ xen/arch/riscv/mm.c | 2 +- xen/arch/riscv/setup.c | 2 +- 3 files changed, 242 insertions(+), 2 deletions(-)
xen/arch/riscv/include/asm/mm.h +240 -0
@@ -3,11 +3,246 @@#ifndef _ASM_RISCV_MM_H#define _ASM_RISCV_MM_H +#include <public/xen.h> +#include <xen/bug.h> +#include <xen/mm-frame.h> +#include <xen/pdx.h> +#include <xen/types.h> +#include <asm/page-bits.h> #define pfn_to_paddr (pfn) ((paddr_t)(pfn) << PAGE_SHIFT)#define paddr_to_pfn (pa) ((unsigned long)((pa) >> PAGE_SHIFT)) +#define paddr_to_pdx (pa) mfn_to_pdx(maddr_to_mfn(pa)) +#define gfn_to_gaddr (gfn) pfn_to_paddr(gfn_x(gfn)) +#define gaddr_to_gfn (ga) _gfn(paddr_to_pfn(ga)) +#define mfn_to_maddr (mfn) pfn_to_paddr(mfn_x(mfn)) +#define maddr_to_mfn (ma) _mfn(paddr_to_pfn(ma)) +#define vmap_to_mfn (va) maddr_to_mfn(virt_to_maddr((vaddr_t)(va))) +#define vmap_to_page (va) mfn_to_page(vmap_to_mfn(va)) + +static inline void *maddr_to_virt (paddr_t ma) +{ +BUG_ON ("unimplemented" ); +return NULL ; +} + +#define virt_to_maddr (va) ({ BUG_ON("unimplemented"); 0; }) + +/* Convert between Xen-heap virtual addresses and machine frame numbers. */ +#define __virt_to_mfn (va) mfn_x(maddr_to_mfn(virt_to_maddr(va))) +#define __mfn_to_virt (mfn) maddr_to_virt(mfn_to_maddr(_mfn(mfn))) + +/* +* We define non-underscored wrappers for above conversion functions. +* These are overriden in various source files while underscored version +* remain intact. +*/ +#define virt_to_mfn (va) __virt_to_mfn(va) +#define mfn_to_virt (mfn) __mfn_to_virt(mfn) + +struct page_info +{ +/* Each frame can be threaded onto a doubly-linked list. */ +struct page_list_entry list; + +/* Reference count and various PGC_xxx flags and fields. */ +unsigned long count_info; + +/* Context-dependent fields follow... */ +union { +/* Page is in use: ((count_info & PGC_count_mask) != 0). */ +struct { +/* Type reference count and various PGT_xxx flags and fields. */ +unsigned long type_info; + } inuse; + +/* Page is on a free list: ((count_info & PGC_count_mask) == 0). */ +union { +struct { +/* +* Index of the first *possibly* unscrubbed page in the buddy. +* One more bit than maximum possible order to accommodate +* INVALID_DIRTY_IDX. +*/ +#define INVALID_DIRTY_IDX ((1UL << (MAX_ORDER + 1)) - 1) +unsigned long first_dirty:MAX_ORDER +1 ; + +/* Do TLBs need flushing for safety before next page use? */ +bool need_tlbflush:1 ; + +#define BUDDY_NOT_SCRUBBING 0 +#define BUDDY_SCRUBBING 1 +#define BUDDY_SCRUB_ABORT 2 +unsigned long scrub_state:2 ; + }; + +unsigned long val; + } free; + } u; + +union { +/* Page is in use */ +struct { +/* Owner of this page (NULL if page is anonymous). */ +struct domain *domain; + } inuse; + +/* Page is on a free list. */ +struct { +/* Order-size of the free chunk this page is the head of. */ +unsigned int order; + } free; + } v; + +union { +/* +* Timestamp from 'TLB clock', used to avoid extra safety flushes. +* Only valid for: a) free pages, and b) pages with zero type count +*/ +uint32_t tlbflush_timestamp; + }; +}; + +#define frame_table ((struct page_info *)FRAMETABLE_VIRT_START) + +/* PDX of the first page in the frame table. */ +extern unsigned long frametable_base_pdx; + +/* Convert between machine frame numbers and page-info structures. */ +#define mfn_to_page (mfn) \ + (frame_table + (mfn_to_pdx(mfn) - frametable_base_pdx)) +#define page_to_mfn (pg) \ + pdx_to_mfn((unsigned long)((pg) - frame_table) + frametable_base_pdx) + +static inline void *page_to_virt (const struct page_info *pg) +{ +return mfn_to_virt (mfn_x (page_to_mfn (pg))); +} + +/* Convert between Xen-heap virtual addresses and page-info structures. */ +static inline struct page_info *virt_to_page (const void *v) +{ +BUG_ON ("unimplemented" ); +return NULL ; +} + +/* +* Common code requires get_page_type and put_page_type. +* We don't care about typecounts so we just do the minimum to make it +* happy. +*/ +static inline int get_page_type (struct page_info *page,unsigned long type) +{ +return 1 ; +} + +static inline void put_page_type (struct page_info *page) +{ +} + +static inline void put_page_and_type (struct page_info *page) +{ +put_page_type (page); +put_page (page); +} + +/* +* RISC-V does not have an M2P, but common code expects a handful of +* M2P-related defines and functions. Provide dummy versions of these. +*/ +#define INVALID_M2P_ENTRY (~0UL) +#define SHARED_M2P_ENTRY (~0UL - 1UL) +#define SHARED_M2P (_e) ((_e) == SHARED_M2P_ENTRY) + +#define set_gpfn_from_mfn (mfn, pfn) do { (void)(mfn), (void)(pfn); } while (0) +#define mfn_to_gfn (d, mfn) ((void)(d), _gfn(mfn_x(mfn))) + +#define PDX_GROUP_SHIFT (PAGE_SHIFT + VPN_BITS) + +static inline unsigned long domain_get_maximum_gpfn (struct domain *d) +{ +BUG_ON ("unimplemented" ); +return 0 ; +} + +static inline long arch_memory_op (int op,XEN_GUEST_HANDLE_PARAM (void ) arg) +{ +BUG_ON ("unimplemented" ); +return 0 ; +} + +/* +* On RISCV, all the RAM is currently direct mapped in Xen. +* Hence return always true. +*/ +static inline bool arch_mfns_in_directmap (unsigned long mfn,unsigned long nr) +{ +return true; +} + +#define PG_shift (idx) (BITS_PER_LONG - (idx)) +#define PG_mask (x, idx) (x ## UL << PG_shift(idx)) + +#define PGT_none PG_mask(0, 1)/* no special uses of this page */ +#define PGT_writable_page PG_mask(1, 1)/* has writable mappings? */ +#define PGT_type_mask PG_mask(1, 1)/* Bits 31 or 63. */ + +/* Count of uses of this frame as its current type. */ +#define PGT_count_width PG_shift(2) +#define PGT_count_mask ((1UL << PGT_count_width) - 1) + +/* +* Page needs to be scrubbed. Since this bit can only be set on a page that is +* free (i.e. in PGC_state_free) we can reuse PGC_allocated bit. +*/ +#define _PGC_need_scrub _PGC_allocated +#define PGC_need_scrub PGC_allocated + +/* Cleared when the owning guest 'frees' this page. */ +#define _PGC_allocated PG_shift(1) +#define PGC_allocated PG_mask(1, 1) +/* Page is Xen heap? */ +#define _PGC_xen_heap PG_shift(2) +#define PGC_xen_heap PG_mask(1, 2) +/* Page is broken? */ +#define _PGC_broken PG_shift(7) +#define PGC_broken PG_mask(1, 7) +/* Mutually-exclusive page states: { inuse, offlining, offlined, free }. */ +#define PGC_state PG_mask(3, 9) +#define PGC_state_inuse PG_mask(0, 9) +#define PGC_state_offlining PG_mask(1, 9) +#define PGC_state_offlined PG_mask(2, 9) +#define PGC_state_free PG_mask(3, 9) +#define page_state_is (pg, st) (((pg)->count_info&PGC_state) == PGC_state_##st) + +/* Count of references to this frame. */ +#define PGC_count_width PG_shift(9) +#define PGC_count_mask ((1UL << PGC_count_width) - 1) + +#define _PGC_extra PG_shift(10) +#define PGC_extra PG_mask(1, 10) + +#define is_xen_heap_page (page) ((page)->count_info & PGC_xen_heap) +#define is_xen_heap_mfn (mfn) \ + (mfn_valid(mfn) && is_xen_heap_page(mfn_to_page(mfn))) + +#define is_xen_fixed_mfn (mfn) \ + ((mfn_to_maddr(mfn) >= virt_to_maddr((vaddr_t)_start)) && \ + (mfn_to_maddr(mfn) <= virt_to_maddr((vaddr_t)_end - 1))) + +#define page_get_owner (p) (p)->v.inuse.domain +#define page_set_owner (p, d) ((p)->v.inuse.domain = (d)) + +/* TODO: implement */ +#define mfn_valid (mfn) ({ (void)(mfn); 0; }) + +#define domain_set_alloc_bitsize (d) ((void)(d)) +#define domain_clamp_alloc_bitsize (d, b) ((void)(d), (b)) + +#define PFN_ORDER (pg) ((pg)->v.free.order) +extern unsigned char cpu0_boot_stack[];void setup_initial_pagetables (void );
@@ -20,4 +255,9 @@ unsigned long calc_phys_offset(void);void turn_on_mmu (unsigned long ra); +static inline unsigned int arch_get_dma_bitsize (void ) +{ +return 32 ;/* TODO */ +} +#endif /* _ASM_RISCV_MM_H */
xen/arch/riscv/mm.c +1 -1
@@ -5,12 +5,12 @@#include <xen/init.h> #include <xen/kernel.h> #include <xen/macros.h> +#include <xen/mm.h> #include <xen/pfn.h> #include <asm/early_printk.h> #include <asm/csr.h> #include <asm/current.h> -#include <asm/mm.h> #include <asm/page.h> #include <asm/processor.h>
xen/arch/riscv/setup.c +1 -1
@@ -2,9 +2,9 @@#include <xen/compile.h> #include <xen/init.h> +#include <xen/mm.h> #include <asm/early_printk.h> -#include <asm/mm.h> /* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]
Signature · 1 line
2.44.0
PATCH v8 14/17 xen/riscv: introduce vm_event_*() functions
In reply to Oleksii Kurochko---
Changes in V5-V8:
- Only rebase was done.
---
Changes in V4:
- New patch.
--- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/vm_event.c | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 xen/arch/riscv/vm_event.c
xen/arch/riscv/Makefile +1 -0
@@ -5,6 +5,7 @@ obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o obj-y += traps.o +obj-y += vm_event.o $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@
xen/arch/riscv/vm_event.c new file +19 -0
@@ -0,0 +1,19 @@ +#include <xen/bug.h> + +struct vm_event_st ; +struct vcpu ; + +void vm_event_fill_regs (struct vm_event_st *req) +{ +BUG_ON ("unimplemented" ); +} + +void vm_event_set_registers (struct vcpu *v,struct vm_event_st *rsp) +{ +BUG_ON ("unimplemented" ); +} + +void vm_event_monitor_next_interrupt (struct vcpu *v) +{ +/* Not supported on RISCV. */ +}
Signature · 1 line
2.44.0
PATCH v8 16/17 xen/riscv: enable full Xen build
In reply to Oleksii Kurochko---
Changes in V5-V8:
- Nothing changed. Only rebase.
---
Changes in V4:
- drop stubs for irq_actor_none() and irq_actor_none() as common/irq.c is compiled now.
- drop defintion of max_page in stubs.c as common/page_alloc.c is compiled now.
- drop printk() related changes in riscv/early_printk.c as common version will be used.
---
Changes in V3:
- Reviewed-by: Jan Beulich <[email protected]>
- unrealted change dropped in tiny64_defconfig
---
Changes in V2:
- Nothing changed. Only rebase.
--- xen/arch/riscv/Makefile | 16 +++- xen/arch/riscv/arch.mk | 4 - xen/arch/riscv/early_printk.c | 168 ---------------------------------- xen/arch/riscv/stubs.c | 24 ----- 4 files changed, 15 insertions(+), 197 deletions(-)
xen/arch/riscv/Makefile +15 -1
@@ -12,10 +12,24 @@ $(TARGET): $(TARGET)-syms $(OBJCOPY) -O binary -S $< $@ $(TARGET)-syms: $(objtree)/prelink.o $(obj)/xen.lds - $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) -o $@ + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ + $(objtree)/common/symbols-dummy.o -o $(dot-target).0 + $(NM) -pa --format=sysv $(dot-target).0 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).0.S + $(MAKE) $(build)=$(@D) $(dot-target).0.o + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< \ + $(dot-target).0.o -o $(dot-target).1 + $(NM) -pa --format=sysv $(dot-target).1 \ + | $(objtree)/tools/symbols $(all_symbols) --sysv --sort \ + > $(dot-target).1.S + $(MAKE) $(build)=$(@D) $(dot-target).1.o + $(LD) $(XEN_LDFLAGS) -T $(obj)/xen.lds -N $< $(build_id_linker) \ + $(dot-target).1.o -o $@ $(NM) -pa --format=sysv $@ \ | $(objtree)/tools/symbols --all-symbols --xensyms --sysv --sort \ > [email protected] + rm -f $(@D)/.$(@F).[0-9]* $(obj)/xen.lds: $(src)/xen.lds.S FORCE $(call if_changed_dep,cpp_lds_S)
xen/arch/riscv/arch.mk +0 -4
@@ -24,7 +24,3 @@ extensions := $(subst $(space),,$(extensions)) # -mcmodel=medlow would force Xen into the lower half. CFLAGS += $(riscv-generic-flags)$(extensions) -mstrict-align -mcmodel=medany - -# TODO: Drop override when more of the build is working -override ALL_OBJS-y = arch/$(SRCARCH)/built_in.o -override ALL_LIBS-y =
xen/arch/riscv/early_printk.c +0 -168
171 lines not on this page · raw message
xen/arch/riscv/stubs.c +0 -24
@@ -24,12 +24,6 @@ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_mask);nodemask_t __read_mostly node_online_map = { { [0 ] =1UL } }; -/* -* max_page is defined in page_alloc.c which isn't complied for now. -* definition of max_page will be remove as soon as page_alloc is built. -*/ -unsigned long __read_mostly max_page; -/* time.c */ unsigned long __ro_after_init cpu_khz;/* CPU clock frequency in kHz. */
@@ -419,21 +413,3 @@ void __cpu_die(unsigned int cpu) {BUG_ON ("unimplemented" ); } - -/* -* The following functions are defined in common/irq.c, but common/irq.c isn't -* built for now. These changes will be removed there when common/irq.c is -* ready. -*/ - -void cf_check irq_actor_none(struct irq_desc *desc) -{ -BUG_ON ("unimplemented" ); -} - -unsigned int cf_check irq_startup_none(struct irq_desc *desc) -{ -BUG_ON ("unimplemented" ); - -return 0 ; -}
Signature · 1 line
2.44.0
PATCH v8 15/17 xen/riscv: add minimal amount of stubs to build full Xen
In reply to Oleksii Kurochko---
Changes in V7:
- Only rebase was done.
---
Changes in V6:
- update the commit in stubs.c around /* ... common/irq.c ... */
- add Acked-by: Jan Beulich <[email protected]>
---
Changes in V5:
- drop unrelated changes
- assert_failed("unimplmented...") change to BUG_ON()
---
Changes in V4:
- added new stubs which are necessary for compilation after rebase: __cpu_up(), __cpu_disable(), __cpu_die() from smpboot.c
- back changes related to printk() in early_printk() as they should be removed in the next patch to avoid compilation error.
- update definition of cpu_khz: __read_mostly -> __ro_after_init.
- drop vm_event_reset_vmtrace(). It is defibed in asm-generic/vm_event.h.
- move vm_event_*() functions from stubs.c to riscv/vm_event.c.
- s/BUG/BUG_ON("unimplemented") in stubs.c
- back irq_actor_none() and irq_actor_none() as common/irq.c isn't compiled at this moment, so this function are needed to avoid compilation error.
- defined max_page to avoid compilation error, it will be removed as soon as common/page_alloc.c will be compiled.
---
Changes in V3:
- code style fixes.
- update attribute for frametable_base_pdx and frametable_virt_end to __ro_after_init. insteaf of read_mostly.
- use BUG() instead of assert_failed/WARN for newly introduced stubs.
- drop "#include <public/vm_event.h>" in stubs.c and use forward declaration instead.
- drop ack_node() and end_node() as they aren't used now.
---
Changes in V2:
- define udelay stub
- remove 'select HAS_PDX' from RISC-V Kconfig because of
https://lore.kernel.org/xen-devel/[email protected]/
--- xen/arch/riscv/Makefile | 1 + xen/arch/riscv/mm.c | 50 +++++ xen/arch/riscv/setup.c | 8 + xen/arch/riscv/stubs.c | 439 ++++++++++++++++++++++++++++++++++++++++ xen/arch/riscv/traps.c | 25 +++ 5 files changed, 523 insertions(+) create mode 100644 xen/arch/riscv/stubs.c
xen/arch/riscv/Makefile +1 -0
@@ -4,6 +4,7 @@ obj-y += mm.o obj-$(CONFIG_RISCV_64) += riscv64/ obj-y += sbi.o obj-y += setup.o +obj-y += stubs.o obj-y += traps.o obj-y += vm_event.o
xen/arch/riscv/mm.c +50 -0
64 lines not on this page · raw message
xen/arch/riscv/setup.c +8 -0
@@ -1,11 +1,19 @@/* SPDX-License-Identifier: GPL-2.0-only */ +#include <xen/bug.h> #include <xen/compile.h> #include <xen/init.h> #include <xen/mm.h> +#include <public/version.h> +#include <asm/early_printk.h> +void arch_get_xen_caps (xen_capabilities_info_t *info) +{ +BUG_ON ("unimplemented" ); +} +/* Xen stack for bringing up the first CPU. */ unsigned char __initdata cpu0_boot_stack[STACK_SIZE ]__aligned(STACK_SIZE) ;
xen/arch/riscv/stubs.c new file +439 -0
439 lines not on this page · raw message
xen/arch/riscv/traps.c +25 -0
@@ -4,6 +4,10 @@* * RISC-V Trap handlers */ + +#include <xen/lib.h> +#include <xen/sched.h> +#include <asm/processor.h> #include <asm/traps.h>
@@ -11,3 +15,24 @@ void do_trap(struct cpu_user_regs *cpu_regs) {die (); } + +void vcpu_show_execution_state (struct vcpu *v) +{ +BUG_ON ("unimplemented" ); +} + +void show_execution_state (const struct cpu_user_regs *regs) +{ +printk ("implement show_execution_state(regs)\n" ); +} + +void arch_hypercall_tasklet_result (struct vcpu *v,long res) +{ +BUG_ON ("unimplemented" ); +} + +enum mc_disposition arch_do_multicall_call (struct mc_state *state) +{ +BUG_ON ("unimplemented" ); +return mc_continue; +}
Signature · 1 line
2.44.0
PATCH v8 3/17 xen/bitops: implement fls{l}() in common logic
In reply to Oleksii KurochkoReturn type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer types lacks a cast [-Werror]
18 | (void) (&_x == &_y); \
| ^~
common/page_alloc.c:1843:34: note: in expansion of macro 'min'
1843 | unsigned int inc_order = min(MAX_ORDER, flsl(e - s) - 1);generic_fls{l} was used instead of __builtin_clz{l}(x) as if x is 0, the result in undefined.
---
The patch is almost independent from Andrew's patch series
( https://lore.kernel.org/xen-devel/[email protected]/T/#t)
except test_fls() function which IMO can be merged as a separate patch after Andrew's patch will be fully ready.
---
Changes in V8:
- do proper rebase: back definition of fls{l} to the current patch.
- drop the changes which removed ffz() in PPC. it should be done not
in this patch.
- add a message after Signed-off.
---
Changes in V7:
- Code style fixes
---
Changes in V6:
- new patch for the patch series.
--- xen/arch/arm/include/asm/arm32/bitops.h | 2 +- xen/arch/arm/include/asm/arm64/bitops.h | 6 ++---- xen/arch/arm/include/asm/bitops.h | 7 ++----- xen/arch/ppc/include/asm/bitops.h | 3 --- xen/arch/x86/include/asm/bitops.h | 6 ++++-- xen/common/bitops.c | 22 ++++++++++++++++++++++ xen/include/xen/bitops.h | 24 ++++++++++++++++++++++++ 7 files changed, 55 insertions(+), 15 deletions(-)
xen/arch/arm/include/asm/arm32/bitops.h +1 -1
@@ -1,7 +1,7 @@#ifndef _ARM_ARM32_BITOPS_H#define _ARM_ARM32_BITOPS_H -#define flsl fls +#define arch_flsl fls/* * Little endian assembly bitops. nr = 0 -> byte 0 bit 0.
xen/arch/arm/include/asm/arm64/bitops.h +2 -4
@@ -22,17 +22,15 @@ static /*__*/always_inline unsigned long __ffs(unsigned long word)*/ #define ffz (x) __ffs(~(x)) -static inline int flsl (unsigned long x) +static inline int arch_flsl (unsigned long x) {uint64_t ret; -if (__builtin_constant_p (x)) -return generic_flsl (x); - asm("clz\t%0, %1" :"=r" (ret) :"r" (x));return BITS_PER_LONG - ret; } +#define arch_flsl arch_flsl/* Based on linux/include/asm-generic/bitops/find.h */
xen/arch/arm/include/asm/bitops.h +2 -5
@@ -78,17 +78,14 @@ bool clear_mask16_timeout(uint16_t mask, volatile void *p,* the clz instruction for much better code efficiency. */ -static inline int fls (unsigned int x) +static inline int arch_fls (unsigned int x) {int ret; -if (__builtin_constant_p (x)) -return generic_fls (x); - asm("clz\t%" __OP32"0, %" __OP32"1" :"=r" (ret) :"r" (x));return 32 - ret; } - +#define arch_fls arch_fls#define arch_ffs (x) ({ unsigned int __t = (x); fls(ISOLATE_LSB(__t)); })#define arch_ffsl (x) ({ unsigned long __t = (x); flsl(ISOLATE_LSB(__t)); })
xen/arch/ppc/include/asm/bitops.h +0 -3
@@ -119,9 +119,6 @@ static inline int test_and_set_bit(unsigned int nr, volatile void *addr) (volatile unsigned int *)addr + BITOP_WORD(nr)) != 0; } -#define flsl (x) generic_flsl(x) -#define fls (x) generic_fls(x) -/* Based on linux/include/asm-generic/bitops/ffz.h */ /* * ffz - find first zero in word.
xen/arch/x86/include/asm/bitops.h +4 -2
@@ -430,7 +430,7 @@ static always_inline unsigned int arch_ffsl(unsigned long x)* * This is defined the same way as ffs. */ -static inline int flsl (unsigned long x) +static always_inline int arch_flsl(unsigned long x) {long r;
@@ -440,8 +440,9 @@ static inline int flsl(unsigned long x) "1:" : "=r" (r) : "rm" (x)); return (int)r+1; } +#define arch_flsl arch_flsl -static inline int fls (unsigned int x) +static always_inline int arch_fls(unsigned int x) {int r;
@@ -451,6 +452,7 @@ static inline int fls(unsigned int x) "1:" : "=r" (r) : "rm" (x)); return r +1 ; } +#define arch_fls arch_fls/** * hweightN - returns the hamming weight of a N-bit word
xen/common/bitops.c +22 -0
@@ -62,9 +62,31 @@ static void test_ffs(void)CHECK (ffs64, (uint64_t )0x8000000000000000 ,64 ); } +static void test_fls (void ) +{ +/* unsigned int ffs(unsigned int) */ +CHECK (fls,1 ,1 ); +CHECK (fls,3 ,2 ); +CHECK (fls,3U <<30 ,32 ); + +/* unsigned int flsl(unsigned long) */ +CHECK (flsl,1 ,1 ); +CHECK (flsl,1UL << (BITS_PER_LONG -1 ),BITS_PER_LONG ); +#if BITS_PER_LONG >32 +CHECK (flsl,3UL <<32 ,34 ); +#endif + +/* unsigned int fls64(uint64_t) */ +CHECK (fls64,1 ,1 ); +CHECK (fls64,0x00000000C0000000ULL ,32 ); +CHECK (fls64,0x0000000180000000ULL ,33 ); +CHECK (fls64,0xC000000000000000ULL ,64 ); +} + static int __init cf_check test_bitops(void) {test_ffs (); +test_fls ();return 0 ; }
xen/include/xen/bitops.h +24 -0
@@ -196,6 +196,30 @@ static always_inline bool test_bit(int nr, const volatile void *addr)test_bit (nr, addr); \ }) +static always_inline __pure int fls(unsigned int x) +{ +if (__builtin_constant_p (x) ) +return generic_fls (x); + +#ifndef arch_fls +#define arch_fls generic_fls +#endif + +return arch_fls (x); +} + +static always_inline __pure int flsl(unsigned long x) +{ +if (__builtin_constant_p (x) ) +return generic_flsl (x); + +#ifndef arch_flsl +#define arch_flsl generic_flsl +#endif + +return arch_flsl (x); +} +/* * Find First Set bit. Bits are labelled from 1. */
Signature · 1 line
2.44.0
PATCH v8 17/17 xen/README: add compiler and binutils versions for RISC-V64
In reply to Oleksii KurochkoThis patch doesn't represent a strict lower bound for GCC and GNU Binutils; rather, these versions are specifically employed by the Xen RISC-V container and are anticipated to undergo continuous testing. Older GCC and GNU Binutils would work,
but this is not a guarantee.
While it is feasible to utilize Clang, it's important to note that, currently, there is no Xen RISC-V CI job in place to verify the seamless functioning of the build with Clang.
---
Changes in V5-V8:
- Nothing changed. Only rebase.
---
Changes in V6:
- update the message in README.
---
Changes in V5:
- update the commit message and README file with additional explanation about GCC and GNU Binutils version. Additionally, it was added information about Clang.
---
Changes in V4:
- Update version of GCC (12.2) and GNU Binutils (2.39) to the version which are in Xen's contrainter for RISC-V
---
Changes in V3:
- new patch
--- README | 4 ++++ 1 file changed, 4 insertions(+)
README +4 -0
@@ -48,6 +48,10 @@ provided by your OS distributor: - For ARM 64-bit: - GCC 5.1 or later - GNU Binutils 2.24 or later + - For RISC-V 64-bit: + - GCC 12.2 or later + - GNU Binutils 2.39 or later + Older GCC and GNU Binutils would work, but this is not a guarantee. * POSIX compatible awk * Development install of zlib (e.g., zlib-dev) * Development install of Python 2.7 or later (e.g., python-dev)
Signature · 1 line
2.44.0
Re: [PATCH v8 01/17] xen/riscv: disable unnecessary configs
In reply to Oleksii KurochkoQuoted 4 lines · Oleksii Kurochko
automation/gitlab-ci/build.yaml +0
-0@@ -515,10 +515,14 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools: .riscv-fixed-randconfig:
automation/gitlab-ci/build.yaml alpine-3.18-gcc-debug-arm64-boot-cpupools: · line 525
Quoted 10 lines
automation/gitlab-ci/build.yaml +4
-0variables: &riscv-fixed-randconfig EXTRA_FIXED_RANDCONFIG: | + CONFIG_BOOT_TIME_CPUPOOLS=n CONFIG_COVERAGE=n CONFIG_EXPERT=y CONFIG_GRANT_TABLE=n CONFIG_MEM_ACCESS=n + CONFIG_PERF_COUNTERS=n + CONFIG_LIVEPATCH=n + CONFIG_XSM=n
While XSM and BOOT_TIME_CPUPOOLS are covered in the description, I struggle with PERF_COUNTERS: What's missing there (besides trivial asm/perfc.h and asm/perfc_defn.h)? As to LIVEPATCH: I suppose there ought to be HAS_LIVEPATCH allowing arch-es to indicate whether they support that.
Jan
Re: [PATCH v8 01/17] xen/riscv: disable unnecessary configs
Quoted 13 lines · Jan Beulich
Quoted 12 lines · Oleksii Kurochko
automation/gitlab-ci/build.yaml +0
-0@@ -515,10 +515,14 @@ alpine-3.18-gcc-debug-arm64-boot-cpupools:.riscv-fixed-randconfig:
variables: &riscv-fixed-randconfig
EXTRA_FIXED_RANDCONFIG: |
+CONFIG_BOOT_TIME_CPUPOOLS=n
CONFIG_COVERAGE=n
CONFIG_EXPERT=y
CONFIG_GRANT_TABLE=n
CONFIG_MEM_ACCESS=n
+CONFIG_PERF_COUNTERS=n
Quoted 8 lines
Quoted 2 lines
+
CONFIG_LIVEPATCH=n
+CONFIG_XSM=nWhile XSM and
BOOT_TIME_CPUPOOLSare covered in the description, I struggle
withPERF_COUNTERS: What's missing there (besides trivialasm/perfc.handasm/perfc_defn.h)?
I think only them are needed. I can wrap them by #ifdef CONFIG_PERF_COUNTERS to check.
We could wrap asm/perfc.h by #ifdef CONFIG_PERF_COUNTERS, but it seems it should be a separate patch and until there is no such patch it should be disabled.
Quoted 2 lines
As to LIVEPATCH: I suppose there ought to be
HAS_LIVEPATCH
allowing arch-es to indicate whether they support that.
Hmm, I haven't seen HAS_LIVEPATCH. I think the intention was that it is enough to have a default value, but it can be overridden.
config LIVEPATCH
bool "Live patching support"
default X86
....
~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
In reply to Oleksii Kurochkoxen/arch/ppc/include/asm/page.h line 8
Quoted 9 lines · Oleksii Kurochko
xen/arch/ppc/include/asm/page.h +1
-1@@ -4,7 +4,7 @@#include <xen/types.h> -#include <asm/bitops.h> +#include <xen/bitops.h> #include <asm/byteorder.h>
This wants to move up into the xen/*.h group then, like you have done ...
Quoted 5 lines
xen/arch/ppc/mm-radix.c +1
-0@@ -1,11 +1,11 @@/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include <xen/bitops.h>
xen/arch/ppc/mm-radix.c line 11
Quoted 10 lines
xen/arch/ppc/mm-radix.c +0
-1#include <xen/init.h> #include <xen/kernel.h> #include <xen/mm.h> #include <xen/types.h> #include <xen/lib.h> -#include <asm/bitops.h> #include <asm/byteorder.h> #include <asm/early_printk.h> #include <asm/page.h>
.. e.g. here.
Quoted 6 lines
xen/include/xen/bitops.h +0
-0@@ -65,10 +65,137 @@ static inline int generic_flsl(unsigned long x)* scope */
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 10 lines
xen/include/xen/bitops.h +6
-0+#define BITOP_MASK (nr) ((bitop_uint_t)1 << ((nr) % BITOP_BITS_PER_WORD)) + +#define BITOP_WORD (nr) ((nr) / BITOP_BITS_PER_WORD) +/* --------------------- Please tidy above here --------------------- */ #include <asm/bitops.h> +#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)
Can this really do nothing? Passing the address of an object smaller than bitop_uint_t will read past the object in the generic__*_bit() functions.
Quoted 6 lines
xen/include/xen/bitops.h +6
-0+#endif + +/** +* generic__test_and_set_bit - Set a bit and return its old value +* @nr: Bit to set +* @addr: Address to count from
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 93
Quoted 10 lines
xen/include/xen/bitops.h +10
-0+* +* This operation is non-atomic and can be reordered. +* If two examples of this operation race, one can appear to succeed +* but actually fail. You must protect multiple accesses with a lock. +*/ +static always_inline bool +generic__test_and_set_bit (unsigned long nr,volatile void *addr) +{ +bitop_uint_t mask =BITOP_MASK (nr); +volatile bitop_uint_t *p = ((volatile bitop_uint_t *)addr) +BITOP_WORD (nr);
The revision log suggests excess parentheses were dropped from such cast expressions.
xen/include/xen/types.h typedef __u64 __be64; · line 69
Quoted 9 lines
xen/include/xen/types.h +3
-0@@ -64,6 +64,11 @@ typedef __u64 __be64; typedef unsigned int __attribute__((__mode__(__pointer__))) uintptr_t; +#ifndef BITOP_TYPE +#define BITOP_BITS_PER_WORD 32 +typedef uint32_t bitop_uint_t ;
Personally I find this indentation odd / misleading. For pre-processor directives the # preferrably remains first on a line (as was iirc demanded by earlier C standards), followed by one or more blanks if so desired. File-scope declarations imo should never be indented.
Jan
Re: [PATCH v8 03/17] xen/bitops: implement fls{l}() in common logic
In reply to Oleksii KurochkoQuoted 7 lines · Oleksii Kurochko
Return type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer types lacks a cast [-Werror]18 | (void) (&_x == &_y); \ | ^~ common/page_alloc.c:1843:34: note: in expansion of macro 'min' 1843 | unsigned int inc_order = min(MAX_ORDER, flsl(e - s) - 1);
Apart from this I'm okay with this patch, assuming Andrew's won't change in any conflicting way. As to the above - no, I don't see us having ffs() / ffsl() returning unsigned int, fls() / flsl() returning plain int. Even more so that, given the LHS variable's type, an unsigned quantity is really meant in the quoted code.
Jan
Re: [PATCH v8 04/17] xen/bitops: put __ffs() into linux compatible header
In reply to Oleksii Kurochkoxen/include/xen/linux-compat.h typedef int64_t __s64; · line 22
Quoted 7 lines · Oleksii Kurochko
xen/include/xen/linux-compat.h +1
-0@@ -19,4 +19,6 @@ typedef int64_t __s64;typedef paddr_t phys_addr_t ; +#define __ffs (x) (ffsl(x) - 1)
See my v7 reply.
Jan
Re: [PATCH v8 05/17] xen/riscv: introduce bitops.h
In reply to Oleksii KurochkoQuoted 19 lines · Oleksii Kurochko
Taken from Linux-6.4.0-rc1
Xen's
bitops.hconsists of several Linux's headers:
*linux/arch/include/asm/bitops.h:
* The following function were removed as they aren't used in Xen:
*test_and_set_bit_lock
*clear_bit_unlock
*__clear_bit_unlock
* The following functions were renamed in the way how they are used by common code:
*__test_and_set_bit
*__test_and_clear_bit
* The declaration and implementation of the following functios were updated to make Xen build happy:
*clear_bit
*set_bit
*__test_and_clear_bit
*__test_and_set_bit
Quoted 1 line
Signed-off-by Oleksii Kurochko <[email protected]>
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
In reply to Jan BeulichQuoted 4 lines · Jan Beulich
Quoted 4 lines
/* --------------------- Please tidy above here ----------------- ---- */
#include <asm/bitops.h>
Quoted 8 lines
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 3 lines
xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller than
bitop_uint_twill read past the object in the generic__*_bit() functions.
Agree, in generic case it would be better to add:
#define arch_check_bitop_size(addr) (sizeof(*(addr)) < sizeof(bitop_uint_t))
Originally, it was defined as empty becuase majority of supported architectures by Xen don't do this check and I decided to use this definition as generic.
Thanks.
~ Oleksii
Re: [PATCH v8 03/17] xen/bitops: implement fls{l}() in common logic
In reply to Jan BeulichQuoted 12 lines · Jan Beulich
Quoted 10 lines · Oleksii Kurochko
Return type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer types lacks a cast [-Werror]
18 | (void) (&_x == &_y); \
| ^~common/page_alloc.c:1843:34: note: in expansion of macro 'min' 1843 | unsigned intinc_order= min(MAX_ORDER, flsl(e
- s) - 1);
Quoted 9 lines
Apart from this I'm okay with this patch, assuming Andrew's won't change in
any conflicting way. As to the above - no, I don't see us havingffs()/ffsl()
returning unsigned int,fls()/flsl()returning plain int. Even more so that,
given the LHS variable's type, an unsigned quantity is really meant in the
quoted code.
If I understand you correctly, it's acceptable for fls() / flsl() to return 'int'. Therefore, I can update the commit message by removing the part mentioning the compilation error, as it's expected for fls() / flsl() to return 'int'. Is my understanding correct?
~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
In reply to OleksiiQuoted 13 lines · Oleksii
Quoted 4 lines · Jan Beulich
Quoted 4 lines
/* --------------------- Please tidy above here ----------------- ---- */
#include <asm/bitops.h>Quoted 8 lines
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 3 lines
xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller than
bitop_uint_twill read past the object in the generic__*_bit() functions.
Quoted 3 lines
Agree, in generic case it would be better to add:
#definearch_check_bitop_size(addr)(sizeof(*(addr)) <sizeof(bitop_uint_t))
At which point x86 won't need any special casing anymore, I think.
Jan
Re: [PATCH v8 03/17] xen/bitops: implement fls{l}() in common logic
In reply to OleksiiQuoted 22 lines · Oleksii
Quoted 12 lines · Jan Beulich
Quoted 10 lines · Oleksii Kurochko
Return type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer types lacks a cast [-Werror]
18 | (void) (&_x == &_y); \
| ^~common/page_alloc.c:1843:34: note: in expansion of macro 'min' 1843 | unsigned intinc_order= min(MAX_ORDER, flsl(e
- s) - 1);Quoted 9 lines
Apart from this I'm okay with this patch, assuming Andrew's won't change in
any conflicting way. As to the above - no, I don't see us havingffs()/ffsl()
returning unsigned int,fls()/flsl()returning plain int. Even more so that,
given the LHS variable's type, an unsigned quantity is really meant in the
quoted code.
Quoted 4 lines
If I understand you correctly, it's acceptable for
fls()/flsl()to return 'int'. Therefore, I can update the commit message by removing the part mentioning the compilation error, as it's expected forfls()/flsl()to return 'int'. Is my understanding correct?
No. I firmly object to ffs() and fls() being different in their return types. I'm sorry, I realize now that my earlier wording was ambiguous (at least missing "but" after the comma).
Jan
Re: [PATCH v8 03/17] xen/bitops: implement fls{l}() in common logic
Quoted 36 lines · Jan Beulich
Quoted 27 lines · Oleksii
Quoted 15 lines · Jan Beulich
Quoted 13 lines · Oleksii Kurochko
Return type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer
types lacks a cast [-Werror]
18 | (void) (&_x == &_y); \
| ^~common/page_alloc.c:1843:34: note: in expansion of macro 'min'
1843 | unsigned intinc_order= min(MAX_ORDER, flsl(e
- s) - 1);Quoted 11 lines
Apart from this I'm okay with this patch, assuming Andrew's won't change in
any conflicting way. As to the above - no, I don't see us havingffs()/ffsl()
returning unsigned int,fls()/flsl()returning plain int. Even more
so that,
given the LHS variable's type, an unsigned quantity is really meant
in the
quoted code.Quoted 7 lines
If I understand you correctly, it's acceptable for
fls()/flsl()to
return 'int'. Therefore, I can update the commit message by removing
the part mentioning the compilation error, as it's expected forfls()/flsl()to return 'int'. Is my understanding correct?
Quoted 4 lines
No. I firmly object to
ffs()andfls()being different in their return
types. I'm sorry, I realize now that my earlier wording was ambiguous (at least missing "but" after the comma).
Thanks for clarifying.
I can change return type of fls() / flsl() to 'unsingned int' to be the same as return type of ffs() / ffsl(), but then it will be needed to add a cast in two places:
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -1842,7 +1842,7 @@ static void _init_heap_pages(const struct page_info *pg,
* Note that the value of ffsl() and flsl() starts from 1
so we need
* to decrement it by 1.
*/
- unsigned int inc_order = min(MAX_ORDER, flsl(e - s) - 1);
+ unsigned int inc_order = min((unsigned int)MAX_ORDER,
flsl(e - s) - 1);
if ( s )
inc_order = min(inc_order, ffsl(s) - 1U);
@@ -2266,7 +2266,7 @@ void __init xenheap_max_mfn(unsigned long mfn)
ASSERT(!first_node_initialised);
ASSERT(!xenheap_bits);
BUILD_BUG_ON((PADDR_BITS - PAGE_SHIFT) >= BITS_PER_LONG);
- xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, PADDR_BITS);
+ xenheap_bits = min(flsl(mfn + 1) - 1 + PAGE_SHIFT, (unsigned
int)PADDR_BITS);
printk(XENLOG_INFO "Xen heap: %u bits\n", xenheap_bits);
}If it looks okay, then I'll do that in the next patch version.
~ Oleksii
Re: [PATCH v8 03/17] xen/bitops: implement fls{l}() in common logic
Quoted 41 lines · Oleksii
Quoted 36 lines · Jan Beulich
Quoted 27 lines · Oleksii
Quoted 15 lines · Jan Beulich
Quoted 13 lines · Oleksii Kurochko
Return type was left 'int' because of the following compilation error:
./include/xen/kernel.h:18:21: error: comparison of distinct pointer
types lacks a cast [-Werror]
18 | (void) (&_x == &_y); \
| ^~common/page_alloc.c:1843:34: note: in expansion of macro 'min'
1843 | unsigned intinc_order= min(MAX_ORDER, flsl(e
- s) - 1);Quoted 11 lines
Apart from this I'm okay with this patch, assuming Andrew's won't change in
any conflicting way. As to the above - no, I don't see us havingffs()/ffsl()
returning unsigned int,fls()/flsl()returning plain int. Even more
so that,
given the LHS variable's type, an unsigned quantity is really meant
in the
quoted code.Quoted 7 lines
If I understand you correctly, it's acceptable for
fls()/flsl()to
return 'int'. Therefore, I can update the commit message by removing
the part mentioning the compilation error, as it's expected forfls()/flsl()to return 'int'. Is my understanding correct?Quoted 4 lines
No. I firmly object to
ffs()andfls()being different in their return
types. I'm sorry, I realize now that my earlier wording was ambiguous (at least missing "but" after the comma).
Quoted 5 lines
Thanks for clarifying.
I can change return type of
fls()/flsl()to 'unsingned int' to be the same as return type offfs()/ffsl(), but then it will be needed to add a cast in two places:
Except that no, it doesn't really need casts there.
Quoted 11 lines
---
a/xen/common/page_alloc.c
+++b/xen/common/page_alloc.c
@@ -1842,7 +1842,7 @@ static void _init_heap_pages(const structpage_info*pg,
* Note that the value offfsl()andflsl()starts from 1
so we need
* to decrement it by 1.
*/
- unsigned intinc_order=min(MAX_ORDER, flsl(e - s) - 1);
+ unsigned intinc_order= min((unsigned int)MAX_ORDER,
flsl(e - s) - 1);
The preferred course of action would want to be to simply make MAX_ORDER expand to an unsigned constant. Depending on the amount of fallout, an alternative would be to use _AC(MAX_ORDER, U) here. Yet another alternative would be to use MAX_ORDER + 0U here, as iirc we do in a few other places, for similar purposes.
Avoiding a cast here is not only shorter, but - see statements elsewhere - generally preferable.
Jan
Re: [PATCH v8 06/17] xen/riscv: introduce cmpxchg.h
In reply to Oleksii KurochkoQuoted 19 lines · Oleksii Kurochko
xen/arch/riscv/include/asm/cmpxchg.h new file +19
-0+/* +* This function doesn't exist, so you'll get a linker error +* if something tries to do an invalid xchg(). +*/ +extern void __bad_xchg (volatile void *ptr,int size); + +static always_inline unsigned long __xchg (volatile void *ptr,unsigned long new,int size) +{ +unsigned long ret; + +switch ( size ) + { +case 1 : + ret =emulate_xchg_1_2 ((volatile uint8_t *)ptr, new,".aq" ,".aqrl" ); +break ; +case 2 : + ret =emulate_xchg_1_2 ((volatile uint16_t *)ptr, new,".aq" ,".aqrl" ); +break ; +case 4 :
xen/arch/riscv/include/asm/cmpxchg.h line 91
Quoted 10 lines
xen/arch/riscv/include/asm/cmpxchg.h new file +10
-0+_amoswap_generic ((volatile uint32_t *)ptr, new, ret,".w.aqrl" ); +break ; +#ifndef CONFIG_RISCV_32 +case 8 : +_amoswap_generic ((volatile uint64_t *)ptr, new, ret,".d.aqrl" ); +break ; +#endif +default : +__bad_xchg (ptr, size), ret =0 ; + }
I see no real reason to use a comma expression here, the more that "break" needs adding anyway. I wonder why here you don't use ...
Quoted 28 lines
xen/arch/riscv/include/asm/cmpxchg.h new file +28
-0+/* This function doesn't exist, so you'll get a linker error +if something tries to do an invalid cmpxchg(). */ +extern unsigned long __bad_cmpxchg (volatile void *ptr,int size); + +/* +* Atomic compare and exchange. Compare OLD with MEM, if identical, +* store NEW in MEM. Return the initial value in MEM. Success is +* indicated by comparing RETURN with OLD. +*/ +static always_inline unsigned long __cmpxchg (volatile void *ptr, +unsigned long old, +unsigned long new, +int size) +{ +unsigned long ret; + +switch ( size ) + { +case 1 : + ret =emulate_cmpxchg_1_2 ((volatile uint8_t *)ptr, old, new, +".aq" ,".aqrl" ); +break ; +case 2 : + ret =emulate_cmpxchg_1_2 ((volatile uint16_t *)ptr, old, new, +".aq" ,".aqrl" ); +break ; +case 4 : + ret = _generic_cmpxchg((volatile uint32_t *)ptr, old, new,
xen/arch/riscv/include/asm/cmpxchg.h line 213
Quoted 10 lines
xen/arch/riscv/include/asm/cmpxchg.h new file +10
-0+ ".w.aq", ".w.aqrl"); +break ; +#ifndef CONFIG_32BIT +case 8 : + ret =_generic_cmpxchg ((volatile uint64_t *)ptr, old, new, +".d.aq" ,".d.aqrl" ); +break ; +#endif +default : +return __bad_cmpxchg (ptr, size);
... the approach used here.
Also (style nit) the comment on __bad_cmpxchg() is malformed, unlike that ahead of __bad_xchg().
Jan
Re: [PATCH v8 08/17] xen/riscv: introduce atomic.h
In reply to Oleksii KurochkoQuoted 71 lines · Oleksii Kurochko
xen/arch/riscv/include/asm/atomic.h new file +68
-0@@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Taken and modified from Linux. +* +* The following changes were done: +* - * atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated +* to use__*xchg_generic() +* - drop casts in write_atomic() as they are unnecessary +* - drop introduction of WRITE_ONCE() and READ_ONCE(). +* Xen provides ACCESS_ONCE() +* - remove zero-length array access in read_atomic() +* - drop defines similar to pattern +* #define atomic_add_return_relaxed atomic_add_return_relaxed +* - move not RISC-V specific functions to asm-generic/atomics-ops.h +* +* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved. +* Copyright (C) 2012 Regents of the University of California +* Copyright (C) 2017 SiFive +* Copyright (C) 2024 Vates SAS +*/ + +#ifndef _ASM_RISCV_ATOMIC_H +#define _ASM_RISCV_ATOMIC_H + +#include <xen/atomic.h> + +#include <asm/cmpxchg.h> +#include <asm/fence.h> +#include <asm/io.h> +#include <asm/system.h> + +void __bad_atomic_size (void ); + +/* +* Legacy from Linux kernel. For some reason they wanted to have ordered +* read/write access. Thereby read* is used instead of read*_cpu() +*/ +static always_inline void read_atomic_size(const volatile void *p, +void *res, +unsigned int size) +{ +switch ( size ) + { +case 1 : *(uint8_t *)res =readb (p);break ; +case 2 : *(uint16_t *)res =readw (p);break ; +case 4 : *(uint32_t *)res =readl (p);break ; +#ifndef CONFIG_RISCV_32 +case 8 : *(uint32_t *)res =readq (p);break ; +#endif +default :__bad_atomic_size ();break ; + } +} + +#define read_atomic (p) ({ \ + union { typeof(*(p)) val; char c[sizeof(*(p))]; } x_; \ + read_atomic_size(p, x_.c, sizeof(*(p))); \ + x_.val; \ +}) + +static always_inline void _write_atomic(volatile void *p, +unsigned long x,unsigned int size) +{ +switch ( size ) + { +case 1 :writeb (x, p);break ; +case 2 :writew (x, p);break ; +case 4 :writel (x, p);break ; +#ifndef CONFIG_RISCV_32
xen/arch/riscv/include/asm/atomic.h line 78
Quoted 10 lines
xen/arch/riscv/include/asm/atomic.h new file +10
-0+case 8 :writeq (x, p);break ; +#endif +default :__bad_atomic_size ();break ; + } +} + +#define write_atomic (p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _write_atomic((p), x_, sizeof(*(p))); \
Nit: There are still excess parentheses here.
xen/arch/riscv/include/asm/atomic.h line 79
Quoted 1 line
xen/arch/riscv/include/asm/atomic.h new file +1
-0+ x_; \
Why is this? The macro isn't supposed to "return" a value, is it?
xen/arch/riscv/include/asm/atomic.h line 89
Quoted 10 lines
xen/arch/riscv/include/asm/atomic.h new file +10
-0+}) + +static always_inline void _add_sized(volatile void *p, +unsigned long x,unsigned int size) +{ +switch ( size ) + { +case 1 : + { +volatile uint8_t *ptr = (volatile uint8_t *)p;
Here and below: Why the casts?
Jan
Re: [PATCH v8 08/17] xen/riscv: introduce atomic.h
Quoted 89 lines · Jan Beulich
Quoted 75 lines · Oleksii Kurochko
xen/arch/riscv/include/asm/atomic.h new file +6
-0@@ -0,0 +1,281 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Taken and modified from Linux. +* +* The following changes were done: +* - * atomic##prefix##_*xchg_*(atomic##prefix##_t *v, c_t n) were updated
+ * to use__*xchg_generic()
+ * - drop casts inwrite_atomic()as they are unnecessary
+ * - drop introduction ofWRITE_ONCE()andREAD_ONCE().
+ * Xen providesACCESS_ONCE()
+ * - remove zero-length array access inread_atomic()
+ * - drop defines similar to pattern
+ * #define atomic_add_return_relaxedatomic_add_return_relaxed
+ * - move not RISC-V specific functions to asm-generic/atomics-ops.h
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Copyright (C) 2012 Regents of the University of California
+ * Copyright (C) 2017 SiFive
+ * Copyright (C) 2024 Vates SAS
+ */xen/arch/riscv/include/asm/atomic.h new file +15
-0+ +#ifndef _ASM_RISCV_ATOMIC_H +#define _ASM_RISCV_ATOMIC_H + +#include <xen/atomic.h> + +#include <asm/cmpxchg.h> +#include <asm/fence.h> +#include <asm/io.h> +#include <asm/system.h> + +void __bad_atomic_size (void ); + +/* +* Legacy from Linux kernel. For some reason they wanted to have ordered
+ * read/write access. Thereby read* is used instead of read*_cpu()
+ */xen/arch/riscv/include/asm/atomic.h new file +24
-0+static always_inline void read_atomic_size(const volatile void *p, + void *res, + unsigned int size) +{ + switch ( size ) + { + case 1: *(uint8_t *)res = readb(p); break; + case 2: *(uint16_t *)res = readw(p); break; + case 4: *(uint32_t *)res = readl(p); break; +#ifndef CONFIG_RISCV_32 + case 8: *(uint32_t *)res = readq(p); break; +#endif + default: __bad_atomic_size(); break; + } +} + +#define read_atomic (p) ({ \ + union { typeof(*(p)) val; char c[sizeof(*(p))]; } x_; \ + read_atomic_size(p, x_.c, sizeof(*(p))); \ + x_.val; \ +}) + +static always_inline void _write_atomic(volatile void *p, + unsigned long x, unsignedint size)
xen/arch/riscv/include/asm/atomic.h new file +7
-0+{ + switch ( size ) + { + case 1: writeb(x, p); break; + case 2: writew(x, p); break; + case 4: writel(x, p); break; +#ifndef CONFIG_RISCV_32 xen/arch/riscv/include/asm/atomic.h line 78
Quoted 10 lines
xen/arch/riscv/include/asm/atomic.h new file +10
-0+ case 8: writeq(x, p); break; +#endif + default: __bad_atomic_size(); break; + } +} + +#define write_atomic (p, x) \ +({ \ + typeof(*(p)) x_ = (x); \ + _write_atomic((p), x_, sizeof(*(p))); \Nit: There are still excess parentheses here.
Quoted 3 lines
Quoted 1 line
+ x_; \
Why is this? The macro isn't supposed to "return" a value, is it?
You are right. write_atomic() isn't supposed to return a value, so "x_;" can be dropped.
Quoted 14 lines
Quoted 5 lines
xen/arch/riscv/include/asm/atomic.h new file +4
-0+}) + +static always_inline void _add_sized(volatile void *p, + unsigned long x, unsigned intQuoted 7 lines
size)
+{
+ switch ( size )
+ {
+ case 1:
+ {
+ volatileuint8_t*ptr = (volatileuint8_t*)p;Here and below: Why the casts?
Yes, they are not needed. Initially I decided that it could be a compilation issue.
~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
In reply to Jan BeulichQuoted 9 lines · Jan Beulich
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 4 lines
#include <
asm/bitops.h>xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller than
bitop_uint_twill read past the object in the generic__*_bit() functions.
It seems RISC-V isn' happy with the following generic definition:
extern void __bitop_bad_size(void);
/* --------------------- Please tidy above here --------------------
- */
#include <asm/bitops.h>
#ifndef arch_check_bitop_size
#define bitop_bad_size(addr) sizeof(*(addr)) < sizeof(bitop_uint_t)
#define arch_check_bitop_size(addr) \
if ( bitop_bad_size(addr) ) __bitop_bad_size();
#endif /* arch_check_bitop_size */The following errors occurs. bitop_uint_t for RISC-V is defined as unsigned long for now:
./common/symbols-dummy.o -o ./.xen-syms.0
riscv64-linux-gnu-ld: prelink.o: in function `atomic_sub':
/build/xen/./arch/riscv/include/asm/atomic.h:152: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_check_pollers':
/build/xen/common/event_channel.c:1531: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: /build/xen/common/event_channel.c:1521: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_init':
/build/xen/common/event_channel.c:1541: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `_read_lock':
/build/xen/./include/xen/rwlock.h:94: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld:
prelink.o:/build/xen/./arch/riscv/include/asm/atomic.h:195: more undefined references to `__bitop_bad_size' follow
riscv64-linux-gnu-ld: ./.xen-syms.0: hidden symbol `__bitop_bad_size' isn't defined
riscv64-linux-gnu-ld: final link failed: bad value
make[2]: *** [arch/riscv/Makefile:15: xen-syms] Error 1
~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
Quoted 11 lines · Oleksii
Quoted 9 lines · Jan Beulich
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 4 lines
#include <
asm/bitops.h>xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller than
bitop_uint_twill read past the object in the generic__*_bit() functions.It seems RISC-V isn' happy with the following generic definition:
Quoted 15 lines
extern void __bitop_bad_size(void);
/* --------------------- Please tidy above here --------------------
- */
#include <asm/bitops.h>
#ifndef arch_check_bitop_size
#define bitop_bad_size(addr) sizeof(*(addr)) < sizeof(bitop_uint_t)
#define arch_check_bitop_size(addr) \
if ( bitop_bad_size(addr) ) __bitop_bad_size();
#endif /* arch_check_bitop_size */I'm afraid you've re-discovered something that was also found during the original Arm porting effort. As nice and logical as it would (seem to) be to have bitop_uint_t match machine word size, there are places ...
Quoted 2 lines
The following errors occurs.
bitop_uint_tfor RISC-V is defined as unsigned long for now:
... where we assume such operations can be done on 32-bit quantities.
Jan
Quoted 24 lines
./common/symbols-dummy.o -o ./.xen-syms.0riscv64-linux-gnu-ld: prelink.o: in function `atomic_sub':
/build/xen/./arch/riscv/include/asm/atomic.h:152: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_check_pollers':
/build/xen/common/event_channel.c:1531: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: /build/xen/common/event_channel.c:1521: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_init':
/build/xen/common/event_channel.c:1541: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `_read_lock':
/build/xen/./include/xen/rwlock.h:94: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld:
prelink.o:/build/xen/./arch/riscv/include/asm/atomic.h:195: more undefined references to `__bitop_bad_size' follow
riscv64-linux-gnu-ld: ./.xen-syms.0: hidden symbol `__bitop_bad_size' isn't defined
riscv64-linux-gnu-ld: final link failed: bad value
make[2]: *** [arch/riscv/Makefile:15: xen-syms] Error 1~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
Quoted 37 lines · Jan Beulich
Quoted 21 lines · Oleksii
Quoted 10 lines · Jan Beulich
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 4 lines
#include <
asm/bitops.h>xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller
thanbitop_uint_twill read past the object in the generic__*_bit() functions.It seems RISC-V isn' happy with the following generic definition:
extern void__bitop_bad_size(void);
/* --------------------- Please tidy above here ----------------
----
- */
#include <asm/bitops.h>
#ifndefarch_check_bitop_sizeQuoted 8 lines
#definebitop_bad_size(addr)sizeof(*(addr)) <sizeof(bitop_uint_t)
#definearch_check_bitop_size(addr)\
if (bitop_bad_size(addr))__bitop_bad_size();
#endif /*arch_check_bitop_size*/I'm afraid you've re-discovered something that was also found during the
original Arm porting effort. As nice and logical as it would (seem to) be
to havebitop_uint_tmatch machine word size, there are places ...
Quoted 4 lines
Quoted 2 lines
The following errors occurs.
bitop_uint_tfor RISC-V is defined as unsigned long for now:... where we assume such operations can be done on 32-bit quantities.
Based on RISC-V spec machine word is 32-bit, so then I can just drop re-definition of bitop_uint_t in riscv/asm/types.h and use the definition of bitop_uint_t in xen/types.h.
Also it will be needed to update __AMO() macros in <riscv>/asm/bitops.h in the following way:
#if BITOP_BITS_PER_WORD == 64
#define __AMO(op) "amo" #op ".d"
#elif BITOP_BITS_PER_WORD == 32
#define __AMO(op) "amo" #op ".w"
#else
#error "Unexpected BITS_PER_LONG"
#endif
Note: BITS_PER_LONG was changed to BITOP_BITS_PER_WORD !
Only one question remains for me. Given that there are some operations whichcan be performed on 32-bit quantities, it seems to me that bitop_uint_t can only be uint32_t.
Am I correct? If yes, do we need to have ability to redefinebitop_uint_t and BITOP_BITS_PER_WORD in xen/types.h:
#ifndef BITOP_TYPE
#define BITOP_BITS_PER_WORD 32
typedef uint32_t bitop_uint_t; #endif
~ Oleksii
Quoted 32 lines
Jan
Quoted 28 lines
./common/symbols-dummy.o-o ./.xen-syms.0
riscv64-linux-gnu-ld: prelink.o: in function `atomic_sub':
/build/xen/./arch/riscv/include/asm/atomic.h:152: undefined reference
to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_check_pollers':
/build/xen/common/event_channel.c:1531: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: /build/xen/common/event_channel.c:1521:
undefined
reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `evtchn_init':
/build/xen/common/event_channel.c:1541: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld: prelink.o: in function `_read_lock':
/build/xen/./include/xen/rwlock.h:94: undefined reference to `__bitop_bad_size'
riscv64-linux-gnu-ld:
prelink.o:/build/xen/./arch/riscv/include/asm/atomic.h:195: more undefined references to `__bitop_bad_size' follow
riscv64-linux-gnu-ld: ./.xen-syms.0: hidden symbol `__bitop_bad_size'
isn't defined
riscv64-linux-gnu-ld: final link failed: bad value make[2]: *** [arch/riscv/Makefile:15: xen-syms] Error 1~ Oleksii
Re: [PATCH v8 02/17] xen: introduce generic non-atomic test_*bit()
Quoted 60 lines · Oleksii
Quoted 37 lines · Jan Beulich
Quoted 21 lines · Oleksii
Quoted 10 lines · Jan Beulich
xen/include/xen/bitops.h static inline int generic_flsl(unsigned long x) · line 77
Quoted 4 lines
#include <
asm/bitops.h>xen/include/xen/bitops.h +2
-0+#ifndef arch_check_bitop_size +#define arch_check_bitop_size (addr)Can this really do nothing? Passing the address of an object smaller
thanbitop_uint_twill read past the object in the generic__*_bit() functions.It seems RISC-V isn' happy with the following generic definition:
extern void__bitop_bad_size(void);
/* --------------------- Please tidy above here ----------------
----
- */
#include <asm/bitops.h>
#ifndefarch_check_bitop_sizeQuoted 8 lines
#definebitop_bad_size(addr)sizeof(*(addr)) <sizeof(bitop_uint_t)
#definearch_check_bitop_size(addr)\
if (bitop_bad_size(addr))__bitop_bad_size();
#endif /*arch_check_bitop_size*/I'm afraid you've re-discovered something that was also found during the
original Arm porting effort. As nice and logical as it would (seem to) be
to havebitop_uint_tmatch machine word size, there are places ...Quoted 4 lines
Quoted 2 lines
The following errors occurs.
bitop_uint_tfor RISC-V is defined as unsigned long for now:... where we assume such operations can be done on 32-bit quantities.
Based on RISC-V spec machine word is 32-bit, so then I can just drop re-definition of
bitop_uint_tinriscv/asm/types.hand use the definition ofbitop_uint_tinxen/types.h.
Also it will be needed to update__AMO()macros in <riscv>/asm/bitops.h in the following way:#if BITOP_BITS_PER_WORD == 64 #define __AMO(op) "amo" #op ".d" #elif BITOP_BITS_PER_WORD == 32 #define __AMO(op) "amo" #op ".w" #else #error "Unexpected BITS_PER_LONG" #endifNote:
BITS_PER_LONGwas changed toBITOP_BITS_PER_WORD!Only one question remains for me. Given that there are some operations whichcan be performed on 32-bit quantities, it seems to me that
bitop_uint_tcan only beuint32_t.
Am I correct? If yes, do we need to have ability to redefinebitop_uint_tand BITOP_BITS_PER_WORD inxen/types.h:
Quoted 5 lines
#ifndef BITOP_TYPE #define BITOP_BITS_PER_WORD 32 typedef uint32_t bitop_uint_t; #endif
Probably not, right now. Hence me having said "As nice and logical as it would (seem to) be" in the earlier reply.
Jan