From patchwork Mon Jul 1 15:18:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11026263 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 B57E2138B for ; Mon, 1 Jul 2019 15:18:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A450A21EEB for ; Mon, 1 Jul 2019 15:18:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 96EA2282E8; Mon, 1 Jul 2019 15:18:57 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2880D21EEB for ; Mon, 1 Jul 2019 15:18:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728274AbfGAPS4 (ORCPT ); Mon, 1 Jul 2019 11:18:56 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:59148 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727423AbfGAPSz (ORCPT ); Mon, 1 Jul 2019 11:18:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=W24hVTkWBqif5TpM38UrHl82eo9rhQffmi/qNIa3KQw=; b=tPLKCpRQPwcfjNA8YQTbRBgjwB cTeldU53kGIZcXI4ZC+66G3bZsYi+NAOgC4hOnQDtHKBLPmjwM+rCM6k4MLq2saC76pV36iLBv82D 7f8KK3JXNsZf4LqhlioGjqhdX7pQYdEm/6TVxvutgT8sqqkerg+ArxXH8RLmHVoobF5EWszZys7o+ HvdKHl/gFGLrYBfl+57ncL82vSfHXvjNgMvVtore1OcJU2Z5i7SW8B083w3nloAyxPCd2IvOHGq1p +tdLt6vxN7p94V4K+zYQ3ireYu6T2Z2UCjgCJlAQhL731e0VNjeSx3YWFQa+mS//b6h2QwnVnPcbd +3WxPSsw==; Received: from [38.98.37.141] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hhy4h-0003zX-TP; Mon, 01 Jul 2019 15:18:36 +0000 From: Christoph Hellwig To: Andrew Morton , Guenter Roeck , Paul Burton , James Hogan , Yoshinori Sato , Rich Felker Cc: linux-mips@vger.kernel.org, linux-sh@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] sh: stub out pud_page Date: Mon, 1 Jul 2019 17:18:17 +0200 Message-Id: <20190701151818.32227-2-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190701151818.32227-1-hch@lst.de> References: <20190701151818.32227-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP There wasn't any actual need to add a real pud_page, as pud_huge always returns false on sh. Just stub it out to fix the sh3 compile failure. Fixes: 937b4e1d6471 ("sh: add the missing pud_page definition") Reported-by: Guenter Roeck Signed-off-by: Christoph Hellwig Tested-by: Guenter Roeck --- arch/sh/include/asm/pgtable-3level.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/sh/include/asm/pgtable-3level.h b/arch/sh/include/asm/pgtable-3level.h index 3c7ff20f3f94..779260b721ca 100644 --- a/arch/sh/include/asm/pgtable-3level.h +++ b/arch/sh/include/asm/pgtable-3level.h @@ -37,7 +37,9 @@ static inline unsigned long pud_page_vaddr(pud_t pud) { return pud_val(pud); } -#define pud_page(pud) pfn_to_page(pud_pfn(pud)) + +/* only used by the stubbed out hugetlb gup code, should never be called */ +#define pud_page(pud) NULL #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD-1)) static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) From patchwork Mon Jul 1 15:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 11026271 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 7FFD8138D for ; Mon, 1 Jul 2019 15:19:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7247321EEB for ; Mon, 1 Jul 2019 15:19:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6698D282E8; Mon, 1 Jul 2019 15:19:06 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14B6126530 for ; Mon, 1 Jul 2019 15:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728482AbfGAPTA (ORCPT ); Mon, 1 Jul 2019 11:19:00 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:59166 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728474AbfGAPS7 (ORCPT ); Mon, 1 Jul 2019 11:18:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From :Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=3Ba+Jb98yVS5mZ3n94oGXQBYD6fv7eSFwFd2YiewCW0=; b=B8zOfMOLAu59NaUvSy8QYch5Jh NskcwR4SmdPEjEvWY+1ydPBApZywsDWMb5u4PEb5VzW92AySwlrysI5iqPnkp3omLj25ThQsOC8OQ VhpVvsHnGevdZJh5uci2lEnl3+OnEZs+hB8YdhBvjqdmhe8uaZ3GTURjRS9se6y1zC6uTlifH6Duz jQGnrj1ElyoefePcSMTTs0ZEzU/YG5oQFbDmjs4gOMgXnfoIaInv2X4QwXyvuepYtI15agNcO8hpv vQQCvAGi87ceTgfl8rtDBr32iVm1vSdz7dsEndDPWwZ3k9U1ghjO+iHrZ4ion4SiXsUNgC4FwnmyB jV4wmmCw==; Received: from [38.98.37.141] (helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92 #3 (Red Hat Linux)) id 1hhy4q-0003zx-QI; Mon, 01 Jul 2019 15:18:46 +0000 From: Christoph Hellwig To: Andrew Morton , Guenter Roeck , Paul Burton , James Hogan , Yoshinori Sato , Rich Felker Cc: linux-mips@vger.kernel.org, linux-sh@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] MIPS: don't select ARCH_HAS_PTE_SPECIAL Date: Mon, 1 Jul 2019 17:18:18 +0200 Message-Id: <20190701151818.32227-3-hch@lst.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190701151818.32227-1-hch@lst.de> References: <20190701151818.32227-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP MIPS doesn't really have a proper pte_special implementation, just stubs. It turns out they were not enough to make get_user_pages_fast work, so drop the select. This means get_user_pages_fast won't actually use the fast path for non-hugepage mappings, so someone who actually knows about mips page table management should look into adding real pte_special support. Fixes: eb9488e58bbc ("MIPS: use the generic get_user_pages_fast code") Reported-by: Guenter Roeck Signed-off-by: Christoph Hellwig Tested-by: Guenter Roeck --- arch/mips/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b1e42f0e4ed0..7957d3457156 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -6,7 +6,6 @@ config MIPS select ARCH_BINFMT_ELF_STATE if MIPS_FP_SUPPORT select ARCH_CLOCKSOURCE_DATA select ARCH_HAS_ELF_RANDOMIZE - select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_HAS_UBSAN_SANITIZE_ALL select ARCH_SUPPORTS_UPROBES