From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12364C2BCA1 for ; Fri, 7 Jun 2019 22:39:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8A3BE20840 for ; Fri, 7 Jun 2019 22:39:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="JpoOI2cB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A3BE20840 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nvidia.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1AA866B0276; Fri, 7 Jun 2019 18:39:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15B0E6B0278; Fri, 7 Jun 2019 18:39:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 04A3B6B0279; Fri, 7 Jun 2019 18:39:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-yb1-f197.google.com (mail-yb1-f197.google.com [209.85.219.197]) by kanga.kvack.org (Postfix) with ESMTP id D90536B0276 for ; Fri, 7 Jun 2019 18:39:11 -0400 (EDT) Received: by mail-yb1-f197.google.com with SMTP id k142so3320580ybk.20 for ; Fri, 07 Jun 2019 15:39:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding:dkim-signature; bh=eTTUWJi61h5qqJA3yxmX9O8Uva/UfogeyAnkiaxrKMg=; b=LrbG3sTMxop380TYmFjhFc0RQ90W2uNW42aY6X10Mm11SXOesWyhuJeswiMintgL9l 10AVgivXidI2L38a8OJOUTzxVu+rTSgRjf816/q9//+F9AeOSj0iBEx2JS+8Ns8NBFqS bJkmld6tITuTfdCrR683KrgKejg5XGa/Q4UbwaiLrnLXBkOBcw7WlS9VCnugBZD9V0ac qdRrYKztiC9f07FyOlpHGi6WFoVz9Kl8Z1yPXOP5vH2lU2LPPUfGpeZIxIAHGPQQ0kOH pmmBM7A6fNEt3rf+UxJyaan7SmbtsZNjBoMVAHPY+St6w+Qss4Itfw0RQJzbk1zr/cqv 30PQ== X-Gm-Message-State: APjAAAUv2+lKebO87AGjIogFF4S9Mt+R+GuH7ghXj0/rTgitZ46MI2yZ 7lbvzcGnjZrncFvXha3oqJTBc0/DVValz6pRjnnkOYRn/C7ePu/5Jxsfbmd/LtsKUiSdMwf5jkA Wla1KrmLxbDaKF4jboo3jZ7WdPr7QiPRaSZY+dsJOKQjqfBproAsjwPalvVNIUoTNZw== X-Received: by 2002:a81:374c:: with SMTP id e73mr20492156ywa.379.1559947151518; Fri, 07 Jun 2019 15:39:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYf4HLzw5thuy17BroQv2tPNS7412khvcpiYXW2NWWdaI34NN9zclthy6zcbn+jM6uITlF X-Received: by 2002:a81:374c:: with SMTP id e73mr20492133ywa.379.1559947150887; Fri, 07 Jun 2019 15:39:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559947150; cv=none; d=google.com; s=arc-20160816; b=aqrH6yOD+DICPlIUfI7YsBM5p5yobO/L3l+T6RDFUDEooBhIJShyqIcFG35CYAA3/9 nXmvliUdHUXQFJDKf410kcWPs5vuk6gXJyEFCEhPwtMC7Vlf76sRRdT9JEB1WU/YxJi/ VyLZ/wpHf7GQL1DNKqf/ELctTkWxdvn5+W1CTFlfqbhePHiITqf+uHmDwZ+S7/xYt/Na U/Sn6CKiARi0qSl5pcsFg7PUS/Ya0i03GfXtudZ9juUU0WlaA0VJj0lTl5WNE5+DZk2q ogkeWhD5qA0y63ehOdndwWFmikQQaaAG6LY9zGcFjfRuiPEW/HZ8iK6GmGotHEikeKx7 HiYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=dkim-signature:content-transfer-encoding:content-language :in-reply-to:mime-version:user-agent:date:message-id:references:cc :to:from:subject; bh=eTTUWJi61h5qqJA3yxmX9O8Uva/UfogeyAnkiaxrKMg=; b=AD90KOimTZurqUyqAtl1MdY+14hzmn0Mbx568Z3Bl5FXTEjgqsh2JZv4UOyOeTKvLN hSlgdZ+zAdVpwAiJEjDjWBHiQ5zNoXtsXkmvgb9fY0Ct9Bw0nVXIKZzJ6vD0gWlGp6QY 1vxWJNIuyVtOMj1nbUSXeALhybGRv4fkM2FhHyDu9qLtqnpAbE1FZi2vDDIoVR2MI8KF meZgyzHo0kBp+Egx3iWhLG14HkOTQkHo5jDmZ8336115p+P7bu4V5FL/LVI4Hp2f4bsf oQnEuZ/JAXwKG8Hv4haNsxOaa/OzY68TOrZw+wfO7eB/Wc9Xa0z4YIvT6mNMoPEEZmPJ w1qA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=JpoOI2cB; spf=pass (google.com: domain of rcampbell@nvidia.com designates 216.228.121.65 as permitted sender) smtp.mailfrom=rcampbell@nvidia.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: from hqemgate16.nvidia.com (hqemgate16.nvidia.com. [216.228.121.65]) by mx.google.com with ESMTPS id d82si1112627ywa.103.2019.06.07.15.39.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 15:39:10 -0700 (PDT) Received-SPF: pass (google.com: domain of rcampbell@nvidia.com designates 216.228.121.65 as permitted sender) client-ip=216.228.121.65; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=JpoOI2cB; spf=pass (google.com: domain of rcampbell@nvidia.com designates 216.228.121.65 as permitted sender) smtp.mailfrom=rcampbell@nvidia.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 07 Jun 2019 15:39:09 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Fri, 07 Jun 2019 15:39:09 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Fri, 07 Jun 2019 15:39:09 -0700 Received: from rcampbell-dev.nvidia.com (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 7 Jun 2019 22:39:07 +0000 Subject: Re: [PATCH v2 hmm 02/11] mm/hmm: Use hmm_mirror not mm as an argument for hmm_range_register From: Ralph Campbell To: Jason Gunthorpe , Jerome Glisse , "John Hubbard" , CC: , , Andrea Arcangeli , , , Jason Gunthorpe References: <20190606184438.31646-1-jgg@ziepe.ca> <20190606184438.31646-3-jgg@ziepe.ca> <4a391bd4-287c-5f13-3bca-c6a46ff8d08c@nvidia.com> X-Nvconfidentiality: public Message-ID: Date: Fri, 7 Jun 2019 15:39:06 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 In-Reply-To: <4a391bd4-287c-5f13-3bca-c6a46ff8d08c@nvidia.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1559947149; bh=eTTUWJi61h5qqJA3yxmX9O8Uva/UfogeyAnkiaxrKMg=; h=X-PGP-Universal:Subject:From:To:CC:References:X-Nvconfidentiality: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=JpoOI2cBmdaAZidTMJPSl0KSbBKE2o4ZRJdWcugT6orV5WnAe0KdsGUXOGpuQQ0LW m7osQ9wOTTxkmKPKnK09Qt6i7dn5T367HVSBBLDJRoRQ7Kv6a6+9l3TYvyZkc1q+gh 4iqORp/qQZBmwO9Sei+lW8GghFirA8MA1f3bJCPvu7DgLJKRDaPmRAYgVijn5AoCWW eWmt1e0vAgP9gCIK2Fla2A3qItjGNnCi2Nm61BH0eUNToknBTqap9RPaibIW3jMXVv 6xmNjJCmplZWRUsIbaXUsE5WEblrvAbyzB1lMSir10Ioo7ikCAQ90cZ2QC7TFVg1Su wkEP7XsQ0osAA== 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: On 6/7/19 11:24 AM, Ralph Campbell wrote: >=20 > On 6/6/19 11:44 AM, Jason Gunthorpe wrote: >> From: Jason Gunthorpe >> >> Ralph observes that hmm_range_register() can only be called by a driver >> while a mirror is registered. Make this clear in the API by passing in=20 >> the >> mirror structure as a parameter. >> >> This also simplifies understanding the lifetime model for struct hmm, as >> the hmm pointer must be valid as part of a registered mirror so all we >> need in hmm_register_range() is a simple kref_get. >> >> Suggested-by: Ralph Campbell >> Signed-off-by: Jason Gunthorpe >=20 > You might CC Ben for the nouveau part. > CC: Ben Skeggs >=20 > Reviewed-by: Ralph Campbell >=20 >=20 >> --- >> v2 >> - Include the oneline patch to nouveau_svm.c >> --- >> =C2=A0 drivers/gpu/drm/nouveau/nouveau_svm.c |=C2=A0 2 +- >> =C2=A0 include/linux/hmm.h=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 7 += +++--- >> =C2=A0 mm/hmm.c=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 | 15 ++++++--------- >> =C2=A0 3 files changed, 11 insertions(+), 13 deletions(-) >> >> diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c=20 >> b/drivers/gpu/drm/nouveau/nouveau_svm.c >> index 93ed43c413f0bb..8c92374afcf227 100644 >> --- a/drivers/gpu/drm/nouveau/nouveau_svm.c >> +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c >> @@ -649,7 +649,7 @@ nouveau_svm_fault(struct nvif_notify *notify) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range.values =3D = nouveau_svm_pfn_values; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range.pfn_shift = =3D NVIF_VMM_PFNMAP_V0_ADDR_SHIFT; >> =C2=A0 again: >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ret =3D hmm_vma_fault(&range= , true); >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ret =3D hmm_vma_fault(&svmm-= >mirror, &range, true); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (ret =3D=3D 0)= { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 mutex_lock(&svmm->mutex); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 if (!hmm_vma_range_done(&range)) { >> diff --git a/include/linux/hmm.h b/include/linux/hmm.h >> index 688c5ca7068795..2d519797cb134a 100644 >> --- a/include/linux/hmm.h >> +++ b/include/linux/hmm.h >> @@ -505,7 +505,7 @@ static inline bool hmm_mirror_mm_is_alive(struct=20 >> hmm_mirror *mirror) >> =C2=A0=C2=A0 * Please see Documentation/vm/hmm.rst for how to use the ra= nge API. >> =C2=A0=C2=A0 */ >> =C2=A0 int hmm_range_register(struct hmm_range *range, >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 struct mm_struct *mm, >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 struct hmm_mirror *mirror, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned long start, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned long end, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned page_shift); >> @@ -541,7 +541,8 @@ static inline bool hmm_vma_range_done(struct=20 >> hmm_range *range) >> =C2=A0 } >> =C2=A0 /* This is a temporary helper to avoid merge conflict between tre= es. */ >> -static inline int hmm_vma_fault(struct hmm_range *range, bool block) >> +static inline int hmm_vma_fault(struct hmm_mirror *mirror, >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0 struct hmm_range *range, bool block) >> =C2=A0 { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 long ret; >> @@ -554,7 +555,7 @@ static inline int hmm_vma_fault(struct hmm_range=20 >> *range, bool block) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->default_flags =3D 0; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->pfn_flags_mask =3D -1UL; >> -=C2=A0=C2=A0=C2=A0 ret =3D hmm_range_register(range, range->vma->vm_mm, >> +=C2=A0=C2=A0=C2=A0 ret =3D hmm_range_register(range, mirror, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->start, range->end, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 PAGE_SHIFT); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 if (ret) >> diff --git a/mm/hmm.c b/mm/hmm.c >> index 547002f56a163d..8796447299023c 100644 >> --- a/mm/hmm.c >> +++ b/mm/hmm.c >> @@ -925,13 +925,13 @@ static void hmm_pfns_clear(struct hmm_range *range= , >> =C2=A0=C2=A0 * Track updates to the CPU page table see include/linux/hmm= .h >> =C2=A0=C2=A0 */ >> =C2=A0 int hmm_range_register(struct hmm_range *range, >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 struct mm_struct *mm, >> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 struct hmm_mirror *mirror, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned long start, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned long end, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0 unsigned page_shift) >> =C2=A0 { >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 unsigned long mask =3D ((1UL << page_shif= t) - 1UL); >> -=C2=A0=C2=A0=C2=A0 struct hmm *hmm; >> +=C2=A0=C2=A0=C2=A0 struct hmm *hmm =3D mirror->hmm; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->valid =3D false; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->hmm =3D NULL; >> @@ -945,15 +945,12 @@ int hmm_range_register(struct hmm_range *range, >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->start =3D start; >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 range->end =3D end; >> -=C2=A0=C2=A0=C2=A0 hmm =3D hmm_get_or_create(mm); >> -=C2=A0=C2=A0=C2=A0 if (!hmm) >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -EFAULT; >> - >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* Check if hmm_mm_destroy() was call. */ >> -=C2=A0=C2=A0=C2=A0 if (hmm->mm =3D=3D NULL || hmm->dead) { >> -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 hmm_put(hmm); >> +=C2=A0=C2=A0=C2=A0 if (hmm->mm =3D=3D NULL || hmm->dead) >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return -EFAULT; >> -=C2=A0=C2=A0=C2=A0 } >> + >> +=C2=A0=C2=A0=C2=A0 range->hmm =3D hmm; >> +=C2=A0=C2=A0=C2=A0 kref_get(&hmm->kref); >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 /* Initialize range to track CPU page tab= le updates. */ >> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 mutex_lock(&hmm->lock); >> I forgot to add that I think you can delete the duplicate "range->hmm =3D hmm;" here between the mutex_lock/unlock.