From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: akpm@linux-foundation.org Cc: peterz@infradead.org, mingo@kernel.org, davej@redhat.com, sasha.levin@oracle.com, hughd@google.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Subject: [PATCH 11/38] arm64: drop PTE_FILE and pte_file()-related helpers Date: Wed, 24 Dec 2014 14:22:19 +0200 [thread overview] Message-ID: <1419423766-114457-12-git-send-email-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <1419423766-114457-1-git-send-email-kirill.shutemov@linux.intel.com> We've replaced remap_file_pages(2) implementation with emulation. Nobody creates non-linear mapping anymore. This patch also adjust __SWP_TYPE_SHIFT and increase number of bits availble for swap offset. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm64/include/asm/pgtable.h | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 22e6157fe8d0..854d051f5fd4 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -25,7 +25,6 @@ * Software defined PTE bits definition. */ #define PTE_VALID (_AT(pteval_t, 1) << 0) -#define PTE_FILE (_AT(pteval_t, 1) << 2) /* only when !pte_present() */ #define PTE_DIRTY (_AT(pteval_t, 1) << 55) #define PTE_SPECIAL (_AT(pteval_t, 1) << 56) #define PTE_WRITE (_AT(pteval_t, 1) << 57) @@ -470,13 +469,12 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; /* * Encode and decode a swap entry: * bits 0-1: present (must be zero) - * bit 2: PTE_FILE - * bits 3-8: swap type - * bits 9-57: swap offset + * bits 2-7: swap type + * bits 8-57: swap offset */ -#define __SWP_TYPE_SHIFT 3 +#define __SWP_TYPE_SHIFT 2 #define __SWP_TYPE_BITS 6 -#define __SWP_OFFSET_BITS 49 +#define __SWP_OFFSET_BITS 50 #define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1) #define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT) #define __SWP_OFFSET_MASK ((1UL << __SWP_OFFSET_BITS) - 1) @@ -494,18 +492,6 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; */ #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS) -/* - * Encode and decode a file entry: - * bits 0-1: present (must be zero) - * bit 2: PTE_FILE - * bits 3-57: file offset / PAGE_SIZE - */ -#define pte_file(pte) (pte_val(pte) & PTE_FILE) -#define pte_to_pgoff(x) (pte_val(x) >> 3) -#define pgoff_to_pte(x) __pte(((x) << 3) | PTE_FILE) - -#define PTE_FILE_MAX_BITS 55 - extern int kern_addr_valid(unsigned long addr); #include <asm-generic/pgtable.h> -- 2.1.3
WARNING: multiple messages have this Message-ID (diff)
From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> To: akpm@linux-foundation.org Cc: peterz@infradead.org, mingo@kernel.org, davej@redhat.com, sasha.levin@oracle.com, hughd@google.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Subject: [PATCH 11/38] arm64: drop PTE_FILE and pte_file()-related helpers Date: Wed, 24 Dec 2014 14:22:19 +0200 [thread overview] Message-ID: <1419423766-114457-12-git-send-email-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <1419423766-114457-1-git-send-email-kirill.shutemov@linux.intel.com> We've replaced remap_file_pages(2) implementation with emulation. Nobody creates non-linear mapping anymore. This patch also adjust __SWP_TYPE_SHIFT and increase number of bits availble for swap offset. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> --- arch/arm64/include/asm/pgtable.h | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 22e6157fe8d0..854d051f5fd4 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -25,7 +25,6 @@ * Software defined PTE bits definition. */ #define PTE_VALID (_AT(pteval_t, 1) << 0) -#define PTE_FILE (_AT(pteval_t, 1) << 2) /* only when !pte_present() */ #define PTE_DIRTY (_AT(pteval_t, 1) << 55) #define PTE_SPECIAL (_AT(pteval_t, 1) << 56) #define PTE_WRITE (_AT(pteval_t, 1) << 57) @@ -470,13 +469,12 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; /* * Encode and decode a swap entry: * bits 0-1: present (must be zero) - * bit 2: PTE_FILE - * bits 3-8: swap type - * bits 9-57: swap offset + * bits 2-7: swap type + * bits 8-57: swap offset */ -#define __SWP_TYPE_SHIFT 3 +#define __SWP_TYPE_SHIFT 2 #define __SWP_TYPE_BITS 6 -#define __SWP_OFFSET_BITS 49 +#define __SWP_OFFSET_BITS 50 #define __SWP_TYPE_MASK ((1 << __SWP_TYPE_BITS) - 1) #define __SWP_OFFSET_SHIFT (__SWP_TYPE_BITS + __SWP_TYPE_SHIFT) #define __SWP_OFFSET_MASK ((1UL << __SWP_OFFSET_BITS) - 1) @@ -494,18 +492,6 @@ extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; */ #define MAX_SWAPFILES_CHECK() BUILD_BUG_ON(MAX_SWAPFILES_SHIFT > __SWP_TYPE_BITS) -/* - * Encode and decode a file entry: - * bits 0-1: present (must be zero) - * bit 2: PTE_FILE - * bits 3-57: file offset / PAGE_SIZE - */ -#define pte_file(pte) (pte_val(pte) & PTE_FILE) -#define pte_to_pgoff(x) (pte_val(x) >> 3) -#define pgoff_to_pte(x) __pte(((x) << 3) | PTE_FILE) - -#define PTE_FILE_MAX_BITS 55 - extern int kern_addr_valid(unsigned long addr); #include <asm-generic/pgtable.h> -- 2.1.3 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-12-24 12:32 UTC|newest] Thread overview: 126+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-12-24 12:22 [PATCH 00/38] mm: remove non-linear mess Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 01/38] mm: drop support of non-linear mapping from unmap/zap codepath Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 02/38] mm: drop support of non-linear mapping from fault codepath Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 03/38] mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 04/38] proc: drop handling non-linear mappings Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 05/38] rmap: drop support of " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 06/38] mm: replace vma->sharead.linear with vma->shared Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 07/38] mm: remove rest usage of VM_NONLINEAR and pte_file() Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 14:02 ` [PATCHv2 " Kirill A. Shutemov 2014-12-24 14:02 ` Kirill A. Shutemov 2014-12-24 14:02 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 08/38] asm-generic: drop unused pte_file* helpers Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 09/38] alpha: drop _PAGE_FILE and pte_file()-related helpers Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 10/38] arc: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:29 ` Vineet Gupta 2014-12-24 12:29 ` Vineet Gupta 2014-12-24 12:22 ` Kirill A. Shutemov [this message] 2014-12-24 12:22 ` [PATCH 11/38] arm64: drop PTE_FILE " Kirill A. Shutemov 2014-12-24 17:23 ` Catalin Marinas 2014-12-24 17:23 ` Catalin Marinas 2014-12-24 12:22 ` [PATCH 12/38] arm: drop L_PTE_FILE " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 13/38] avr32: drop _PAGE_FILE " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 14:15 ` Hans-Christian Egtvedt 2014-12-24 14:15 ` Hans-Christian Egtvedt 2014-12-24 12:22 ` [PATCH 14/38] blackfin: drop pte_file() Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 15/38] c6x: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 14:08 ` Mark Salter 2014-12-24 14:08 ` Mark Salter 2014-12-24 12:22 ` [PATCH 16/38] cris: drop _PAGE_FILE and pte_file()-related helpers Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 17/38] frv: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 18/38] hexagon: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 19/38] ia64: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 20/38] m32r: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 21/38] m68k: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-29 12:16 ` [PATCHv2 " Kirill A. Shutemov 2014-12-29 12:16 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 22/38] metag: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2015-01-02 16:03 ` James Hogan 2015-01-02 16:03 ` James Hogan 2014-12-24 12:22 ` [PATCH 23/38] microblaze: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 24/38] mips: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-25 10:08 ` Geert Uytterhoeven 2014-12-25 10:08 ` Geert Uytterhoeven 2014-12-25 10:18 ` Kirill A. Shutemov 2014-12-25 10:18 ` Kirill A. Shutemov 2014-12-29 12:17 ` [PATCHv2 " Kirill A. Shutemov 2014-12-29 12:17 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 25/38] mn10300: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 26/38] nios2: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-25 12:30 ` Tobias Klauser 2014-12-25 12:30 ` Tobias Klauser 2014-12-26 5:52 ` Ley Foon Tan 2014-12-26 5:52 ` Ley Foon Tan 2014-12-24 12:22 ` [PATCH 27/38] openrisc: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 28/38] parisc: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 29/38] powerpc: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2015-01-05 5:03 ` Michael Ellerman 2015-01-05 5:03 ` Michael Ellerman 2014-12-24 12:22 ` [PATCH 30/38] s390: drop " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-29 10:07 ` Martin Schwidefsky 2014-12-29 10:07 ` Martin Schwidefsky 2014-12-29 10:37 ` Kirill A. Shutemov 2014-12-29 10:37 ` Kirill A. Shutemov 2014-12-30 10:55 ` Martin Schwidefsky 2014-12-30 10:55 ` Martin Schwidefsky 2014-12-24 12:22 ` [PATCH 31/38] score: drop _PAGE_FILE and " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 32/38] sh: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 14:05 ` [PATCH] " Kirill A. Shutemov 2014-12-24 14:05 ` Kirill A. Shutemov 2014-12-24 14:05 ` Kirill A. Shutemov 2014-12-24 14:05 ` Kirill A. Shutemov 2014-12-24 14:05 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 33/38] sparc: drop " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-25 23:34 ` David Miller 2014-12-25 23:34 ` David Miller 2014-12-24 12:22 ` [PATCH 34/38] tile: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-25 2:57 ` Chris Metcalf 2014-12-25 2:57 ` Chris Metcalf 2014-12-25 2:57 ` Chris Metcalf 2014-12-24 12:22 ` [PATCH 35/38] um: drop _PAGE_FILE and " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 36/38] unicore32: drop " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 37/38] x86: drop _PAGE_FILE and " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-24 12:22 ` [PATCH 38/38] xtensa: " Kirill A. Shutemov 2014-12-24 12:22 ` Kirill A. Shutemov 2014-12-25 10:25 ` Max Filippov 2014-12-25 10:25 ` Max Filippov 2014-12-26 21:10 ` [PATCH 00/38] mm: remove non-linear mess Felipe Balbi 2014-12-26 21:10 ` Felipe Balbi
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=1419423766-114457-12-git-send-email-kirill.shutemov@linux.intel.com \ --to=kirill.shutemov@linux.intel.com \ --cc=akpm@linux-foundation.org \ --cc=catalin.marinas@arm.com \ --cc=davej@redhat.com \ --cc=hughd@google.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mingo@kernel.org \ --cc=peterz@infradead.org \ --cc=sasha.levin@oracle.com \ --cc=will.deacon@arm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.