From patchwork Fri Jan 27 23:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 49727 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1110004wrn; Fri, 27 Jan 2023 16:07:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXsWyZxJL6f0yhDGhCTDzjjjxMDYpl+sodlHo7vziBcZ0jlTedkGCyDz/voqOBuq61/WTy87 X-Received: by 2002:a05:6402:4305:b0:49c:7aa2:55de with SMTP id m5-20020a056402430500b0049c7aa255demr56509782edc.1.1674864435107; Fri, 27 Jan 2023 16:07:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674864435; cv=none; d=google.com; s=arc-20160816; b=vquvGZA1Aah/o2rqhCOg1MTnQbPb8M7zdjSrYAEY68EadzeeGrfyFuDzOJ/UDRhQJm bP6XVzEM9ZTYuYWj5b2ANf98Yv8E902PtqaolmWO2S+o80YhFeLnju7zOEGU6oyuxZkw iT/52I1iGEo8lRi+PXC8la9GhAf+9eNwFxjUsm46WTA8r8f+elbAuwKN+b51V4p4Ta3n Ah2x8tAcXRztGAOrHqG3EbTRd0n+sLjGiFr1YEe8q42mXK0CPTEirNa7TroNzBQkfIfM CmQaYgXRAmNqzJjdGFrCO6l67PJx/asrJtCOWg0LUK7UBEMuvwlBJduupi4pA1bbGeCS eKsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=sjBzs7p6VyjLsfM9jF7Ude6+5lIZi52fmgqYqe8YS6Q=; b=VBk3zFunDUHDdya95iabjbUD5gen6rb+fLk5BtL4KRMDjyIBZcX/gwLMWFc7gnzNG3 Nbl2+6JBztUfwHa+zMMLgPJWPBq79gkVQkfYPzhKoIOaPHJozZKV+b3S+IqRmtvx8Tpu ekdYuU427Q5SybJAYRlty7HnHAoJUv/+c65cB7n74yKjklQ936k2XUoNuJiKD2FSKGJ3 p33MdavQjvFNPiw+VfEGKLx+5kB1m9eFoxD92ygjDICUjyThdCVcMJxHbT2mwH+/dXW0 oiM+Pli8gT1hvTFFDKUcKtx1t1IOyHrGl7pJWFXb8tyOTkwdX6LBsjiimpmQlhB5f4ex hU+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HDV8dSXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n19-20020a05640206d300b0049e27c8bdfesi6698984edy.171.2023.01.27.16.06.50; Fri, 27 Jan 2023 16:07:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HDV8dSXI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230343AbjA0Xx7 (ORCPT + 99 others); Fri, 27 Jan 2023 18:53:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47464 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231496AbjA0Xxz (ORCPT ); Fri, 27 Jan 2023 18:53:55 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65D0B721CC for ; Fri, 27 Jan 2023 15:53:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674863586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sjBzs7p6VyjLsfM9jF7Ude6+5lIZi52fmgqYqe8YS6Q=; b=HDV8dSXIpjrqmoD52h0xFZmpAJqLWgvQDslknSrxJDmFAJP3Vp5IsTheZW5SG0Wh3c2zVn Mf03hBY8wGvUsC9cBJ35V3LzZCU45E+J1XPvGJQMZh9bGYZC0+HAJ8ABlINzNdwij9/kZY ftzzwXCzJxIv/uVp82V6N2jDRhh/1kw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-100-yzl2-LN_P2eNkgdWM9jZag-1; Fri, 27 Jan 2023 18:53:01 -0500 X-MC-Unique: yzl2-LN_P2eNkgdWM9jZag-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 115E4811E6E; Fri, 27 Jan 2023 23:53:00 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-64.bne.redhat.com [10.64.54.64]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 74A44400DE84; Fri, 27 Jan 2023 23:52:52 +0000 (UTC) From: Gavin Shan To: kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu Cc: pbonzini@redhat.com, corbet@lwn.net, maz@kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, catalin.marinas@arm.com, will@kernel.org, yuzhe@nfschina.com, gshan@redhat.com, seanjc@google.com, isaku.yamahata@intel.com, ricarkol@google.com, eric.auger@redhat.com, renzhengeek@gmail.com, reijiw@google.com, shan.gavin@gmail.com Subject: [PATCH v4 4/4] KVM: arm64: Allow no running vcpu on saving VGICv3 pending table Date: Sat, 28 Jan 2023 07:51:50 +0800 Message-Id: <20230127235150.17025-5-gshan@redhat.com> In-Reply-To: <20230127235150.17025-1-gshan@redhat.com> References: <20230127235150.17025-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756222649937618553?= X-GMAIL-MSGID: =?utf-8?q?1756222649937618553?= We don't have a running VCPU context to save VGICv3 pending table due to KVM_DEV_ARM_VGIC_{GRP_CTRL, SAVE_PENDING_TABLES} command on KVM device "kvm-arm-vgic-v3". The unknown case is caught by kvm-unit-tests. # ./kvm-unit-tests/tests/its-pending-migration WARNING: CPU: 120 PID: 7973 at arch/arm64/kvm/../../../virt/kvm/kvm_main.c:3325 \ mark_page_dirty_in_slot+0x60/0xe0 : mark_page_dirty_in_slot+0x60/0xe0 __kvm_write_guest_page+0xcc/0x100 kvm_write_guest+0x7c/0xb0 vgic_v3_save_pending_tables+0x148/0x2a0 vgic_set_common_attr+0x158/0x240 vgic_v3_set_attr+0x4c/0x5c kvm_device_ioctl+0x100/0x160 __arm64_sys_ioctl+0xa8/0xf0 invoke_syscall.constprop.0+0x7c/0xd0 el0_svc_common.constprop.0+0x144/0x160 do_el0_svc+0x34/0x60 el0_svc+0x3c/0x1a0 el0t_64_sync_handler+0xb4/0x130 el0t_64_sync+0x178/0x17c Use vgic_write_guest_lock() to save VGICv3 pending table. Reported-by: Zenghui Yu Signed-off-by: Gavin Shan Reviewed-by: Oliver Upton --- Documentation/virt/kvm/api.rst | 4 +++- arch/arm64/kvm/vgic/vgic-v3.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 5dc3598afbe2..d653e13954d9 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -8074,7 +8074,9 @@ NOTE: Multiple examples of using the backup bitmap: (1) save vgic/its tables through command KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_SAVE_TABLES} on KVM device "kvm-arm-vgic-its". (2) restore vgic/its tables through command KVM_DEV_ARM_{VGIC_GRP_CTRL, ITS_RESTORE_TABLES} on KVM device -"kvm-arm-vgic-its". VGICv3 LPI pending status is restored. +"kvm-arm-vgic-its". VGICv3 LPI pending status is restored. (3) save +VGICv3 pending table through KVM_DEV_ARM_VGIC_{GRP_CTRL, SAVE_PENDING_TABLES} +command on KVM device "kvm-arm-vgic-v3". 8.30 KVM_CAP_XEN_HVM -------------------- diff --git a/arch/arm64/kvm/vgic/vgic-v3.c b/arch/arm64/kvm/vgic/vgic-v3.c index c94e4d7520fc..558ccc805fff 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -436,7 +436,7 @@ int vgic_v3_save_pending_tables(struct kvm *kvm) else val &= ~(1 << bit_nr); - ret = kvm_write_guest_lock(kvm, ptr, &val, 1); + ret = vgic_write_guest_lock(kvm, ptr, &val, 1); if (ret) goto out; }