From patchwork Fri Jul 10 01:56:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11655391 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 941BA14F6 for ; Fri, 10 Jul 2020 01:57:14 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 5762220772 for ; Fri, 10 Jul 2020 01:57:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bsl6w6DS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5762220772 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 91D5C6B0005; Thu, 9 Jul 2020 21:57:13 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 8CFC16B0007; Thu, 9 Jul 2020 21:57:13 -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 77A9D6B0005; Thu, 9 Jul 2020 21:57:13 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0200.hostedemail.com [216.40.44.200]) by kanga.kvack.org (Postfix) with ESMTP id 620DC6B0005 for ; Thu, 9 Jul 2020 21:57:13 -0400 (EDT) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 10DE0181AEF0B for ; Fri, 10 Jul 2020 01:57:13 +0000 (UTC) X-FDA: 77020503546.06.pear64_041541e26eca Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id BA20D10095BA5 for ; Fri, 10 Jul 2020 01:57:12 +0000 (UTC) X-Spam-Summary: 1,0,0,877813e16b7b3156,d41d8cd98f00b204,npiggin@gmail.com,,RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1431:1437:1515:1535:1544:1605:1711:1730:1747:1777:1792:1978:1981:2194:2199:2393:2559:2562:2693:3138:3139:3140:3141:3142:3865:3866:3867:3868:3871:3872:4118:4250:4321:4605:5007:6119:6120:6261:6653:7514:7875:7903:9413:9592:10004:11026:11473:11657:11658:11914:12043:12296:12297:12438:12517:12519:12555:12895:12986:13894:14096:14181:14687:14721:21080:21433:21444:21451:21627:21666:21987:21990:30054,0,RBL:209.85.215.196:@gmail.com:.lbl8.mailshell.net-62.50.0.100 66.100.201.100;04y85r4mrtppq46ut6bwn1kwe7a3zopdqe1buebcpgyodthbqsz3gwm7bg4oh9i.a1jaj9496mq4u1m89kbzr7fjb7cdtx7g5j8o153xg45csjfaho6nnekxgjycokx.k-lbl8.mailshell.net-223.238.255.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:25,LUA_SUMMARY:none X-HE-Tag: pear64_041541e26eca X-Filterd-Recvd-Size: 7774 Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by imf30.hostedemail.com (Postfix) with ESMTP for ; Fri, 10 Jul 2020 01:57:12 +0000 (UTC) Received: by mail-pg1-f196.google.com with SMTP id t6so1817251pgq.1 for ; Thu, 09 Jul 2020 18:57:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lqgdcf4W4nyd4T+76bDWEwAQ0qL2bOb12H7iEQITiag=; b=Bsl6w6DS+UBvKpZoK4wXCmnQGU0ewfOBlQPrDKoCEkWv/2kDrAJwFHbd1SWqVeJdeL CziLht/b/KkM4NPlZlH+XmNB5vqzrMJNIcdyP2BNi9cupfGbeM6x5dM7ZMa5kucXYDM5 l4Y9+6wiV8JPWAiCxTH0U1fsTFdcf5uc0fQsJ6G2lln4cMvpEHVB7G6bl7YQlu3OtfJ5 cIqtTLtC2u+Va2ORstjbZ8mWnGFoxexPLae5Vz85lo5xBOXzrv1t1d8TLcZ0FWo1gICB jHoDDR1UFjI6izLYc6vvQkk0lFv7w2wW/z7yu9JP1RGuvI/AiQs3+3ACt4BmtlSf6eNX ikOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lqgdcf4W4nyd4T+76bDWEwAQ0qL2bOb12H7iEQITiag=; b=lbdCFpi6n3G2vXzj6z0+XBDeg97WFi6d9PWuVbt/wZLab4SZ1rTN3bIuBUCcKqaH8N M/CmnfvWxBFd/9OJ1SBusVLGBHj4j6o+j6TiWXe892K5tNUWIxyNQ2hgm7oR+Zls3aFB DF7P1KjtFGHMT/QK5CyKWOkZs7V0JqmDr3qx86srDm60ou3eCsNi7VObCQENSJhznNc0 DUIeZW67VxDm1fAxZwfk82lHlcSpJ6+yxxY3ssvEPwc0JVaxFazF7ODHqFop6HAtZSde R1QHZp/8XsLINvtwuz0EGwwWuCKlf41kGOTIewtEA8RtjZyNpwrJqLMOutXiCdl7ZwvF AAPw== X-Gm-Message-State: AOAM532LO81J7GNxKp66p+uwPuO48mIAEg7anEczInEY8XfAHBtjWLM+ sJxBJtkwoRnYZJQSy8dHftY= X-Google-Smtp-Source: ABdhPJw1L2niD/P2jvytdxicFLyx/6l3tljWtgvBgnhSMhEEeF1GCsLRQuoV7KEVgNbXurGjErZj4g== X-Received: by 2002:a63:eb55:: with SMTP id b21mr56103283pgk.433.1594346231584; Thu, 09 Jul 2020 18:57:11 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (220-245-19-62.static.tpgi.com.au. [220.245.19.62]) by smtp.gmail.com with ESMTPSA id 7sm3912834pgw.85.2020.07.09.18.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 18:57:11 -0700 (PDT) From: Nicholas Piggin To: linux-arch@vger.kernel.org Cc: Nicholas Piggin , x86@kernel.org, Mathieu Desnoyers , Arnd Bergmann , Peter Zijlstra , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, Anton Blanchard , Remis Lima Baima Subject: [RFC PATCH 1/7] asm-generic: add generic MMU versions of mmu context functions Date: Fri, 10 Jul 2020 11:56:40 +1000 Message-Id: <20200710015646.2020871-2-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200710015646.2020871-1-npiggin@gmail.com> References: <20200710015646.2020871-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: BA20D10095BA5 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam01 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: Many of these are no-ops on many architectures, so extend mmu_context.h to cover MMU and NOMMU, and split the NOMMU bits out to nommu_context.h Cc: Arnd Bergmann Cc: Remis Lima Baima Signed-off-by: Nicholas Piggin --- arch/microblaze/include/asm/mmu_context.h | 2 +- arch/sh/include/asm/mmu_context.h | 2 +- include/asm-generic/mmu_context.h | 57 +++++++++++++++++------ include/asm-generic/nommu_context.h | 19 ++++++++ 4 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 include/asm-generic/nommu_context.h diff --git a/arch/microblaze/include/asm/mmu_context.h b/arch/microblaze/include/asm/mmu_context.h index f74f9da07fdc..34004efb3def 100644 --- a/arch/microblaze/include/asm/mmu_context.h +++ b/arch/microblaze/include/asm/mmu_context.h @@ -2,5 +2,5 @@ #ifdef CONFIG_MMU # include #else -# include +# include #endif diff --git a/arch/sh/include/asm/mmu_context.h b/arch/sh/include/asm/mmu_context.h index 48e67d544d53..9470d17c71c2 100644 --- a/arch/sh/include/asm/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h @@ -134,7 +134,7 @@ static inline void switch_mm(struct mm_struct *prev, #define set_TTB(pgd) do { } while (0) #define get_TTB() (0) -#include +#include #endif /* CONFIG_MMU */ diff --git a/include/asm-generic/mmu_context.h b/include/asm-generic/mmu_context.h index 6be9106fb6fb..86cea80a50df 100644 --- a/include/asm-generic/mmu_context.h +++ b/include/asm-generic/mmu_context.h @@ -3,44 +3,73 @@ #define __ASM_GENERIC_MMU_CONTEXT_H /* - * Generic hooks for NOMMU architectures, which do not need to do - * anything special here. + * Generic hooks to implement no-op functionality. */ -#include - struct task_struct; struct mm_struct; +/* + * enter_lazy_tlb - Called when "tsk" is about to enter lazy TLB mode. + * + * @mm: the currently active mm context which is becoming lazy + * @tsk: task which is entering lazy tlb + * + * tsk->mm will be NULL + */ +#ifndef enter_lazy_tlb static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) { } +#endif +/** + * init_new_context - Initialize context of a new mm_struct. + * @tsk: task struct for the mm + * @mm: the new mm struct + */ +#ifndef init_new_context static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm) { return 0; } +#endif +/** + * destroy_context - Undo init_new_context when the mm is going away + * @mm: old mm struct + */ +#ifndef destroy_context static inline void destroy_context(struct mm_struct *mm) { } +#endif -static inline void deactivate_mm(struct task_struct *task, - struct mm_struct *mm) -{ -} - -static inline void switch_mm(struct mm_struct *prev, - struct mm_struct *next, - struct task_struct *tsk) +/** + * activate_mm - called after exec switches the current task to a new mm, to switch to it + * @prev_mm: previous mm of this task + * @next_mm: new mm + */ +#ifndef activate_mm +static inline void activate_mm(struct mm_struct *prev_mm, + struct mm_struct *next_mm) { + switch_mm(prev_mm, next_mm, current); } +#endif -static inline void activate_mm(struct mm_struct *prev_mm, - struct mm_struct *next_mm) +/** + * dectivate_mm - called when an mm is released after exit or exec switches away from it + * @tsk: the task + * @mm: the old mm + */ +#ifndef deactivate_mm +static inline void deactivate_mm(struct task_struct *tsk, + struct mm_struct *mm) { } +#endif #endif /* __ASM_GENERIC_MMU_CONTEXT_H */ diff --git a/include/asm-generic/nommu_context.h b/include/asm-generic/nommu_context.h new file mode 100644 index 000000000000..72b8d8b1d81e --- /dev/null +++ b/include/asm-generic/nommu_context.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_GENERIC_NOMMU_H +#define __ASM_GENERIC_NOMMU_H + +/* + * Generic hooks for NOMMU architectures, which do not need to do + * anything special here. + */ + +#include +#include + +static inline void switch_mm(struct mm_struct *prev, + struct mm_struct *next, + struct task_struct *tsk) +{ +} + +#endif /* __ASM_GENERIC_NOMMU_H */