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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BA02C433EF for ; Tue, 10 May 2022 04:17:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235273AbiEJEVc (ORCPT ); Tue, 10 May 2022 00:21:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236188AbiEJEUC (ORCPT ); Tue, 10 May 2022 00:20:02 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 582792AC6E7 for ; Mon, 9 May 2022 21:15:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E76B961766 for ; Tue, 10 May 2022 04:15:01 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3ADE1C385C8; Tue, 10 May 2022 04:15:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1652156101; bh=FQmdpLMEqyuYWLp076R2bTQOvWLi3vDoRYddNfqqPDQ=; h=Date:To:From:Subject:From; b=tg8bS8Tn/fC7iPLGHX3YuguzmttVvgW3K31QjObkwS0q687es26QAd7t5B63QczR8 TOl0iRkyl74li57qZrHLQYi+lKamfAR7PaNCKA4yKa87t4afNlJ5WmexrKg9NEH5nz dnl+hl1oCwjAs01bk/Q8kXyGifTmh6ZwSHcQPR28= Date: Mon, 09 May 2022 21:15:00 -0700 To: mm-commits@vger.kernel.org, zhangliang5@huawei.com, willy@infradead.org, will@kernel.org, vbabka@suse.cz, tglx@linutronix.de, shakeelb@google.com, rppt@linux.ibm.com, riel@surriel.com, peterx@redhat.com, pedrodemargomes@gmail.com, paulus@samba.org, oleg@redhat.com, oded.gabbay@gmail.com, namit@vmware.com, mpe@ellerman.id.au, mingo@redhat.com, mike.kravetz@oracle.com, mhocko@kernel.org, kirill.shutemov@linux.intel.com, jhubbard@nvidia.com, jgg@nvidia.com, jannh@google.com, jack@suse.cz, hughd@google.com, hch@lst.de, hca@linux.ibm.com, guro@fb.com, gor@linux.ibm.com, gerald.schaefer@linux.ibm.com, ddutile@redhat.com, dave.hansen@linux.intel.com, catalin.marinas@arm.com, bp@alien8.de, benh@kernel.crashing.org, aarcange@redhat.com, david@redhat.com, akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] s390-pgtable-cleanup-description-of-swp-pte-layout.patch removed from -mm tree Message-Id: <20220510041501.3ADE1C385C8@smtp.kernel.org> Precedence: bulk Reply-To: linux-kernel@vger.kernel.org List-ID: X-Mailing-List: mm-commits@vger.kernel.org The quilt patch titled Subject: s390/pgtable: cleanup description of swp pte layout has been removed from the -mm tree. Its filename was s390-pgtable-cleanup-description-of-swp-pte-layout.patch This patch was dropped because it was merged into mm-stable ------------------------------------------------------ From: David Hildenbrand Subject: s390/pgtable: cleanup description of swp pte layout Bit 52 and bit 55 don't have to be zero: they only trigger a translation-specifiation exception if the PTE is marked as valid, which is not the case for swap ptes. Document which bits are used for what, and which ones are unused. Link: https://lkml.kernel.org/r/20220329164329.208407-6-david@redhat.com Signed-off-by: David Hildenbrand Cc: Andrea Arcangeli Cc: Benjamin Herrenschmidt Cc: Borislav Petkov Cc: Catalin Marinas Cc: Christoph Hellwig Cc: Dave Hansen Cc: Don Dutile Cc: Gerald Schaefer Cc: Heiko Carstens Cc: Hugh Dickins Cc: Ingo Molnar Cc: Jan Kara Cc: Jann Horn Cc: Jason Gunthorpe Cc: John Hubbard Cc: "Kirill A. Shutemov" Cc: Liang Zhang Cc: Matthew Wilcox (Oracle) Cc: Michael Ellerman Cc: Michal Hocko Cc: Mike Kravetz Cc: Mike Rapoport Cc: Nadav Amit Cc: Oded Gabbay Cc: Oleg Nesterov Cc: Paul Mackerras Cc: Pedro Demarchi Gomes Cc: Peter Xu Cc: Rik van Riel Cc: Roman Gushchin Cc: Shakeel Butt Cc: Thomas Gleixner Cc: Vasily Gorbik Cc: Vlastimil Babka Cc: Will Deacon Signed-off-by: Andrew Morton --- arch/s390/include/asm/pgtable.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) --- a/arch/s390/include/asm/pgtable.h~s390-pgtable-cleanup-description-of-swp-pte-layout +++ a/arch/s390/include/asm/pgtable.h @@ -1712,18 +1712,17 @@ static inline int has_transparent_hugepa /* * 64 bit swap entry format: * A page-table entry has some bits we have to treat in a special way. - * Bits 52 and bit 55 have to be zero, otherwise a specification - * exception will occur instead of a page translation exception. The - * specification exception has the bad habit not to store necessary - * information in the lowcore. - * Bits 54 and 63 are used to indicate the page type. + * Bits 54 and 63 are used to indicate the page type. Bit 53 marks the pte + * as invalid. * A swap pte is indicated by bit pattern (pte & 0x201) == 0x200 - * This leaves the bits 0-51 and bits 56-62 to store type and offset. - * We use the 5 bits from 57-61 for the type and the 52 bits from 0-51 - * for the offset. - * | offset |01100|type |00| + * | offset |X11XX|type |S0| * |0000000000111111111122222222223333333333444444444455|55555|55566|66| * |0123456789012345678901234567890123456789012345678901|23456|78901|23| + * + * Bits 0-51 store the offset. + * Bits 57-61 store the type. + * Bit 62 (S) is used for softdirty tracking. + * Bits 52, 55 and 56 (X) are unused. */ #define __SWP_OFFSET_MASK ((1UL << 52) - 1) _ Patches currently in -mm which might be from david@redhat.com are