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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C90D4CF58D5 for ; Fri, 20 Sep 2024 06:42:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=H4qwPVUcOeLS4jun9PnEUTM1Q3BC4ou4PWP3WnHD7Sw=; b=xUY4NtENA3DSn8 RJEZJmfUpAIrb33T5Sff6XX7DRJIXGG8B9l6IH8mThdtPcK2GUX4wLjq2+IsW8dGoF598/ylexXoY 6mk925LZkvOTnlx63ocuLycpoG17cjoqlESA/kBMFQmEVawxvodkLsoWErGEyTBqifp3TmL92g32e orWcI7uUNVc29nCcCMaFqEeS1anGtRlIQXP56CAChejk2kEXLV5gST9WGcBcyB3gYCQ20UuoZNDf5 PtnLV9951Ma8j1VWZdIs5jClHP003g2J4+EWN69Pa9MLT6p/NlrBw+Q9kz//mBUOXCmqi7R7QoK35 rxHetXzJA/wEHI3Cgtyg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1srXLY-0000000BYkI-0WsU; Fri, 20 Sep 2024 06:42:28 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1srXJ4-0000000BYJQ-21rr for linux-riscv@lists.infradead.org; Fri, 20 Sep 2024 06:39:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1726814392; 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=TBTohzt93k/pWZ0gykhNCsmzYxdwEQp2uEI3E4E2c9E=; b=LAINRAKNN/nWG58TZyn/8wuvs6T/UiC7sWjms0UScY0jakUPM5/HWgO6rrt8gfBCm00cDo YsayIGpXITZQ4bc5y9llpwvCtTifDWPm7j64PQHJiaOnDd5hhD3RDWdl43e29mIdVIKplS 7Gk9mn+2aQHzy3hhaCD61gSMubuyPIQ= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-489-Sr5GDR8xMe2gvyRgS0k1HA-1; Fri, 20 Sep 2024 02:39:50 -0400 X-MC-Unique: Sr5GDR8xMe2gvyRgS0k1HA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-374cbbaf315so843472f8f.0 for ; Thu, 19 Sep 2024 23:39:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726814389; x=1727419189; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :content-language: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=TBTohzt93k/pWZ0gykhNCsmzYxdwEQp2uEI3E4E2c9E=; b=CetyfSeN7Pqd6X6JLa87HA/HbsWqFnXbBaxE5PiRIFVr3yRVgKYrp3OlONue03nkMf BiOl34xlO/so2JDgEH5PvteKBONqyjkNr15jf1M3v8swSrItPfWy0CDzFyrg2Wi8gQTJ qREfZV8YUiQjDpR6ogVmTr21vYestnR+BoVmTqv3HEUE1KeogfWQUoLdEyvFn/cAZXZV +9ZsE/rTFmYe0Bgt1PN/FE/8OILJCnTV3+M+WNQs4qCMcjLz8NHjzeVqx04VYZLpnD3z RsbQBvUTDq20u/m/6CFL75927kgcaf7UOFNerk1j0FcSUHg4SJS0kGVO2Myy92+i1Fl5 PZyQ== X-Forwarded-Encrypted: i=1; AJvYcCUTwTO+s03RGEVywRwYSHev1Y+qhNlYn89lXlxI6yHO8jvoRKgLwOt/XL/R6g6yTuzNnpCQqiaqXvq3cw==@lists.infradead.org X-Gm-Message-State: AOJu0Yz3AErfzkcmhqCo6QXhrBJwEmSICy/s142JrNRjdbZhvyu00V/P RIrLWrkiTKpQ3leh/OXD/hzSRg3Q8yc9FeXdv3WRUXQDES7OWrjAxbuRt8P0ALF+SRnKCmtHquH zHnLtJPNo67+/b/pu5XzeOUlPxu2xinebBR6mE1GxB41s0qH6424naLWJKuiF4pfkVQ== X-Received: by 2002:a5d:59a7:0:b0:374:bcfe:e73 with SMTP id ffacd0b85a97d-37a4159acb4mr1162100f8f.28.1726814389483; Thu, 19 Sep 2024 23:39:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNuEOmvvlI6JB+HKX1XlBcDemyM8s/TOWb5uNYzbgvjt8YB27WYVLkE+t5zNEfo0/pu/qk2A== X-Received: by 2002:a5d:59a7:0:b0:374:bcfe:e73 with SMTP id ffacd0b85a97d-37a4159acb4mr1162083f8f.28.1726814388959; Thu, 19 Sep 2024 23:39:48 -0700 (PDT) Received: from [192.168.21.234] (85-124-1-52.static.upcbusiness.at. [85.124.1.52]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-378e78002afsm16854347f8f.75.2024.09.19.23.39.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 19 Sep 2024 23:39:47 -0700 (PDT) Message-ID: <4aad893a-f8ba-4b2e-bded-b01a35ec0a94@redhat.com> Date: Fri, 20 Sep 2024 08:39:49 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm: Move set_pxd_safe() helpers from generic to platform To: Anshuman Khandual , linux-mm@kvack.org, akpm@linux-foundation.org Cc: Paul Walmsley , Palmer Dabbelt , Thomas Gleixner , Dave Hansen , Ryan Roberts , x86@kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org References: <20240920053017.2514920-1-anshuman.khandual@arm.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20240920053017.2514920-1-anshuman.khandual@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240919_233954_663984_68E10B86 X-CRM114-Status: GOOD ( 22.72 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org On 20.09.24 07:30, Anshuman Khandual wrote: > set_pxd_safe() helpers that serve a specific purpose for both x86 and riscv > platforms, do not need to be in the common memory code. Otherwise they just > unnecessarily make the common API more complicated. This moves the helpers > from common code to platform instead. > > Cc: Paul Walmsley > Cc: Palmer Dabbelt > Cc: Thomas Gleixner > Cc: Dave Hansen > Cc: David Hildenbrand > Cc: Ryan Roberts > Cc: Andrew Morton > Cc: x86@kernel.org > Cc: linux-mm@kvack.org > Cc: linux-riscv@lists.infradead.org > Cc: linux-kernel@vger.kernel.org > Suggested-by: David Hildenbrand > Signed-off-by: Anshuman Khandual > --- > arch/riscv/include/asm/pgtable.h | 19 ++++++++++++++++ > arch/x86/include/asm/pgtable.h | 37 +++++++++++++++++++++++++++++++ > include/linux/pgtable.h | 38 -------------------------------- > 3 files changed, 56 insertions(+), 38 deletions(-) > > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > index 089f3c9f56a3..39ca652c5ebe 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -957,6 +957,25 @@ void misc_mem_init(void); > extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]; > #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page)) > > +/* > + * Use set_p*_safe(), and elide TLB flushing, when confident that *no* > + * TLB flush will be required as a result of the "set". For example, use > + * in scenarios where it is known ahead of time that the routine is > + * setting non-present entries, or re-setting an existing entry to the > + * same value. Otherwise, use the typical "set" helpers and flush the > + * TLB. > + */ > +#define set_p4d_safe(p4dp, p4d) \ > +({ \ > + WARN_ON_ONCE(p4d_present(*p4dp) && !p4d_same(*p4dp, p4d)); \ > + set_p4d(p4dp, p4d); \ > +}) > + > +#define set_pgd_safe(pgdp, pgd) \ > +({ \ > + WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \ > + set_pgd(pgdp, pgd); \ > +}) > #endif /* !__ASSEMBLY__ */ > > #endif /* _ASM_RISCV_PGTABLE_H */ > diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h > index e39311a89bf4..fefb52bb6b4d 100644 > --- a/arch/x86/include/asm/pgtable.h > +++ b/arch/x86/include/asm/pgtable.h > @@ -1701,6 +1701,43 @@ bool arch_is_platform_page(u64 paddr); > #define arch_is_platform_page arch_is_platform_page > #endif > > +/* > + * Use set_p*_safe(), and elide TLB flushing, when confident that *no* > + * TLB flush will be required as a result of the "set". For example, use > + * in scenarios where it is known ahead of time that the routine is > + * setting non-present entries, or re-setting an existing entry to the > + * same value. Otherwise, use the typical "set" helpers and flush the > + * TLB. > + */ > +#define set_pte_safe(ptep, pte) \ > +({ \ > + WARN_ON_ONCE(pte_present(*ptep) && !pte_same(*ptep, pte)); \ > + set_pte(ptep, pte); \ > +}) > + > +#define set_pmd_safe(pmdp, pmd) \ > +({ \ > + WARN_ON_ONCE(pmd_present(*pmdp) && !pmd_same(*pmdp, pmd)); \ > + set_pmd(pmdp, pmd); \ > +}) > + > +#define set_pud_safe(pudp, pud) \ > +({ \ > + WARN_ON_ONCE(pud_present(*pudp) && !pud_same(*pudp, pud)); \ > + set_pud(pudp, pud); \ > +}) > + > +#define set_p4d_safe(p4dp, p4d) \ > +({ \ > + WARN_ON_ONCE(p4d_present(*p4dp) && !p4d_same(*p4dp, p4d)); \ > + set_p4d(p4dp, p4d); \ > +}) > + > +#define set_pgd_safe(pgdp, pgd) \ > +({ \ > + WARN_ON_ONCE(pgd_present(*pgdp) && !pgd_same(*pgdp, pgd)); \ > + set_pgd(pgdp, pgd); \ > +}) > #endif /* __ASSEMBLY__ */ I'm wondering if we can completely get rid of these, for example via: diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index d8dbeac8b206..bc71c25930bb 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -79,10 +79,8 @@ DEFINE_POPULATE(pmd_populate_kernel, pmd, pte, init) static inline void set_##type1##_init(type1##_t *arg1, \ type2##_t arg2, bool init) \ { \ - if (init) \ - set_##type1##_safe(arg1, arg2); \ - else \ - set_##type1(arg1, arg2); \ + WARN_ON_ONCE(init && ##type1##_present(*arg1) && !##type1##_same(*arg1, arg2)); \ + set_##type1(arg1, arg2); \ } We might be able to handle the pgd_populate etc part similarly, possibly getting rid of the pgd_populate_safe etc as well. Assuming I don't miss anything important :) Ideally, we get rid of the macros here and just use inline functions ... -- Cheers, David / dhildenb _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv