From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 86257CCF2C7 for ; Sat, 17 Oct 2026 11:03:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JoX/Sc8sCNCbQgMGh7YagBl2a8I79t4cTQe0/x9ldd0=; b=D4NfvSN0q4eTUk fMnmpXEPulsRVg0m9i4jTJJWLx/ODRFXJy3KULGFLI4gp2OcS0uO+ufouLEsmohmnGB+G28atVXc5 Lxw2ntiDX0OU8sKs+XqL/RElzbkv3JTkal0nzMX6oUHRDCxbZEjvUCK4XC4v9enNcvVV4p8WLQnMl 7nlDXWwdMR4/lSo0j2gHdvsx0s4CYN/XaUzEyw5WhXKBo3eU8ZnZI2Kpj4LWfG8QrG5w9yIaZAnMx fa+nIv4bJ3vZ3zAYXVeeruMVB4KywE/FV0yqVxuO47cxohe6hbC5DM8ervyQpLcxmT0FblV1JEbPd VCPpCgZ9NuMckeLsyO1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1xI2CJ-00000004hWx-3w9q; Sat, 17 Oct 2026 11:03:33 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1xI2C7-00000004hQi-39nv for linux-riscv@lists.infradead.org; Sat, 17 Oct 2026 11:03:20 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-2e95bd1c14cso5454225ad.2 for ; Sat, 17 Oct 2026 04:03:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792234999; x=1792839799; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ny7KTMx+qld96qza0vCY0Dx/Bp+/LmW5iI7Izuhy18k=; b=IfMTp1WPqg5knQfayfRmDRHqRpwDlB1vj2ygSrUGegUuPn88JY1qspdqN4TYNEp+Q2 ZNCgOAuyRd9dVzP+PbGnqKWcbVA9C5PnDM+j5L9jBtiUSd1xJxZLyYJtqZgxo7BgnnYS c4k/ucemOB2w6bDIFKA6kyctcPcXXCKqWHzJ9sV/goRW00eCAcGcNibxqM/D/96Tan1M +Z3t4FMo1Y7mE3QrjfgG/Oe1fp+p3aJHLM+GvpP9kO1bLd7DKEev4kvADdgobndDzpqP LKcEkXApdDpVKQHnWSQkVfe+kFQpbUUKU9dUtzrcmIE175NKs2vGzzQwaIjzbyYdyRVh Og+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792234999; x=1792839799; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ny7KTMx+qld96qza0vCY0Dx/Bp+/LmW5iI7Izuhy18k=; b=o2CA+Fz6Bah5h/B4a6hb82OYibvCjga491Zpnz2vzvvzz2DEhCmUpkvnHft+ZBJxCN fjYo51zZDLvw7eaBxBKflZ61670xeC20fzi44Keu2JZuRqeJqt8AjvYBdnI08ODg17pO N/p+najaHicUumy/xsKhK6uRoRHzfB164uXeSiC3c4NjexcO/9gtZ47ayyvCc20N4BI1 PScSeGGTdYDtzb3mjWWX0tvS38CiZaPV/C/ynbjIgQSzlBxXsgN7OnvWaGjxQM0+c6J7 DawQI/SsjaXI7FOhYSpM5uNlCmpzgGl0f+nAktLnswOsULQWj3eNMHTYSp3Ii/JnFP4z PMHw== X-Forwarded-Encrypted: i=1; AKwUvByClILfidfRre1lzF/gu0wKO/kwG0SVOXXP0IUS8PsGC0+1qX4hdCFzCYgx8ZI9Cs7vNQVDomtI3eX88w==@lists.infradead.org X-Gm-Message-State: AFq9FYI5DHYmOwZ0AGm8pJccb3ggoMa6c5lVrYNtjGAEaYOBvr0iR+S1 GvoUS52cCSxsHrHZYEwDZy51pRlGHW4ulOltZ6pk16Ty4l1fgZg2yk3U X-Gm-Gg: AYBFou1fGRb66QQpg0k6oEdTi+LwsAwPgOZXeCbGltIivbCv7M7IYfu/rC4IPAz+w6Y mB8YCM89e2ZV1NgMyfXf6V/+2MhdVUAzJLSvv9hXYCCgVpvSKmSsXleD5we4p2g1Lk86/iQ3xo9 q6Mi/JlydVyAK7QbuLGsna8/8wRCLCCtiYqw70jSAo3yOOGCU2qN2Tr/tesIy6i3JYzcj8jtOjC n7LXBbC9NFIMI2DWKc/fcTzKkb2ojjuoOiDnKdeVQFFBPymjI+RLOq1w56p1TRSSb0kDEd7reiE 2lDtMWIKRNeApPF2c7G5DH/VzSl2A+IWPYvlvBRRUIv3Sw1emfnMTW88sfsHiZlMh2/MAARjyo3 J7t7jNvQcfIvLXs+LE/fhpOsxlYyHs/OgZVt2/F4RqpU+6sVAlRpDqcEIJ1sbcSMbCnYkel9ZP7 m9FbcVITbgdQLFN48WNgn7Hjz9p7Uwo/BP7X7aiFFl4LQMhbeoIQU63VxGDUy4noZNN6hhYX5K7 gMNfkdCp6OPhNqtEhf+KQ== X-Received: by 2002:a17:902:d512:b0:2e9:3c24:999 with SMTP id d9443c01a7336-2e9a6c0de51mr23081545ad.40.1792234999087; Sat, 17 Oct 2026 04:03:19 -0700 (PDT) Received: from x1c ([2405:9800:b670:b64b:7c65:ff3e:80ba:b06]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2e97e804dd9sm20559955ad.16.2026.10.17.04.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Oct 2026 04:03:18 -0700 (PDT) From: Tharit Tangkijwanichakul To: Paolo Bonzini , Sean Christopherson Cc: Shuah Khan , Marc Zyngier , Oliver Upton , Fuad Tabba , Joey Gouly , Steffen Eiden , Suzuki K Poulose , Zenghui Yu , Anup Patel , Atish Patra , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel-mentees@lists.linux.dev, skhan@linuxfoundation.org, me@brighamcampbell.com, jkoolstra@xs4all.nl, Tharit Tangkijwanichakul Subject: [PATCH 4/5] KVM: selftests: Reserve memslot 1 for the ucall MMIO address Date: Sat, 17 Oct 2026 18:02:12 +0700 Message-ID: <20261017110213.46199-5-tharitt97@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261017110213.46199-1-tharitt97@gmail.com> References: <20261017110213.46199-1-tharitt97@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261017_040319_795917_220754A1 X-CRM114-Status: GOOD ( 10.34 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Back the ucall MMIO address with a read-only region in slot 1 when KVM_CAP_READONLY_MEM is available. Writes still exit as MMIO, while overlapping memslot creation is rejected. Start test memslots at slot 2, leaving slot 1 reserved by convention even when read-only memory is unsupported. Signed-off-by: Tharit Tangkijwanichakul --- .../testing/selftests/kvm/include/kvm_util.h | 2 +- tools/testing/selftests/kvm/lib/kvm_util.c | 19 +++++++++++++------ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 759d604d44ce..4dbb2ef332fc 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -30,7 +30,7 @@ #define KVM_DEV_PATH "/dev/kvm" #define KVM_MAX_VCPUS 512 -#define TEST_MEM_SLOT_BASE 1 +#define TEST_MEM_SLOT_BASE 2 #define NSEC_PER_SEC 1000000000L diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 9ddc047d5c27..73e28814a226 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -20,6 +20,7 @@ #include #define KVM_UTIL_MIN_PFN 2 +#define KVM_UCALL_MEMSLOT 1 u32 kvm_random_seed; struct kvm_random_state kvm_rng; @@ -492,6 +493,7 @@ struct kvm_vm *__vm_create(struct vm_shape shape, u32 nr_runnable_vcpus, struct userspace_mem_region *slot0; struct kvm_vm *vm; int i, flags; + gpa_t mmio_gpa; kvm_set_files_rlimit(nr_runnable_vcpus); @@ -514,14 +516,19 @@ struct kvm_vm *__vm_create(struct vm_shape shape, u32 nr_runnable_vcpus, kvm_vm_elf_load(vm, program_invocation_name); - /* - * TODO: Add proper defines to protect the library's memslots, and then - * carve out memslot1 for the ucall MMIO address. KVM treats writes to - * read-only memslots as MMIO, and creating a read-only memslot for the - * MMIO region would prevent silently clobbering the MMIO region. + /* KVM treats writes to read-only memslots as MMIO, and creating + * a read-only memslot for the MMIO region would prevent silently + * clobbering the MMIO region. */ slot0 = memslot2region(vm, 0); - ucall_init(vm, slot0->region.guest_phys_addr + slot0->region.memory_size); + mmio_gpa = slot0->region.guest_phys_addr + slot0->region.memory_size; + ucall_init(vm, mmio_gpa); + + if (vm_check_cap(vm, KVM_CAP_READONLY_MEM)) + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, + mmio_gpa, KVM_UCALL_MEMSLOT, + vm_adjust_num_guest_pages(vm->mode, 1), + KVM_MEM_READONLY); if (kvm_random_seed != last_kvm_seed) kvm_seed_rng(kvm_random_seed); -- 2.53.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv