- Linux-kselftest-mirror - lists.linaro.org

[PATCH bpf v2 2/2] selftests/bpf: check that modifier resolves after pointer

by Lorenz Bauer

Add a regression test that ensures that a VAR pointing at a modifier which follows a PTR (or STRUCT or ARRAY) is resolved correctly by the datasec validator. Signed-off-by: Lorenz Bauer <lmb(a)isovalent.com> --- tools/testing/selftests/bpf/prog_tests/btf.c | 28 ++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c index cbb600be943d..210d643fda6c 100644 --- a/tools/testing/selftests/bpf/prog_tests/btf.c +++ b/tools/testing/selftests/bpf/prog_tests/btf.c @@ -879,6 +879,34 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, +{ + .descr = "var after datasec, ptr followed by modifier", + .raw_types = { + /* .bss section */ /* [1] */ + BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), + sizeof(void*)+4), + BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), + BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), + /* int */ /* [2] */ + BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), + /* int* */ /* [3] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ + /* const int */ /* [5] */ + BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), + BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ + BTF_END_RAW, + }, + .str_sec = "\0a\0b\0c\0", + .str_sec_size = sizeof("\0a\0b\0c\0"), + .map_type = BPF_MAP_TYPE_ARRAY, + .map_name = ".bss", + .key_size = sizeof(int), + .value_size = sizeof(void*)+4, + .key_type_id = 0, + .value_type_id = 1, + .max_entries = 1, +}, /* Test member exceeds the size of struct. * * struct A { -- 2.39.2

2 years, 6 months

1
0
0 0

Re: Claim of Fund:

by Ms Eve from U.N

Hello Good Morning, This is to bring to your notice that all our efforts to contact you through this your email ID failed Please Kindly contact Barrister. Steven Mike { mbarrsteven(a)gmail.com } on his private email for the claim of your compensation entitlement Note: You have to pay for the delivery fee. Yours Sincerely Mrs EVE LEWIS

2 years, 6 months

1
0
0 0

Re: [PATCH 0/8] clk: Add kunit tests for fixed rate and parent data

by Geert Uytterhoeven

Hi Stephen, On Thu, Mar 2, 2023 at 8:28 PM Stephen Boyd <sboyd(a)kernel.org> wrote: > Quoting Rob Herring (2023-03-02 09:32:09) > > On Thu, Mar 2, 2023 at 2:14 AM David Gow <davidgow(a)google.com> wrote: > > > On Thu, 2 Mar 2023 at 09:38, Stephen Boyd <sboyd(a)kernel.org> wrote: > > > > This patch series adds unit tests for the clk fixed rate basic type and > > > > the clk registration functions that use struct clk_parent_data. To get > > > > there, we add support for loading a DTB into the UML kernel that's > > > > running the unit tests along with probing platform drivers to bind to > > > > device nodes specified in DT. > > > > > > > > With this series, we're able to exercise some of the code in the common > > > > clk framework that uses devicetree lookups to find parents and the fixed > > > > rate clk code that scans devicetree directly and creates clks. Please > > > > review. > > > > > > > > > > Thanks Stephen -- this is really neat! > > > > > > This works well here, and I love all of the tests for the > > > KUnit/device-tree integration as well. > > > > > > I'm still looking through the details of it (alas, I've mostly lived > > > in x86-land, so my device-tree knowledge is, uh, spotty to say the > > > least), but apart from possibly renaming some things or similarly > > > minor tweaks, I've not got any real suggestions thus far. > > > > > > I do wonder whether we'll want, on the KUnit side, to have some way of > > > supporting KUnit device trees on non-UML architecctures (e.g., if we > > > need to test something architecture-specific, or on a big-endian > > > platform, etc), but I think that's a question for the future, rather > > > than something that affects this series. > > > > I'll say that's a requirement. We should be able to structure the > > tests to not interfere with the running system's DT. The DT unittest > > does that. > > That could be another choice in the unit test choice menu. > CONFIG_OF_KUNIT_NOT_UML that injects some built-in DTB overlay on an > architecture that wants to run tests. As long as you use compatible values that don't exist elsewhere, and don't overwrite anything, you can load your kunit test overlays on any running system that has DT support. > > As a side topic, Is anyone looking at getting UML to work on arm64? > > It's surprising how much x86 stuff there is which is I guess one > > reason it hasn't happened. > > I've no idea but it would be nice indeed. I believe that's non-trivial. At least for arm32 (I didn't have any arm64 systems last time I asked the experts). > > > Similarly, I wonder if there's something we could do with device tree > > > overlays, in order to make it possible for tests to swap nodes in and > > > out for testing. > > > > Yes, that's how the DT unittest works. But it is pretty much one big > > overlay (ignoring the overlay tests). It could probably be more > > modular where it is apply overlay, test, remove overlay, repeat. > > I didn't want to rely on the overlay code to inject DT nodes. Having > tests written for the fake KUnit machine is simple. It closely matches > how clk code probes the DTB and how nodes are created and populated on > the platform bus as devices. CLK_OF_DECLARE() would need the overlay to > be applied early too, which doesn't happen otherwise as far as I know. Don't all generic clock drivers also create a platform driver? At least drivers/clk/clk-fixed-factor.c does. > But perhaps this design is too much of an end-to-end test and not a unit > test? In the spirit of unit testing we shouldn't care about how the node > is added to the live devicetree, just that there is a devicetree at all. > > Supporting overlays to more easily test combinations sounds like a good > idea. Probably some kunit_*() prefixed functions could be used to > apply a test managed overlay and automatically remove it when the test > is over would work. The clk registration tests could use this API to > inject an overlay and then manually call the of_platform_populate() > function to create the platform device(s). The overlay could be built in > drivers/clk/ too and then probably some macroish function can find the > blob and apply it. No need to manually call of_platform_populate() to create the platform devices. That is taken care of automatically when applying an overlay. > Is there some way to delete the platform devices that we populate from > the overlay? I'd like the tests to be hermetic. Removing the overlay will delete the platform devices. All of that works if you have your own code to apply a DT overlay. The recent fw_devlinks patches did cause some regressions, cfr. https://lore.kernel.org/all/CAMuHMdXEnSD4rRJ-o90x4OprUacN_rJgyo8x6=9F9rZ+-K… P.S. Shameless plug: for loading overlays from userspace, there are my overlay branches, cfr. https://elinux.org/R-Car/DT-Overlays Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert(a)linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds

2 years, 6 months

2
3
0 0

[PATCH bpf-next 0/2] bpf: add bound tracking for BPF_MOD

by Xu Kuohai

From: Xu Kuohai <xukuohai(a)huawei.com> dst_reg is marked as unknown when BPF_MOD instruction is verified, causing the following bpf prog to be incorrectly rejected. 0: r0 = 0 1: r0 %= 10 // r0 is marked as unknown 2: r1 = 0 3: r1 += 1 4: if r1 < r0 goto pc-2 // verifier concludes the loop is unbounded 5: exit To teach verifier to accept the above prog, this series adds bound tracking for BPF_MOD. Xu Kuohai (2): bpf: add bound tracking for BPF_MOD selftests/bpf: check if verifier tracks dst_reg bound for BPF_MOD kernel/bpf/verifier.c | 98 +++++++- tools/testing/selftests/bpf/verifier/mod.c | 247 +++++++++++++++++++++ 2 files changed, 340 insertions(+), 5 deletions(-) create mode 100644 tools/testing/selftests/bpf/verifier/mod.c -- 2.30.2

2 years, 6 months

2
4
0 0

Re: [PATCH 0/8] clk: Add kunit tests for fixed rate and parent data

by Rob Herring

On Thu, Mar 2, 2023 at 1:44 PM Stephen Boyd <sboyd(a)kernel.org> wrote: > > Quoting Rob Herring (2023-03-02 09:13:59) > > On Wed, Mar 1, 2023 at 7:38 PM Stephen Boyd <sboyd(a)kernel.org> wrote: > > > > > > This patch series adds unit tests for the clk fixed rate basic type and > > > the clk registration functions that use struct clk_parent_data. To get > > > there, we add support for loading a DTB into the UML kernel that's > > > running the unit tests along with probing platform drivers to bind to > > > device nodes specified in DT. > > > > > > With this series, we're able to exercise some of the code in the common > > > clk framework that uses devicetree lookups to find parents and the fixed > > > rate clk code that scans devicetree directly and creates clks. Please > > > review. > > > > > > I Cced everyone to all the patches so they get the full context. I'm > > > hoping I can take the whole pile through the clk tree as they almost all > > > depend on each other. In the future I imagine it will be easy to add > > > more test nodes to the clk.dtsi file and not need to go across various > > > maintainer trees like this series does. > > > > > > Stephen Boyd (8): > > > dt-bindings: Add linux,kunit binding > > > of: Enable DTB loading on UML for KUnit tests > > > kunit: Add test managed platform_device/driver APIs > > > clk: Add test managed clk provider/consumer APIs > > > dt-bindings: kunit: Add fixed rate clk consumer test > > > clk: Add KUnit tests for clk fixed rate basic type > > > dt-bindings: clk: Add KUnit clk_parent_data test > > > clk: Add KUnit tests for clks registered with struct clk_parent_data > > > > Good to see bindings for this. I've been meaning to do something about > > the DT unittest ones being undocumented, but I hadn't really decided > > whether it was worth writing schemas for them. The compatibles at > > least show up with 'make dt_compatible_check'. Perhaps we want to just > > define some vendor (not 'linux') that's an exception rather than > > requiring schemas (actually, that already works for 'foo'). > > Sure. Maybe "kunit" should be the vendor prefix? Or "dtbunit"? We'd want to use the same thing on the DT unittests or anything else potentially. How about just 'test'? > > It's > > likely that we want test DTs that fail normal checks and schemas get > > in the way of that as we don't have a way to turn off checks. > > Having the schemas is nice to make sure tests that are expecting some > binding are actually getting that. But supporting broken bindings is > also important to test any error paths in functions that parse > properties. Maybe we keep the schema and have it enforce that incorrect > properties are being set? I wasn't suggesting throwing them out. More why I hadn't written any I guess. > Do we really need to test incorrect bindings? Doesn't the > dt_bindings_check catch these problems so we don't have to write DTB > verifiers in the kernel? Fair enough. Using my frequently stated position against me. :) I do have a secret plan to implement (debug) type checks into the of_property_* APIs by extracting the type information from schemas into C. > > We already have GPIO tests in the DT unittests, so why is clocks > > different? Or should the GPIO tests be moved out (yes, please!)? > > Ah I didn't notice the GPIO tests in there. There are i2c tests too, > right? All I can say is clks are using kunit, that's the difference ;-) Yeah, they should perhaps all move to the subsystems. > > What happens when/if the DT unittest is converted to kunit? I think > > that would look confusing from the naming. My initial thought is > > 'kunit' should be dropped from the naming of a lot of this. Note that > > the original kunit submission converted the DT unittests. I would > > still like to see that happen. Frank disagreed over what's a unit test > > or not, then agreed, then didn't... I don't really care. If there's a > > framework to use, then we should use it IMO. > > Honestly I don't want to get involved in migrating the existing DT > unittest code to kunit. I'm aware that it was attempted years ago when > kunit was introduced. Maybe if the overlay route works well enough I can > completely sidestep introducing any code in drivers/of/ besides some > kunit wrappers for this. I'll cross my fingers! Yeah, I wasn't expecting you to. I just want to make sure this meshes with any future conversion to kunit. There's also some plans to always populate the DT root node if not present. That may help here. Or not. There's been a few versions posted with Frank's in the last week or 2. Rob

2 years, 6 months

2
1
0 0

Re: [PATCH 0/8] clk: Add kunit tests for fixed rate and parent data

by Frank Rowand

On 3/2/23 13:27, Stephen Boyd wrote: > Quoting Rob Herring (2023-03-02 09:32:09) >> On Thu, Mar 2, 2023 at 2:14 AM David Gow <davidgow(a)google.com> wrote: >>> >>> On Thu, 2 Mar 2023 at 09:38, Stephen Boyd <sboyd(a)kernel.org> wrote: >>>> >>>> This patch series adds unit tests for the clk fixed rate basic type and >>>> the clk registration functions that use struct clk_parent_data. To get >>>> there, we add support for loading a DTB into the UML kernel that's >>>> running the unit tests along with probing platform drivers to bind to >>>> device nodes specified in DT. >>>> >>>> With this series, we're able to exercise some of the code in the common >>>> clk framework that uses devicetree lookups to find parents and the fixed >>>> rate clk code that scans devicetree directly and creates clks. Please >>>> review. >>>> >>> >>> Thanks Stephen -- this is really neat! >>> >>> This works well here, and I love all of the tests for the >>> KUnit/device-tree integration as well. >>> >>> I'm still looking through the details of it (alas, I've mostly lived >>> in x86-land, so my device-tree knowledge is, uh, spotty to say the >>> least), but apart from possibly renaming some things or similarly >>> minor tweaks, I've not got any real suggestions thus far. >>> >>> I do wonder whether we'll want, on the KUnit side, to have some way of >>> supporting KUnit device trees on non-UML architecctures (e.g., if we >>> need to test something architecture-specific, or on a big-endian >>> platform, etc), but I think that's a question for the future, rather >>> than something that affects this series. >> >> I'll say that's a requirement. We should be able to structure the >> tests to not interfere with the running system's DT. The DT unittest >> does that. > > That could be another choice in the unit test choice menu. > CONFIG_OF_KUNIT_NOT_UML that injects some built-in DTB overlay on an > architecture that wants to run tests. > >> >> As a side topic, Is anyone looking at getting UML to work on arm64? >> It's surprising how much x86 stuff there is which is I guess one >> reason it hasn't happened. > > I've no idea but it would be nice indeed. > >> >>> Similarly, I wonder if there's something we could do with device tree >>> overlays, in order to make it possible for tests to swap nodes in and >>> out for testing. >> >> Yes, that's how the DT unittest works. But it is pretty much one big >> overlay (ignoring the overlay tests). It could probably be more >> modular where it is apply overlay, test, remove overlay, repeat. >> > > I didn't want to rely on the overlay code to inject DT nodes. Having > tests written for the fake KUnit machine is simple. It closely matches > how clk code probes the DTB and how nodes are created and populated on > the platform bus as devices. CLK_OF_DECLARE() would need the overlay to > be applied early too, which doesn't happen otherwise as far as I know. > > But perhaps this design is too much of an end-to-end test and not a unit > test? In the spirit of unit testing we shouldn't care about how the node > is added to the live devicetree, just that there is a devicetree at all. > > Supporting overlays to more easily test combinations sounds like a good > idea. Probably some kunit_*() prefixed functions could be used to In an imaginary world where overlay support was completed, then _maybe_. To me, the most important environment to test is where the devictree data is populated in early boot from an FDT. This is the environment that drivers currently exist in. Populating devicetree data via an overlay adds in the functioning of the overlay apply code (and how the rules behind that functioning may differ from devicetree data populated in early boot from an FDT). In an ideal world where overlay support was completed, most or all of the devicetree tests that were performed against the devicetree data populated in early boot from an FDT would be repeated, but against comparable devicetree data populated via an overlay load. The tests with the overlay data may have to be aware of some differences in how an overlay load processes an FDT vs how the early boot processing of an FDT behaves. This extra testing would verify that the overlay environment behaves the same as the non-overlay environment (with some known exceptions due to overlay policies). Overlay support is not complete: https://elinux.org/Device_Tree_Reference#Mainline_Linux_Support https://elinux.org/Frank%27s_Evolving_Overlay_Thoughts -Frank > apply a test managed overlay and automatically remove it when the test > is over would work. The clk registration tests could use this API to > inject an overlay and then manually call the of_platform_populate() > function to create the platform device(s). The overlay could be built in > drivers/clk/ too and then probably some macroish function can find the > blob and apply it. > > Is there some way to delete the platform devices that we populate from > the overlay? I'd like the tests to be hermetic.

2 years, 6 months

1
0
0 0

[PATCH] selftests: ir: add config file

by Anders Roxell

Building and running the subsuite 'ir' of kselftest, shows the following issues: ir_loopback: module rc-loopback is not found in /lib/modules/6.2.0-rc8-next-20230220 [SKIP] By creating a config file with RC_LOOPBACK=m, LIRC=y and a few IR_*DECODER=m in the selftests/ir/ directory the tests pass. Reported-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Anders Roxell <anders.roxell(a)linaro.org> --- tools/testing/selftests/ir/config | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 tools/testing/selftests/ir/config diff --git a/tools/testing/selftests/ir/config b/tools/testing/selftests/ir/config new file mode 100644 index 000000000000..a6031914fa3d --- /dev/null +++ b/tools/testing/selftests/ir/config @@ -0,0 +1,13 @@ +CONFIG_LIRC=y +CONFIG_IR_IMON_DECODER=m +CONFIG_IR_JVC_DECODER=m +CONFIG_IR_MCE_KBD_DECODER=m +CONFIG_IR_NEC_DECODER=m +CONFIG_IR_RC5_DECODER=m +CONFIG_IR_RC6_DECODER=m +CONFIG_IR_RCMM_DECODER=m +CONFIG_IR_SANYO_DECODER=m +CONFIG_IR_SHARP_DECODER=m +CONFIG_IR_SONY_DECODER=m +CONFIG_IR_XMP_DECODER=m +CONFIG_RC_LOOPBACK=m -- 2.39.1

2 years, 6 months

2
1
0 0

[PATCH 2/2] replace 2&>1 by 2>&1

by Patrice Duroux

Signed-off-by: Patrice Duroux <patrice.duroux(a)gmail.com> --- .../testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh b/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh index a1f269ee84da..92acab83fbe2 100755 --- a/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh +++ b/tools/testing/selftests/drivers/net/dsa/test_bridge_fdb_stress.sh @@ -31,7 +31,7 @@ trap 'cleanup' EXIT eth=${NETIFS[p1]} -ip link del br0 2&>1 >/dev/null || : +ip link del br0 2>&1 >/dev/null || : ip link add br0 type bridge && ip link set $eth master br0 (while :; do -- 2.39.2

2 years, 6 months

2
1
0 0

[PATCH v3 0/5] Add IO page table replacement support for emulated pathway

by Nicolin Chen

Changelog v3: * Rebased on top of Jason's iommufd_hwpt branch: https://github.com/jgunthorpe/linux/commits/iommufd_hwpt Particularly the following series: 1) "Revise the hwpt lifetime model" https://lore.kernel.org/linux-iommu/0-v2-406f7ac07936+6a-iommufd_hwpt_jgg@n… 2) "Add iommufd physical device operations for replace and alloc hwpt" https://lore.kernel.org/linux-iommu/0-v1-7612f88c19f5+2f21-iommufd_alloc_jg… * Dropped patches from this series accordingly. There were a couple of VFIO patches that will be submitted after the VFIO cdev series. Also, renamed the series to be "emulated". * Moved dma_unmap sanity patch to the first in the series. * Moved dma_unmap sanity to cover both VFIO and IOMMUFD pathways. * Added Kevin's "Reviewed-by" to two of the patches. * Fixed a NULL pointer bug in vfio_iommufd_emulated_bind(). * Moved unmap() call to the common place in iommufd_access_set_ioas(). v2: https://lore.kernel.org/linux-iommu/cover.1675802050.git.nicolinc@nvidia.co… * Rebased on top of vfio_device cdev v2 series. * Update the kdoc and commit message of iommu_group_replace_domain(). * Dropped revert-to-core-domain part in iommu_group_replace_domain(). * Dropped !ops->dma_unmap check in vfio_iommufd_emulated_attach_ioas(). * Added missing rc value in vfio_iommufd_emulated_attach_ioas() from the iommufd_access_set_ioas() call. * Added a new patch in vfio_main to deny vfio_pin/unpin_pages() calls if vdev->ops->dma_unmap is not implemented. * Added a __iommmufd_device_detach helper and let the replace routine do a partial detach(). * Added restriction on auto_domains to use the replace feature. * Added the patch "iommufd/device: Make hwpt_list list_add/del symmetric" from the has_group removal series. v1: https://lore.kernel.org/linux-iommu/cover.1675320212.git.nicolinc@nvidia.co… Hi all, The existing IOMMU APIs provide a pair of functions: iommu_attach_group() for callers to attach a device from the default_domain (NULL if not being supported) to a given iommu domain, and iommu_detach_group() for callers to detach a device from a given domain to the default_domain. Internally, the detach_dev op is deprecated for the newer drivers with default_domain. This means that those drivers likely can switch an attaching domain to another one, without stagging the device at a blocking or default domain, for use cases such as: 1) vPASID mode, when a guest wants to replace a single pasid (PASID=0) table with a larger table (PASID=N) 2) Nesting mode, when switching the attaching device from an S2 domain to an S1 domain, or when switching between relevant S1 domains. This series is rebased on top of Jason Gunthorpe's series that introduces iommu_group_replace_domain API and IOMMUFD infrastructure for the IOMMUFD "physical" devices. The IOMMUFD "emulated" deivces will need some extra steps to replace the access->ioas object and its iopt pointer. You can also find this series on Github: https://github.com/nicolinc/iommufd/commits/iommu_group_replace_domain-v3 Thank you Nicolin Chen Nicolin Chen (5): vfio: Do not allow !ops->dma_unmap in vfio_pin/unpin_pages() iommufd: Create access in vfio_iommufd_emulated_bind() iommufd/selftest: Add IOMMU_TEST_OP_ACCESS_SET_IOAS coverage iommufd: Add replace support in iommufd_access_set_ioas() iommufd/selftest: Add coverage for access->ioas replacement drivers/iommu/iommufd/device.c | 114 ++++++++++++++---- drivers/iommu/iommufd/iommufd_private.h | 2 + drivers/iommu/iommufd/iommufd_test.h | 4 + drivers/iommu/iommufd/selftest.c | 25 +++- drivers/vfio/iommufd.c | 23 ++-- drivers/vfio/vfio_main.c | 4 + include/linux/iommufd.h | 3 +- tools/testing/selftests/iommu/iommufd.c | 29 ++++- tools/testing/selftests/iommu/iommufd_utils.h | 22 +++- 9 files changed, 185 insertions(+), 41 deletions(-) -- 2.39.2

2 years, 6 months

3
10
0 0

[PATCH v1] KVM: selftests: arm64: Fix ttbr0_el1 encode for PA bits > 48

by Ryan Roberts

Bits [51:48] of the pgd address are stored at bits [5:1] of ttbr0_el1. page_table_test stores its page tables at the far end of IPA space so was tripping over this when run on a system that supports FEAT_LPA (or FEAT_LPA2). Signed-off-by: Ryan Roberts <ryan.roberts(a)arm.com> --- tools/testing/selftests/kvm/lib/aarch64/processor.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/aarch64/processor.c b/tools/testing/selftests/kvm/lib/aarch64/processor.c index 13f28d96521c..3947f3ccee7e 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/processor.c +++ b/tools/testing/selftests/kvm/lib/aarch64/processor.c @@ -242,7 +242,7 @@ void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init) { struct kvm_vcpu_init default_init = { .target = -1, }; struct kvm_vm *vm = vcpu->vm; - uint64_t sctlr_el1, tcr_el1; + uint64_t sctlr_el1, tcr_el1, ttbr0_el1; if (!init) init = &default_init; @@ -293,10 +293,13 @@ void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init) TEST_FAIL("Unknown guest mode, mode: 0x%x", vm->mode); } + ttbr0_el1 = vm->pgd & GENMASK(47, vm->page_shift); + /* Configure output size */ switch (vm->mode) { case VM_MODE_P52V48_64K: tcr_el1 |= 6ul << 32; /* IPS = 52 bits */ + ttbr0_el1 |= (vm->pgd & GENMASK(51, 48)) >> (48 - 2); break; case VM_MODE_P48V48_4K: case VM_MODE_P48V48_16K: @@ -326,7 +329,7 @@ void aarch64_vcpu_setup(struct kvm_vcpu *vcpu, struct kvm_vcpu_init *init) vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_SCTLR_EL1), sctlr_el1); vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TCR_EL1), tcr_el1); vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_MAIR_EL1), DEFAULT_MAIR_EL1); - vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), vm->pgd); + vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TTBR0_EL1), ttbr0_el1); vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_TPIDR_EL1), vcpu->id); } -- 2.25.1

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror