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 1499BC64ED8 for ; Mon, 27 Feb 2023 13:32:02 +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:Subject:From:References:Cc:To: 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=2Xmu1DRhiWDlTJ7/jyDswL4WE0dCW+P9W60CkNVGNGE=; b=QrKzPKMfKVv9tr Ab+vLISuNgFv8pGiCituVQimz2jzWjSGPDXvYVEEGEI28k7lQHMIwzYCOMHYr4pdIz8msrJV9RA/v y8AMkGNAVZUjzVXSzCLrc/AkSN9r1X3TDpIOUYs0f5jrbx1kJMNmhAA0fEn7zu/WPW01Tjh8GiyPy vhu6wifryzewqtNI0EV9xJb3R1tQ/t/i2+Uo8yyInjn1bu6I+BhGBuyDE87g3X6ZPgjNxR4ytp4j3 yZYfrLx6v536ibmhLKegCY1K1aaPI7ZzhVm/W6PCREkNQght1u7SMZd7wBR2z69QpmChj0CV8RFas n+1mo+7U6h9ZWUV5X38A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWdbg-009lid-Nw; Mon, 27 Feb 2023 13:31:56 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWdbV-009lex-A3 for linux-snps-arc@lists.infradead.org; Mon, 27 Feb 2023 13:31:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677504702; 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; bh=V+6qFC7OXniFoFqHVWKESI1xjQfVcOUspp9yumvENXI=; b=ex46fXXrhKmDPYEWGcB+af8vCe1J2IzZwA/e2KmgnAYszjSYEeJRhD0SpcUuO1qPy3fF9X XAUmcoTTxXm+25+CGrHsNBZUTmHTyITfycVgVEzyB9To6mrfHrZuTHv/h//7qCbivgE7jW G/8xMJixjPXbKePOGt18zoDHMoIkxVA= 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_128_GCM_SHA256) id us-mta-569-VbnW0M-JNOa36PQQd5dySQ-1; Mon, 27 Feb 2023 08:31:41 -0500 X-MC-Unique: VbnW0M-JNOa36PQQd5dySQ-1 Received: by mail-wr1-f70.google.com with SMTP id bx25-20020a5d5b19000000b002c7ce4ce3c3so847893wrb.13 for ; Mon, 27 Feb 2023 05:31:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=V+6qFC7OXniFoFqHVWKESI1xjQfVcOUspp9yumvENXI=; b=Ni/ed3wMRdhHMGsi/cv1q8qTbpXx3vrCz0JifpAdKWQivmo3/gPESI9mODi3fP/pEQ LRS2VGe3L3z6cYOlGJ9PMU6RPsbWg6boK0aUYxavn6irKvWnbmMeI/Nj++RSyCr3PF29 /3RYgep26sz2+29CPYA9pq8GgFpuxuTq5hUCREJO/rJBsjWS3Ki+bj1iuHHJsSy52hR8 Du9DSfqP3FCvFjhwwq7yFmL8wufBICXXr8z3ofZmQcN5Yd4wTCCP4/e9QpzCm2cbjR31 l0APzTApM3YsMG+uNPYoI9bDxczsRTSTWTsfzG7a0kup4XV8V/XzwJDkPbaPlpAS9PLO +wTA== X-Gm-Message-State: AO0yUKUtiwQ/5g3zsV9le/tbXcCfpMokzFH2MY6IkOXWwKRLzn6JCJ+H EOza7XoAFpepZAHhqJnj0Hk+HWDLuxCQQJHebOTy4KXRr0PDlTPa2q1kyRf7LcTSzaaVLlt+myW C3Esq1w8DG9KdX1bzbp3AJOT8ZnLU1QaM X-Received: by 2002:a05:600c:3d9b:b0:3ea:f6c4:5f2a with SMTP id bi27-20020a05600c3d9b00b003eaf6c45f2amr11631380wmb.17.1677504699853; Mon, 27 Feb 2023 05:31:39 -0800 (PST) X-Google-Smtp-Source: AK7set9k8OE3X06H0t6ffblDghDw4p6MluetLQ2Nt3K/GymnPq5PiNVd71t1cUTwSWsd1hBXO2jKVw== X-Received: by 2002:a05:600c:3d9b:b0:3ea:f6c4:5f2a with SMTP id bi27-20020a05600c3d9b00b003eaf6c45f2amr11631342wmb.17.1677504699482; Mon, 27 Feb 2023 05:31:39 -0800 (PST) Received: from ?IPV6:2003:cb:c703:1f00:7816:2307:5967:2228? (p200300cbc7031f007816230759672228.dip0.t-ipconnect.de. [2003:cb:c703:1f00:7816:2307:5967:2228]) by smtp.gmail.com with ESMTPSA id m34-20020a05600c3b2200b003df5be8987esm14091432wms.20.2023.02.27.05.31.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 27 Feb 2023 05:31:38 -0800 (PST) Message-ID: <9ed766a6-cf06-535d-3337-ea6ff25c2362@redhat.com> Date: Mon, 27 Feb 2023 14:31:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.2 To: Geert Uytterhoeven Cc: linux-kernel@vger.kernel.org, Andrew Morton , Hugh Dickins , John Hubbard , Jason Gunthorpe , Mike Rapoport , Yang Shi , Vlastimil Babka , Nadav Amit , Andrea Arcangeli , Peter Xu , linux-mm@kvack.org, x86@kernel.org, linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, openrisc@lists.librecores.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, Michal Simek References: <20230113171026.582290-1-david@redhat.com> <20230113171026.582290-12-david@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH mm-unstable v1 11/26] microblaze/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE In-Reply-To: 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-20230227_053145_440490_8D424273 X-CRM114-Status: GOOD ( 29.81 ) X-BeenThere: linux-snps-arc@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux on Synopsys ARC Processors 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-snps-arc" Errors-To: linux-snps-arc-bounces+linux-snps-arc=archiver.kernel.org@lists.infradead.org On 26.02.23 21:13, Geert Uytterhoeven wrote: > Hi David, Hi Geert, > > On Fri, Jan 13, 2023 at 6:16 PM David Hildenbrand wrote: >> Let's support __HAVE_ARCH_PTE_SWP_EXCLUSIVE by stealing one bit >> from the type. Generic MM currently only uses 5 bits for the type >> (MAX_SWAPFILES_SHIFT), so the stolen bit is effectively unused. >> >> The shift by 2 when converting between PTE and arch-specific swap entry >> makes the swap PTE layout a little bit harder to decipher. >> >> While at it, drop the comment from paulus---copy-and-paste leftover >> from powerpc where we actually have _PAGE_HASHPTE---and mask the type in >> __swp_entry_to_pte() as well. >> >> Cc: Michal Simek >> Signed-off-by: David Hildenbrand > > Thanks for your patch, which is now commit b5c88f21531c3457 > ("microblaze/mm: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE") in > Right, it went upstream, so we can only fixup. >> arch/m68k/include/asm/mcf_pgtable.h | 4 +-- > > What is this m68k change doing here? > Sorry for not noticing this earlier. Thanks for the late review, still valuable :) That hunk should have gone into the previous patch, looks like I messed that up when reworking. > > Furthermore, several things below look strange to me... > >> arch/microblaze/include/asm/pgtable.h | 45 +++++++++++++++++++++------ >> 2 files changed, 37 insertions(+), 12 deletions(-) >> >> diff --git a/arch/m68k/include/asm/mcf_pgtable.h b/arch/m68k/include/asm/mcf_pgtable.h >> index 3f8f4d0e66dd..e573d7b649f7 100644 >> --- a/arch/m68k/include/asm/mcf_pgtable.h >> +++ b/arch/m68k/include/asm/mcf_pgtable.h >> @@ -46,8 +46,8 @@ >> #define _CACHEMASK040 (~0x060) >> #define _PAGE_GLOBAL040 0x400 /* 68040 global bit, used for kva descs */ >> >> -/* We borrow bit 7 to store the exclusive marker in swap PTEs. */ >> -#define _PAGE_SWP_EXCLUSIVE 0x080 >> +/* We borrow bit 24 to store the exclusive marker in swap PTEs. */ >> +#define _PAGE_SWP_EXCLUSIVE CF_PAGE_NOCACHE > > CF_PAGE_NOCACHE is 0x80, so this is still bit 7, thus the new comment > is wrong? You're right, it's still bit 7 (and we use LSB-0 bit numbering in that file). I'll send a fixup. > >> >> /* >> * Externally used page protection values. >> diff --git a/arch/microblaze/include/asm/pgtable.h b/arch/microblaze/include/asm/pgtable.h >> index 42f5988e998b..7e3de54bf426 100644 >> --- a/arch/microblaze/include/asm/pgtable.h >> +++ b/arch/microblaze/include/asm/pgtable.h >> @@ -131,10 +131,10 @@ extern pte_t *va_to_pte(unsigned long address); >> * of the 16 available. Bit 24-26 of the TLB are cleared in the TLB >> * miss handler. Bit 27 is PAGE_USER, thus selecting the correct >> * zone. >> - * - PRESENT *must* be in the bottom two bits because swap cache >> - * entries use the top 30 bits. Because 4xx doesn't support SMP >> - * anyway, M is irrelevant so we borrow it for PAGE_PRESENT. Bit 30 >> - * is cleared in the TLB miss handler before the TLB entry is loaded. >> + * - PRESENT *must* be in the bottom two bits because swap PTEs use the top >> + * 30 bits. Because 4xx doesn't support SMP anyway, M is irrelevant so we >> + * borrow it for PAGE_PRESENT. Bit 30 is cleared in the TLB miss handler >> + * before the TLB entry is loaded. > > So the PowerPC 4xx comment is still here? I only dropped the comment above __swp_type(). I guess you mean that we could also drop the "Because 4xx doesn't support SMP anyway, M is irrelevant so we borrow it for PAGE_PRESENT." sentence, correct? Not sure about the "Bit 30 is cleared in the TLB miss handler" comment, if that can similarly be dropped. > >> * - All other bits of the PTE are loaded into TLBLO without >> * * modification, leaving us only the bits 20, 21, 24, 25, 26, 30 for >> * software PTE bits. We actually use bits 21, 24, 25, and >> @@ -155,6 +155,9 @@ extern pte_t *va_to_pte(unsigned long address); >> #define _PAGE_ACCESSED 0x400 /* software: R: page referenced */ >> #define _PMD_PRESENT PAGE_MASK >> >> +/* We borrow bit 24 to store the exclusive marker in swap PTEs. */ >> +#define _PAGE_SWP_EXCLUSIVE _PAGE_DIRTY > > _PAGE_DIRTY is 0x80, so this is also bit 7, thus the new comment is > wrong? In the example, I use MSB-0 bit numbering (which I determined to be correct in microblaze context eventually, but I got confused a couple a times because it's very inconsistent). That should be MSB-0 bit 24. Thanks! -- Thanks, David / dhildenb _______________________________________________ linux-snps-arc mailing list linux-snps-arc@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-snps-arc