Commit 4e15a073 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

Revert "mm, mmu_notifier: annotate mmu notifiers with blockable invalidate callbacks" 

Revert 5ff7091f ("mm, mmu_notifier: annotate mmu notifiers with
blockable invalidate callbacks").

MMU_INVALIDATE_DOES_NOT_BLOCK flags was the only one used and it is no
longer needed since 93065ac7 ("mm, oom: distinguish blockable mode for
mmu notifiers").  We now have a full support for per range !blocking
behavior so we can drop the stop gap workaround which the per notifier
flag was used for.

Link: http://lkml.kernel.org/r/20180827112623.8992-4-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 33490af3

drivers/infiniband/hw/hfi1/mmu_rb.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static void do_remove(struct mmu_rb_handler *handler, 
static void handle_remove(struct work_struct *work);



static const struct mmu_notifier_ops mn_opts = {

	.flags = MMU_INVALIDATE_DOES_NOT_BLOCK,

	.invalidate_range_start = mmu_notifier_range_start,

};

drivers/iommu/amd_iommu_v2.c

+0 −1
Original line number Diff line number Diff line
@@ -427,7 +427,6 @@ static void mn_release(struct mmu_notifier *mn, struct mm_struct *mm) 
}



static const struct mmu_notifier_ops iommu_mn = {

	.flags			= MMU_INVALIDATE_DOES_NOT_BLOCK,

	.release		= mn_release,

	.clear_flush_young      = mn_clear_flush_young,

	.invalidate_range       = mn_invalidate_range,

drivers/iommu/intel-svm.c

+0 −1
Original line number Diff line number Diff line
@@ -273,7 +273,6 @@ static void intel_mm_release(struct mmu_notifier *mn, struct mm_struct *mm) 
}



static const struct mmu_notifier_ops intel_mmuops = {

	.flags = MMU_INVALIDATE_DOES_NOT_BLOCK,

	.release = intel_mm_release,

	.change_pte = intel_change_pte,

	.invalidate_range = intel_invalidate_range,

drivers/misc/sgi-gru/grutlbpurge.c

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ static void gru_release(struct mmu_notifier *mn, struct mm_struct *mm) 




static const struct mmu_notifier_ops gru_mmuops = {

	.flags			= MMU_INVALIDATE_DOES_NOT_BLOCK,

	.invalidate_range_start	= gru_invalidate_range_start,

	.invalidate_range_end	= gru_invalidate_range_end,

	.release		= gru_release,

include/linux/mmu_notifier.h

+0 −23
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
#ifndef _LINUX_MMU_NOTIFIER_H

#define _LINUX_MMU_NOTIFIER_H



#include <linux/types.h>

#include <linux/list.h>

#include <linux/spinlock.h>

#include <linux/mm_types.h>
@@ -11,9 +10,6 @@ 
struct mmu_notifier;

struct mmu_notifier_ops;



/* mmu_notifier_ops flags */

#define MMU_INVALIDATE_DOES_NOT_BLOCK	(0x01)



#ifdef CONFIG_MMU_NOTIFIER



/*
@@ -30,15 +26,6 @@ struct mmu_notifier_mm { 
};



struct mmu_notifier_ops {

	/*

	 * Flags to specify behavior of callbacks for this MMU notifier.

	 * Used to determine which context an operation may be called.

	 *

	 * MMU_INVALIDATE_DOES_NOT_BLOCK: invalidate_range_* callbacks do not

	 *	block

	 */

	int flags;



	/*

	 * Called either by mmu_notifier_unregister or when the mm is

	 * being destroyed by exit_mmap, always before all pages are
@@ -183,10 +170,6 @@ struct mmu_notifier_ops { 
	 * Note that this function might be called with just a sub-range

	 * of what was passed to invalidate_range_start()/end(), if

	 * called between those functions.

	 *

	 * If this callback cannot block, and invalidate_range_{start,end}

	 * cannot block, mmu_notifier_ops.flags should have

	 * MMU_INVALIDATE_DOES_NOT_BLOCK set.

	 */

	void (*invalidate_range)(struct mmu_notifier *mn, struct mm_struct *mm,

				 unsigned long start, unsigned long end);
@@ -241,7 +224,6 @@ extern void __mmu_notifier_invalidate_range_end(struct mm_struct *mm, 
				  bool only_end);

extern void __mmu_notifier_invalidate_range(struct mm_struct *mm,

				  unsigned long start, unsigned long end);

extern bool mm_has_blockable_invalidate_notifiers(struct mm_struct *mm);



static inline void mmu_notifier_release(struct mm_struct *mm)

{
@@ -495,11 +477,6 @@ static inline void mmu_notifier_invalidate_range(struct mm_struct *mm, 
{

}



static inline bool mm_has_blockable_invalidate_notifiers(struct mm_struct *mm)

{

	return false;

}



static inline void mmu_notifier_mm_init(struct mm_struct *mm)

{

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE