From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: David Hildenbrand <david@redhat.com>
Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
linux-s390@vger.kernel.org, Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Janosch Frank <frankja@linux.ibm.com>,
Gerald Schaefer <gerald.schaefer@linux.ibm.com>,
Matthew Wilcox <willy@infradead.org>,
Thomas Huth <thuth@redhat.com>
Subject: Re: [PATCH v2 08/10] s390/uv: convert uv_convert_owned_from_secure() to uv_convert_from_secure_(folio|pte)()
Date: Tue, 7 May 2024 18:26:19 +0200 [thread overview]
Message-ID: <20240507182619.2846ea8f@p-imbrenda.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20240412142120.220087-9-david@redhat.com>
On Fri, 12 Apr 2024 16:21:18 +0200
David Hildenbrand <david@redhat.com> wrote:
> Let's do the same as we did for uv_destroy_(folio|pte)() and
> have the following variants:
>
> (1) uv_convert_from_secure(): "low level" helper that operates on paddr
> and does not mess with folios.
>
> (2) uv_convert_from_secure_folio(): Consumes a folio to which we hold a
> reference.
>
> (3) uv_convert_from_secure_pte(): Consumes a PTE that holds a reference
> through the mapping.
>
> Unfortunately we need uv_convert_from_secure_pte(), because pfn_folio()
> and friends are not available in pgtable.h.
>
> Signed-off-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
> ---
> arch/s390/include/asm/pgtable.h | 6 +++---
> arch/s390/include/asm/uv.h | 4 ++--
> arch/s390/kernel/uv.c | 18 +++++++++++++-----
> 3 files changed, 18 insertions(+), 10 deletions(-)
>
> diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
> index 97e040617c29..5ffc4828c25a 100644
> --- a/arch/s390/include/asm/pgtable.h
> +++ b/arch/s390/include/asm/pgtable.h
> @@ -1149,7 +1149,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
> res = ptep_xchg_lazy(mm, addr, ptep, __pte(_PAGE_INVALID));
> /* At this point the reference through the mapping is still present */
> if (mm_is_protected(mm) && pte_present(res))
> - uv_convert_owned_from_secure(pte_val(res) & PAGE_MASK);
> + uv_convert_from_secure_pte(res);
> return res;
> }
>
> @@ -1167,7 +1167,7 @@ static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
> res = ptep_xchg_direct(vma->vm_mm, addr, ptep, __pte(_PAGE_INVALID));
> /* At this point the reference through the mapping is still present */
> if (mm_is_protected(vma->vm_mm) && pte_present(res))
> - uv_convert_owned_from_secure(pte_val(res) & PAGE_MASK);
> + uv_convert_from_secure_pte(res);
> return res;
> }
>
> @@ -1206,7 +1206,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
> * if this is not a mm teardown, the slower export is used as
> * fallback instead.
> */
> - uv_convert_owned_from_secure(pte_val(res) & PAGE_MASK);
> + uv_convert_from_secure_pte(res);
> return res;
> }
>
> diff --git a/arch/s390/include/asm/uv.h b/arch/s390/include/asm/uv.h
> index a1bef30066ef..0679445cac0b 100644
> --- a/arch/s390/include/asm/uv.h
> +++ b/arch/s390/include/asm/uv.h
> @@ -485,7 +485,7 @@ int gmap_make_secure(struct gmap *gmap, unsigned long gaddr, void *uvcb);
> int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr);
> int uv_destroy_folio(struct folio *folio);
> int uv_destroy_pte(pte_t pte);
> -int uv_convert_owned_from_secure(unsigned long paddr);
> +int uv_convert_from_secure_pte(pte_t pte);
> int gmap_convert_to_secure(struct gmap *gmap, unsigned long gaddr);
>
> void setup_uv(void);
> @@ -508,7 +508,7 @@ static inline int uv_destroy_pte(pte_t pte)
> return 0;
> }
>
> -static inline int uv_convert_owned_from_secure(unsigned long paddr)
> +static inline int uv_convert_from_secure_pte(pte_t pte)
> {
> return 0;
> }
> diff --git a/arch/s390/kernel/uv.c b/arch/s390/kernel/uv.c
> index 61c1ce51c883..b456066d72da 100644
> --- a/arch/s390/kernel/uv.c
> +++ b/arch/s390/kernel/uv.c
> @@ -178,11 +178,10 @@ static int uv_convert_from_secure(unsigned long paddr)
> }
>
> /*
> - * The caller must already hold a reference to the page
> + * The caller must already hold a reference to the folio.
> */
> -int uv_convert_owned_from_secure(unsigned long paddr)
> +static int uv_convert_from_secure_folio(struct folio *folio)
> {
> - struct folio *folio = phys_to_folio(paddr);
> int rc;
>
> /* See gmap_make_secure(): large folios cannot be secure */
> @@ -190,13 +189,22 @@ int uv_convert_owned_from_secure(unsigned long paddr)
> return 0;
>
> folio_get(folio);
> - rc = uv_convert_from_secure(paddr);
> + rc = uv_convert_from_secure(folio_to_phys(folio));
> if (!rc)
> clear_bit(PG_arch_1, &folio->flags);
> folio_put(folio);
> return rc;
> }
>
> +/*
> + * The present PTE still indirectly holds a folio reference through the mapping.
> + */
> +int uv_convert_from_secure_pte(pte_t pte)
> +{
> + VM_WARN_ON(!pte_present(pte));
> + return uv_convert_from_secure_folio(pfn_folio(pte_pfn(pte)));
> +}
> +
> /*
> * Calculate the expected ref_count for a folio that would otherwise have no
> * further pins. This was cribbed from similar functions in other places in
> @@ -481,7 +489,7 @@ int gmap_destroy_page(struct gmap *gmap, unsigned long gaddr)
> * we instead try to export the page.
> */
> if (rc)
> - rc = uv_convert_owned_from_secure(page_to_phys(page));
> + rc = uv_convert_from_secure_folio(folio);
> folio_put(folio);
> out:
> mmap_read_unlock(gmap->mm);
next prev parent reply other threads:[~2024-05-07 16:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-12 14:21 [PATCH v2 00/10] s390: PG_arch_1+folio cleanups for uv+hugetlb David Hildenbrand
2024-04-12 14:21 ` [PATCH v2 01/10] s390/uv: don't call folio_wait_writeback() without a folio reference David Hildenbrand
2024-04-12 14:21 ` [PATCH v2 02/10] s390/uv: gmap_make_secure() cleanups for further changes David Hildenbrand
2024-05-07 15:27 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 03/10] s390/uv: split large folios in gmap_make_secure() David Hildenbrand
2024-05-07 15:43 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 04/10] s390/uv: convert PG_arch_1 users to only work on small folios David Hildenbrand
2024-05-07 15:49 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 05/10] s390/uv: update PG_arch_1 comment David Hildenbrand
2024-04-12 14:21 ` [PATCH v2 06/10] s390/uv: make uv_convert_from_secure() a static function David Hildenbrand
2024-05-07 15:53 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 07/10] s390/uv: convert uv_destroy_owned_page() to uv_destroy_(folio|pte)() David Hildenbrand
2024-05-07 16:25 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 08/10] s390/uv: convert uv_convert_owned_from_secure() to uv_convert_from_secure_(folio|pte)() David Hildenbrand
2024-05-07 16:26 ` Claudio Imbrenda [this message]
2024-04-12 14:21 ` [PATCH v2 09/10] s390/uv: implement HAVE_ARCH_MAKE_FOLIO_ACCESSIBLE David Hildenbrand
2024-05-07 16:29 ` Claudio Imbrenda
2024-04-12 14:21 ` [PATCH v2 10/10] s390/hugetlb: convert PG_arch_1 code to work on folio->flags David Hildenbrand
2024-05-07 16:33 ` Claudio Imbrenda
2024-05-08 18:08 ` David Hildenbrand
2024-05-10 8:45 ` Claudio Imbrenda
2024-04-30 18:49 ` [PATCH v2 00/10] s390: PG_arch_1+folio cleanups for uv+hugetlb David Hildenbrand
2024-05-06 8:38 ` Heiko Carstens
2024-05-07 16:34 ` Claudio Imbrenda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240507182619.2846ea8f@p-imbrenda.boeblingen.de.ibm.com \
--to=imbrenda@linux.ibm.com \
--cc=agordeev@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=gerald.schaefer@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hca@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=svens@linux.ibm.com \
--cc=thuth@redhat.com \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).