From patchwork Fri Sep 10 00:49:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Koller X-Patchwork-Id: 12484195 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30BD9C433EF for ; Fri, 10 Sep 2021 01:14:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 130A361051 for ; Fri, 10 Sep 2021 01:14:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235085AbhIJBQC (ORCPT ); Thu, 9 Sep 2021 21:16:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234402AbhIJBPy (ORCPT ); Thu, 9 Sep 2021 21:15:54 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75AB2C08ED4B for ; Thu, 9 Sep 2021 17:49:24 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id j4-20020a258b84000000b005a203c5e066so173028ybl.19 for ; Thu, 09 Sep 2021 17:49:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=PnmYaOqrQjNWrJEqxLGOl8MYEOt5oEWk1M6ZydsFVAE=; b=TQM4yg1FQfOHBQ3ZAvGNocrqsOwJKAxncc4mbKyCgHs5sxi89dK2qKe5iyJqq1tvRR An/tkJry/YQJFz5NFvLeQWjiGWZV0FNQxX6QlpwEu0YEYlcLf/SL1VEosgZip9wKDt1o Qheb62L3ihr6th3Wp84yvD/P8BtLuGFAkktnoXOnaBiIIMQaGKUV/XNawWcPtC3IO1Zm 0PKmKFlrBx8a1DpltbAaAi8pbfBr3joPqTjnBeN5wsA5zCOQ9NbF8ymQAuzxwkHJE4gc R4LfXayln5UN0nhCcF3OFkoL9yv7E/nF1z8EpdhuBipWE0CNvsIFi3c4iq0iRIHRk7ye J2BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=PnmYaOqrQjNWrJEqxLGOl8MYEOt5oEWk1M6ZydsFVAE=; b=oaSWA3DOn0RathJHVPb/Vuk7mefs1QXLoF1nghOU0gQo9ii3AYfJQ4FXOrnRxdL20W 6Ti8/SPztFD9eTGbTZtdOYbrysCKbprt1MMXDAAMlv7rsnXZWSkgUreFWXB3FCBliL/A A+xZxHgDnf1Ibtv2UKWiLlS1lrLn75PACq5IpGUEzF8YfiWmh7FtjgNd3DS6C6oBL3yG jKBf1A7ScJCOegOqFzS5EHlPPJVnkZcNBLmX/qkfbXSVwIQnFVH3CJGPMGaf/OfjDOB8 ZLvt392hyboV13Ymynf4VAsPp422xHRUTnyjsxxXo8dJTVd1DLQXIAzvX+9PFs1b9M55 9qqQ== X-Gm-Message-State: AOAM5302+F5sqAHD0RAeaGVPBLrSIJn7Upwl2jhOOA/fwmhHnTV1xZ9n vT9uOXQxjGgYUBEOF5CKzj8c5Ngr+MnP+7LWu2IFZtxxhr2NfF06LX71ZRa6Kyl5rLNXI8ChPOC 13VD6E2FSGHgKJ1DwfILvB9T7tw436VhcGhtmw8/n0jjBq20eT89V/hQflS2VCJQ= X-Google-Smtp-Source: ABdhPJwltqINxS2/XMXrxLmWX9yF6gQpclVmbDxaDjAl+YaM/CMRTWEuXw0zyveFYzixo9Vkn5FgkDdOFdD6Tg== X-Received: from ricarkol2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:62fe]) (user=ricarkol job=sendgmr) by 2002:a25:7409:: with SMTP id p9mr7587625ybc.462.1631234963645; Thu, 09 Sep 2021 17:49:23 -0700 (PDT) Date: Thu, 9 Sep 2021 17:49:18 -0700 In-Reply-To: <20210910004919.1610709-1-ricarkol@google.com> Message-Id: <20210910004919.1610709-2-ricarkol@google.com> Mime-Version: 1.0 References: <20210910004919.1610709-1-ricarkol@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog Subject: [PATCH v2 1/2] KVM: arm64: vgic: check redist region is not above the VM IPA size From: Ricardo Koller To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: Paolo Bonzini , oupton@google.com, james.morse@arm.com, suzuki.poulose@arm.com, shuah@kernel.org, jingzhangos@google.com, pshier@google.com, rananta@google.com, reijiw@google.com, Ricardo Koller Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Verify that the redistributor regions do not extend beyond the VM-specified IPA size (phys_size). This can happen when using KVM_VGIC_V3_ADDR_TYPE_REDIST or KVM_VGIC_V3_ADDR_TYPE_REDIST_REGIONS with: base + size > phys_size AND base < phys_size Add the missing check into vgic_v3_alloc_redist_region() which is called when setting the regions, and into vgic_v3_check_base() which is called when attempting the first vcpu-run. The vcpu-run check does not apply to KVM_VGIC_V3_ADDR_TYPE_REDIST_REGIONS because the regions size is known before the first vcpu-run. Finally, this patch also enables some extra tests in vgic_v3_alloc_redist_region() by calculating "size" early for the legacy redist api. Signed-off-by: Ricardo Koller --- arch/arm64/kvm/vgic/vgic-mmio-v3.c | 7 ++++++- arch/arm64/kvm/vgic/vgic-v3.c | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/vgic/vgic-mmio-v3.c b/arch/arm64/kvm/vgic/vgic-mmio-v3.c index a09cdc0b953c..055671bede85 100644 --- a/arch/arm64/kvm/vgic/vgic-mmio-v3.c +++ b/arch/arm64/kvm/vgic/vgic-mmio-v3.c @@ -796,7 +796,9 @@ static int vgic_v3_alloc_redist_region(struct kvm *kvm, uint32_t index, struct vgic_dist *d = &kvm->arch.vgic; struct vgic_redist_region *rdreg; struct list_head *rd_regions = &d->rd_regions; - size_t size = count * KVM_VGIC_V3_REDIST_SIZE; + int nr_vcpus = atomic_read(&kvm->online_vcpus); + size_t size = count ? count * KVM_VGIC_V3_REDIST_SIZE : + nr_vcpus * KVM_VGIC_V3_REDIST_SIZE; int ret; /* cross the end of memory ? */ @@ -834,6 +836,9 @@ static int vgic_v3_alloc_redist_region(struct kvm *kvm, uint32_t index, if (vgic_v3_rdist_overlap(kvm, base, size)) return -EINVAL; + if (base + size > kvm_phys_size(kvm)) + return -E2BIG; + rdreg = kzalloc(sizeof(*rdreg), GFP_KERNEL); if (!rdreg) return -ENOMEM; diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index 66004f61cd83..5afd9f6f68f6 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -512,6 +512,10 @@ bool vgic_v3_check_base(struct kvm *kvm) if (rdreg->base + vgic_v3_rd_region_size(kvm, rdreg) < rdreg->base) return false; + + if (rdreg->base + vgic_v3_rd_region_size(kvm, rdreg) > + kvm_phys_size(kvm)) + return false; } if (IS_VGIC_ADDR_UNDEF(d->vgic_dist_base)) From patchwork Fri Sep 10 00:49:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ricardo Koller X-Patchwork-Id: 12484197 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8297FC433FE for ; Fri, 10 Sep 2021 01:14:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 60B2160F45 for ; Fri, 10 Sep 2021 01:14:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235129AbhIJBQD (ORCPT ); Thu, 9 Sep 2021 21:16:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234581AbhIJBPz (ORCPT ); Thu, 9 Sep 2021 21:15:55 -0400 Received: from mail-qt1-x849.google.com (mail-qt1-x849.google.com [IPv6:2607:f8b0:4864:20::849]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE28AC08ED6D for ; Thu, 9 Sep 2021 17:49:25 -0700 (PDT) Received: by mail-qt1-x849.google.com with SMTP id r6-20020a05622a034600b002a0ba9994f4so4214qtw.22 for ; Thu, 09 Sep 2021 17:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=qXTzlQcki5Z1B3LV6gzbhBx4QrZxfh2wOWzu6LDwbLI=; b=DvMVWjV3QYWlrellGcgEt+A/tPhUiz5dpu+g0e7xAqEBmW+XVsbtrG9TSYRL/rQbF/ Vb8PshuGDJefFH7kzGp5MQuYE4qrful3MV7uzGaerCHJkLlyAGRIqp+Fxfc5PC2M8IsI aCDSZ9Q4tEw62gWGjSFCY9w09U3jPwLqNBEsvGbDeRlLCi6Wz7AwUU/gRyLcto7iRBVm TRmv5hSI6M4wM1n2YZ59xwuxCIyw9GlkBAwvjlSKcoUB5gkBfuZGfObHt+Dxxp97BBRM pU3QP1vrVQGZvyf2CH3rmBHrJOMRO73ARJ1C5a+KsAiKEjtpkkxBBD7YAHn7RQBdHGps VfnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=qXTzlQcki5Z1B3LV6gzbhBx4QrZxfh2wOWzu6LDwbLI=; b=6lckXFuueZAC3jiKQvYP3c3Z9DckqtHIPAuNXEa9gsr53he4ei+DxWKaQqjf9V8Fub iawRZaDUkA+XczEZ17/0lDVkSi9QQ4SKt/PGTJgH0E+APWWfU/T9bQztQujl0YCTE9xA wU+bifmfrJ7XdDD9nGOjlvbJgcIAMaJlBVm/cMNNXZBJIw2UWaNdOQquNUpcMNidG/iu Wzkz+WSBCmQLqbnRvVh5EUeFI456lshsU4hSn/4SayohDzF72jNDwFS0IX5sTMW+fvxo kWyZNxv7yvCyZKY3tXjrxDj8ZBLo5Llvl1vmx83AFqvJufknQuGJn0UtXlOg1OVCntlm ZKmA== X-Gm-Message-State: AOAM532drhvw/aEt7cBdZhuZQDyNy9Dy7Y0REQ6nA8IBrTgySWVUR4Ot dDNTCkJw5LRgRloltntJB/tRuD8K6R5x2ZXtnwVHYiCkqBD6WhdNbGI9xy2koX7PTekkYaN4o0y +Rl/bWtgn04kakR+57vIdimHY91PEvQkft/BgB2bVnDmPHj6y7jk1Jm3ewaTcC9Y= X-Google-Smtp-Source: ABdhPJziAmZhL+w/+T/9SGzl2L6SkBxRI7kg2xJlY6KsdHMtvzcpxiUebER6o80VRB2Z/qQzuTXCgswqOmGYtg== X-Received: from ricarkol2.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:62fe]) (user=ricarkol job=sendgmr) by 2002:ad4:522c:: with SMTP id r12mr5969701qvq.17.1631234965148; Thu, 09 Sep 2021 17:49:25 -0700 (PDT) Date: Thu, 9 Sep 2021 17:49:19 -0700 In-Reply-To: <20210910004919.1610709-1-ricarkol@google.com> Message-Id: <20210910004919.1610709-3-ricarkol@google.com> Mime-Version: 1.0 References: <20210910004919.1610709-1-ricarkol@google.com> X-Mailer: git-send-email 2.33.0.309.g3052b89438-goog Subject: [PATCH v2 2/2] KVM: arm64: selftests: tests for vgic redist regions above the VM IPA size From: Ricardo Koller To: kvm@vger.kernel.org, maz@kernel.org, kvmarm@lists.cs.columbia.edu, drjones@redhat.com, eric.auger@redhat.com, alexandru.elisei@arm.com Cc: Paolo Bonzini , oupton@google.com, james.morse@arm.com, suzuki.poulose@arm.com, shuah@kernel.org, jingzhangos@google.com, pshier@google.com, rananta@google.com, reijiw@google.com, Ricardo Koller Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org These new tests attempt (and fail) to set a redist region using the KVM_VGIC_V3_ADDR_TYPE_REDIST and KVM_VGIC_V3_ADDR_TYPE_REDIST_REGIONS with regions partially above the VM-specified IPA size (phys_size). Signed-off-by: Ricardo Koller --- .../testing/selftests/kvm/aarch64/vgic_init.c | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index 623f31a14326..15aa01dc6a4d 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -285,6 +285,57 @@ static void test_vcpus_then_vgic(void) vm_gic_destroy(&v); } +static void test_redist_above_vm_pa_bits(enum vm_guest_mode mode) +{ + struct vm_gic v; + int ret, i; + uint32_t vcpuids[] = { 1, 2, 3, 4, }; + int pa_bits = vm_guest_mode_params[mode].pa_bits; + uint64_t addr, psize = 1ULL << pa_bits; + + /* Add vcpu 1 */ + v.vm = vm_create_with_vcpus(mode, 1, DEFAULT_GUEST_PHY_PAGES, + 0, 0, guest_code, vcpuids); + v.gic_fd = kvm_create_device(v.vm, KVM_DEV_TYPE_ARM_VGIC_V3, false); + + /* The redist end is above the IPA size, so this fails. */ + addr = REDIST_REGION_ATTR_ADDR(1, psize - 0x10000, 0, 0); + ret = _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist region with end address beyond IPA range"); + + /* Set space for half a redist, we have 1 vcpu, so this fails. */ + addr = psize - 0x10000; + ret = _kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true); + TEST_ASSERT(ret && errno == E2BIG, + "register redist (legacy) with end address beyond IPA range"); + + /* Set space for 3 redists, we have 1 vcpu, so this succeeds. */ + addr = psize - (3 * 2 * 0x10000); + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_REDIST, &addr, true); + + addr = 0x00000; + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_ADDR, + KVM_VGIC_V3_ADDR_TYPE_DIST, &addr, true); + + /* Add the rest of the VCPUs */ + for (i = 1; i < 4; ++i) + vm_vcpu_add_default(v.vm, vcpuids[i], guest_code); + + kvm_device_access(v.gic_fd, KVM_DEV_ARM_VGIC_GRP_CTRL, + KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true); + + /* Attempt to run a vcpu without enough redist space. */ + ret = run_vcpu(v.vm, vcpuids[3]); + TEST_ASSERT(ret && errno == EINVAL, + "redist base+size above IPA detected on 1st vcpu run"); + + vm_gic_destroy(&v); +} + static void test_new_redist_regions(void) { void *dummy = NULL; @@ -542,6 +593,7 @@ int main(int ac, char **av) test_kvm_device(); test_vcpus_then_vgic(); test_vgic_then_vcpus(); + test_redist_above_vm_pa_bits(VM_MODE_DEFAULT); test_new_redist_regions(); test_typer_accesses(); test_last_bit_redist_regions();