From patchwork Tue Sep 1 14:15:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 11748337 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 6BD6513B6 for ; Tue, 1 Sep 2020 14:23:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2BFD2206CD for ; Tue, 1 Sep 2020 14:23:59 +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="G7S8DAAC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2BFD2206CD 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 5550B90001B; Tue, 1 Sep 2020 10:23:58 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 50659900008; Tue, 1 Sep 2020 10:23:58 -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 3F5E590001B; Tue, 1 Sep 2020 10:23:58 -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 23DB6900008 for ; Tue, 1 Sep 2020 10:23:58 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id D742A181AEF0B for ; Tue, 1 Sep 2020 14:23:57 +0000 (UTC) X-FDA: 77214711714.25.bikes78_3d1266327099 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 7C05C1804E512 for ; Tue, 1 Sep 2020 14:23:53 +0000 (UTC) X-Spam-Summary: 1,0,0,3ebd5d8723c21fa3,d41d8cd98f00b204,npiggin@gmail.com,,RULES_HIT:2:41:355:379:541:800:960:973:988:989:1260:1311:1314:1345:1359:1431:1437:1515:1535:1605:1606:1730:1747:1777:1792:1978:1981:2194:2199:2393:2559:2562:2693:2899:3138:3139:3140:3141:3142:3865:3866:3867:3868:3871:3872:4119:4250:4321:4605:5007:6119:6261:6653:7514:7875:7903:9413:9592:10004:11026:11473:11657:11658:11914:12043:12296:12297:12438:12517:12519:12555:12895:12986:13894:14096:14394:14687:21080:21433:21444:21451:21627:21666:21987:21990:30054,0,RBL:209.85.219.65:@gmail.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100;04yfb5wo1qeb3jg337f76rsa3toi5opk7ygamc7wswjicic6wrz3gwm7bg41rgo.8jgzy9496mq4u1m8s9g16trqsswy1yk69r8knmzqy5khspwrn18jiykxgjycokx.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:none,Custom_rules:0:0:0,LFtime:26,LUA_SUMMARY:none X-HE-Tag: bikes78_3d1266327099 X-Filterd-Recvd-Size: 8090 Received: from mail-qv1-f65.google.com (mail-qv1-f65.google.com [209.85.219.65]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Tue, 1 Sep 2020 14:23:45 +0000 (UTC) Received: by mail-qv1-f65.google.com with SMTP id cy2so584238qvb.0 for ; Tue, 01 Sep 2020 07:23:45 -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=DD+NHkNz//cJ/l/7deT3g02opc5NfKv/2SZ3eKZT8h0=; b=G7S8DAAC/HQ1g+FV88jEIa/Jmk+mIymnXDOsHhmBoiLY8bdSi4j2s0Jioaz2HEhh/A jPJhu+mTn4+GpDygwJBvQ+QDADiHp3MOo0oTNtF7u3pJlTs0SjcxDlS+rASyy7mg8C2N InXYMk+m6ySJbdDz4mlBXc1sLQEQrlV8YggBPYQ0i61u6I7EXeJnDxQuumHtfkukhj/X nPP4kT3CvJ5vl/YPsPwwNRR8dMCA9WoqjXFdHdFJSM7bffPKpNxDsWoAu0iVqCvnwY/W NJiRVAvbWkjBODv8vQ+ADt2F/38EfuTi6zTWvnpDtn0QZ+/ek4fgOG8p6Omys8nVs9Jz C/ww== 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=DD+NHkNz//cJ/l/7deT3g02opc5NfKv/2SZ3eKZT8h0=; b=PKE8BQq1YCqpRk0tnmSYNldGCLfj2bRFle2YtY3tr60jQpl6NzcVbJiPOzDpVgYh1L 6UvTm1EfDakluujKqEmGxXEJN9DzyYuDqQfOXwBqw0boLOCSqAz5OVLkbdN1z6mqyZrq HSfGq/2gKK58XxD4qUIiNhCnuCtERw/72puw4FblNxg6Rwgrb01a9Mzw1SZhHd87DNeZ cvHMN90/nG/KHROOFBRQuf6z75LXF/eJua65IRNfV8GSEcGEgRirBUX0kj7Ps7RrclsU LXyrRP3DkibtROXZHKY0H9XomrBpQsBQ0gBv75ZrNuJHil0QkRJs2KVccKF9pzWnTrBe llBQ== X-Gm-Message-State: AOAM532a4fgRWYLAlFTytgbDoF7FsNZiVRtNekElafELoU3Bt3izKCCh Js98tM7C5FyixE+Z24SQw5AE/Eu8fpM= X-Google-Smtp-Source: ABdhPJyjxjgc9+p9Eqs93m0oRM6EvqZHzcjtwlF7foeZidiL83luX6Sa0saoCyXVuknBGZtaORfSLQ== X-Received: by 2002:aa7:9d8b:: with SMTP id f11mr2036814pfq.5.1598969752061; Tue, 01 Sep 2020 07:15:52 -0700 (PDT) Received: from bobo.ibm.com ([203.185.249.227]) by smtp.gmail.com with ESMTPSA id w9sm2212816pgg.76.2020.09.01.07.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Sep 2020 07:15:51 -0700 (PDT) From: Nicholas Piggin To: linux-arch@vger.kernel.org Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Arnd Bergmann , Mike Rapoport Subject: [PATCH v3 01/23] asm-generic: add generic MMU versions of mmu context functions Date: Wed, 2 Sep 2020 00:15:17 +1000 Message-Id: <20200901141539.1757549-2-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20200901141539.1757549-1-npiggin@gmail.com> References: <20200901141539.1757549-1-npiggin@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7C05C1804E512 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: linux-arch@vger.kernel.org Acked-by: Mike Rapoport Acked-by: Arnd Bergmann Signed-off-by: Nicholas Piggin --- arch/c6x/include/asm/mmu_context.h | 6 +++ arch/microblaze/include/asm/mmu_context.h | 2 +- arch/sh/include/asm/mmu_context.h | 2 +- include/asm-generic/mmu_context.h | 58 +++++++++++++++++------ include/asm-generic/nommu_context.h | 19 ++++++++ 5 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 arch/c6x/include/asm/mmu_context.h create mode 100644 include/asm-generic/nommu_context.h diff --git a/arch/c6x/include/asm/mmu_context.h b/arch/c6x/include/asm/mmu_context.h new file mode 100644 index 000000000000..d2659d0a3297 --- /dev/null +++ b/arch/c6x/include/asm/mmu_context.h @@ -0,0 +1,6 @@ +#ifndef _ASM_C6X_MMU_CONTEXT_H +#define _ASM_C6X_MMU_CONTEXT_H + +#include + +#endif /* _ASM_C6X_MMU_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 f664e51e8a15..461b1304580b 100644 --- a/arch/sh/include/asm/mmu_context.h +++ b/arch/sh/include/asm/mmu_context.h @@ -133,7 +133,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..91727065bacb 100644 --- a/include/asm-generic/mmu_context.h +++ b/include/asm-generic/mmu_context.h @@ -3,44 +3,74 @@ #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 + * @return: 0 on success, -errno on failure + */ +#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..4f916f9e16cd --- /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 + +static inline void switch_mm(struct mm_struct *prev, + struct mm_struct *next, + struct task_struct *tsk) +{ +} + +#include + +#endif /* __ASM_GENERIC_NOMMU_H */