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.0 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 539D5C432C3 for ; Wed, 27 Nov 2019 08:43:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 09815204FD for ; Wed, 27 Nov 2019 08:43:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="RrSBhf9r" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09815204FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 9BF4D6B0364; Wed, 27 Nov 2019 03:43:45 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 970376B0367; Wed, 27 Nov 2019 03:43:45 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85E556B0368; Wed, 27 Nov 2019 03:43:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0254.hostedemail.com [216.40.44.254]) by kanga.kvack.org (Postfix) with ESMTP id 71A416B0364 for ; Wed, 27 Nov 2019 03:43:45 -0500 (EST) Received: from smtpin02.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with SMTP id 26E3B180AD811 for ; Wed, 27 Nov 2019 08:43:45 +0000 (UTC) X-FDA: 76201419210.02.pull77_20a74fe459a2b X-HE-Tag: pull77_20a74fe459a2b X-Filterd-Recvd-Size: 9338 Received: from NAM04-SN1-obe.outbound.protection.outlook.com (mail-eopbgr700058.outbound.protection.outlook.com [40.107.70.58]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Wed, 27 Nov 2019 08:43:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jSWJRcNEhBmK8mEJ5nUvoC/bG9MwbnpRdKKeLmRx33VDtpkohhEI2vcGPwYjKUT9Rw3sr2HJ0LJmYyvOgouCPPsn8A0fQX/t+dtc2Gd4dgrCx77N4p9J45vp36r8QOOhb/fN5gASjH71bLJExEN0+Z3wrZUyOPrzVPiIy4MzK7nw0ZqY2mPu2qDqLGYlD5PvkectprrJGM2y/evLVpaDjC+9YJz9lQUTelzZAE4v5y91hvOavF0ILz8VbEGjTbUlj1GhPDbOx1+3sfjAjNE4dVZ+B6fMDE5hDY4zVlMbfK4JVheHV7O/CU07qGLUDNOppHTeIFrW1y5HyLn62O6qAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9GOdGPmLbLK2dWtxDG4fQ+gRLqxmPik3t4IKg2vFwTo=; b=UFB8EXTZdi6tBntA1HqXRo9gEvq19KzOdmk6xe0g+j7ICsiqOBJERyaM/aXdKMrKdI15BhSZFuroM04eGjqzN+AqqIsWnxlFn8YasURVTlbcuTP943isIlDO/ILusd/3JRgXEkvMyHIU20CcILtiV89EaP3OGOYgtZSs0n+0Kbe2IPYhxOOYSST/X8ONRm3JoWuvgDbwOIYVsCyAI61g8WK/765OvaS49ldvL6PHmXnLPluASoUHzDNdihCOAIBuJYmU9z/sOtqT7uHLeWvQh74o2Ae6c2IFnVKHEQ7R6KTQS+hUMlXH4g3kck9gc4EeShWk8qy11s9EthogZwfLzw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9GOdGPmLbLK2dWtxDG4fQ+gRLqxmPik3t4IKg2vFwTo=; b=RrSBhf9rCm0Gst0I4YHMAyyBCRG/k9L9aQ2tmi7JiZyYuJmokVgEYIApdo9aOJcT2L9dmGKiaOy2vEdFRQVxEJWDlI42wroDrtL3RQHGLpQQnE8+CuwSwhkj0gpw9d3tLcgA0j5RYmHO3XpzPQ62YE6IRXxETWexh2GCQWcVPMQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Christian.Koenig@amd.com; Received: from DM5PR12MB1705.namprd12.prod.outlook.com (10.175.88.22) by DM5PR12MB1211.namprd12.prod.outlook.com (10.168.239.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2474.19; Wed, 27 Nov 2019 08:43:42 +0000 Received: from DM5PR12MB1705.namprd12.prod.outlook.com ([fe80::e5e7:96f0:ad90:d933]) by DM5PR12MB1705.namprd12.prod.outlook.com ([fe80::e5e7:96f0:ad90:d933%7]) with mapi id 15.20.2474.023; Wed, 27 Nov 2019 08:43:42 +0000 Subject: Re: [PATCH 2/2] drm/ttm: Fix vm page protection handling To: =?UTF-8?Q?Thomas_Hellstr=c3=b6m_=28VMware=29?= , dri-devel@lists.freedesktop.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-graphics-maintainer@vmware.com Cc: Thomas Hellstrom , Andrew Morton , Michal Hocko , "Matthew Wilcox (Oracle)" , "Kirill A. Shutemov" , Ralph Campbell , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= References: <20191126202717.30762-1-thomas_os@shipmail.org> <20191126202717.30762-2-thomas_os@shipmail.org> From: =?UTF-8?Q?Christian_K=c3=b6nig?= Message-ID: <04b5dae3-6e72-2c35-117a-a79421d274d9@amd.com> Date: Wed, 27 Nov 2019 09:43:35 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 In-Reply-To: <20191126202717.30762-2-thomas_os@shipmail.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US X-ClientProxiedBy: AM4PR07CA0031.eurprd07.prod.outlook.com (2603:10a6:205:1::44) To DM5PR12MB1705.namprd12.prod.outlook.com (2603:10b6:3:10c::22) MIME-Version: 1.0 X-Originating-IP: [2a02:908:1252:fb60:be8a:bd56:1f94:86e7] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0568cbb9-b7f2-42a3-00a5-08d77315e805 X-MS-TrafficTypeDiagnostic: DM5PR12MB1211: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-Forefront-PRVS: 023495660C X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4636009)(366004)(396003)(346002)(136003)(39860400002)(376002)(189003)(199004)(31686004)(446003)(11346002)(4326008)(50466002)(65806001)(47776003)(316002)(2616005)(186003)(46003)(2486003)(58126008)(229853002)(65956001)(6246003)(81166006)(81156014)(66556008)(386003)(66476007)(8676002)(6506007)(52116002)(7736002)(54906003)(76176011)(66946007)(23676004)(5660300002)(478600001)(6436002)(99286004)(6116002)(7416002)(8936002)(305945005)(66574012)(6512007)(25786009)(6666004)(14454004)(86362001)(31696002)(2906002)(6486002)(14444005)(36756003)(2870700001);DIR:OUT;SFP:1101;SCL:1;SRVR:DM5PR12MB1211;H:DM5PR12MB1705.namprd12.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2aI+74WArvZDM7lEo7TZnFuPzBnIDf3Evbz5PyfQ9kUg1GTUSYOfcrIUtFslGD7ubbfCyTNXyz2PX5L23ItPNGxntRRBpMHX1FdF1d0uDSAzn4xB7z1UNXIcBP7u+dzu5J/ZaktRi/WJo8hrZxCbm/nLWlYRx3o3o6QWHAYetYS5WqyBuyIVvayMxC1wLDpHmEmsVtedQya5Jk5Hrub3L4z/x1hJR9gJKMRTwIzqZPC6D8WgPhPuKYzXdViXlxZEZq01fKBNjXL+1w8JtslmqRJXTg9kFI21286uxjLrnFMxnHt78QItvdggX5d5602skLdHoXuhmoYiZeYtdt8FiwoCz7CJkXmGNBVmLIQYAnlsHqRSwXfViDBYe7nxCLID+a1A+UgGE44ncxG8NU2u6wGfQU4EFnMGOmEO32XVs4MQtqOBgeVR9B93Imvj9fU7 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0568cbb9-b7f2-42a3-00a5-08d77315e805 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Nov 2019 08:43:42.2573 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: LFypZ/Ucq29xrbRpEI1kZxa/pmJk3kQOBUriu2tSnxYH1IsrH0ypc+H/PjAK1zHj X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1211 Content-Transfer-Encoding: quoted-printable 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: Am 26.11.19 um 21:27 schrieb Thomas Hellstr=C3=B6m (VMware): > From: Thomas Hellstrom > > We were using an ugly hack to set the page protection correctly. > Fix that and instead use vmf_insert_mixed_prot() and / or > vmf_insert_pfn_prot(). > Also get the default page protection from > struct vm_area_struct::vm_page_prot rather than using vm_get_page_prot(= ). > This way we catch modifications done by the vm system for drivers that > want write-notification. > > Cc: Andrew Morton > Cc: Michal Hocko > Cc: "Matthew Wilcox (Oracle)" > Cc: "Kirill A. Shutemov" > Cc: Ralph Campbell > Cc: "J=C3=A9r=C3=B4me Glisse" > Cc: "Christian K=C3=B6nig" > Signed-off-by: Thomas Hellstrom Reviewed-by: Christian K=C3=B6nig > --- > drivers/gpu/drm/ttm/ttm_bo_vm.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_= bo_vm.c > index e6495ca2630b..2098f8d4dfc5 100644 > --- a/drivers/gpu/drm/ttm/ttm_bo_vm.c > +++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c > @@ -173,7 +173,6 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault= *vmf, > pgoff_t num_prefault) > { > struct vm_area_struct *vma =3D vmf->vma; > - struct vm_area_struct cvma =3D *vma; > struct ttm_buffer_object *bo =3D vma->vm_private_data; > struct ttm_bo_device *bdev =3D bo->bdev; > unsigned long page_offset; > @@ -244,7 +243,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault= *vmf, > goto out_io_unlock; > } > =20 > - cvma.vm_page_prot =3D ttm_io_prot(bo->mem.placement, prot); > + prot =3D ttm_io_prot(bo->mem.placement, prot); > if (!bo->mem.bus.is_iomem) { > struct ttm_operation_ctx ctx =3D { > .interruptible =3D false, > @@ -260,7 +259,7 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fault= *vmf, > } > } else { > /* Iomem should not be marked encrypted */ > - cvma.vm_page_prot =3D pgprot_decrypted(cvma.vm_page_prot); > + prot =3D pgprot_decrypted(prot); > } > =20 > /* > @@ -284,10 +283,11 @@ vm_fault_t ttm_bo_vm_fault_reserved(struct vm_fau= lt *vmf, > } > =20 > if (vma->vm_flags & VM_MIXEDMAP) > - ret =3D vmf_insert_mixed(&cvma, address, > - __pfn_to_pfn_t(pfn, PFN_DEV)); > + ret =3D vmf_insert_mixed_prot(vma, address, > + __pfn_to_pfn_t(pfn, PFN_DEV), > + prot); > else > - ret =3D vmf_insert_pfn(&cvma, address, pfn); > + ret =3D vmf_insert_pfn_prot(vma, address, pfn, prot); > =20 > /* Never error on prefaulted PTEs */ > if (unlikely((ret & VM_FAULT_ERROR))) { > @@ -319,7 +319,7 @@ vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) > if (ret) > return ret; > =20 > - prot =3D vm_get_page_prot(vma->vm_flags); > + prot =3D vma->vm_page_prot; > ret =3D ttm_bo_vm_fault_reserved(vmf, prot, TTM_BO_VM_NUM_PREFAULT); > if (ret =3D=3D VM_FAULT_RETRY && !(vmf->flags & FAULT_FLAG_RETRY_NOW= AIT)) > return ret;