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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D789CF8852 for ; Fri, 4 Oct 2024 22:49:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A22B26B009A; Fri, 4 Oct 2024 18:49:20 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9A99B6B038A; Fri, 4 Oct 2024 18:49:20 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 84A486B038C; Fri, 4 Oct 2024 18:49:20 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 61F2C6B009A for ; Fri, 4 Oct 2024 18:49:20 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 0AA0B803A2 for ; Fri, 4 Oct 2024 22:49:20 +0000 (UTC) X-FDA: 82637412480.27.349BCBF Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf14.hostedemail.com (Postfix) with ESMTP id 65DEC100007 for ; Fri, 4 Oct 2024 22:49:18 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of "SRS0=EjJ8=RA=goodmis.org=rostedt@kernel.org" designates 147.75.193.91 as permitted sender) smtp.mailfrom="SRS0=EjJ8=RA=goodmis.org=rostedt@kernel.org" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728082062; a=rsa-sha256; cv=none; b=ba3YHvFoazmynNBOJCgBps1DiFxQjpWdYac+oDAeklsX5cV4WNEtw+nNZn7O6v8+ZsKMKs GOsDzKM2spvwcOqamN3qMg6pRZ38GZntptB4u5Dnyi4PS77fRv/Mg7dNwC/r83mem9iKSg 4IPV8uWUGx7d6P5k9g+S006qc+T1yaU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf14.hostedemail.com: domain of "SRS0=EjJ8=RA=goodmis.org=rostedt@kernel.org" designates 147.75.193.91 as permitted sender) smtp.mailfrom="SRS0=EjJ8=RA=goodmis.org=rostedt@kernel.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728082062; h=from:from:sender: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=BY06EodgvgtFqubdB2IGTW9F+EdYjZ6n9d248cTY2pY=; b=M3Un1bwd64rvWF4TBp+hZ3ke+XqWfoZcdFbHbcHuN0eJDyXD/KUNWg03bpIsGafahOZrgP KJGn5qfmEflUU63ITum8ATEP/+dj9AFC/o73jjK6ZiAA5w4rWekYL5pVpsM9J+EU0d/pL4 8zc436uvBoDcQSAKcohXRwyvUpHG5pY= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 4BF04A4324E; Fri, 4 Oct 2024 22:49:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E0A2C4CEC6; Fri, 4 Oct 2024 22:49:14 +0000 (UTC) Date: Fri, 4 Oct 2024 18:50:10 -0400 From: Steven Rostedt To: Patrick Roy Cc: , , , , , , , , , , , , , , , , , , , , , , , , Subject: Re: [RFC PATCH v2 06/10] kvm: gmem: add tracepoints for gmem share/unshare Message-ID: <20241004185010.60807289@gandalf.local.home> In-Reply-To: <20240910163038.1298452-7-roypat@amazon.co.uk> References: <20240910163038.1298452-1-roypat@amazon.co.uk> <20240910163038.1298452-7-roypat@amazon.co.uk> X-Mailer: Claws Mail 3.20.0git84 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 65DEC100007 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: a9c6ssowm1kppjbkbzkt641cox3ijyrx X-HE-Tag: 1728082158-406643 X-HE-Meta: U2FsdGVkX1+X/LxefqeEOf5Kcbc8GFAG5rMp1kszPMuG85uZNw8rlRPLDfZT/4Z5EoL8fAc5xg52puhcS6db5AXrJsnm9fAdnIopXHiOWJLCS+PGBacwTtO5SRGIj69Ikv3mE5epbl0upaXOoPHrnN3yXvHQshfzDt2IYF/OqC/e9u6gjtYRy8ztb575ZslgjpnRwvPxlZJdHYhWRyMR2RX9X7kfQYnAjcgRjI33sJKyIDhJ+LIHuwS/hV586X6DkcT5F9gv3pQNJ+0v5sMntaVlQKla2UyhUw6FO1iNbtjL5yJ3fauK8TWddDsFm7Xz0MypGiQkNj2I7zqU2KCvnOz1ruzi3gMmBcy6DY8B1bbCPs6rIhffGqq4h66XPuqORw+82FsdUNcYX48tkhKRfETWMllCOXJpL7iPdCvTA3F7uQ2zVYUqRLg/YBtOHKUb/b7swnNLL8ExQB+/H8UzRAAI0DYDdZ8s75rfXrqokm/BdldPvT11We6ejZt+8A3rVepFfHTcQX/GXLJbIxvgNVxKxpL6PAiHPOKdhKO54ZN1iGNWCrbo5TYqE6m1cSaVYBQaLMEpmQ5H+N20QWbRNoVF4ygt3Mp0HO6JI18GJkkd3c4BBlm/c3bYfMLtNCBLaARqrUBC8cmm/CrPysp/1Gv7fCD6HSUIkjpM9ZAW5956m3CaEVtAqalPEfi+tmcPfmDlRpLF0E+F9+1sSuLhnX6P7KQJYB7ttexDzfT3R1Y/GX+tPJ7SObY8Qrj0IZE1eGCOQ5mUxCnXZ5l2Isd9uKA2PWhXih94EtB1wUF5/aTofkrUpOQTBgGVYkTZ4qKSFMuyv0+eEe0bYWnzQNlABetFcPy6EamiSVDiRF6Xhmf2ZQQdD2w5MZoRTnQk1G4awislCNscfYOnPlPcWUUBQmXqjs+1CklWzGepSBDvoXRB4KWs679lSuiSERE/GiZMptUrJwZi070Q0jiHSUp v1aNHrhm ymaotxRT/G2I46F43s1vSYEA05sLNI+b0s/4EP0YjL1NhT/9wWO5xNSAPPWGamtmpHpiEbVxIhS8engTk8gD1+RJqRHdBcw2DG2bsl8Yg8B0SMNsXdZm8/HPhRBQgxk33hW5dt663Tk22aPeUq5Blid4ywa0HYwDDXXcRxKx2/scf+58QsJ7NilzrBLMsPUu2i4R8H4ZzI4K6d8uqlXU6I2/vP1lHkRuOLDfw3ok/rnmBTmNexghIm5SQ5KNjDV2TZ/m6FuXmZgfTD0+tE7CHgANXGg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Tue, 10 Sep 2024 17:30:32 +0100 Patrick Roy wrote: > Add tracepoints for calls to kvm_gmem_get_folio that cause the returned > folio to be considered "shared" (e.g. accessible by host KVM), and > tracepoint for when KVM is done accessing a gmem pfn > (kvm_gmem_put_shared_pfn). > > The above operations can cause folios to be insert/removed into/from the > direct map. We want to be able to make sure that only those gmem folios > that we expect KVM to access are ever reinserted into the direct map, > and that all folios that are temporarily reinserted are also removed > again at a later point. Processing ftrace output is one way to verify > this. > > Signed-off-by: Patrick Roy > --- > include/trace/events/kvm.h | 43 ++++++++++++++++++++++++++++++++++++++ > virt/kvm/guest_memfd.c | 7 ++++++- > 2 files changed, 49 insertions(+), 1 deletion(-) > > diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h > index 74e40d5d4af42..4a40fd4c22f91 100644 > --- a/include/trace/events/kvm.h > +++ b/include/trace/events/kvm.h > @@ -489,6 +489,49 @@ TRACE_EVENT(kvm_test_age_hva, > TP_printk("mmu notifier test age hva: %#016lx", __entry->hva) > ); > > +#ifdef CONFIG_KVM_PRIVATE_MEM > +TRACE_EVENT(kvm_gmem_share, > + TP_PROTO(struct folio *folio, pgoff_t index), > + TP_ARGS(folio, index), > + > + TP_STRUCT__entry( > + __field(unsigned int, sharing_count) > + __field(kvm_pfn_t, pfn) > + __field(pgoff_t, index) > + __field(unsigned long, npages) Looking at the TP_printk() format below, the pfn is 8 bytes and sharing_count is 4. This will likely create a hole between the two fields for alignment reasons. Should put the sharing_count at the end. > + ), > + > + TP_fast_assign( > + __entry->sharing_count = refcount_read(folio_get_private(folio)); > + __entry->pfn = folio_pfn(folio); > + __entry->index = index; > + __entry->npages = folio_nr_pages(folio); > + ), > + > + TP_printk("pfn=0x%llx index=%lu pages=%lu (refcount now %d)", > + __entry->pfn, __entry->index, __entry->npages, __entry->sharing_count - 1) > +); > + > +TRACE_EVENT(kvm_gmem_unshare, > + TP_PROTO(kvm_pfn_t pfn), > + TP_ARGS(pfn), > + > + TP_STRUCT__entry( > + __field(unsigned int, sharing_count) > + __field(kvm_pfn_t, pfn) Same here. It should swap the two fields. Note, if you already added this, it will not break backward compatibility swapping them, as tooling should use the format files that state where these fields are located in the raw data. -- Steve > + ), > + > + TP_fast_assign( > + __entry->sharing_count = refcount_read(folio_get_private(pfn_folio(pfn))); > + __entry->pfn = pfn; > + ), > + > + TP_printk("pfn=0x%llx (refcount now %d)", > + __entry->pfn, __entry->sharing_count - 1) > +) > + > +#endif > + > #endif /* _TRACE_KVM_MAIN_H */ > > /* This part must be outside protection */ > diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c > index 6772253497e4d..742eba36d2371 100644 > --- a/virt/kvm/guest_memfd.c > +++ b/virt/kvm/guest_memfd.c > @@ -7,6 +7,7 @@ > #include > > #include "kvm_mm.h" > +#include "trace/events/kvm.h" > > struct kvm_gmem { > struct kvm *kvm; > @@ -204,8 +205,10 @@ static struct folio *kvm_gmem_get_folio(struct inode *inode, pgoff_t index, unsi > if (r) > goto out_err; > > - if (share) > + if (share) { > refcount_inc(folio_get_private(folio)); > + trace_kvm_gmem_share(folio, index); > + } > > out: > /* > @@ -759,6 +762,8 @@ int kvm_gmem_put_shared_pfn(kvm_pfn_t pfn) { > if (refcount_read(sharing_count) == 1) > r = kvm_gmem_folio_set_private(folio); > > + trace_kvm_gmem_unshare(pfn); > + > return r; > } > EXPORT_SYMBOL_GPL(kvm_gmem_put_shared_pfn);