From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Morton Subject: + dma-reservations-use-the-new-mmap-locking-api.patch added to -mm tree Date: Wed, 20 May 2020 20:23:53 -0700 Message-ID: <20200521032353.MUCTv0GGA%akpm@linux-foundation.org> References: <20200513175005.1f4839360c18c0238df292d1@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from mail.kernel.org ([198.145.29.99]:60536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727825AbgEUDXz (ORCPT ); Wed, 20 May 2020 23:23:55 -0400 In-Reply-To: <20200513175005.1f4839360c18c0238df292d1@linux-foundation.org> Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: daniel.m.jordan@oracle.com, dbueso@suse.de, hughd@google.com, jgg@ziepe.ca, jglisse@redhat.com, jhubbard@nvidia.com, ldufour@linux.ibm.com, Liam.Howlett@oracle.com, mm-commits@vger.kernel.org, peterz@infradead.org, rientjes@google.com, vbabka@suse.cz, walken@google.com, willy@infradead.org, yinghan@google.com The patch titled Subject: DMA reservations: use the new mmap locking API has been added to the -mm tree. Its filename is dma-reservations-use-the-new-mmap-locking-api.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/dma-reservations-use-the-new-mmap-locking-api.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/dma-reservations-use-the-new-mmap-locking-api.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Michel Lespinasse Subject: DMA reservations: use the new mmap locking API 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. Link: http://lkml.kernel.org/r/20200520052908.204642-4-walken@google.com Signed-off-by: Michel Lespinasse Reviewed-by: Daniel Jordan Reviewed-by: Laurent Dufour Reviewed-by: Vlastimil Babka Cc: Davidlohr Bueso Cc: David Rientjes Cc: Hugh Dickins Cc: Jason Gunthorpe Cc: Jerome Glisse Cc: John Hubbard Cc: Liam Howlett Cc: Matthew Wilcox Cc: Peter Zijlstra Cc: Ying Han Signed-off-by: Andrew Morton --- drivers/dma-buf/dma-resv.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/dma-buf/dma-resv.c~dma-reservations-use-the-new-mmap-locking-api +++ a/drivers/dma-buf/dma-resv.c @@ -34,6 +34,7 @@ #include #include +#include #include /** @@ -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); _ Patches currently in -mm which might be from walken@google.com are mmap-locking-api-initial-implementation-as-rwsem-wrappers.patch mmu-notifier-use-the-new-mmap-locking-api.patch dma-reservations-use-the-new-mmap-locking-api.patch mmap-locking-api-use-coccinelle-to-convert-mmap_sem-rwsem-call-sites.patch mmap-locking-api-convert-mmap_sem-call-sites-missed-by-coccinelle.patch mmap-locking-api-convert-nested-write-lock-sites.patch mmap-locking-api-add-mmap_read_trylock_non_owner.patch mmap-locking-api-add-mmap_lock_initializer.patch mmap-locking-api-add-mmap_assert_locked-and-mmap_assert_write_locked.patch mmap-locking-api-rename-mmap_sem-to-mmap_lock.patch mmap-locking-api-convert-mmap_sem-api-comments.patch mmap-locking-api-convert-mmap_sem-comments.patch