From patchwork Mon Nov 5 21:19:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10669179 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 031A51751 for ; Mon, 5 Nov 2018 21:19:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC1F029C30 for ; Mon, 5 Nov 2018 21:19:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E007E29C5E; Mon, 5 Nov 2018 21:19:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 532A529C30 for ; Mon, 5 Nov 2018 21:19:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 402706B0269; Mon, 5 Nov 2018 16:19:33 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 3B0216B026A; Mon, 5 Nov 2018 16:19:33 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29EEB6B026B; Mon, 5 Nov 2018 16:19:33 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by kanga.kvack.org (Postfix) with ESMTP id DD7B26B0269 for ; Mon, 5 Nov 2018 16:19:32 -0500 (EST) Received: by mail-pf1-f198.google.com with SMTP id j2-v6so10598509pfi.18 for ; Mon, 05 Nov 2018 13:19:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:subject:from :to:cc:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=N7QsOf2Z/nQcPR5Au/9h8BAwepLKKQZHd3bW3P1jVUM=; b=daj0F4nkpqFhGIojBbRg7ubWP3K0nrSFERDn2S8Omg2GZZcycS/6cm0N0dRkivnjfR AqIHiohjhmfBOfRLxxbhIZ/ftHACJNS9MqPUt+/QGf4F0N/2Z4QqFx9U2MCs9Qn4+6Nd xxu84F2sA1F/MEf4dGj6TlN0zIqOvCb/g3rtQI+cZF/vwA4Ilf2qptzDaQNrUZYu3/uk AaGbdYJEvhcU+jSYUazF+Tijxn+3618AL5TVy2CH1gXDkHCp6SX3YtDZDWdZBux0kgZe JAc3py1LB0ew4OpCLpaLT9WqQ722LDYXxX6oqJ5DqiyxmMKXLKE8uQe8+q0VtPsqLSuC FpPQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: AGRZ1gIFX8XZSh5XyO5AKanYTjmHADNsWol074+hFcoS7rID7DlLerY2 s8kwQXjWwjNtl20I5Kx0fz7TvoXi4AAnahYtLnrlqLRw0EQuB0WD9c2/X9oZwUBuyZ3iw6byU1X j5Gn+6u9e5QEm5nriqgS62VvNMWY6NDduQrLOO/56b3abY/9bJQtIimBCEEXxEqpynQ== X-Received: by 2002:a63:f34b:: with SMTP id t11mr21466552pgj.341.1541452772521; Mon, 05 Nov 2018 13:19:32 -0800 (PST) X-Google-Smtp-Source: AJdET5cPYyDsOQH9Y4o5RXn3yPCssdc1qCSDa9Bt6dbN+Gd3PUGywhhWtkfZXcDR8ColUs0vLgw/ X-Received: by 2002:a63:f34b:: with SMTP id t11mr21466501pgj.341.1541452771508; Mon, 05 Nov 2018 13:19:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541452771; cv=none; d=google.com; s=arc-20160816; b=lxVlHOGnuaTJ9IomcF+par3z03OanCcVqqsdzsZnKr05u4PaSsAyGJUKiNcErQnK5s hFvvkJBqDnek0kfTv6IE8RdV+trYcoot83RzOop4Sur5lV4oyBqfIxv1ynoaX/kCpwT4 OX0/Sm1ffuu1aXXBTArEF99z0Oc0KVVkIg5lRm10cv9MunKzPeLXC05xmt5k3d8dgcJi TwpS+EDwer1LFx5JtfXM641tdnlGrWSKjCUZUqLk2YgFbQQmJH55GJ84PP7hL2sz58n9 cNihGxCEHNjAqBePY7B0PH8pgJ7KbMmktmXzksd4l/w6vXStao4aXfQcs+ELbxJJGvZ5 hU+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:cc:to:from:subject; bh=N7QsOf2Z/nQcPR5Au/9h8BAwepLKKQZHd3bW3P1jVUM=; b=y1l4OAdSM/BBEcm4pMUwpjgvpG74HZ1c7FMqNDUgmtROtPrK2mDUoK3JCpUuYHrKNF vg3f4sZotlvSwfmfxf7jAEEhEMz5qdL0J6Qg/rSIqJPoerwPSqbMq5h1q05mPQLZpaFW RqGJIApwqcjT/npc2u+U9fKfwnRgd+NvYycnlieI5YKuAtTbrutScTu0PXmQoMD266UY 9oyqCyn6TL/iM5V2UpUNGLhfYhVkC4NMhE1BjjW9U5QkZxI5jzwsDrG83ctHI5fhrXFq s3wOMXm6k0VJ8wiw1IdARrp91K82Mgc22UEev2coaTndaYFw5N8FEr3bTRjlz1kaDTnA b5NQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga04.intel.com (mga04.intel.com. [192.55.52.120]) by mx.google.com with ESMTPS id m22-v6si44798386pgj.583.2018.11.05.13.19.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 13:19:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.120 as permitted sender) client-ip=192.55.52.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.120 as permitted sender) smtp.mailfrom=alexander.h.duyck@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Nov 2018 13:19:30 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,469,1534834800"; d="scan'208";a="105640305" Received: from ahduyck-desk1.jf.intel.com ([10.7.198.76]) by orsmga001.jf.intel.com with ESMTP; 05 Nov 2018 13:19:30 -0800 Subject: [mm PATCH v5 1/7] mm: Use mm_zero_struct_page from SPARC on all 64b architectures From: Alexander Duyck To: akpm@linux-foundation.org, linux-mm@kvack.org Cc: sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvdimm@lists.01.org, davem@davemloft.net, pavel.tatashin@microsoft.com, mhocko@suse.com, mingo@kernel.org, kirill.shutemov@linux.intel.com, dan.j.williams@intel.com, dave.jiang@intel.com, alexander.h.duyck@linux.intel.com, rppt@linux.vnet.ibm.com, willy@infradead.org, vbabka@suse.cz, khalid.aziz@oracle.com, ldufour@linux.vnet.ibm.com, mgorman@techsingularity.net, yi.z.zhang@linux.intel.com, alexander.h.duyck@linux.intel.com Date: Mon, 05 Nov 2018 13:19:30 -0800 Message-ID: <154145277052.30046.9861512989491054994.stgit@ahduyck-desk1.jf.intel.com> In-Reply-To: <154145268025.30046.11742652345962594283.stgit@ahduyck-desk1.jf.intel.com> References: <154145268025.30046.11742652345962594283.stgit@ahduyck-desk1.jf.intel.com> User-Agent: StGit/unknown-version MIME-Version: 1.0 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: X-Virus-Scanned: ClamAV using ClamSMTP This change makes it so that we use the same approach that was already in use on Sparc on all the archtectures that support a 64b long. This is mostly motivated by the fact that 7 to 10 store/move instructions are likely always going to be faster than having to call into a function that is not specialized for handling page init. An added advantage to doing it this way is that the compiler can get away with combining writes in the __init_single_page call. As a result the memset call will be reduced to only about 4 write operations, or at least that is what I am seeing with GCC 6.2 as the flags, LRU poitners, and count/mapcount seem to be cancelling out at least 4 of the 8 assignments on my system. One change I had to make to the function was to reduce the minimum page size to 56 to support some powerpc64 configurations. This change should introduce no change on SPARC since it already had this code. In the case of x86_64 I saw a reduction from 3.75s to 2.80s when initializing 384GB of RAM per node. Pavel Tatashin tested on a system with Broadcom's Stingray CPU and 48GB of RAM and found that __init_single_page() takes 19.30ns / 64-byte struct page before this patch and with this patch it takes 17.33ns / 64-byte struct page. Mike Rapoport ran a similar test on a OpenPower (S812LC 8348-21C) with Power8 processor and 128GB or RAM. His results per 64-byte struct page were 4.68ns before, and 4.59ns after this patch. Reviewed-by: Pavel Tatashin Acked-by: Michal Hocko Signed-off-by: Alexander Duyck --- arch/sparc/include/asm/pgtable_64.h | 30 -------------------------- include/linux/mm.h | 41 ++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 33 deletions(-) diff --git a/arch/sparc/include/asm/pgtable_64.h b/arch/sparc/include/asm/pgtable_64.h index 1393a8ac596b..22500c3be7a9 100644 --- a/arch/sparc/include/asm/pgtable_64.h +++ b/arch/sparc/include/asm/pgtable_64.h @@ -231,36 +231,6 @@ extern unsigned long _PAGE_ALL_SZ_BITS; extern struct page *mem_map_zero; #define ZERO_PAGE(vaddr) (mem_map_zero) -/* This macro must be updated when the size of struct page grows above 80 - * or reduces below 64. - * The idea that compiler optimizes out switch() statement, and only - * leaves clrx instructions - */ -#define mm_zero_struct_page(pp) do { \ - unsigned long *_pp = (void *)(pp); \ - \ - /* Check that struct page is either 64, 72, or 80 bytes */ \ - BUILD_BUG_ON(sizeof(struct page) & 7); \ - BUILD_BUG_ON(sizeof(struct page) < 64); \ - BUILD_BUG_ON(sizeof(struct page) > 80); \ - \ - switch (sizeof(struct page)) { \ - case 80: \ - _pp[9] = 0; /* fallthrough */ \ - case 72: \ - _pp[8] = 0; /* fallthrough */ \ - default: \ - _pp[7] = 0; \ - _pp[6] = 0; \ - _pp[5] = 0; \ - _pp[4] = 0; \ - _pp[3] = 0; \ - _pp[2] = 0; \ - _pp[1] = 0; \ - _pp[0] = 0; \ - } \ -} while (0) - /* PFNs are real physical page numbers. However, mem_map only begins to record * per-page information starting at pfn_base. This is to handle systems where * the first physical page in the machine is at some huge physical address, diff --git a/include/linux/mm.h b/include/linux/mm.h index 5411de93a363..288c407c08fc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -98,10 +98,45 @@ extern int mmap_rnd_compat_bits __read_mostly; /* * On some architectures it is expensive to call memset() for small sizes. - * Those architectures should provide their own implementation of "struct page" - * zeroing by defining this macro in . + * If an architecture decides to implement their own version of + * mm_zero_struct_page they should wrap the defines below in a #ifndef and + * define their own version of this macro in */ -#ifndef mm_zero_struct_page +#if BITS_PER_LONG == 64 +/* This function must be updated when the size of struct page grows above 80 + * or reduces below 56. The idea that compiler optimizes out switch() + * statement, and only leaves move/store instructions. Also the compiler can + * combine write statments if they are both assignments and can be reordered, + * this can result in several of the writes here being dropped. + */ +#define mm_zero_struct_page(pp) __mm_zero_struct_page(pp) +static inline void __mm_zero_struct_page(struct page *page) +{ + unsigned long *_pp = (void *)page; + + /* Check that struct page is either 56, 64, 72, or 80 bytes */ + BUILD_BUG_ON(sizeof(struct page) & 7); + BUILD_BUG_ON(sizeof(struct page) < 56); + BUILD_BUG_ON(sizeof(struct page) > 80); + + switch (sizeof(struct page)) { + case 80: + _pp[9] = 0; /* fallthrough */ + case 72: + _pp[8] = 0; /* fallthrough */ + case 64: + _pp[7] = 0; /* fallthrough */ + case 56: + _pp[6] = 0; + _pp[5] = 0; + _pp[4] = 0; + _pp[3] = 0; + _pp[2] = 0; + _pp[1] = 0; + _pp[0] = 0; + } +} +#else #define mm_zero_struct_page(pp) ((void)memset((pp), 0, sizeof(struct page))) #endif