From patchwork Wed May 20 05:28:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 11559319 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2A96660D for ; Wed, 20 May 2020 05:29:21 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E2198206C3 for ; Wed, 20 May 2020 05:29:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="SSxMo2AJ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E2198206C3 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 65B0E80057; Wed, 20 May 2020 01:29:19 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 5E4D88002C; Wed, 20 May 2020 01:29:19 -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 4AF6C80057; Wed, 20 May 2020 01:29:19 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0189.hostedemail.com [216.40.44.189]) by kanga.kvack.org (Postfix) with ESMTP id 2F7448002C for ; Wed, 20 May 2020 01:29:19 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id F2A538248068 for ; Wed, 20 May 2020 05:29:18 +0000 (UTC) X-FDA: 76835969196.25.team08_514f2cbfcbb5b X-Spam-Summary: 2,0,0,d45aea7c595423fb,d41d8cd98f00b204,3lsdexgykcl0zdonhqjrrjoh.frpolqx0-ppnydfn.ruj@flex--walken.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:973:988:989:1260:1277:1313:1314:1345:1359:1437:1516:1518:1534:1541:1593:1594:1711:1730:1747:1777:1792:2198:2199:2393:2559:2562:3138:3139:3140:3141:3142:3152:3352:3865:3866:3870:3871:3872:4321:5007:6261:6653:6742:9969:10004:10400:10450:10455:11026:11658:11914:12043:12297:12438:12555:12895:13069:13311:13357:14096:14097:14181:14394:14659:14721:19904:19999:21080:21433:21444:21451:21627:21987:30054:30064,0,RBL:209.85.219.202:@flex--walken.bounces.google.com:.lbl8.mailshell.net-66.100.201.100 62.18.0.100,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:23,LUA_SUMMARY:none X-HE-Tag: team08_514f2cbfcbb5b X-Filterd-Recvd-Size: 4420 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf08.hostedemail.com (Postfix) with ESMTP for ; Wed, 20 May 2020 05:29:18 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id n7so788045ybh.13 for ; Tue, 19 May 2020 22:29:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=gLHH8qp+cYXwW8jRyKSlJBqB5UMPqJrCDS4qFPCf+dg=; b=SSxMo2AJhnlfSf/ZvXnACSRetnbCwbiy1h4mF2wsrAxplpgt5TkT//aTBy2576EFtq Zx7hUhmePluZ5nS0TRCdVfnxXvmxjyLWOBWQM6IEmLP5IUlhae/4qLPSqpArS1KEOPH9 7XtZUaEJXeRjX5B3n/lZfVgQR5PcYh9vdt2LbJkrbNQJGAwv5stEsS7a/A+LYAqwj+7J XjtxtkHLzILSLzgkfHw8rBd0/PDA1cHkzl0ZGzHlOuGWbMbIwn5GxrCLX9YWB3kvtCCT AUG9GLFti5TxfiYW/pRAKGK1UfFT4aPxmzifKbr1/OYpyKbaQ9FIciF+2A0zXFDyYIZ4 AUxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gLHH8qp+cYXwW8jRyKSlJBqB5UMPqJrCDS4qFPCf+dg=; b=bDZ8oaN80zJSrw9C5mBYi2+8ZMe/qwJd6ElLXv1K07mhQ9odDqOPRRwMlcdzZYVnia M9lRH+JtjLxYKe3ShFH2jr//nkyGZWR682POwUJk4HJOn801E7Ik9UfVfQO4RR3xjAsn fLTNcKStaadB/tU93HF+G0qYohJ454n5f3uezdKj0Kd7vcpLuLh7SvH8AWT4hPx8noXG fTBeEAOlpVVVl4eZSl8hy46I4Lx9UXA6NTUsTolbA5OPDuNbpfecmioan3nXhJGiIdAk p1ZCMzY2EY7cbUiuxIbiF7MdjVxMg2rLcHkYXq28xbWW4IRPWCsUcgKmQas2huFET7s5 USWQ== X-Gm-Message-State: AOAM532dnsxdfNZsdivllqmRNX8/LhsUbRbvoNQu5/l39hJt0uLuQDWn BtOWLYE/GDjgn945hLHbTuUgWfi8U30= X-Google-Smtp-Source: ABdhPJw/E1zWNbDSelXgByf12MoInkyaQ/jc/SjICoxh5X/9tXkPORZTTkpcGSzX3CcDokRMAnm9Zs6xoGk= X-Received: by 2002:a25:dad5:: with SMTP id n204mr4778038ybf.164.1589952558050; Tue, 19 May 2020 22:29:18 -0700 (PDT) Date: Tue, 19 May 2020 22:28:59 -0700 In-Reply-To: <20200520052908.204642-1-walken@google.com> Message-Id: <20200520052908.204642-4-walken@google.com> Mime-Version: 1.0 References: <20200520052908.204642-1-walken@google.com> X-Mailer: git-send-email 2.26.2.761.g0e0b3e54be-goog Subject: [PATCH v6 03/12] DMA reservations: use the new mmap locking API From: Michel Lespinasse To: Andrew Morton , linux-mm Cc: LKML , Peter Zijlstra , Laurent Dufour , Vlastimil Babka , Matthew Wilcox , Liam Howlett , Jerome Glisse , Davidlohr Bueso , David Rientjes , Hugh Dickins , Ying Han , Jason Gunthorpe , Daniel Jordan , John Hubbard , Michel Lespinasse 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: 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 Reviewed-by: Daniel Jordan Reviewed-by: Laurent Dufour Reviewed-by: Vlastimil Babka --- 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 #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);