From patchwork Thu Feb 15 15:28:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Durrant X-Patchwork-Id: 201576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:b825:b0:106:860b:bbdd with SMTP id da37csp485051dyb; Thu, 15 Feb 2024 07:41:44 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVNmMmoNZHjLGutZSKFz3trLsGQZZaUu59cd60E4uoTXJyQl5dYDT5H0XzCgohy4jDnsrOGMlrGjDOiuVzqrBxOO9ye3A== X-Google-Smtp-Source: AGHT+IHs41fCQKMHpqU+5fsbt+L9Rgf0ihvH6Q/r3uQC68gqT4Y8TVUt4bIzgjgGPqSNpS+Xc2d1 X-Received: by 2002:a17:906:4ac5:b0:a3d:7d6b:60c1 with SMTP id u5-20020a1709064ac500b00a3d7d6b60c1mr1443946ejt.61.1708011702528; Thu, 15 Feb 2024 07:41:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708011702; cv=pass; d=google.com; s=arc-20160816; b=TdcHgmE0oax3fM9ZAQ91qL6giep2U2xaR1zsRfaePSDDdr7xOiHMIBrBBvl/6ixWB0 7tmnOjBaSDVvfBKNvQvjEKZbqgb3uVflcXMx+i2C3c+NZvP0s6ruJclBCG5VQ2qWucuk l8hW4lG1ZqESOpY9NDqm5j2N/hm4l9SB3OSBvZK9fLpSS5a2Ymyp3BEQohQEX0Eeng+r Mha+5r+Egsfz3bNEFQDRO9rdsv1RjHHjf+VNnTsyWC0t4qcN2pc8g+f4SAAP2ubFHd6F dmR5FLGA0QBA+Nbr4+MnUm4ZLb8HpW5DGVEHJVWqTGMw0+JCvs+nTip5+gtx1pew5IRg Un9g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=MzrwEZvE/wDfZ2Uo3THdD0GCfEvkC+DSco4Yj2j2Ijs=; fh=NrOggL3VZvuSFh5W9Wj2+kLgS4v0nogfnAWvBJoouXQ=; b=s7J1H0w30MHfjWcdga5axdLlQwP+GBof7mF2fJsViBq+DEGssqqg2VKoPCMQx2NcqX 651f9sOD51vfx37U+F+BBDm65oDHWYKIC/+BwwQ26q62g357iikzrYYVJRlsGti7Pybt JeN85FirLpjXRPgKn+t35noczdMnpO6Lnk59HdThQrxu47qjwSjI5zg2GMwptdoI+Vto Pv3FemOBC6VxYMslQ2CkcOToXD03cQJ+AdhCx/bRKAsHwBQoieD18F/4WWDuHdSKsWRs f1Kh9/CV6ZLLCTKayALfh3EGZMcPnK+UiQNO5zyxtuJrve2t5QjGWn8h264iUq1xtwWp BV1w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=nLahtEzG; arc=pass (i=1 spf=pass spfdomain=xen.org dkim=pass dkdomain=xen.org); spf=pass (google.com: domain of linux-kernel+bounces-67182-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67182-ouuuleilei=gmail.com@vger.kernel.org" Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id e26-20020a170906081a00b00a3d8bab1e42si720268ejd.570.2024.02.15.07.41.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 07:41:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67182-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@xen.org header.s=20200302mail header.b=nLahtEzG; arc=pass (i=1 spf=pass spfdomain=xen.org dkim=pass dkdomain=xen.org); spf=pass (google.com: domain of linux-kernel+bounces-67182-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67182-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id DFD521F28FB7 for ; Thu, 15 Feb 2024 15:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59869134CD4; Thu, 15 Feb 2024 15:30:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b="nLahtEzG" Received: from mail.xenproject.org (mail.xenproject.org [104.130.215.37]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E0E7133434; Thu, 15 Feb 2024 15:30:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=104.130.215.37 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708011034; cv=none; b=hOBgISp9c6KD4GbicRCOxr1fJyxwMvgWkjaM2frBkz58/Phh/r9ZjF/T1Xd9GDBCU30nWIseh6Z33PUVYHJa12GAtzxJZxe6DhAL2JVKa0IjBsoNms0oQao5BDc6RMjI8fK/KTeqGomej667k3Z372p3j2SZoEreS+bCOhrEzRg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708011034; c=relaxed/simple; bh=X/WsBLnIzIL2tm2hCMFKJpiOFtCtGjkxbwRt5PheKO4=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Ce3J72Cwj7PWEBIWC/RY8x18QcobcQiNQ7iGqpV7Q7ZVpz/SxAq5V6K12HaUGFPz9EJM4CjSP0fx7n4US+h7DNwUsaIPvWd/u/LVPSbC/aTrYUOCYooRx9G7+Z1inFBXFf0JIXi41uI7gAPxj9lsL6bFDLn3qGzztk7IFGjvQEA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org; spf=pass smtp.mailfrom=xen.org; dkim=pass (1024-bit key) header.d=xen.org header.i=@xen.org header.b=nLahtEzG; arc=none smtp.client-ip=104.130.215.37 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=xen.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xen.org; s=20200302mail; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:To:From; bh=MzrwEZvE/wDfZ2Uo3THdD0GCfEvkC+DSco4Yj2j2Ijs=; b=nLahtEzG0yR+mQ7BUOJj6qVQHv AV/b5Nw+QIpzDU8OGMckPKerSIwlaRHOwwR9at/NjfvOGQWf9DeANfcH0Gqp2mBZMhg1HDeYMMhwR h2oDvQuIR6J3vCcPPb1eKWlKsavsKOivMYFN2h+SQy4SVMOYLWgzODJnJQI9J9NG/1WE=; Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1radgk-0001E7-Av; Thu, 15 Feb 2024 15:30:14 +0000 Received: from 54-240-197-226.amazon.com ([54.240.197.226] helo=REM-PW02S00X.ant.amazon.com) by xenbits.xenproject.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1radgk-00089r-1T; Thu, 15 Feb 2024 15:30:14 +0000 From: Paul Durrant To: Paolo Bonzini , Jonathan Corbet , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , David Hildenbrand , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Sven Schnelle , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , David Woodhouse , Paul Durrant , Shuah Khan , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH v13 03/21] KVM: x86/xen: mark guest pages dirty with the pfncache lock held Date: Thu, 15 Feb 2024 15:28:58 +0000 Message-Id: <20240215152916.1158-4-paul@xen.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240215152916.1158-1-paul@xen.org> References: <20240215152916.1158-1-paul@xen.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790980079010360359 X-GMAIL-MSGID: 1790980079010360359 From: Paul Durrant Sampling gpa and memslot from an unlocked pfncache may yield inconsistent values so, since there is no problem with calling mark_page_dirty_in_slot() with the pfncache lock held, relocate the calls in kvm_xen_update_runstate_guest() and kvm_xen_inject_pending_events() accordingly. Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse --- Cc: Sean Christopherson Cc: Paolo Bonzini Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Borislav Petkov Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: David Woodhouse Cc: x86@kernel.org v13: - Patch title change. v8: - New in this version. --- arch/x86/kvm/xen.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index 4b4e738c6f1b..f3327508ae41 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -452,14 +452,13 @@ static void kvm_xen_update_runstate_guest(struct kvm_vcpu *v, bool atomic) smp_wmb(); } - if (user_len2) + if (user_len2) { + mark_page_dirty_in_slot(v->kvm, gpc2->memslot, gpc2->gpa >> PAGE_SHIFT); read_unlock(&gpc2->lock); - - read_unlock_irqrestore(&gpc1->lock, flags); + } mark_page_dirty_in_slot(v->kvm, gpc1->memslot, gpc1->gpa >> PAGE_SHIFT); - if (user_len2) - mark_page_dirty_in_slot(v->kvm, gpc2->memslot, gpc2->gpa >> PAGE_SHIFT); + read_unlock_irqrestore(&gpc1->lock, flags); } void kvm_xen_update_runstate(struct kvm_vcpu *v, int state) @@ -565,13 +564,13 @@ void kvm_xen_inject_pending_events(struct kvm_vcpu *v) : "0" (evtchn_pending_sel32)); WRITE_ONCE(vi->evtchn_upcall_pending, 1); } + + mark_page_dirty_in_slot(v->kvm, gpc->memslot, gpc->gpa >> PAGE_SHIFT); read_unlock_irqrestore(&gpc->lock, flags); /* For the per-vCPU lapic vector, deliver it as MSI. */ if (v->arch.xen.upcall_vector) kvm_xen_inject_vcpu_vector(v); - - mark_page_dirty_in_slot(v->kvm, gpc->memslot, gpc->gpa >> PAGE_SHIFT); } int __kvm_xen_has_interrupt(struct kvm_vcpu *v)