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 E1DCFC7EE2A for ; Wed, 17 May 2023 14:59:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3A6F0900004; Wed, 17 May 2023 10:59:57 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3563C900003; Wed, 17 May 2023 10:59:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2449B900004; Wed, 17 May 2023 10:59:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 16754900003 for ; Wed, 17 May 2023 10:59:57 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CC8AC1401E6 for ; Wed, 17 May 2023 14:59:56 +0000 (UTC) X-FDA: 80800056792.26.948062E Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id BCC37C000B for ; Wed, 17 May 2023 14:59:54 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1684335594; 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=+b8yoAB8HawSrHfyczl9n+6+ha/R/REJ8rWKalPWC8M=; b=NVf02+6kR70NodUghBw80wiC8MYQ16jEqkkeWvEBBb8e//wOYBYUTWDj+zyyuahCQiztz9 CY3sJXlHiuoCNjHC5pOtsU/mkOafuEfW2R/jocNh1lmNIjMZu2CmmmyF7JpxQCoaH69lux QVdzOOoL5jZe++uVO/RjWWZfrbeKwds= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684335594; a=rsa-sha256; cv=none; b=G6YdQfKGcmgeTQypczwOAzvQ+heph4Jnohwv/6XoBWl5h9xFOHn3HHYT+AjWkyh6rVHgJI dhDChP9TIGdywAnVG21oBUvGzAaqdHNI4+AxS219McjZr7hIDADgfTbQEmpl1YfBrVnHB0 5qCpUfUVwuSYSZdY0l9/muMjnC9/Kpo= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; spf=pass (imf22.hostedemail.com: domain of steven.price@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=steven.price@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6E33C113E; Wed, 17 May 2023 08:00:38 -0700 (PDT) Received: from [10.57.58.217] (unknown [10.57.58.217]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A69203F73F; Wed, 17 May 2023 07:59:50 -0700 (PDT) Message-ID: <993ee407-cd7a-ab14-9d66-2e1009e05d3a@arm.com> Date: Wed, 17 May 2023 15:59:48 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v3 3/3] arm64: mte: Simplify swap tag restoration logic Content-Language: en-GB To: Peter Collingbourne , Catalin Marinas Cc: =?UTF-8?B?UXVuLXdlaSBMaW4gKOael+e+pOW0tCk=?= , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "surenb@google.com" , "david@redhat.com" , =?UTF-8?B?Q2hpbndlbiBDaGFuZyAo5by16Yym5paHKQ==?= , "kasan-dev@googlegroups.com" , =?UTF-8?B?S3Vhbi1ZaW5nIExlZSAo5p2O5Yag56mOKQ==?= , =?UTF-8?B?Q2FzcGVyIExpICjmnY7kuK3mpq4p?= , "gregkh@linuxfoundation.org" , vincenzo.frascino@arm.com, Alexandru Elisei , will@kernel.org, eugenis@google.com References: <20230517022115.3033604-1-pcc@google.com> <20230517022115.3033604-4-pcc@google.com> From: Steven Price In-Reply-To: <20230517022115.3033604-4-pcc@google.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Stat-Signature: 1au7gspgec85ro684fhtrtu8ipztbahc X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: BCC37C000B X-HE-Tag: 1684335594-690140 X-HE-Meta: U2FsdGVkX1/6sPkAsXE8A+v8jos65sfmlTu2oNp6Svq8hrDs7LnBq6z7Db/owkYsmZ2PnR/YpzvEIQ8XnO33OU2HE+JB3UpFIwvTGyp2Lq/KTqFIxGCR0R5R2RMLsT8C3RMwywY5EsEAJOzdUxx+IGnyBLSAJqztjROU75uS9Asw1aZbxdIe3Z4xg+Rf9LUpj3CjDPYjZ7hXaHVuad4rlrbDAdGRRQvcCz8J/SPp3BwzZ0cJoImacoaUODKyyxbN5cpmp+t/4c9bj9p3MjUTDeokjY/tkhTdY7PMQDUnxbfYHNw1kDuAN0LlesSSAXSoCg3FOH0Czk47uxanZnWA1zEavjVnmDC05Ez0ORVhh/w71JtkheAlk9yovRnuvYRjt5FVV+s7AKCqNu3b8RMmiIETE6lZunyczBibodzv6i7X75bEBtNVpz7w3Z0gZDgRjgDX79uRLE5ZTh0qxyJ4/qorveLkA0bXNSILK3e81YUhOUg3lx7s07V/I7RR3VsP2/Rol6TBVnX2HraIplKow8nZVTCz61+UQQsSTc5OjbeAuWf53v3vydaH7SKA+pMfPJX0CLsstxEjznJXnPTBv+EC9OExGHoVQvKBxPQMR04MWMs8CWDzNseERqKJN5L7+CYQAjheUSfYJ1FU1qhBV/Ye9LShSUfTU0CI0+ZPUrEyfg8Hc2WtOtu6S0FxaopOaDDF8fkh6s1rikxYph5AVQHf8qAQLruT2m1+jvFpbx8RHAztKfqXJclHIIQ69IHqJOoEL92osNOw4nOTI/td2zD6RFivs6ZxttDEehcvJn8RbaTS30Q0V3/85BKWg9Te0MmBQTVUSov2rxPDxyZY8uYGNy2h8eqlCwQovwryAkhl8+OOpQfRmhbALdMVWRNSROB48XmMTeJyeQ4JNMyVu4weG4Ka0rOrUsjjaIFwen8kdasqtr217VqK9vmTlbwUkyHnPG3Gd03s0mFIUkR HgwvdoFP 418eYLiwMNAwTiouSoKSsD1ObmDwFiJ0AZZWpSzkhEw6GXufa13f3DcjJZ09dRm7FWfRh0hyIsXV5DjzHrTpatr0I3gEidkzV+GjRCisNg7z8canuBW28ZEqDVmDClC5lPX7Foq++rooBwsxX1bFl4dEc4VUzSs9lYH0tEbLCYxBwSb6rp2gLVlAMGBRpp3tjrNH5jAbL4i/CEEDxE9RFYiHMdXQw4Z9n+B31gLrLVnn7rRAVieGR7Ep7iKNm/btXys4sMJN0dqj5GdH+VQZzqscDoWBnzZT7/cSr 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: On 17/05/2023 03:21, Peter Collingbourne wrote: > As a result of the previous two patches, there are no circumstances > in which a swapped-in page is installed in a page table without first > having arch_swap_restore() called on it. Therefore, we no longer need > the logic in set_pte_at() that restores the tags, so remove it. > > Because we can now rely on the page being locked, we no longer need to > handle the case where a page is having its tags restored by multiple tasks > concurrently, so we can slightly simplify the logic in mte_restore_tags(). > > Signed-off-by: Peter Collingbourne > Link: https://linux-review.googlesource.com/id/I8ad54476f3b2d0144ccd8ce0c1d7a2963e5ff6f3 This is much neater, thanks for figuring out a better way of implementing it. The set_pte_at() thing always felt like a hack, but it was always there for the non-swap case and I obviously never figured out a better solution. Reviewed-by: Steven Price > --- > v3: > - Rebased onto arm64/for-next/fixes, which already has a fix > for the issue previously tagged, therefore removed Fixes: > tag > > arch/arm64/include/asm/mte.h | 4 ++-- > arch/arm64/include/asm/pgtable.h | 14 ++---------- > arch/arm64/kernel/mte.c | 37 ++++++-------------------------- > arch/arm64/mm/mteswap.c | 7 +++--- > 4 files changed, 14 insertions(+), 48 deletions(-) > > diff --git a/arch/arm64/include/asm/mte.h b/arch/arm64/include/asm/mte.h > index c028afb1cd0b..4cedbaa16f41 100644 > --- a/arch/arm64/include/asm/mte.h > +++ b/arch/arm64/include/asm/mte.h > @@ -90,7 +90,7 @@ static inline bool try_page_mte_tagging(struct page *page) > } > > void mte_zero_clear_page_tags(void *addr); > -void mte_sync_tags(pte_t old_pte, pte_t pte); > +void mte_sync_tags(pte_t pte); > void mte_copy_page_tags(void *kto, const void *kfrom); > void mte_thread_init_user(void); > void mte_thread_switch(struct task_struct *next); > @@ -122,7 +122,7 @@ static inline bool try_page_mte_tagging(struct page *page) > static inline void mte_zero_clear_page_tags(void *addr) > { > } > -static inline void mte_sync_tags(pte_t old_pte, pte_t pte) > +static inline void mte_sync_tags(pte_t pte) > { > } > static inline void mte_copy_page_tags(void *kto, const void *kfrom) > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index 0bd18de9fd97..e8a252e62b12 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -337,18 +337,8 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, > * don't expose tags (instruction fetches don't check tags). > */ > if (system_supports_mte() && pte_access_permitted(pte, false) && > - !pte_special(pte)) { > - pte_t old_pte = READ_ONCE(*ptep); > - /* > - * We only need to synchronise if the new PTE has tags enabled > - * or if swapping in (in which case another mapping may have > - * set tags in the past even if this PTE isn't tagged). > - * (!pte_none() && !pte_present()) is an open coded version of > - * is_swap_pte() > - */ > - if (pte_tagged(pte) || (!pte_none(old_pte) && !pte_present(old_pte))) > - mte_sync_tags(old_pte, pte); > - } > + !pte_special(pte) && pte_tagged(pte)) > + mte_sync_tags(pte); > > __check_safe_pte_update(mm, ptep, pte); > > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index 7e89968bd282..c40728046fed 100644 > --- a/arch/arm64/kernel/mte.c > +++ b/arch/arm64/kernel/mte.c > @@ -35,41 +35,18 @@ DEFINE_STATIC_KEY_FALSE(mte_async_or_asymm_mode); > EXPORT_SYMBOL_GPL(mte_async_or_asymm_mode); > #endif > > -static void mte_sync_page_tags(struct page *page, pte_t old_pte, > - bool check_swap, bool pte_is_tagged) > -{ > - if (check_swap && is_swap_pte(old_pte)) { > - swp_entry_t entry = pte_to_swp_entry(old_pte); > - > - if (!non_swap_entry(entry)) > - mte_restore_tags(entry, page); > - } > - > - if (!pte_is_tagged) > - return; > - > - if (try_page_mte_tagging(page)) { > - mte_clear_page_tags(page_address(page)); > - set_page_mte_tagged(page); > - } > -} > - > -void mte_sync_tags(pte_t old_pte, pte_t pte) > +void mte_sync_tags(pte_t pte) > { > struct page *page = pte_page(pte); > long i, nr_pages = compound_nr(page); > - bool check_swap = nr_pages == 1; > - bool pte_is_tagged = pte_tagged(pte); > - > - /* Early out if there's nothing to do */ > - if (!check_swap && !pte_is_tagged) > - return; > > /* if PG_mte_tagged is set, tags have already been initialised */ > - for (i = 0; i < nr_pages; i++, page++) > - if (!page_mte_tagged(page)) > - mte_sync_page_tags(page, old_pte, check_swap, > - pte_is_tagged); > + for (i = 0; i < nr_pages; i++, page++) { > + if (try_page_mte_tagging(page)) { > + mte_clear_page_tags(page_address(page)); > + set_page_mte_tagged(page); > + } > + } > > /* ensure the tags are visible before the PTE is set */ > smp_wmb(); > diff --git a/arch/arm64/mm/mteswap.c b/arch/arm64/mm/mteswap.c > index cd508ba80ab1..3a78bf1b1364 100644 > --- a/arch/arm64/mm/mteswap.c > +++ b/arch/arm64/mm/mteswap.c > @@ -53,10 +53,9 @@ void mte_restore_tags(swp_entry_t entry, struct page *page) > if (!tags) > return; > > - if (try_page_mte_tagging(page)) { > - mte_restore_page_tags(page_address(page), tags); > - set_page_mte_tagged(page); > - } > + WARN_ON_ONCE(!try_page_mte_tagging(page)); > + mte_restore_page_tags(page_address(page), tags); > + set_page_mte_tagged(page); > } > > void mte_invalidate_tags(int type, pgoff_t offset)