From: Felix Kuehling <felix.kuehling@amd.com>
To: Christoph Hellwig <hch@lst.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>,
Alex Deucher <alexander.deucher@amd.com>,
Zhenyu Wang <zhenyuw@linux.intel.com>,
Zhi Wang <zhi.a.wang@intel.com>, Felipe Balbi <balbi@kernel.org>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>, Jens Axboe <axboe@kernel.dk>,
linux-kernel@vger.kernel.org, amd-gfx@lists.freedesktop.org,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, linux-usb@vger.kernel.org,
virtualization@lists.linux-foundation.org,
linux-fsdevel@vger.kernel.org, io-uring@vger.kernel.org,
linux-mm@kvack.org
Subject: Re: [PATCH 4/6] kernel: move use_mm/unuse_mm to kthread.c
Date: Mon, 6 Apr 2020 12:09:22 -0400 [thread overview]
Message-ID: <86ab9f2f-4081-ebd6-790d-9b334db998c1@amd.com> (raw)
In-Reply-To: <20200404094101.672954-5-hch@lst.de>
Am 2020-04-04 um 5:40 a.m. schrieb Christoph Hellwig:
> These helpers are only for use with kernel threads, and I will tie them
> more into the kthread infrastructure going forward. Also move the
> prototypes to kthread.h - mmu_context.h was a little weird to start with
> as it otherwise contains very low-level MM bits.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Thanks for cleaning up the unnecessary includes in amdgpu.
Regards,
Felix
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
> .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 -
> .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 -
> drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> drivers/usb/gadget/function/f_fs.c | 2 +-
> drivers/usb/gadget/legacy/inode.c | 2 +-
> drivers/vhost/vhost.c | 1 -
> fs/aio.c | 1 -
> fs/io-wq.c | 1 -
> fs/io_uring.c | 1 -
> include/linux/kthread.h | 5 ++
> include/linux/mmu_context.h | 5 --
> kernel/kthread.c | 56 ++++++++++++++++
> mm/Makefile | 2 +-
> mm/mmu_context.c | 64 -------------------
> 18 files changed, 66 insertions(+), 85 deletions(-)
> delete mode 100644 mm/mmu_context.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4db143c19dcc..bce5e93fefc8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -27,6 +27,7 @@
>
> #include <linux/types.h>
> #include <linux/mm.h>
> +#include <linux/kthread.h>
> #include <linux/workqueue.h>
> #include <kgd_kfd_interface.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> index 6529caca88fe..35d4a5ab0228 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> @@ -22,7 +22,6 @@
> #include <linux/module.h>
> #include <linux/fdtable.h>
> #include <linux/uaccess.h>
> -#include <linux/mmu_context.h>
> #include <linux/firmware.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> index 4ec6d0c03201..b1655054b919 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> @@ -19,7 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_10_1_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index 0b7e78748540..7d01420c0c85 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "cikd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index ccd635b812b5..635cd1a26bed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gfx_v8_0.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index df841c2ac5e7..c7fd0c47b254 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -19,8 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_9_0_offset.h"
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 5848400620b4..dee01c371bf5 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -31,7 +31,7 @@
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/sched/mm.h>
> #include <linux/types.h>
> #include <linux/list.h>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index c81023b195c3..c57b1b2507c6 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -32,7 +32,7 @@
> #include <linux/usb/functionfs.h>
>
> #include <linux/aio.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/poll.h>
> #include <linux/eventfd.h>
>
> diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
> index aa0de9e35afa..8b5233888bf8 100644
> --- a/drivers/usb/gadget/legacy/inode.c
> +++ b/drivers/usb/gadget/legacy/inode.c
> @@ -21,7 +21,7 @@
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/aio.h>
> #include <linux/uio.h>
> #include <linux/refcount.h>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index f44340b41494..4e9ce54869af 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -14,7 +14,6 @@
> #include <linux/vhost.h>
> #include <linux/uio.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/miscdevice.h>
> #include <linux/mutex.h>
> #include <linux/poll.h>
> diff --git a/fs/aio.c b/fs/aio.c
> index 5f3d3d814928..328829f0343b 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -27,7 +27,6 @@
> #include <linux/file.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/timer.h>
> diff --git a/fs/io-wq.c b/fs/io-wq.c
> index cc5cf2209fb0..c49c2bdbafb5 100644
> --- a/fs/io-wq.c
> +++ b/fs/io-wq.c
> @@ -10,7 +10,6 @@
> #include <linux/errno.h>
> #include <linux/sched/signal.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/sched/mm.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 358f97be9c7b..27a4ecb724ca 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -55,7 +55,6 @@
> #include <linux/fdtable.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/kthread.h>
> diff --git a/include/linux/kthread.h b/include/linux/kthread.h
> index 8bbcaad7ef0f..c2d40c9672d6 100644
> --- a/include/linux/kthread.h
> +++ b/include/linux/kthread.h
> @@ -5,6 +5,8 @@
> #include <linux/err.h>
> #include <linux/sched.h>
>
> +struct mm_struct;
> +
> __printf(4, 5)
> struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
> void *data,
> @@ -198,6 +200,9 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
>
> void kthread_destroy_worker(struct kthread_worker *worker);
>
> +void use_mm(struct mm_struct *mm);
> +void unuse_mm(struct mm_struct *mm);
> +
> struct cgroup_subsys_state;
>
> #ifdef CONFIG_BLK_CGROUP
> diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
> index d9a543a9e1cc..c51a84132d7c 100644
> --- a/include/linux/mmu_context.h
> +++ b/include/linux/mmu_context.h
> @@ -4,11 +4,6 @@
>
> #include <asm/mmu_context.h>
>
> -struct mm_struct;
> -
> -void use_mm(struct mm_struct *mm);
> -void unuse_mm(struct mm_struct *mm);
> -
> /* Architectures that care about IRQ state in switch_mm can override this. */
> #ifndef switch_mm_irqs_off
> # define switch_mm_irqs_off switch_mm
> diff --git a/kernel/kthread.c b/kernel/kthread.c
> index bfbfa481be3a..ce4610316377 100644
> --- a/kernel/kthread.c
> +++ b/kernel/kthread.c
> @@ -1,13 +1,17 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Kernel thread helper functions.
> * Copyright (C) 2004 IBM Corporation, Rusty Russell.
> + * Copyright (C) 2009 Red Hat, Inc.
> *
> * Creation is done via kthreadd, so that we get a clean environment
> * even if we're invoked from userspace (think modprobe, hotplug cpu,
> * etc.).
> */
> #include <uapi/linux/sched/types.h>
> +#include <linux/mm.h>
> +#include <linux/mmu_context.h>
> #include <linux/sched.h>
> +#include <linux/sched/mm.h>
> #include <linux/sched/task.h>
> #include <linux/kthread.h>
> #include <linux/completion.h>
> @@ -25,6 +29,7 @@
> #include <linux/numa.h>
> #include <trace/events/sched.h>
>
> +
> static DEFINE_SPINLOCK(kthread_create_lock);
> static LIST_HEAD(kthread_create_list);
> struct task_struct *kthreadd_task;
> @@ -1203,6 +1208,57 @@ void kthread_destroy_worker(struct kthread_worker *worker)
> }
> EXPORT_SYMBOL(kthread_destroy_worker);
>
> +/*
> + * use_mm
> + * Makes the calling kernel thread take on the specified
> + * mm context.
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void use_mm(struct mm_struct *mm)
> +{
> + struct mm_struct *active_mm;
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + active_mm = tsk->active_mm;
> + if (active_mm != mm) {
> + mmgrab(mm);
> + tsk->active_mm = mm;
> + }
> + tsk->mm = mm;
> + switch_mm(active_mm, mm, tsk);
> + task_unlock(tsk);
> +#ifdef finish_arch_post_lock_switch
> + finish_arch_post_lock_switch();
> +#endif
> +
> + if (active_mm != mm)
> + mmdrop(active_mm);
> +}
> +EXPORT_SYMBOL_GPL(use_mm);
> +
> +/*
> + * unuse_mm
> + * Reverses the effect of use_mm, i.e. releases the
> + * specified mm context which was earlier taken on
> + * by the calling kernel thread
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void unuse_mm(struct mm_struct *mm)
> +{
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + sync_mm_rss(mm);
> + tsk->mm = NULL;
> + /* active_mm is still 'mm' */
> + enter_lazy_tlb(mm, tsk);
> + task_unlock(tsk);
> +}
> +EXPORT_SYMBOL_GPL(unuse_mm);
> +
> #ifdef CONFIG_BLK_CGROUP
> /**
> * kthread_associate_blkcg - associate blkcg to current kthread
> diff --git a/mm/Makefile b/mm/Makefile
> index dbc8346d16ca..0af4ee81aed2 100644
> --- a/mm/Makefile
> +++ b/mm/Makefile
> @@ -41,7 +41,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
> maccess.o page-writeback.o \
> readahead.o swap.o truncate.o vmscan.o shmem.o \
> util.o mmzone.o vmstat.o backing-dev.o \
> - mm_init.o mmu_context.o percpu.o slab_common.o \
> + mm_init.o percpu.o slab_common.o \
> compaction.o vmacache.o \
> interval_tree.o list_lru.o workingset.o \
> debug.o gup.o $(mmu-y)
> diff --git a/mm/mmu_context.c b/mm/mmu_context.c
> deleted file mode 100644
> index 3e612ae748e9..000000000000
> --- a/mm/mmu_context.c
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/* Copyright (C) 2009 Red Hat, Inc.
> - *
> - * See ../COPYING for licensing terms.
> - */
> -
> -#include <linux/mm.h>
> -#include <linux/sched.h>
> -#include <linux/sched/mm.h>
> -#include <linux/sched/task.h>
> -#include <linux/mmu_context.h>
> -#include <linux/export.h>
> -
> -#include <asm/mmu_context.h>
> -
> -/*
> - * use_mm
> - * Makes the calling kernel thread take on the specified
> - * mm context.
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void use_mm(struct mm_struct *mm)
> -{
> - struct mm_struct *active_mm;
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - active_mm = tsk->active_mm;
> - if (active_mm != mm) {
> - mmgrab(mm);
> - tsk->active_mm = mm;
> - }
> - tsk->mm = mm;
> - switch_mm(active_mm, mm, tsk);
> - task_unlock(tsk);
> -#ifdef finish_arch_post_lock_switch
> - finish_arch_post_lock_switch();
> -#endif
> -
> - if (active_mm != mm)
> - mmdrop(active_mm);
> -}
> -EXPORT_SYMBOL_GPL(use_mm);
> -
> -/*
> - * unuse_mm
> - * Reverses the effect of use_mm, i.e. releases the
> - * specified mm context which was earlier taken on
> - * by the calling kernel thread
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void unuse_mm(struct mm_struct *mm)
> -{
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - sync_mm_rss(mm);
> - tsk->mm = NULL;
> - /* active_mm is still 'mm' */
> - enter_lazy_tlb(mm, tsk);
> - task_unlock(tsk);
> -}
> -EXPORT_SYMBOL_GPL(unuse_mm);
WARNING: multiple messages have this Message-ID (diff)
From: Felix Kuehling <felix.kuehling-5C7GfCeVMHo@public.gmane.org>
To: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org>,
Linus Torvalds
<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>,
Andrew Morton
<akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Cc: Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>,
Felipe Balbi <balbi-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
"Michael S. Tsirkin"
<mst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
Jason Wang <jasowang-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
io-uring-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Zhenyu Wang <zhenyuw-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>,
virtualization-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org,
linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>,
Alex Deucher <alexander.deucher-5C7GfCeVMHo@public.gmane.org>,
intel-gvt-dev-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
intel-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org,
Zhi Wang <zhi.a.wang-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
Subject: Re: [PATCH 4/6] kernel: move use_mm/unuse_mm to kthread.c
Date: Mon, 6 Apr 2020 12:09:22 -0400 [thread overview]
Message-ID: <86ab9f2f-4081-ebd6-790d-9b334db998c1@amd.com> (raw)
In-Reply-To: <20200404094101.672954-5-hch-jcswGhMUV9g@public.gmane.org>
Am 2020-04-04 um 5:40 a.m. schrieb Christoph Hellwig:
> These helpers are only for use with kernel threads, and I will tie them
> more into the kthread infrastructure going forward. Also move the
> prototypes to kthread.h - mmu_context.h was a little weird to start with
> as it otherwise contains very low-level MM bits.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Thanks for cleaning up the unnecessary includes in amdgpu.
Regards,
Felix
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
> .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 -
> .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 -
> drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> drivers/usb/gadget/function/f_fs.c | 2 +-
> drivers/usb/gadget/legacy/inode.c | 2 +-
> drivers/vhost/vhost.c | 1 -
> fs/aio.c | 1 -
> fs/io-wq.c | 1 -
> fs/io_uring.c | 1 -
> include/linux/kthread.h | 5 ++
> include/linux/mmu_context.h | 5 --
> kernel/kthread.c | 56 ++++++++++++++++
> mm/Makefile | 2 +-
> mm/mmu_context.c | 64 -------------------
> 18 files changed, 66 insertions(+), 85 deletions(-)
> delete mode 100644 mm/mmu_context.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4db143c19dcc..bce5e93fefc8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -27,6 +27,7 @@
>
> #include <linux/types.h>
> #include <linux/mm.h>
> +#include <linux/kthread.h>
> #include <linux/workqueue.h>
> #include <kgd_kfd_interface.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> index 6529caca88fe..35d4a5ab0228 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> @@ -22,7 +22,6 @@
> #include <linux/module.h>
> #include <linux/fdtable.h>
> #include <linux/uaccess.h>
> -#include <linux/mmu_context.h>
> #include <linux/firmware.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> index 4ec6d0c03201..b1655054b919 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> @@ -19,7 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_10_1_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index 0b7e78748540..7d01420c0c85 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "cikd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index ccd635b812b5..635cd1a26bed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gfx_v8_0.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index df841c2ac5e7..c7fd0c47b254 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -19,8 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_9_0_offset.h"
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 5848400620b4..dee01c371bf5 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -31,7 +31,7 @@
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/sched/mm.h>
> #include <linux/types.h>
> #include <linux/list.h>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index c81023b195c3..c57b1b2507c6 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -32,7 +32,7 @@
> #include <linux/usb/functionfs.h>
>
> #include <linux/aio.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/poll.h>
> #include <linux/eventfd.h>
>
> diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
> index aa0de9e35afa..8b5233888bf8 100644
> --- a/drivers/usb/gadget/legacy/inode.c
> +++ b/drivers/usb/gadget/legacy/inode.c
> @@ -21,7 +21,7 @@
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/aio.h>
> #include <linux/uio.h>
> #include <linux/refcount.h>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index f44340b41494..4e9ce54869af 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -14,7 +14,6 @@
> #include <linux/vhost.h>
> #include <linux/uio.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/miscdevice.h>
> #include <linux/mutex.h>
> #include <linux/poll.h>
> diff --git a/fs/aio.c b/fs/aio.c
> index 5f3d3d814928..328829f0343b 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -27,7 +27,6 @@
> #include <linux/file.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/timer.h>
> diff --git a/fs/io-wq.c b/fs/io-wq.c
> index cc5cf2209fb0..c49c2bdbafb5 100644
> --- a/fs/io-wq.c
> +++ b/fs/io-wq.c
> @@ -10,7 +10,6 @@
> #include <linux/errno.h>
> #include <linux/sched/signal.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/sched/mm.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 358f97be9c7b..27a4ecb724ca 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -55,7 +55,6 @@
> #include <linux/fdtable.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/kthread.h>
> diff --git a/include/linux/kthread.h b/include/linux/kthread.h
> index 8bbcaad7ef0f..c2d40c9672d6 100644
> --- a/include/linux/kthread.h
> +++ b/include/linux/kthread.h
> @@ -5,6 +5,8 @@
> #include <linux/err.h>
> #include <linux/sched.h>
>
> +struct mm_struct;
> +
> __printf(4, 5)
> struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
> void *data,
> @@ -198,6 +200,9 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
>
> void kthread_destroy_worker(struct kthread_worker *worker);
>
> +void use_mm(struct mm_struct *mm);
> +void unuse_mm(struct mm_struct *mm);
> +
> struct cgroup_subsys_state;
>
> #ifdef CONFIG_BLK_CGROUP
> diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
> index d9a543a9e1cc..c51a84132d7c 100644
> --- a/include/linux/mmu_context.h
> +++ b/include/linux/mmu_context.h
> @@ -4,11 +4,6 @@
>
> #include <asm/mmu_context.h>
>
> -struct mm_struct;
> -
> -void use_mm(struct mm_struct *mm);
> -void unuse_mm(struct mm_struct *mm);
> -
> /* Architectures that care about IRQ state in switch_mm can override this. */
> #ifndef switch_mm_irqs_off
> # define switch_mm_irqs_off switch_mm
> diff --git a/kernel/kthread.c b/kernel/kthread.c
> index bfbfa481be3a..ce4610316377 100644
> --- a/kernel/kthread.c
> +++ b/kernel/kthread.c
> @@ -1,13 +1,17 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Kernel thread helper functions.
> * Copyright (C) 2004 IBM Corporation, Rusty Russell.
> + * Copyright (C) 2009 Red Hat, Inc.
> *
> * Creation is done via kthreadd, so that we get a clean environment
> * even if we're invoked from userspace (think modprobe, hotplug cpu,
> * etc.).
> */
> #include <uapi/linux/sched/types.h>
> +#include <linux/mm.h>
> +#include <linux/mmu_context.h>
> #include <linux/sched.h>
> +#include <linux/sched/mm.h>
> #include <linux/sched/task.h>
> #include <linux/kthread.h>
> #include <linux/completion.h>
> @@ -25,6 +29,7 @@
> #include <linux/numa.h>
> #include <trace/events/sched.h>
>
> +
> static DEFINE_SPINLOCK(kthread_create_lock);
> static LIST_HEAD(kthread_create_list);
> struct task_struct *kthreadd_task;
> @@ -1203,6 +1208,57 @@ void kthread_destroy_worker(struct kthread_worker *worker)
> }
> EXPORT_SYMBOL(kthread_destroy_worker);
>
> +/*
> + * use_mm
> + * Makes the calling kernel thread take on the specified
> + * mm context.
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void use_mm(struct mm_struct *mm)
> +{
> + struct mm_struct *active_mm;
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + active_mm = tsk->active_mm;
> + if (active_mm != mm) {
> + mmgrab(mm);
> + tsk->active_mm = mm;
> + }
> + tsk->mm = mm;
> + switch_mm(active_mm, mm, tsk);
> + task_unlock(tsk);
> +#ifdef finish_arch_post_lock_switch
> + finish_arch_post_lock_switch();
> +#endif
> +
> + if (active_mm != mm)
> + mmdrop(active_mm);
> +}
> +EXPORT_SYMBOL_GPL(use_mm);
> +
> +/*
> + * unuse_mm
> + * Reverses the effect of use_mm, i.e. releases the
> + * specified mm context which was earlier taken on
> + * by the calling kernel thread
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void unuse_mm(struct mm_struct *mm)
> +{
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + sync_mm_rss(mm);
> + tsk->mm = NULL;
> + /* active_mm is still 'mm' */
> + enter_lazy_tlb(mm, tsk);
> + task_unlock(tsk);
> +}
> +EXPORT_SYMBOL_GPL(unuse_mm);
> +
> #ifdef CONFIG_BLK_CGROUP
> /**
> * kthread_associate_blkcg - associate blkcg to current kthread
> diff --git a/mm/Makefile b/mm/Makefile
> index dbc8346d16ca..0af4ee81aed2 100644
> --- a/mm/Makefile
> +++ b/mm/Makefile
> @@ -41,7 +41,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
> maccess.o page-writeback.o \
> readahead.o swap.o truncate.o vmscan.o shmem.o \
> util.o mmzone.o vmstat.o backing-dev.o \
> - mm_init.o mmu_context.o percpu.o slab_common.o \
> + mm_init.o percpu.o slab_common.o \
> compaction.o vmacache.o \
> interval_tree.o list_lru.o workingset.o \
> debug.o gup.o $(mmu-y)
> diff --git a/mm/mmu_context.c b/mm/mmu_context.c
> deleted file mode 100644
> index 3e612ae748e9..000000000000
> --- a/mm/mmu_context.c
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/* Copyright (C) 2009 Red Hat, Inc.
> - *
> - * See ../COPYING for licensing terms.
> - */
> -
> -#include <linux/mm.h>
> -#include <linux/sched.h>
> -#include <linux/sched/mm.h>
> -#include <linux/sched/task.h>
> -#include <linux/mmu_context.h>
> -#include <linux/export.h>
> -
> -#include <asm/mmu_context.h>
> -
> -/*
> - * use_mm
> - * Makes the calling kernel thread take on the specified
> - * mm context.
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void use_mm(struct mm_struct *mm)
> -{
> - struct mm_struct *active_mm;
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - active_mm = tsk->active_mm;
> - if (active_mm != mm) {
> - mmgrab(mm);
> - tsk->active_mm = mm;
> - }
> - tsk->mm = mm;
> - switch_mm(active_mm, mm, tsk);
> - task_unlock(tsk);
> -#ifdef finish_arch_post_lock_switch
> - finish_arch_post_lock_switch();
> -#endif
> -
> - if (active_mm != mm)
> - mmdrop(active_mm);
> -}
> -EXPORT_SYMBOL_GPL(use_mm);
> -
> -/*
> - * unuse_mm
> - * Reverses the effect of use_mm, i.e. releases the
> - * specified mm context which was earlier taken on
> - * by the calling kernel thread
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void unuse_mm(struct mm_struct *mm)
> -{
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - sync_mm_rss(mm);
> - tsk->mm = NULL;
> - /* active_mm is still 'mm' */
> - enter_lazy_tlb(mm, tsk);
> - task_unlock(tsk);
> -}
> -EXPORT_SYMBOL_GPL(unuse_mm);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Felix Kuehling <felix.kuehling@amd.com>
To: Christoph Hellwig <hch@lst.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>, Felipe Balbi <balbi@kernel.org>,
amd-gfx@lists.freedesktop.org,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
linux-usb@vger.kernel.org, io-uring@vger.kernel.org,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Alex Deucher <alexander.deucher@amd.com>,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org
Subject: Re: [Intel-gfx] [PATCH 4/6] kernel: move use_mm/unuse_mm to kthread.c
Date: Mon, 6 Apr 2020 12:09:22 -0400 [thread overview]
Message-ID: <86ab9f2f-4081-ebd6-790d-9b334db998c1@amd.com> (raw)
In-Reply-To: <20200404094101.672954-5-hch@lst.de>
Am 2020-04-04 um 5:40 a.m. schrieb Christoph Hellwig:
> These helpers are only for use with kernel threads, and I will tie them
> more into the kthread infrastructure going forward. Also move the
> prototypes to kthread.h - mmu_context.h was a little weird to start with
> as it otherwise contains very low-level MM bits.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Thanks for cleaning up the unnecessary includes in amdgpu.
Regards,
Felix
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
> .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 -
> .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 -
> drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> drivers/usb/gadget/function/f_fs.c | 2 +-
> drivers/usb/gadget/legacy/inode.c | 2 +-
> drivers/vhost/vhost.c | 1 -
> fs/aio.c | 1 -
> fs/io-wq.c | 1 -
> fs/io_uring.c | 1 -
> include/linux/kthread.h | 5 ++
> include/linux/mmu_context.h | 5 --
> kernel/kthread.c | 56 ++++++++++++++++
> mm/Makefile | 2 +-
> mm/mmu_context.c | 64 -------------------
> 18 files changed, 66 insertions(+), 85 deletions(-)
> delete mode 100644 mm/mmu_context.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4db143c19dcc..bce5e93fefc8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -27,6 +27,7 @@
>
> #include <linux/types.h>
> #include <linux/mm.h>
> +#include <linux/kthread.h>
> #include <linux/workqueue.h>
> #include <kgd_kfd_interface.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> index 6529caca88fe..35d4a5ab0228 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> @@ -22,7 +22,6 @@
> #include <linux/module.h>
> #include <linux/fdtable.h>
> #include <linux/uaccess.h>
> -#include <linux/mmu_context.h>
> #include <linux/firmware.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> index 4ec6d0c03201..b1655054b919 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> @@ -19,7 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_10_1_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index 0b7e78748540..7d01420c0c85 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "cikd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index ccd635b812b5..635cd1a26bed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gfx_v8_0.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index df841c2ac5e7..c7fd0c47b254 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -19,8 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_9_0_offset.h"
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 5848400620b4..dee01c371bf5 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -31,7 +31,7 @@
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/sched/mm.h>
> #include <linux/types.h>
> #include <linux/list.h>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index c81023b195c3..c57b1b2507c6 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -32,7 +32,7 @@
> #include <linux/usb/functionfs.h>
>
> #include <linux/aio.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/poll.h>
> #include <linux/eventfd.h>
>
> diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
> index aa0de9e35afa..8b5233888bf8 100644
> --- a/drivers/usb/gadget/legacy/inode.c
> +++ b/drivers/usb/gadget/legacy/inode.c
> @@ -21,7 +21,7 @@
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/aio.h>
> #include <linux/uio.h>
> #include <linux/refcount.h>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index f44340b41494..4e9ce54869af 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -14,7 +14,6 @@
> #include <linux/vhost.h>
> #include <linux/uio.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/miscdevice.h>
> #include <linux/mutex.h>
> #include <linux/poll.h>
> diff --git a/fs/aio.c b/fs/aio.c
> index 5f3d3d814928..328829f0343b 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -27,7 +27,6 @@
> #include <linux/file.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/timer.h>
> diff --git a/fs/io-wq.c b/fs/io-wq.c
> index cc5cf2209fb0..c49c2bdbafb5 100644
> --- a/fs/io-wq.c
> +++ b/fs/io-wq.c
> @@ -10,7 +10,6 @@
> #include <linux/errno.h>
> #include <linux/sched/signal.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/sched/mm.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 358f97be9c7b..27a4ecb724ca 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -55,7 +55,6 @@
> #include <linux/fdtable.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/kthread.h>
> diff --git a/include/linux/kthread.h b/include/linux/kthread.h
> index 8bbcaad7ef0f..c2d40c9672d6 100644
> --- a/include/linux/kthread.h
> +++ b/include/linux/kthread.h
> @@ -5,6 +5,8 @@
> #include <linux/err.h>
> #include <linux/sched.h>
>
> +struct mm_struct;
> +
> __printf(4, 5)
> struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
> void *data,
> @@ -198,6 +200,9 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
>
> void kthread_destroy_worker(struct kthread_worker *worker);
>
> +void use_mm(struct mm_struct *mm);
> +void unuse_mm(struct mm_struct *mm);
> +
> struct cgroup_subsys_state;
>
> #ifdef CONFIG_BLK_CGROUP
> diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
> index d9a543a9e1cc..c51a84132d7c 100644
> --- a/include/linux/mmu_context.h
> +++ b/include/linux/mmu_context.h
> @@ -4,11 +4,6 @@
>
> #include <asm/mmu_context.h>
>
> -struct mm_struct;
> -
> -void use_mm(struct mm_struct *mm);
> -void unuse_mm(struct mm_struct *mm);
> -
> /* Architectures that care about IRQ state in switch_mm can override this. */
> #ifndef switch_mm_irqs_off
> # define switch_mm_irqs_off switch_mm
> diff --git a/kernel/kthread.c b/kernel/kthread.c
> index bfbfa481be3a..ce4610316377 100644
> --- a/kernel/kthread.c
> +++ b/kernel/kthread.c
> @@ -1,13 +1,17 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Kernel thread helper functions.
> * Copyright (C) 2004 IBM Corporation, Rusty Russell.
> + * Copyright (C) 2009 Red Hat, Inc.
> *
> * Creation is done via kthreadd, so that we get a clean environment
> * even if we're invoked from userspace (think modprobe, hotplug cpu,
> * etc.).
> */
> #include <uapi/linux/sched/types.h>
> +#include <linux/mm.h>
> +#include <linux/mmu_context.h>
> #include <linux/sched.h>
> +#include <linux/sched/mm.h>
> #include <linux/sched/task.h>
> #include <linux/kthread.h>
> #include <linux/completion.h>
> @@ -25,6 +29,7 @@
> #include <linux/numa.h>
> #include <trace/events/sched.h>
>
> +
> static DEFINE_SPINLOCK(kthread_create_lock);
> static LIST_HEAD(kthread_create_list);
> struct task_struct *kthreadd_task;
> @@ -1203,6 +1208,57 @@ void kthread_destroy_worker(struct kthread_worker *worker)
> }
> EXPORT_SYMBOL(kthread_destroy_worker);
>
> +/*
> + * use_mm
> + * Makes the calling kernel thread take on the specified
> + * mm context.
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void use_mm(struct mm_struct *mm)
> +{
> + struct mm_struct *active_mm;
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + active_mm = tsk->active_mm;
> + if (active_mm != mm) {
> + mmgrab(mm);
> + tsk->active_mm = mm;
> + }
> + tsk->mm = mm;
> + switch_mm(active_mm, mm, tsk);
> + task_unlock(tsk);
> +#ifdef finish_arch_post_lock_switch
> + finish_arch_post_lock_switch();
> +#endif
> +
> + if (active_mm != mm)
> + mmdrop(active_mm);
> +}
> +EXPORT_SYMBOL_GPL(use_mm);
> +
> +/*
> + * unuse_mm
> + * Reverses the effect of use_mm, i.e. releases the
> + * specified mm context which was earlier taken on
> + * by the calling kernel thread
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void unuse_mm(struct mm_struct *mm)
> +{
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + sync_mm_rss(mm);
> + tsk->mm = NULL;
> + /* active_mm is still 'mm' */
> + enter_lazy_tlb(mm, tsk);
> + task_unlock(tsk);
> +}
> +EXPORT_SYMBOL_GPL(unuse_mm);
> +
> #ifdef CONFIG_BLK_CGROUP
> /**
> * kthread_associate_blkcg - associate blkcg to current kthread
> diff --git a/mm/Makefile b/mm/Makefile
> index dbc8346d16ca..0af4ee81aed2 100644
> --- a/mm/Makefile
> +++ b/mm/Makefile
> @@ -41,7 +41,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
> maccess.o page-writeback.o \
> readahead.o swap.o truncate.o vmscan.o shmem.o \
> util.o mmzone.o vmstat.o backing-dev.o \
> - mm_init.o mmu_context.o percpu.o slab_common.o \
> + mm_init.o percpu.o slab_common.o \
> compaction.o vmacache.o \
> interval_tree.o list_lru.o workingset.o \
> debug.o gup.o $(mmu-y)
> diff --git a/mm/mmu_context.c b/mm/mmu_context.c
> deleted file mode 100644
> index 3e612ae748e9..000000000000
> --- a/mm/mmu_context.c
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/* Copyright (C) 2009 Red Hat, Inc.
> - *
> - * See ../COPYING for licensing terms.
> - */
> -
> -#include <linux/mm.h>
> -#include <linux/sched.h>
> -#include <linux/sched/mm.h>
> -#include <linux/sched/task.h>
> -#include <linux/mmu_context.h>
> -#include <linux/export.h>
> -
> -#include <asm/mmu_context.h>
> -
> -/*
> - * use_mm
> - * Makes the calling kernel thread take on the specified
> - * mm context.
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void use_mm(struct mm_struct *mm)
> -{
> - struct mm_struct *active_mm;
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - active_mm = tsk->active_mm;
> - if (active_mm != mm) {
> - mmgrab(mm);
> - tsk->active_mm = mm;
> - }
> - tsk->mm = mm;
> - switch_mm(active_mm, mm, tsk);
> - task_unlock(tsk);
> -#ifdef finish_arch_post_lock_switch
> - finish_arch_post_lock_switch();
> -#endif
> -
> - if (active_mm != mm)
> - mmdrop(active_mm);
> -}
> -EXPORT_SYMBOL_GPL(use_mm);
> -
> -/*
> - * unuse_mm
> - * Reverses the effect of use_mm, i.e. releases the
> - * specified mm context which was earlier taken on
> - * by the calling kernel thread
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void unuse_mm(struct mm_struct *mm)
> -{
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - sync_mm_rss(mm);
> - tsk->mm = NULL;
> - /* active_mm is still 'mm' */
> - enter_lazy_tlb(mm, tsk);
> - task_unlock(tsk);
> -}
> -EXPORT_SYMBOL_GPL(unuse_mm);
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
WARNING: multiple messages have this Message-ID (diff)
From: Felix Kuehling <felix.kuehling@amd.com>
To: Christoph Hellwig <hch@lst.de>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Jens Axboe <axboe@kernel.dk>, Felipe Balbi <balbi@kernel.org>,
amd-gfx@lists.freedesktop.org,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
linux-usb@vger.kernel.org, io-uring@vger.kernel.org,
linux-kernel@vger.kernel.org,
Zhenyu Wang <zhenyuw@linux.intel.com>,
virtualization@lists.linux-foundation.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Alex Deucher <alexander.deucher@amd.com>,
intel-gvt-dev@lists.freedesktop.org,
intel-gfx@lists.freedesktop.org, Zhi Wang <zhi.a.wang@intel.com>
Subject: Re: [PATCH 4/6] kernel: move use_mm/unuse_mm to kthread.c
Date: Mon, 6 Apr 2020 12:09:22 -0400 [thread overview]
Message-ID: <86ab9f2f-4081-ebd6-790d-9b334db998c1@amd.com> (raw)
In-Reply-To: <20200404094101.672954-5-hch@lst.de>
Am 2020-04-04 um 5:40 a.m. schrieb Christoph Hellwig:
> These helpers are only for use with kernel threads, and I will tie them
> more into the kthread infrastructure going forward. Also move the
> prototypes to kthread.h - mmu_context.h was a little weird to start with
> as it otherwise contains very low-level MM bits.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Thanks for cleaning up the unnecessary includes in amdgpu.
Regards,
Felix
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 +
> .../drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 1 -
> .../drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 1 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 -
> .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 2 -
> drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +-
> drivers/usb/gadget/function/f_fs.c | 2 +-
> drivers/usb/gadget/legacy/inode.c | 2 +-
> drivers/vhost/vhost.c | 1 -
> fs/aio.c | 1 -
> fs/io-wq.c | 1 -
> fs/io_uring.c | 1 -
> include/linux/kthread.h | 5 ++
> include/linux/mmu_context.h | 5 --
> kernel/kthread.c | 56 ++++++++++++++++
> mm/Makefile | 2 +-
> mm/mmu_context.c | 64 -------------------
> 18 files changed, 66 insertions(+), 85 deletions(-)
> delete mode 100644 mm/mmu_context.c
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> index 4db143c19dcc..bce5e93fefc8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h
> @@ -27,6 +27,7 @@
>
> #include <linux/types.h>
> #include <linux/mm.h>
> +#include <linux/kthread.h>
> #include <linux/workqueue.h>
> #include <kgd_kfd_interface.h>
> #include <drm/ttm/ttm_execbuf_util.h>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> index 6529caca88fe..35d4a5ab0228 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c
> @@ -22,7 +22,6 @@
> #include <linux/module.h>
> #include <linux/fdtable.h>
> #include <linux/uaccess.h>
> -#include <linux/mmu_context.h>
> #include <linux/firmware.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> index 4ec6d0c03201..b1655054b919 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c
> @@ -19,7 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_10_1_0_offset.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> index 0b7e78748540..7d01420c0c85 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "cikd.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> index ccd635b812b5..635cd1a26bed 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c
> @@ -20,8 +20,6 @@
> * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gfx_v8_0.h"
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> index df841c2ac5e7..c7fd0c47b254 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c
> @@ -19,8 +19,6 @@
> * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> * OTHER DEALINGS IN THE SOFTWARE.
> */
> -#include <linux/mmu_context.h>
> -
> #include "amdgpu.h"
> #include "amdgpu_amdkfd.h"
> #include "gc/gc_9_0_offset.h"
> diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c
> index 5848400620b4..dee01c371bf5 100644
> --- a/drivers/gpu/drm/i915/gvt/kvmgt.c
> +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
> @@ -31,7 +31,7 @@
> #include <linux/init.h>
> #include <linux/device.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/sched/mm.h>
> #include <linux/types.h>
> #include <linux/list.h>
> diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
> index c81023b195c3..c57b1b2507c6 100644
> --- a/drivers/usb/gadget/function/f_fs.c
> +++ b/drivers/usb/gadget/function/f_fs.c
> @@ -32,7 +32,7 @@
> #include <linux/usb/functionfs.h>
>
> #include <linux/aio.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/poll.h>
> #include <linux/eventfd.h>
>
> diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
> index aa0de9e35afa..8b5233888bf8 100644
> --- a/drivers/usb/gadget/legacy/inode.c
> +++ b/drivers/usb/gadget/legacy/inode.c
> @@ -21,7 +21,7 @@
> #include <linux/sched.h>
> #include <linux/slab.h>
> #include <linux/poll.h>
> -#include <linux/mmu_context.h>
> +#include <linux/kthread.h>
> #include <linux/aio.h>
> #include <linux/uio.h>
> #include <linux/refcount.h>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index f44340b41494..4e9ce54869af 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -14,7 +14,6 @@
> #include <linux/vhost.h>
> #include <linux/uio.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/miscdevice.h>
> #include <linux/mutex.h>
> #include <linux/poll.h>
> diff --git a/fs/aio.c b/fs/aio.c
> index 5f3d3d814928..328829f0343b 100644
> --- a/fs/aio.c
> +++ b/fs/aio.c
> @@ -27,7 +27,6 @@
> #include <linux/file.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/timer.h>
> diff --git a/fs/io-wq.c b/fs/io-wq.c
> index cc5cf2209fb0..c49c2bdbafb5 100644
> --- a/fs/io-wq.c
> +++ b/fs/io-wq.c
> @@ -10,7 +10,6 @@
> #include <linux/errno.h>
> #include <linux/sched/signal.h>
> #include <linux/mm.h>
> -#include <linux/mmu_context.h>
> #include <linux/sched/mm.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index 358f97be9c7b..27a4ecb724ca 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -55,7 +55,6 @@
> #include <linux/fdtable.h>
> #include <linux/mm.h>
> #include <linux/mman.h>
> -#include <linux/mmu_context.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> #include <linux/kthread.h>
> diff --git a/include/linux/kthread.h b/include/linux/kthread.h
> index 8bbcaad7ef0f..c2d40c9672d6 100644
> --- a/include/linux/kthread.h
> +++ b/include/linux/kthread.h
> @@ -5,6 +5,8 @@
> #include <linux/err.h>
> #include <linux/sched.h>
>
> +struct mm_struct;
> +
> __printf(4, 5)
> struct task_struct *kthread_create_on_node(int (*threadfn)(void *data),
> void *data,
> @@ -198,6 +200,9 @@ bool kthread_cancel_delayed_work_sync(struct kthread_delayed_work *work);
>
> void kthread_destroy_worker(struct kthread_worker *worker);
>
> +void use_mm(struct mm_struct *mm);
> +void unuse_mm(struct mm_struct *mm);
> +
> struct cgroup_subsys_state;
>
> #ifdef CONFIG_BLK_CGROUP
> diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
> index d9a543a9e1cc..c51a84132d7c 100644
> --- a/include/linux/mmu_context.h
> +++ b/include/linux/mmu_context.h
> @@ -4,11 +4,6 @@
>
> #include <asm/mmu_context.h>
>
> -struct mm_struct;
> -
> -void use_mm(struct mm_struct *mm);
> -void unuse_mm(struct mm_struct *mm);
> -
> /* Architectures that care about IRQ state in switch_mm can override this. */
> #ifndef switch_mm_irqs_off
> # define switch_mm_irqs_off switch_mm
> diff --git a/kernel/kthread.c b/kernel/kthread.c
> index bfbfa481be3a..ce4610316377 100644
> --- a/kernel/kthread.c
> +++ b/kernel/kthread.c
> @@ -1,13 +1,17 @@
> // SPDX-License-Identifier: GPL-2.0-only
> /* Kernel thread helper functions.
> * Copyright (C) 2004 IBM Corporation, Rusty Russell.
> + * Copyright (C) 2009 Red Hat, Inc.
> *
> * Creation is done via kthreadd, so that we get a clean environment
> * even if we're invoked from userspace (think modprobe, hotplug cpu,
> * etc.).
> */
> #include <uapi/linux/sched/types.h>
> +#include <linux/mm.h>
> +#include <linux/mmu_context.h>
> #include <linux/sched.h>
> +#include <linux/sched/mm.h>
> #include <linux/sched/task.h>
> #include <linux/kthread.h>
> #include <linux/completion.h>
> @@ -25,6 +29,7 @@
> #include <linux/numa.h>
> #include <trace/events/sched.h>
>
> +
> static DEFINE_SPINLOCK(kthread_create_lock);
> static LIST_HEAD(kthread_create_list);
> struct task_struct *kthreadd_task;
> @@ -1203,6 +1208,57 @@ void kthread_destroy_worker(struct kthread_worker *worker)
> }
> EXPORT_SYMBOL(kthread_destroy_worker);
>
> +/*
> + * use_mm
> + * Makes the calling kernel thread take on the specified
> + * mm context.
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void use_mm(struct mm_struct *mm)
> +{
> + struct mm_struct *active_mm;
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + active_mm = tsk->active_mm;
> + if (active_mm != mm) {
> + mmgrab(mm);
> + tsk->active_mm = mm;
> + }
> + tsk->mm = mm;
> + switch_mm(active_mm, mm, tsk);
> + task_unlock(tsk);
> +#ifdef finish_arch_post_lock_switch
> + finish_arch_post_lock_switch();
> +#endif
> +
> + if (active_mm != mm)
> + mmdrop(active_mm);
> +}
> +EXPORT_SYMBOL_GPL(use_mm);
> +
> +/*
> + * unuse_mm
> + * Reverses the effect of use_mm, i.e. releases the
> + * specified mm context which was earlier taken on
> + * by the calling kernel thread
> + * (Note: this routine is intended to be called only
> + * from a kernel thread context)
> + */
> +void unuse_mm(struct mm_struct *mm)
> +{
> + struct task_struct *tsk = current;
> +
> + task_lock(tsk);
> + sync_mm_rss(mm);
> + tsk->mm = NULL;
> + /* active_mm is still 'mm' */
> + enter_lazy_tlb(mm, tsk);
> + task_unlock(tsk);
> +}
> +EXPORT_SYMBOL_GPL(unuse_mm);
> +
> #ifdef CONFIG_BLK_CGROUP
> /**
> * kthread_associate_blkcg - associate blkcg to current kthread
> diff --git a/mm/Makefile b/mm/Makefile
> index dbc8346d16ca..0af4ee81aed2 100644
> --- a/mm/Makefile
> +++ b/mm/Makefile
> @@ -41,7 +41,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \
> maccess.o page-writeback.o \
> readahead.o swap.o truncate.o vmscan.o shmem.o \
> util.o mmzone.o vmstat.o backing-dev.o \
> - mm_init.o mmu_context.o percpu.o slab_common.o \
> + mm_init.o percpu.o slab_common.o \
> compaction.o vmacache.o \
> interval_tree.o list_lru.o workingset.o \
> debug.o gup.o $(mmu-y)
> diff --git a/mm/mmu_context.c b/mm/mmu_context.c
> deleted file mode 100644
> index 3e612ae748e9..000000000000
> --- a/mm/mmu_context.c
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/* Copyright (C) 2009 Red Hat, Inc.
> - *
> - * See ../COPYING for licensing terms.
> - */
> -
> -#include <linux/mm.h>
> -#include <linux/sched.h>
> -#include <linux/sched/mm.h>
> -#include <linux/sched/task.h>
> -#include <linux/mmu_context.h>
> -#include <linux/export.h>
> -
> -#include <asm/mmu_context.h>
> -
> -/*
> - * use_mm
> - * Makes the calling kernel thread take on the specified
> - * mm context.
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void use_mm(struct mm_struct *mm)
> -{
> - struct mm_struct *active_mm;
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - active_mm = tsk->active_mm;
> - if (active_mm != mm) {
> - mmgrab(mm);
> - tsk->active_mm = mm;
> - }
> - tsk->mm = mm;
> - switch_mm(active_mm, mm, tsk);
> - task_unlock(tsk);
> -#ifdef finish_arch_post_lock_switch
> - finish_arch_post_lock_switch();
> -#endif
> -
> - if (active_mm != mm)
> - mmdrop(active_mm);
> -}
> -EXPORT_SYMBOL_GPL(use_mm);
> -
> -/*
> - * unuse_mm
> - * Reverses the effect of use_mm, i.e. releases the
> - * specified mm context which was earlier taken on
> - * by the calling kernel thread
> - * (Note: this routine is intended to be called only
> - * from a kernel thread context)
> - */
> -void unuse_mm(struct mm_struct *mm)
> -{
> - struct task_struct *tsk = current;
> -
> - task_lock(tsk);
> - sync_mm_rss(mm);
> - tsk->mm = NULL;
> - /* active_mm is still 'mm' */
> - enter_lazy_tlb(mm, tsk);
> - task_unlock(tsk);
> -}
> -EXPORT_SYMBOL_GPL(unuse_mm);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
next prev parent reply other threads:[~2020-04-06 16:11 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-04 9:40 improve use_mm / unuse_mm Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-04 9:40 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 9:40 ` [PATCH 1/6] amdgpu: a NULL ->mm does not mean a thread is a kthread Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-04 9:40 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-06 16:07 ` Felix Kuehling
2020-04-06 16:07 ` Felix Kuehling
2020-04-06 16:07 ` [Intel-gfx] " Felix Kuehling
2020-04-06 16:07 ` Felix Kuehling
2020-04-04 9:40 ` [PATCH 2/6] i915/gvt/kvm: " Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-04 9:40 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 10:05 ` Sergei Shtylyov
2020-04-04 10:05 ` Sergei Shtylyov
2020-04-04 10:05 ` [Intel-gfx] " Sergei Shtylyov
2020-04-07 3:08 ` Yan Zhao
2020-04-07 3:08 ` Yan Zhao
2020-04-07 3:08 ` [Intel-gfx] " Yan Zhao
2020-04-13 13:27 ` Christoph Hellwig
2020-04-13 13:27 ` Christoph Hellwig
2020-04-13 13:27 ` [Intel-gfx] " Christoph Hellwig
2020-04-14 0:04 ` Yan Zhao
2020-04-14 0:04 ` Yan Zhao
2020-04-14 0:04 ` [Intel-gfx] " Yan Zhao
2020-04-14 7:00 ` Christoph Hellwig
2020-04-14 7:00 ` Christoph Hellwig
2020-04-14 7:00 ` [Intel-gfx] " Christoph Hellwig
2020-04-14 7:00 ` Christoph Hellwig
2020-04-14 7:03 ` Yan Zhao
2020-04-14 7:03 ` Yan Zhao
2020-04-14 7:03 ` [Intel-gfx] " Yan Zhao
2020-04-04 9:40 ` [PATCH 3/6] i915/gvt: remove unused xen bits Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-04 9:40 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-08 1:44 ` Zhenyu Wang
2020-04-08 1:44 ` Zhenyu Wang
2020-04-08 1:44 ` [Intel-gfx] " Zhenyu Wang
2020-04-08 1:44 ` Zhenyu Wang
2020-04-13 13:08 ` Christoph Hellwig
2020-04-13 13:08 ` Christoph Hellwig
2020-04-13 13:08 ` [Intel-gfx] " Christoph Hellwig
2020-04-14 3:04 ` Zhenyu Wang
2020-04-14 3:04 ` Zhenyu Wang
2020-04-14 3:04 ` [Intel-gfx] " Zhenyu Wang
2020-04-14 3:04 ` Zhenyu Wang
2020-04-04 9:40 ` [PATCH 4/6] kernel: move use_mm/unuse_mm to kthread.c Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-04 9:40 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 9:40 ` Christoph Hellwig
2020-04-06 16:09 ` Felix Kuehling [this message]
2020-04-06 16:09 ` Felix Kuehling
2020-04-06 16:09 ` [Intel-gfx] " Felix Kuehling
2020-04-06 16:09 ` Felix Kuehling
2020-04-04 9:41 ` [PATCH 5/6] kernel: better document the use_mm/unuse_mm API contract Christoph Hellwig
2020-04-04 9:41 ` Christoph Hellwig
2020-04-04 9:41 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 13:07 ` Pavel Begunkov
2020-04-04 13:07 ` Pavel Begunkov
2020-04-04 13:07 ` Pavel Begunkov
2020-04-04 13:07 ` Pavel Begunkov
2020-04-06 16:10 ` Felix Kuehling
2020-04-06 16:10 ` Felix Kuehling
2020-04-06 16:10 ` [Intel-gfx] " Felix Kuehling
2020-04-06 16:10 ` Felix Kuehling
2020-04-04 9:41 ` [PATCH 6/6] kernel: set USER_DS in kthread_use_mm Christoph Hellwig
2020-04-04 9:41 ` Christoph Hellwig
2020-04-04 9:41 ` [Intel-gfx] " Christoph Hellwig
2020-04-04 9:41 ` Christoph Hellwig
2020-04-06 21:49 ` Michael S. Tsirkin
2020-04-06 21:49 ` Michael S. Tsirkin
2020-04-06 21:49 ` [Intel-gfx] " Michael S. Tsirkin
2020-04-04 9:52 ` [Intel-gfx] ✗ Fi.CI.BUILD: failure for series starting with [1/6] amdgpu: a NULL ->mm does not mean a thread is a kthread Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=86ab9f2f-4081-ebd6-790d-9b334db998c1@amd.com \
--to=felix.kuehling@amd.com \
--cc=akpm@linux-foundation.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=axboe@kernel.dk \
--cc=balbi@kernel.org \
--cc=hch@lst.de \
--cc=intel-gfx@lists.freedesktop.org \
--cc=intel-gvt-dev@lists.freedesktop.org \
--cc=io-uring@vger.kernel.org \
--cc=jasowang@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-usb@vger.kernel.org \
--cc=mst@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=virtualization@lists.linux-foundation.org \
--cc=zhenyuw@linux.intel.com \
--cc=zhi.a.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.