From patchwork Fri Oct 5 15:12:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Duyck X-Patchwork-Id: 10628289 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 B0343112B for ; Fri, 5 Oct 2018 15:12:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9B5FF297EC for ; Fri, 5 Oct 2018 15:12:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F457297C8; Fri, 5 Oct 2018 15:12:09 +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=ham 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 ECD94297DD for ; Fri, 5 Oct 2018 15:12:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEE8C6B0269; Fri, 5 Oct 2018 11:12:07 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id D760C6B026A; Fri, 5 Oct 2018 11:12:07 -0400 (EDT) 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 BF3A56B026B; Fri, 5 Oct 2018 11:12:07 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by kanga.kvack.org (Postfix) with ESMTP id 7A5936B0269 for ; Fri, 5 Oct 2018 11:12:07 -0400 (EDT) Received: by mail-pl1-f200.google.com with SMTP id f17-v6so11046621plr.1 for ; Fri, 05 Oct 2018 08:12:07 -0700 (PDT) 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=4YpHKYowNmDunqru8cf2X7iL3IkiQufp/CAJaNxAXVk=; b=KG/j2jc/L5eWQ3aVRZoJK9FCD9CAYq3P98AvYWLpAqNC4Vu6bQtmpchsLzrnQZOOYc W31FlrvEUMat/wJXuH5yD/rga1LSf79Apy9wk6882PXyj0YwLVGhGR4NucJmaQ7MpZG3 HIUmMzVWlMowaWkRpRo6vGrjbsxMuRIBs8+12Fg7wTpRYQKvEuDkBfOv2s5WcyCLRYP7 AUvYvaEsI7yBiqMc94Gz7uFXvVMuHgdJ1vDYeW33lyr1czugEoHk8j3S3CiU+T0XRo1P S20zuPsfZ/wbPpn4f2SgmDxwD0RKD+9cMVqoOakJ0IhpIr+/g+BUCa2prNYnkj6aJx+R JPVA== 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.136 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: ABuFfoi3hsnjgPvoq9LEjeQ3Snr02TggUS9eCebE1OeRemfpyNKt+YfG ZVaFXXdQ+hzCdrFuRCY/8B58cgphHA2N7/i0IqzQpTx094nIu+CMmvYav03CgfjFB0rBPWcGIqz 80i2Fuac0nrbRhz5Z2ETzX23XSykImixaLKP00Xusn6JDBWcFBAUib3+5Ck6U/7qcpw== X-Received: by 2002:a63:fa4e:: with SMTP id g14-v6mr10690271pgk.18.1538752327124; Fri, 05 Oct 2018 08:12:07 -0700 (PDT) X-Google-Smtp-Source: ACcGV60dC2Yh7wdRnVV+/Ip/Ls4CpDoQLBOxOYzcq1ne44QZ8lXqe2u7aBo2k8l73uvW3GH2MvYh X-Received: by 2002:a63:fa4e:: with SMTP id g14-v6mr10690206pgk.18.1538752326106; Fri, 05 Oct 2018 08:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538752326; cv=none; d=google.com; s=arc-20160816; b=zjbj3AJABdshUyxLNeRzFcKuaWQmxhxMPehNw+yp35ljiWk2WSEgJH57TCU+Apza3r CLrwxC0MdViAvMOV5Fs0VRTa2vsgUgxza9ZF/sDUjH/L+Lo5gpsGUvW/78xDDJlVn824 RUQ7aQ0T6bJ+v2Wh0YF2HU4zocLxQOOdtVwY1auG42Gdmy+TrMD6+oXRYwB8lAf9/hun TBimTWzHkfVaDTRpqGSq7fm0YNBSlv87iyUl2DwK4fZRPuhMWnHaUvcj0oJOZbrv5+Nj hmloA/rOEF5+4a7pRwDh42niytOy4npvO8pLvsgqeaxGuixMeKpKtLk/SpLMZPrTaiZz AkOQ== 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=4YpHKYowNmDunqru8cf2X7iL3IkiQufp/CAJaNxAXVk=; b=m5DVHME2pfafxEyOIkfFFZmZo4KKmlVx/SOQHrPV+21x8TNAGuQZGVsAcFIvyTZ62Q xmktVj8spNUtlcM+X6RlMpqcX9dBHZU2mdA7pXUDwrlDDqvPB8c9QS0EztOb4JM4vzqI 7dqF/a2CdYA1wuUVmAii1H82a+9xSjqGsKGoXQd+biaFUz34XONuQr236UlEkopzvUIa xEb2wpy4FHYCjXWKMsOnr0G55wHtbO0hq4QhEozmLAPaDt3pU7hEyyFwQhPzz8ojs9Qk wnNpReZIR7qjp6prPP8YjtlA9wA77vNd7cCo+s1rjUXi0LPliXwJTJG73a2OINhqptHV JhRA== 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.136 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 mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id h90-v6si8389154plb.64.2018.10.05.08.12.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 Oct 2018 08:12:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of alexander.h.duyck@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; 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.136 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 orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Oct 2018 08:12:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,344,1534834800"; d="scan'208";a="79013096" Received: from ahduyck-mobl.amr.corp.intel.com (HELO localhost.localdomain) ([10.7.198.166]) by orsmga008.jf.intel.com with ESMTP; 05 Oct 2018 08:12:04 -0700 Subject: [mm PATCH 1/5] mm: Use mm_zero_struct_page from SPARC on all 64b architectures From: Alexander Duyck To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: pavel.tatashin@microsoft.com, mhocko@suse.com, dave.jiang@intel.com, alexander.h.duyck@linux.intel.com, linux-kernel@vger.kernel.org, willy@infradead.org, davem@davemloft.net, khalid.aziz@oracle.com, rppt@linux.vnet.ibm.com, vbabka@suse.cz, sparclinux@vger.kernel.org, dan.j.williams@intel.com, ldufour@linux.vnet.ibm.com, mgorman@techsingularity.net, mingo@kernel.org, kirill.shutemov@linux.intel.com Date: Fri, 05 Oct 2018 08:12:03 -0700 Message-ID: <20181005151203.17473.25723.stgit@localhost.localdomain> In-Reply-To: <20181005151006.17473.83040.stgit@localhost.localdomain> References: <20181005151006.17473.83040.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty 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 8 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. Signed-off-by: Alexander Duyck Reviewed-by: Khalid Aziz --- arch/sparc/include/asm/pgtable_64.h | 30 ------------------------------ include/linux/mm.h | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 30 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 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 273d4dbd3883..a0440a6ef5cf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -102,8 +102,41 @@ static inline void set_max_mapnr(unsigned long limit) { } * zeroing by defining 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 64. The idea that compiler optimizes out switch() + * statement, and only leaves move/store instructions + */ +#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 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; + } +} +#else #define mm_zero_struct_page(pp) ((void)memset((pp), 0, sizeof(struct page))) #endif +#endif /* * Default maximum number of active map areas, this limits the number of vmas