From patchwork Thu Jan 19 23:44:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gavin Shan X-Patchwork-Id: 46061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp606438wrn; Thu, 19 Jan 2023 15:53:13 -0800 (PST) X-Google-Smtp-Source: AMrXdXtZMRnzO/XvoOp+nZemsRL4y05lNf+7B8etXHO86hR0XSnlsyiJsMc3jiJQKwUqSmutfHlW X-Received: by 2002:a17:906:4c49:b0:877:6525:4683 with SMTP id d9-20020a1709064c4900b0087765254683mr7020691ejw.33.1674172393408; Thu, 19 Jan 2023 15:53:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674172393; cv=none; d=google.com; s=arc-20160816; b=ZAhGi+ye7D0T5mC6MJMJ0xZZl5zF+ndMNEZt7PCfpPTKWVfof1jXvNN8kMDg4ey7Ak VU8bmIX5IVBGRxvmHq8BtJtoMoueOBM0dERfb0cGhnpVMeiZppl8MRFB7lVjzut6WZK6 0ZpaJ4W+62RMd/J8qDNPkQU1rnUZeoAMu/6hal+4+FS2R3T28Xfa1/LPjVrkynZoiRx5 Orl6jGky7kjHHYuh2VlBSoSkyVyw8VFj1sIm9Qrdoc4din2mpWRhZu12whTDaXcc97nr WzYYTPtyqkCQn8+y/zMUfIZlHbMHOShyYCFODGfiPoPonIWT046T78LtTZkfJ+iUGkIn uC6w== 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=3zFh3s/QzTjRrooT54dh0V5tVwdCR5pp1Mfct0DavzQ=; b=XABfu4RNs94+5at8Vx60lr8hPAZzYQ28aE0mO/wx3Fy5GeQ1rJAYjCByLPicmuLLnb Q//8VSLd4SoXZwMBsYu8Bly6nMxTOC3RJrMmM+jQf/g29iYKPL3K+rsY5aRSZLAvwMns 3mkNxB7sNd3cjEFu0Lx0kAoLzBcHRMVyAmrOJLakuLh3sMFUR2SneJ9qXqaNMs4H/H/A 2mPHDlPDlXL1BZsZw+3NcE2y+Z+LPDV8wK8UGsILnSJrmVRX6r5rOSgs91HExj+MX/CH 9SeyUrNLU+pwhTYSyTvvA7kD9iqSbO347VuX2EUmSEBxqnHV36rjR3YzdIOH8PHRItcY xXFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=h7LDdZDk; 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 y14-20020a17090668ce00b0084c439a1da6si32630251ejr.137.2023.01.19.15.52.50; Thu, 19 Jan 2023 15:53:13 -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=h7LDdZDk; 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 S230402AbjASXqb (ORCPT + 99 others); Thu, 19 Jan 2023 18:46:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230233AbjASXqG (ORCPT ); Thu, 19 Jan 2023 18:46:06 -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 94BA29F3A1 for ; Thu, 19 Jan 2023 15:45:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674171919; 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=3zFh3s/QzTjRrooT54dh0V5tVwdCR5pp1Mfct0DavzQ=; b=h7LDdZDkggDtHbDuhi0cQ6K27rsi0vvsALvsOvduwqDWk8TLPZbGh9wnsyKAZQVoFg9A/f dnjviqi0Pdnc/cSET08Vi9auQ2rzHrVxa5woL5lA0b+RLvxRdH3BvS8iGRTZAo6gVUjeXT t+3gT+mg+g6n1NcI8SsHJieQ0uGslm4= 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-556-kWfVYrgHOYywcdOFPH1jDg-1; Thu, 19 Jan 2023 18:45:18 -0500 X-MC-Unique: kWfVYrgHOYywcdOFPH1jDg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C00F085C064; Thu, 19 Jan 2023 23:45:17 +0000 (UTC) Received: from gshan.redhat.com (vpn2-54-98.bne.redhat.com [10.64.54.98]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CB5A02166B2A; Thu, 19 Jan 2023 23:45:10 +0000 (UTC) From: Gavin Shan To: kvmarm@lists.linux.dev Cc: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, pbonzini@redhat.com, corbet@lwn.net, maz@kernel.org, oliver.upton@linux.dev, will@kernel.org, gshan@redhat.com, ricarkol@google.com, eric.auger@redhat.com, yuzhe@nfschina.com, renzhengeek@gmail.com, reijiw@google.com, ardb@kernel.org, Julia.Lawall@inria.fr, yuzenghui@huawei.com, seanjc@google.com, shan.gavin@gmail.com Subject: [PATCH v2 3/3] KVM: arm64: Allow no running vcpu on saving vgic3 pending table Date: Fri, 20 Jan 2023 07:44:05 +0800 Message-Id: <20230119234405.349644-4-gshan@redhat.com> In-Reply-To: <20230119234405.349644-1-gshan@redhat.com> References: <20230119234405.349644-1-gshan@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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=ham 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?1755496991564633874?= X-GMAIL-MSGID: =?utf-8?q?1755496991564633874?= We don't have a running VCPU context to save vgic3 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 vgic3 pending table. Reported-by: Zenghui Yu Signed-off-by: Gavin Shan --- 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 40ada313faa3..07f07668995e 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". vgic3 LPI pending status is restored. +"kvm-arm-vgic-its". vgic3 LPI pending status is restored. (3) save +vgic3 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 2e680d8a0a15..fc2f24433076 100644 --- a/arch/arm64/kvm/vgic/vgic-v3.c +++ b/arch/arm64/kvm/vgic/vgic-v3.c @@ -437,7 +437,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; }