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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 31A5AC47247 for ; Tue, 5 May 2020 00:23:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id DB99E20661 for ; Tue, 5 May 2020 00:23:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="qw4J8O9R" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB99E20661 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 6FB9E8E008C; Mon, 4 May 2020 20:23:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 684CC8E0058; Mon, 4 May 2020 20:23:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5994C8E008C; Mon, 4 May 2020 20:23:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0145.hostedemail.com [216.40.44.145]) by kanga.kvack.org (Postfix) with ESMTP id 41FEF8E0058 for ; Mon, 4 May 2020 20:23:50 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 085DD180AD806 for ; Tue, 5 May 2020 00:23:50 +0000 (UTC) X-FDA: 76780767420.26.month75_2165df67ba516 X-HE-Tag: month75_2165df67ba516 X-Filterd-Recvd-Size: 6966 Received: from hqnvemgate24.nvidia.com (hqnvemgate24.nvidia.com [216.228.121.143]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Tue, 5 May 2020 00:23:49 +0000 (UTC) Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Mon, 04 May 2020 17:21:40 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Mon, 04 May 2020 17:23:48 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Mon, 04 May 2020 17:23:48 -0700 Received: from [10.2.56.198] (172.20.13.39) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 5 May 2020 00:23:47 +0000 Subject: Re: [PATCH hmm v2 4/5] mm/hmm: remove HMM_PFN_SPECIAL To: Jason Gunthorpe , , Ralph Campbell CC: Alex Deucher , , Ben Skeggs , =?UTF-8?Q?Christian_K=c3=b6nig?= , "David (ChunMing) Zhou" , , Felix Kuehling , Christoph Hellwig , , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , , Niranjana Vishwanathapura , , "Yang, Philip" References: <4-v2-b4e84f444c7d+24f57-hmm_no_flags_jgg@mellanox.com> X-Nvconfidentiality: public From: John Hubbard Message-ID: <11e39f2e-e244-a75f-15f4-83d2f5dd2f26@nvidia.com> Date: Mon, 4 May 2020 17:23:46 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.7.0 MIME-Version: 1.0 In-Reply-To: <4-v2-b4e84f444c7d+24f57-hmm_no_flags_jgg@mellanox.com> X-Originating-IP: [172.20.13.39] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1588638100; bh=LbTFGAO939OtgC3J478q1/lLZNcOmbmZm/bb6JPA+3g=; h=X-PGP-Universal:Subject:To:CC:References:X-Nvconfidentiality:From: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=qw4J8O9R40LD/qwoUcwvvA/9rtpnX8IImDRS9vHOyZrJtm90MVganf/mHpIZLk1G2 TAaZxWVsiQD4LfvXhom5hDALdA1n9rwzM/TX7FVswoGDDHCxrarRiboHsnvtRGwfaB XKUfU9+NeTQ12kJUC1MpdFE2FpDUzqsBAAJ2qH76Gr+U2Wn+OGtNJBOQeTAFsxD7Xb hzwEziNt+xMaVGWJ2xKZIj1gPJ5+BVHFfaGuaAaky5NcasEmrfLU4+U+l+TVi4bLUh O7o5uuDV8EwCSq3Qst8WqzmyAaKwQMM7ipuSr9hNn9vnKmA4K1RyrTUleAA0KmoAm6 HX5++tYtaWNGw== 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 2020-05-01 11:20, Jason Gunthorpe wrote: > From: Jason Gunthorpe > > This is just an alias for HMM_PFN_ERROR, nothing cares that the error was > because of a special page vs any other error case. Reviewed-by: John Hubbard thanks, -- John Hubbard NVIDIA > > Acked-by: Felix Kuehling > Reviewed-by: Christoph Hellwig > Signed-off-by: Jason Gunthorpe > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 1 - > drivers/gpu/drm/nouveau/nouveau_svm.c | 1 - > include/linux/hmm.h | 8 -------- > mm/hmm.c | 2 +- > 4 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > index 41ae7f96f48194..76b4a4fa39ed04 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c > @@ -775,7 +775,6 @@ static const uint64_t hmm_range_flags[HMM_PFN_FLAG_MAX] = { > static const uint64_t hmm_range_values[HMM_PFN_VALUE_MAX] = { > 0xfffffffffffffffeUL, /* HMM_PFN_ERROR */ > 0, /* HMM_PFN_NONE */ > - 0xfffffffffffffffcUL /* HMM_PFN_SPECIAL */ > }; > > /** > diff --git a/drivers/gpu/drm/nouveau/nouveau_svm.c b/drivers/gpu/drm/nouveau/nouveau_svm.c > index c68e9317cf0740..cf0d9bd61bebf9 100644 > --- a/drivers/gpu/drm/nouveau/nouveau_svm.c > +++ b/drivers/gpu/drm/nouveau/nouveau_svm.c > @@ -379,7 +379,6 @@ static const u64 > nouveau_svm_pfn_values[HMM_PFN_VALUE_MAX] = { > [HMM_PFN_ERROR ] = ~NVIF_VMM_PFNMAP_V0_V, > [HMM_PFN_NONE ] = NVIF_VMM_PFNMAP_V0_NONE, > - [HMM_PFN_SPECIAL] = ~NVIF_VMM_PFNMAP_V0_V, > }; > > /* Issue fault replay for GPU to retry accesses that faulted previously. */ > diff --git a/include/linux/hmm.h b/include/linux/hmm.h > index 0df27dd03d53d7..81c302c884c0e3 100644 > --- a/include/linux/hmm.h > +++ b/include/linux/hmm.h > @@ -44,10 +44,6 @@ enum hmm_pfn_flag_e { > * Flags: > * HMM_PFN_ERROR: corresponding CPU page table entry points to poisoned memory > * HMM_PFN_NONE: corresponding CPU page table entry is pte_none() > - * HMM_PFN_SPECIAL: corresponding CPU page table entry is special; i.e., the > - * result of vmf_insert_pfn() or vm_insert_page(). Therefore, it should not > - * be mirrored by a device, because the entry will never have HMM_PFN_VALID > - * set and the pfn value is undefined. > * > * Driver provides values for none entry, error entry, and special entry. > * Driver can alias (i.e., use same value) error and special, but > @@ -56,12 +52,10 @@ enum hmm_pfn_flag_e { > * HMM pfn value returned by hmm_vma_get_pfns() or hmm_vma_fault() will be: > * hmm_range.values[HMM_PFN_ERROR] if CPU page table entry is poisonous, > * hmm_range.values[HMM_PFN_NONE] if there is no CPU page table entry, > - * hmm_range.values[HMM_PFN_SPECIAL] if CPU page table entry is a special one > */ > enum hmm_pfn_value_e { > HMM_PFN_ERROR, > HMM_PFN_NONE, > - HMM_PFN_SPECIAL, > HMM_PFN_VALUE_MAX > }; > > @@ -110,8 +104,6 @@ static inline struct page *hmm_device_entry_to_page(const struct hmm_range *rang > return NULL; > if (entry == range->values[HMM_PFN_ERROR]) > return NULL; > - if (entry == range->values[HMM_PFN_SPECIAL]) > - return NULL; > if (!(entry & range->flags[HMM_PFN_VALID])) > return NULL; > return pfn_to_page(entry >> range->pfn_shift); > diff --git a/mm/hmm.c b/mm/hmm.c > index f06bcac948a79b..2e975eedb14f89 100644 > --- a/mm/hmm.c > +++ b/mm/hmm.c > @@ -301,7 +301,7 @@ static int hmm_vma_handle_pte(struct mm_walk *walk, unsigned long addr, > pte_unmap(ptep); > return -EFAULT; > } > - *pfn = range->values[HMM_PFN_SPECIAL]; > + *pfn = range->values[HMM_PFN_ERROR]; > return 0; > } > >