linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Michel Lespinasse <walken@google.com>
To: Andrew Morton <akpm@linux-foundation.org>, linux-mm <linux-mm@kvack.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	 Laurent Dufour <ldufour@linux.ibm.com>,
	Vlastimil Babka <vbabka@suse.cz>,
	 Matthew Wilcox <willy@infradead.org>,
	Liam Howlett <Liam.Howlett@oracle.com>,
	 Jerome Glisse <jglisse@redhat.com>,
	Davidlohr Bueso <dave@stgolabs.net>,
	 David Rientjes <rientjes@google.com>,
	Hugh Dickins <hughd@google.com>, Ying Han <yinghan@google.com>,
	 Jason Gunthorpe <jgg@ziepe.ca>,
	Markus Elfring <Markus.Elfring@web.de>,
	 Michel Lespinasse <walken@google.com>
Subject: [PATCH v3 03/10] DMA  reservations: use the new mmap locking API
Date: Fri, 27 Mar 2020 15:50:55 -0700	[thread overview]
Message-ID: <20200327225102.25061-4-walken@google.com> (raw)
In-Reply-To: <20200327225102.25061-1-walken@google.com>

This use is converted manually ahead of the next patch in the series,
as it requires including a new header which the automated conversion
would miss.

Signed-off-by: Michel Lespinasse <walken@google.com>
---
 drivers/dma-buf/dma-resv.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/dma-buf/dma-resv.c b/drivers/dma-buf/dma-resv.c
index 4264e64788c4..b45f8514dc82 100644
--- a/drivers/dma-buf/dma-resv.c
+++ b/drivers/dma-buf/dma-resv.c
@@ -34,6 +34,7 @@
 
 #include <linux/dma-resv.h>
 #include <linux/export.h>
+#include <linux/mm.h>
 #include <linux/sched/mm.h>
 
 /**
@@ -109,7 +110,7 @@ static int __init dma_resv_lockdep(void)
 
 	dma_resv_init(&obj);
 
-	down_read(&mm->mmap_sem);
+	mmap_read_lock(mm);
 	ww_acquire_init(&ctx, &reservation_ww_class);
 	ret = dma_resv_lock(&obj, &ctx);
 	if (ret == -EDEADLK)
@@ -118,7 +119,7 @@ static int __init dma_resv_lockdep(void)
 	fs_reclaim_release(GFP_KERNEL);
 	ww_mutex_unlock(&obj.lock);
 	ww_acquire_fini(&ctx);
-	up_read(&mm->mmap_sem);
+	mmap_read_unlock(mm);
 	
 	mmput(mm);
 
-- 
2.26.0.rc2.310.g2932bb562d-goog



  parent reply	other threads:[~2020-03-27 22:51 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-27 22:50 [PATCH v3 00/10] Add a new mmap locking API wrapping mmap_sem calls Michel Lespinasse
2020-03-27 22:50 ` [PATCH v3 01/10] mmap locking API: initial implementation as rwsem wrappers Michel Lespinasse
2020-03-28  8:57   ` [PATCH v3 01/10] mmap locking API: initial implementation as rwsem wrappers (Michel Lespinasse) SeongJae Park
2020-03-27 22:50 ` [PATCH v3 02/10] MMU notifier: use the new mmap locking API Michel Lespinasse
2020-03-27 22:50 ` Michel Lespinasse [this message]
2020-03-27 22:50 ` [PATCH v3 04/10] mmap locking API: use coccinelle to convert mmap_sem rwsem call sites Michel Lespinasse
2020-03-27 22:50 ` [PATCH v3 05/10] mmap locking API: convert mmap_sem call sites missed by coccinelle Michel Lespinasse
2020-03-28  7:36   ` Markus Elfring
2020-03-28  7:47     ` Michel Lespinasse
2020-03-28  8:39       ` [v3 " Markus Elfring
2020-03-28  8:53         ` Michel Lespinasse
2020-03-28  9:01           ` Markus Elfring
2020-03-28 13:20           ` [v3 05/10] mmap locking API: Checking the Coccinelle software Markus Elfring
2020-03-28 13:42             ` [Cocci] " Julia Lawall
2020-03-28 13:52               ` Markus Elfring
2020-03-28 13:53             ` Julia Lawall
2020-03-28 14:00             ` Julia Lawall
2020-03-28 14:16               ` Markus Elfring
2020-03-30  6:10           ` [v3 05/10] mmap locking API: Improving " Markus Elfring
2020-03-30  8:47             ` [Cocci] " Julia Lawall
2020-03-30 10:15               ` Markus Elfring
2020-03-30 10:20                 ` Julia Lawall
2020-03-30 10:42                   ` Markus Elfring
2020-04-13 17:06   ` [PATCH v3 05/10] mmap locking API: convert mmap_sem call sites missed by coccinelle Daniel Jordan
2020-03-27 22:50 ` [PATCH v3 06/10] mmap locking API: convert nested write lock sites Michel Lespinasse
2020-04-01 13:42   ` Peter Zijlstra
2020-04-06 15:35     ` Michel Lespinasse
2020-04-06 15:58       ` Peter Zijlstra
2020-03-27 22:50 ` [PATCH v3 07/10] mmap locking API: add mmap_read_release() and mmap_read_unlock_non_owner() Michel Lespinasse
2020-04-01 13:46   ` Peter Zijlstra
2020-04-06 15:39     ` Michel Lespinasse
2020-03-27 22:51 ` [PATCH v3 08/10] mmap locking API: add MMAP_LOCK_INITIALIZER Michel Lespinasse
2020-03-27 22:51 ` [PATCH v3 09/10] mmap locking API: use lockdep_assert_held Michel Lespinasse
2020-03-27 22:51 ` [PATCH v3 10/10] mmap locking API: rename mmap_sem to mmap_lock Michel Lespinasse
2020-04-01 13:48   ` Peter Zijlstra
2020-04-06 15:49     ` Michel Lespinasse

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=20200327225102.25061-4-walken@google.com \
    --to=walken@google.com \
    --cc=Liam.Howlett@oracle.com \
    --cc=Markus.Elfring@web.de \
    --cc=akpm@linux-foundation.org \
    --cc=dave@stgolabs.net \
    --cc=hughd@google.com \
    --cc=jgg@ziepe.ca \
    --cc=jglisse@redhat.com \
    --cc=ldufour@linux.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=peterz@infradead.org \
    --cc=rientjes@google.com \
    --cc=vbabka@suse.cz \
    --cc=willy@infradead.org \
    --cc=yinghan@google.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).