From patchwork Mon Aug 27 11:26:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Hocko X-Patchwork-Id: 10577001 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 CE75D174C for ; Mon, 27 Aug 2018 11:26:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE345298B7 for ; Mon, 27 Aug 2018 11:26:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B26F5298D0; Mon, 27 Aug 2018 11:26:46 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10A49298B7 for ; Mon, 27 Aug 2018 11:26:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 050166B403B; Mon, 27 Aug 2018 07:26:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id EF6426B403C; Mon, 27 Aug 2018 07:26:40 -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 D6EA26B403D; Mon, 27 Aug 2018 07:26:40 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by kanga.kvack.org (Postfix) with ESMTP id 5EEDD6B403B for ; Mon, 27 Aug 2018 07:26:40 -0400 (EDT) Received: by mail-ed1-f72.google.com with SMTP id b4-v6so2129206ede.4 for ; Mon, 27 Aug 2018 04:26:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=w8FkKqoz4arYOPrFAusP9GIOvx2XYTMfGYJsQt6jYP0=; b=izQoDqSWcXojzFotMUwzNoJE6J/8nual1n0KqUwKgbXhMtXaYgiJS3a8MkX4l05s1E ELvJbd1cHdE6ftMQQ/0xcnXKYIcxCJiTbrOLDnzHCGyhYic19S5OBmYtXRq42J9P3k1D 0Pm57Z1JEngUQNWOfJRBA3Aw3O7wiM6UTSFhBl3qSUDw9mSqLQDAj10CU8NlW+++eHWY M2KSGrC2u+7GkEwh89r2YxuKnNW0qbJIL6615H1OxevzFKE5+QUcYqlkr3xbcHEFQ0sA raktX+IjoLms78+Yncj9W0fu8uzZWoxMu8So5Dxib2fgCUZENFDehU2O5OPxdz0jxBvc cSxg== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Gm-Message-State: APzg51CNCPZBhiANtJJ8CYfeSV0JyUWqysvbnWX1tH8twduPXSNN39ys Mo6nJpfBBU/K0WhqjD4nOgLytpF9JWBae5MTXb5YyRkwujAIDOPsOry+v04MKmphHvhRN5I96M4 rIwY4zF/VFn1Gw1UR53ZlSwsd55r1M14GjjFvmb78oLM0YQXFj6HJ48Kd19LWKNBr5IZzwkQ7bw oi9NghfWdt2fiV0UY3U12I8DuvNmXS4cvnns0LNtNPCfgIPVBGFKhMk3qGLj8DFObCgCN1NMr25 w7w6UV0SraP1FJtDrV2MAiy4lfVsObqwTr6NnfM8KfTBidFURe5oJCrumKKfIlS9s5a0jr8Za09 /b4I7X+2bF+1xAzDgv+/G2B9ojFdzgS8bosaAoKgDjoW32ahAsDHMZje7j8LvC2GXFW3s3Ws9A= = X-Received: by 2002:a50:aed8:: with SMTP id f24-v6mr16706023edd.271.1535369199862; Mon, 27 Aug 2018 04:26:39 -0700 (PDT) X-Received: by 2002:a50:aed8:: with SMTP id f24-v6mr16705954edd.271.1535369198957; Mon, 27 Aug 2018 04:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535369198; cv=none; d=google.com; s=arc-20160816; b=de4OIjAr5LoOvAB341h3QGh9FdogSTf1bB/wgPdj9ztwfSbpQg8eYx0MNRDdI2qPrv lrwyoGFWdZGANWV6m0kahYP6R7ZQpl5y13jSELUEcB2U/jqymrfKDeiZqkCgFrDvtywH Hv9Uf3IhuWxA46EqrwSNBaP9GkPN8jQhHx41XkP9EEk7hbRdwGfL7KqNchcnWN1kLFTi uyhFej+fENVASaAzJkjvrYoIjgUXLtUqzo+2DaJt7ZCukBa/gBISbCFiEvbtg2yiygsl 6wHi2KSjfGUgbRefdi2FUCto03lIak8lP8zCZmQrevtcZmYrWSYQK1xDmdyy2/oTg/tu dzyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=w8FkKqoz4arYOPrFAusP9GIOvx2XYTMfGYJsQt6jYP0=; b=TSJnCrVNmah8KXPlHeO/1vdOwxOPoGM9kMJ9WxySAPePsSutOHVymZbxBiDcyEArjp H8pWMOM6n2SodBiZBkAJhB9+2aIe/m41X5H7kBy1Bb1IKspcVLtlyMXDtVFXPyJGWtLi ZIC4x1Tq19IEfo2ZvLXinBulxsvqaV916aUQxNUpODY1AXwpOC3szFXUbCxOQtl2y8eH cBnDxv9FC0IwiKgXIdKK8yAyZs+eqQvl6T6Cm2dX/hY66esOaJXrXcmben8Etg/r7v/J lYK18MNGx5PQhOgcMHRBT9n40gUMzTOIFm5VnOc6hZPATFv+E3voxnfSZgBjeC88PYcN I3vA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id l17-v6sor6894097edc.29.2018.08.27.04.26.38 for (Google Transport Security); Mon, 27 Aug 2018 04:26:38 -0700 (PDT) Received-SPF: pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mstsxfx@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=mstsxfx@gmail.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Google-Smtp-Source: ANB0VdYczqC9Yqxtb1VL1/+NUws5G5DlAbCv50qys7oObdORxml7SUdI60ahxhkBpeh0PbLfjKs3FQ== X-Received: by 2002:aa7:c358:: with SMTP id j24-v6mr6856960edr.100.1535369198652; Mon, 27 Aug 2018 04:26:38 -0700 (PDT) Received: from tiehlicka.suse.cz (prg-ext-pat.suse.com. [213.151.95.130]) by smtp.gmail.com with ESMTPSA id v1-v6sm6454416edf.3.2018.08.27.04.26.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 04:26:38 -0700 (PDT) From: Michal Hocko To: Andrew Morton Cc: Tetsuo Handa , , LKML , Michal Hocko , David Rientjes Subject: [PATCH 3/3] Revert "mm, mmu_notifier: annotate mmu notifiers with blockable invalidate callbacks" Date: Mon, 27 Aug 2018 13:26:23 +0200 Message-Id: <20180827112623.8992-4-mhocko@kernel.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180827112623.8992-1-mhocko@kernel.org> References: <20180827112623.8992-1-mhocko@kernel.org> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Michal Hocko This reverts commit 5ff7091f5a2ca1b7b642ca0dbdede8f693a56926. MMU_INVALIDATE_DOES_NOT_BLOCK flags was the only one used and it is no longer needed since 93065ac753e4 ("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. Cc: David Rientjes Signed-off-by: Michal Hocko --- drivers/infiniband/hw/hfi1/mmu_rb.c | 1 - drivers/iommu/amd_iommu_v2.c | 1 - drivers/iommu/intel-svm.c | 1 - drivers/misc/sgi-gru/grutlbpurge.c | 1 - include/linux/mmu_notifier.h | 23 --------------------- mm/mmu_notifier.c | 31 ----------------------------- virt/kvm/kvm_main.c | 1 - 7 files changed, 59 deletions(-) diff --git a/drivers/infiniband/hw/hfi1/mmu_rb.c b/drivers/infiniband/hw/hfi1/mmu_rb.c index e1c7996c018e..475b769e120c 100644 --- a/drivers/infiniband/hw/hfi1/mmu_rb.c +++ b/drivers/infiniband/hw/hfi1/mmu_rb.c @@ -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, }; diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index 58da65df03f5..fd552235bd13 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c @@ -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, diff --git a/drivers/iommu/intel-svm.c b/drivers/iommu/intel-svm.c index 7d65aab36a96..e16ee247add8 100644 --- a/drivers/iommu/intel-svm.c +++ b/drivers/iommu/intel-svm.c @@ -292,7 +292,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, diff --git a/drivers/misc/sgi-gru/grutlbpurge.c b/drivers/misc/sgi-gru/grutlbpurge.c index be28f05bfafa..03b49d52092e 100644 --- a/drivers/misc/sgi-gru/grutlbpurge.c +++ b/drivers/misc/sgi-gru/grutlbpurge.c @@ -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, diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index 698e371aafe3..9893a6432adf 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -2,7 +2,6 @@ #ifndef _LINUX_MMU_NOTIFIER_H #define _LINUX_MMU_NOTIFIER_H -#include #include #include #include @@ -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) { } diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c index 82bb1a939c0e..5119ff846769 100644 --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c @@ -247,37 +247,6 @@ void __mmu_notifier_invalidate_range(struct mm_struct *mm, } EXPORT_SYMBOL_GPL(__mmu_notifier_invalidate_range); -/* - * Must be called while holding mm->mmap_sem for either read or write. - * The result is guaranteed to be valid until mm->mmap_sem is dropped. - */ -bool mm_has_blockable_invalidate_notifiers(struct mm_struct *mm) -{ - struct mmu_notifier *mn; - int id; - bool ret = false; - - WARN_ON_ONCE(!rwsem_is_locked(&mm->mmap_sem)); - - if (!mm_has_notifiers(mm)) - return ret; - - id = srcu_read_lock(&srcu); - hlist_for_each_entry_rcu(mn, &mm->mmu_notifier_mm->list, hlist) { - if (!mn->ops->invalidate_range && - !mn->ops->invalidate_range_start && - !mn->ops->invalidate_range_end) - continue; - - if (!(mn->ops->flags & MMU_INVALIDATE_DOES_NOT_BLOCK)) { - ret = true; - break; - } - } - srcu_read_unlock(&srcu, id); - return ret; -} - static int do_mmu_notifier_register(struct mmu_notifier *mn, struct mm_struct *mm, int take_mmap_sem) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index f986e31fa68c..636462edc7ca 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -499,7 +499,6 @@ static void kvm_mmu_notifier_release(struct mmu_notifier *mn, } static const struct mmu_notifier_ops kvm_mmu_notifier_ops = { - .flags = MMU_INVALIDATE_DOES_NOT_BLOCK, .invalidate_range_start = kvm_mmu_notifier_invalidate_range_start, .invalidate_range_end = kvm_mmu_notifier_invalidate_range_end, .clear_flush_young = kvm_mmu_notifier_clear_flush_young,