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 B757CE7718A for ; Fri, 20 Dec 2024 09:55:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 44F076B007B; Fri, 20 Dec 2024 04:55:56 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3FF756B0083; Fri, 20 Dec 2024 04:55:56 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 278816B0085; Fri, 20 Dec 2024 04:55:56 -0500 (EST) 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 090256B007B for ; Fri, 20 Dec 2024 04:55:56 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id DDDDC44310 for ; Fri, 20 Dec 2024 09:55:54 +0000 (UTC) X-FDA: 82914879390.03.F47277A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf02.hostedemail.com (Postfix) with ESMTP id 192D78000D for ; Fri, 20 Dec 2024 09:54:46 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BW8ymFew; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1734688520; a=rsa-sha256; cv=none; b=WVh2YWfqEIGN39YuSRaUneCuDZQp/i15SXXCrnniwlBi3FZATHduUjDmjGnL6JlukIVwu6 jhQz9Q07/kQFF9sPDQbvHi2AxfiGYOV+iyHf0I3Uv/66FNak12SjpPHZP9ZkljAZiiMwnD 7XbetLOoj+umM7y74oDcoc39qdpp9rw= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=BW8ymFew; spf=pass (imf02.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1734688520; 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:dkim-signature; bh=AvU8JFqW6ZJDZpFadoum7GUCRHp9GUaFtFIZ2dfsiNU=; b=b3b8pyamXRYZED9m2tI1swnFR4nI8PeBRATq+cd+QJViqerQd1agvx/hZP/OJb2ZjnrqCz Jq4bza833yGeG8CT6BdxFXwxc5yusW7yoSOVve87Yhr5I0w167LS8b11a4k3wkmg4kn4hF DevnPggM68rHTkywv9/gk3QWZRdwp0I= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734688551; 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:autocrypt:autocrypt; bh=AvU8JFqW6ZJDZpFadoum7GUCRHp9GUaFtFIZ2dfsiNU=; b=BW8ymFewYYVVlo+CKJ1EJQ0La9oFlcGZ/YyasVejYQagOQNedKAKAHgZtxykMlI5hwzeSJ 2uHag6MSes6AWs1mdshGL08MkVNlWzHENKlAlhZ885fyqg0KM5m3Si/O5OuCKpAA762drn goKQoWx4gIclEIi/1XbElQla5b8kMjI= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-216-mg6wlQgaMOeYkuLTLFSu4g-1; Fri, 20 Dec 2024 04:55:47 -0500 X-MC-Unique: mg6wlQgaMOeYkuLTLFSu4g-1 X-Mimecast-MFC-AGG-ID: mg6wlQgaMOeYkuLTLFSu4g Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-38629a685fdso834471f8f.2 for ; Fri, 20 Dec 2024 01:55:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734688547; x=1735293347; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=AvU8JFqW6ZJDZpFadoum7GUCRHp9GUaFtFIZ2dfsiNU=; b=OjFK+U/6hNgoAgNdcx/VXgdBm0n5jMt/8fYh1265QbwgMkOT02kDHBdLGTp4toltKY cENNJa5zhpBuC1DGxZBG1/wZawV5L6xYnSUreDyGNjP90Dp/kt8yOvZZIsWezOCgtTQi vSSfSTqbd0zUC80njTilwXwKRdyiN+OPrQVRx8lbVyX4IpgmkFxGtWIohKoTYerObKjO RE/kgtr1HM7xggoFNsUOI1+GdPJrDFrG4ON+VlyMQBp0Y+sGgB3RkxO0YgMuVO/Zpq9t kXqMa8T8Mq7L0uLyeTZenUfBgVyLmIn4/EgHtzA3Qg+BInLz8glycf1yEW8/IjbKj0Og aZ+A== X-Gm-Message-State: AOJu0Ywf6JfVQKZA0llC1DTQa2AE4ndHplnUmV0ymwBmo/MGa6T0RqYD YQobS4L7ub+1i9tP+aYik14Xz3YvDp6x0Us3B6Avpc0P6QBG1YrDc8ITPlznSELjaPZVwHSoSdR uOzyvdCVmnwERD2Tn7/SB14vk/mbcrbUcitm05/xv6LETm46T90LifBwM X-Gm-Gg: ASbGncvJH2CMtczGhmbXrSpnfRsH1wVWB5u3/Xrgyidjzs7TiiSpo10JtnyqDOL/+km ydQ9CHMmkNz/jlrHiWK7odleLnjLzsUKL6EaBexA9OTRRMC+hENP4SoVZc5Ifh3jCP38Wfs/isc Vs59g36YdH4O2+mXKd9qpST0z30kl2iIw5l9hTFIUK+IjP4wDaE3ZQXNQYoDV8G1fEp0PA3JHUz cPRkbJZmXkpIi68IMpIlYVd+8+Euhc5+QFS9/fhULuE5RY/85YTCUi54NUIIIij1JnGCrAu1Ybc 3VCIXDWHMQ667eVh2gbqtkjzu4uoK4MwwMVdu++Z9eaXHTFUA9azloG3mHz2FsUPUHC9Hs+MTYm Es/QUO5uW X-Received: by 2002:a05:6000:480d:b0:385:f38e:c0d3 with SMTP id ffacd0b85a97d-38a22408d9cmr1987322f8f.58.1734688546610; Fri, 20 Dec 2024 01:55:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGd8b4THn8ndcj6OJD2Cr1moAk5STf4OEK1lnTnKJBHx+mPBX++hd54hzcZ7RNbGxDLRr4kHw== X-Received: by 2002:a05:6000:480d:b0:385:f38e:c0d3 with SMTP id ffacd0b85a97d-38a22408d9cmr1987296f8f.58.1734688546192; Fri, 20 Dec 2024 01:55:46 -0800 (PST) Received: from ?IPV6:2003:cb:c708:9d00:edd9:835b:4bfb:2ce3? (p200300cbc7089d00edd9835b4bfb2ce3.dip0.t-ipconnect.de. [2003:cb:c708:9d00:edd9:835b:4bfb:2ce3]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c89e1acsm3629356f8f.68.2024.12.20.01.55.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 20 Dec 2024 01:55:45 -0800 (PST) Message-ID: <0b45aab7-a0d0-4471-b3d1-c50283f19515@redhat.com> Date: Fri, 20 Dec 2024 10:55:44 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] s390: Convert vsie code to use page->private To: "Matthew Wilcox (Oracle)" , Claudio Imbrenda Cc: linux-mm@kvack.org, linux-s390@vger.kernel.org References: <20241219162252.1025317-1-willy@infradead.org> <20241219162252.1025317-3-willy@infradead.org> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20241219162252.1025317-3-willy@infradead.org> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ebi1HEYJEEe_KLpvp63Ue8oEnPxGK1Nr-qTWA5aeuXA_1734688547 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 192D78000D X-Stat-Signature: zqcsgysy1gw5sahamh8zbfegri4uks9h X-Rspam-User: X-Rspamd-Server: rspam09 X-HE-Tag: 1734688486-924460 X-HE-Meta: U2FsdGVkX19DXRfH5SZ8uMEdHt3iqy1dOmvOftVe+05rLJqrS5pVmvoa86dULky/dpkklqMbYEWXGg3DE1Vh0tRN5MCt+UHgxcHjc5LtyL0XUSXYWPEK3b26jLtwOWwayR+vURBJS16+s9w1avaTzwdep8GPN3m+Mrh4yUzoksOdwyeRiK8VqW/JVgARYXj+urpBDjs2Jie4JZYKSXdkLMSQb43Q+9q4rKZOuVgMBeE8qQfs+jCJCd2ii6KmqZAw5Eh9uToELbUl/2yjuY4iPE+D3R1+UOtd2gpyldi4eZe3cEdAhZyTJwnWZzf+0z4H1ciZV0qNS0SdFtr3DHLTfZItZXBCCKj5sNySGBJy28B4QH8vA1kPShCHA3T5E2oF5I96jUoGw1nNbPOuszyGTWtMtoyOo/lcy/XBse3S8AMCUfFkVNB9Txyz9oXt+O9rLNDSlOz7Ahp6ey3BNw8unCSPLWpmyJcSLbbOxr9oHfdpaQi/wjyq4calmdXosk4ipp0EF24cpNr6fIRxwxr6zu00eJ5lIvNfn6bu8fnRPMWTcu2SyqDJJexTX3pzNNolcdm50QqBMm+4YNxObrhryMHksfYDaQZx7voOH7afzO4FdYcbHFiSQv/S30yye7KXkK/U095g1q075/yLrX15DxPXNBCKhS6MMyck+u7zsqKHxLm595AlfrG97SZEsCzig8GfK0RSDiiK0DOvZtPZhDkibxP+R8gUzAuK8zaqclJFpbuzlYGu+cN90U6qqnxO2M6CvDvZn/JcaDboQtPx3C6SSKHyeZPsu/9S0LDgYkGQalQDui51DK5G6i95/nrk85u1YsWmY31XCkzchqJKv9yrxE2UJtMsySdmDKRN5jIaQLlpgFsUogHAq57Dnl2DXPhlxgfC2TC2WZwwr0RASY/WWMS1VxBbNipo1n4VzNuQV56/j9mNmwQkqh2RO0vKlVFnx+pSqxYm4ymeRGr KNvBxGs8 W+mUiZ47GGp19GeMjqVN/tQzNpOvbp+O0/szfDLawu6vEoRCEKoEv+K8fz9ai9Xbe9bvR6LzijW8ldLa9XEnSnmeKM/1O9BLXOS21xXbxdasWm4LXCOX2XZQ5mkWkWnyUD0YeNFjRieTktzNMiEtjTGfW09/p99A0K9p5X+FUeeO6Uw3BXvi5AkL74Fz2ptef8kL8JbJFCUo7ltZVIEezAM9qzKw4TDageWcjx9HcKSAcuC0lnuLNCZG55EGJG/PkRJKpNYFh4EoPtdVFLpD5osy6l2r0K74U/zPjBoaA11i6wAVcBwEtj0uXzbXYTGMGng9ybSU3YybWIdo6Z/5rnlCjywRYvXVWlN3UWjVEaimvWRSyjOZyxr+6Wmqb5pjpl+V0C0h1VwUR6MXQFLK3b6V2C+1HuMFswv7PbSpiMEZ6NDPiR9TfbgMhIW+PRH1xQcr0o/7o8z4ZOgBWRIW8w6fuAjQDQ2AH+j9q X-Bogosity: Ham, tests=bogofilter, spamicity=0.000022, 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 19.12.24 17:22, Matthew Wilcox (Oracle) wrote: > The vsie pages are not standard page tables, so do not convert them to > use ptdesc. They are not page tables "at all" :) A vsie_page is used when emulating hardware virtualization (SIE -- Start Interpretive Executio) for a CPU: vSIE -- virtual SIE These pages primarily hold the shadowed "SIE control block" (SCB) that tells the hardware what to do when entering hardware virtualization (SIE), and include things like CPU state such as registers. We store some other information in the same page. We have to the SCB provided by the VM VCPU when running the nested VM VCPU. The SCB resides in guest physical memory. So similar to shadowing of page tables, we have to detect modifications to the SCB, so we can update out shadowed version accordingly. We use grab a page and fill a vsie page VCPU wants to execute the SIE instruction (executing the nested VM VCPU), and return it to the pool when we are done emulating the SIE instruction. We try to reuse the same vsie pages over various runs, thats why we store the address of the last SCB address we shadowed, to look it up. (improves HW performance) So page->index will hold the "guest physical address of the SCB we shadowed the last time this vsie page was used". We seem to have space in the vsie page, so I think we can avoid messing with page-> completely! From c94e4ecd6ee791ef9cda1c0577a1e765e5ce2867 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Fri, 20 Dec 2024 10:53:46 +0100 Subject: [PATCH] tmp Signed-off-by: David Hildenbrand --- arch/s390/kvm/vsie.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 150b9387860ad..0a8cffe9b80bf 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -46,7 +46,13 @@ struct vsie_page { gpa_t gvrd_gpa; /* 0x0240 */ gpa_t riccbd_gpa; /* 0x0248 */ gpa_t sdnx_gpa; /* 0x0250 */ - __u8 reserved[0x0700 - 0x0258]; /* 0x0258 */ + /* + * guest address of the original SCB. Remains set for free vsie + * pages, so we can properly look them up in our addr_to_page + * radix tree. + */ + gpa_t scb_gpa; /* 0x0258 */ + __u8 reserved[0x0700 - 0x0260]; /* 0x0260 */ struct kvm_s390_crypto_cb crycb; /* 0x0700 */ __u8 fac[S390_ARCH_FAC_LIST_SIZE_BYTE]; /* 0x0800 */ }; @@ -1383,6 +1389,7 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) page_ref_inc(page); kvm->arch.vsie.pages[kvm->arch.vsie.page_count] = page; kvm->arch.vsie.page_count++; + vsie_page = page_to_virt(page); } else { /* reuse an existing entry that belongs to nobody */ while (true) { @@ -1393,9 +1400,11 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) kvm->arch.vsie.next++; kvm->arch.vsie.next %= nr_vcpus; } - radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->index >> 9); + vsie_page = page_to_virt(page); + radix_tree_delete(&kvm->arch.vsie.addr_to_page, + vsie_page->scb_gpa >> 9); } - page->index = addr; + vsie_page->scb_gpa = addr; /* double use of the same address */ if (radix_tree_insert(&kvm->arch.vsie.addr_to_page, addr >> 9, page)) { page_ref_dec(page); @@ -1404,7 +1413,6 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) } mutex_unlock(&kvm->arch.vsie.mutex); - vsie_page = page_to_virt(page); memset(&vsie_page->scb_s, 0, sizeof(struct kvm_s390_sie_block)); release_gmap_shadow(vsie_page); vsie_page->fault_addr = 0; @@ -1496,7 +1504,8 @@ void kvm_s390_vsie_destroy(struct kvm *kvm) vsie_page = page_to_virt(page); release_gmap_shadow(vsie_page); /* free the radix tree entry */ - radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->index >> 9); + radix_tree_delete(&kvm->arch.vsie.addr_to_page, + vsie_page->scb_gpa >> 9); __free_page(page); } kvm->arch.vsie.page_count = 0; -- 2.47.1 Howver, page->index is going away so use page->private to > store the address rather than page->index. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > arch/s390/kvm/vsie.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c > index 150b9387860a..26cbd69eb06d 100644 > --- a/arch/s390/kvm/vsie.c > +++ b/arch/s390/kvm/vsie.c > @@ -1393,9 +1393,9 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) > kvm->arch.vsie.next++; > kvm->arch.vsie.next %= nr_vcpus; > } > - radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->index >> 9); > + radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->private >> 9); > } > - page->index = addr; > + page->private = addr; > /* double use of the same address */ > if (radix_tree_insert(&kvm->arch.vsie.addr_to_page, addr >> 9, page)) { > page_ref_dec(page); > @@ -1496,7 +1496,7 @@ void kvm_s390_vsie_destroy(struct kvm *kvm) > vsie_page = page_to_virt(page); > release_gmap_shadow(vsie_page); > /* free the radix tree entry */ > - radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->index >> 9); > + radix_tree_delete(&kvm->arch.vsie.addr_to_page, page->private >> 9); > __free_page(page); > } > kvm->arch.vsie.page_count = 0; -- Cheers, David / dhildenb