Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp1384666ybi; Wed, 3 Jul 2019 14:52:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5jlmrhmJCKhqTisD8l6gUnxEMkrHJbsDa9qMq+erEoc5VStb5mLIP9NUIF6ZnkIy3/06w X-Received: by 2002:a65:4cc4:: with SMTP id n4mr40808464pgt.307.1562190729528; Wed, 03 Jul 2019 14:52:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562190729; cv=none; d=google.com; s=arc-20160816; b=SQqcqTJxOT+imuLAEFCfInXd8Q83Fvbqp0GzfE88oFSjtC/76TS6dF5htu5KtpyuT9 r3ukkmFTiBJacjIgIkVlslNFWd5RS8/K4SJcHqvO9Knoff/FDs69ox+euzcob6tY2PcF 2rC+RBJrkSGzcvS/eDqq8Lh9OPQgYX7FbIGziyeAOpZI09AXlGRrPLMZ7+kFrE13UgzD wM9SytP56VTzQ/E08HtAnDF7dZcCsUqFH8zIPFcELOCICtVnWccbA6pmj4yXJvA0jDkn l5nbAGtkbvCLEJEur6NWzyy7HGOx2qQlSBQQGNyTLjINpQzg1zL0bdMW3po+XwvPH5n4 DK1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=BQCLL5C2maXjuWUH1GMB4u+IF4n1j6/UYl1ONzdzHCU=; b=RabTO9LP5A+CG0HDueDgJ5S2GPynv8C7wcUJwYFocvX7rj05L0QlYvhYrCeJ8GaN5n uMAFUxA9ZabxrwuHwQ6nc2VXMZiTcOWB/6BvznKeM6iss+qL7kyORwUWHZ3ZOQrWIORE LA0CT4cwI+k3FqC6paCwCJ1mcvt03/TR8zWthr9q8x1VpL8vcGpwBccvJzjsl0AdsU7+ J/jLEIgxI3ozTAkL7UybM7zpUolLPEUAuojMKuCXJi6GYI73Xkc7VxRZ29c+3FXttYbb r2brRdh/j28cK/blqXXwRfXYdLKcjsvSsXL5bFMzYuerj5RwwwXqMuN2JwgVWiWQs9k+ 2CPg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si3546432pfc.80.2019.07.03.14.51.53; Wed, 03 Jul 2019 14:52:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727335AbfGCVv3 (ORCPT + 99 others); Wed, 3 Jul 2019 17:51:29 -0400 Received: from verein.lst.de ([213.95.11.211]:55501 "EHLO verein.lst.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727058AbfGCVv2 (ORCPT ); Wed, 3 Jul 2019 17:51:28 -0400 Received: by verein.lst.de (Postfix, from userid 2407) id C562368B05; Wed, 3 Jul 2019 23:51:26 +0200 (CEST) Date: Wed, 3 Jul 2019 23:51:26 +0200 From: Christoph Hellwig To: Ralph Campbell Cc: Christoph Hellwig , =?iso-8859-1?B?Suly9G1l?= Glisse , Jason Gunthorpe , Ben Skeggs , linux-mm@kvack.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/5] nouveau: unlock mmap_sem on all errors from nouveau_range_fault Message-ID: <20190703215126.GA17366@lst.de> References: <20190703184502.16234-1-hch@lst.de> <20190703184502.16234-5-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jul 03, 2019 at 01:46:02PM -0700, Ralph Campbell wrote: > You can delete the comment "With the old API the driver must ..." > (not visible in the patch here). Sure. > I suggest moving the two assignments: > range->default_flags = 0; > range->pfn_flags_mask = -1UL; > to just above the "again:" where the other range.xxx fields are > initialized in nouveau_svm_fault(). For now I really just want to move the code around. As Jason pointed out the flow will need some major rework, and I'd rather not mess with little things like this for now. Especially as I assume Jerome must have an update to the proper API ready given that he both wrote that new API and the nouveau code. > You can delete this comment (only the first line is visible here) > since it is about the "old API". Ok. > Also, it should return -EBUSY not -EAGAIN since it means there was a > range invalidation collision (similar to hmm_range_fault() if > !range->valid). Yes, probably. >> @@ -515,15 +517,14 @@ nouveau_range_fault(struct hmm_mirror *mirror, struct hmm_range *range, >> ret = hmm_range_fault(range, block); > > nouveau_range_fault() is only called with "block = true" so > could eliminate the block parameter and pass true here. Indeed. > >> if (ret <= 0) { >> - if (ret == -EBUSY || !ret) { >> - /* Same as above, drop mmap_sem to match old API. */ >> - up_read(&range->vma->vm_mm->mmap_sem); >> - ret = -EBUSY; >> - } else if (ret == -EAGAIN) >> + if (ret == 0) >> ret = -EBUSY; >> + if (ret != -EAGAIN) >> + up_read(&range->vma->vm_mm->mmap_sem); > > Can ret == -EAGAIN happen if "block = true"? I don't think so, we can remove that. > Generally, I prefer the read_down()/read_up() in the same function > (i.e., nouveau_svm_fault()) but I can see why it should be here > if hmm_range_fault() can return with mmap_sem unlocked. Yes, in the long run this all needs a major cleanup.. >> @@ -718,8 +719,8 @@ nouveau_svm_fault(struct nvif_notify *notify) >> NULL); >> svmm->vmm->vmm.object.client->super = false; >> mutex_unlock(&svmm->mutex); >> + up_read(&svmm->mm->mmap_sem); >> } >> - up_read(&svmm->mm->mmap_sem); >> > > The "else" case should check for -EBUSY and goto again. It should if I were trying to fix this. But this is just code inspection and I don't even have the hardware, so I'll have to leave that for someone who can do real development on the driver.