Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6029843ybc; Wed, 27 Nov 2019 13:42:30 -0800 (PST) X-Google-Smtp-Source: APXvYqz8WIMiT9TmT2DEfcrKAy2syqcsZ/06MiWactC+auA1M/JXX0lTSin6XsnGMlB4QOINEHlx X-Received: by 2002:a50:ac81:: with SMTP id x1mr33961394edc.200.1574890950705; Wed, 27 Nov 2019 13:42:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574890950; cv=none; d=google.com; s=arc-20160816; b=liOWU+zaoOBJaL7DxC4O4eTvCNa9uvEaHjXLIXG6KZuKan3a1QWIK0X7LAjGrESC2T xDW/AIAdPkf1STYfolMod3BZQAU8kfelLhOjYUmHcClgCfqe6TAbHs7Uw3uSQb4wR8ar Eaqu6wSzF8Zm69D9oKWf3aOe76MPC66wXikokdKzYW94g07DYHb2o12CEvdesU+M7HGE gAKoEM6y/Xe4Ag9JHrXLfyKpXCK1vxwfcjFmU1TyQ70MEy04SEjkFhvV+n4wLMM7hjCF 5bbTKazzGlnaggz4kA92jyooTKGmM2bZYd9RDFSNiA35UkMu6mG5kXzlcxWidvWPfbvn AVKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4orBHnnIjh+AgOXFlSfft8OJph8fyqXRYYdZrYoxdK8=; b=bc3DJH1MLN3xPdrRXssz8GB6CVmVA5FXbDEu8aL1LXSEOKvdSlkXmTbt1U7dyNpL9z /ieeYFK7iXsyTkBS6yLH6AAX/tX4Wc5aRfnUTFA1+FbxVLJtP37vR6vYPUcN/m/NkIC8 NyWgws0toQWm7JIFgtIvBgUidJP7lPcQiHhmQy/7g31yRoE25UPQaEcYYj7w7L9awO3P x8sXgomY+G7Dmi8FeuXTECn0ilD3wKjYoe6SSPXgluGfiCjzRGyOx7bhS+IlwCKymp7p 8xVckqzOCqZ8Pe65nDcrsBnZjlkpzwCo4ptYxiYhKgCFYxmYX15vPr/QmXk1AKwFtHo4 m2Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=aggL7dHG; 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 f17si10066154eja.153.2019.11.27.13.42.07; Wed, 27 Nov 2019 13:42:30 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=aggL7dHG; 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 S1729516AbfK0Vhx (ORCPT + 99 others); Wed, 27 Nov 2019 16:37:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:58130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729326AbfK0UqT (ORCPT ); Wed, 27 Nov 2019 15:46:19 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E2F13217D6; Wed, 27 Nov 2019 20:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887578; bh=YZYsr2hwbyZiAUpsBrpZ9jak9+BSvF9xRBuWHDifUMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aggL7dHGDq6sYrEANcXK+nUtVwOX1NM5LskVDhdMGeQGy9isFd6PLDSJgZy7CbEiS nx93mZdoU7eG97BP4Y9axVSuXwMjkyP6JhD4Ku7ywyZ7HegLXcsrONCsWTYZ+tJPMW dKm57ms5cQPLn1KvEwBB5USflGJIzqsf2ZAWgVzM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Wilson , Lionel Landwerlin , Tvrtko Ursulin , Joonas Lahtinen , Rodrigo Vivi Subject: [PATCH 4.14 014/211] drm/i915/userptr: Try to acquire the page lock around set_page_dirty() Date: Wed, 27 Nov 2019 21:29:07 +0100 Message-Id: <20191127203051.824199232@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203049.431810767@linuxfoundation.org> References: <20191127203049.431810767@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chris Wilson commit 2d691aeca4aecbb8d0414a777a46981a8e142b05 upstream. set_page_dirty says: For pages with a mapping this should be done under the page lock for the benefit of asynchronous memory errors who prefer a consistent dirty state. This rule can be broken in some special cases, but should be better not to. Under those rules, it is only safe for us to use the plain set_page_dirty calls for shmemfs/anonymous memory. Userptr may be used with real mappings and so needs to use the locked version (set_page_dirty_lock). However, following a try_to_unmap() we may want to remove the userptr and so call put_pages(). However, try_to_unmap() acquires the page lock and so we must avoid recursively locking the pages ourselves -- which means that we cannot safely acquire the lock around set_page_dirty(). Since we can't be sure of the lock, we have to risk skip dirtying the page, or else risk calling set_page_dirty() without a lock and so risk fs corruption. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=203317 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=112012 Fixes: 5cc9ed4b9a7a ("drm/i915: Introduce mapping of user pages into video memory (userptr) ioctl") Signed-off-by: Chris Wilson Cc: Lionel Landwerlin Cc: Tvrtko Ursulin Cc: Joonas Lahtinen Cc: stable@vger.kernel.org Reviewed-by: Tvrtko Ursulin Link: https://patchwork.freedesktop.org/patch/msgid/20191111133205.11590-1-chris@chris-wilson.co.uk (cherry picked from commit 0d4bbe3d407f79438dc4f87943db21f7134cfc65) Signed-off-by: Joonas Lahtinen (cherry picked from commit cee7fb437edcdb2f9f8affa959e274997f5dca4d) Signed-off-by: Rodrigo Vivi Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_gem_userptr.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -690,8 +690,28 @@ i915_gem_userptr_put_pages(struct drm_i9 i915_gem_gtt_finish_pages(obj, pages); for_each_sgt_page(page, sgt_iter, pages) { - if (obj->mm.dirty) + if (obj->mm.dirty && trylock_page(page)) { + /* + * As this may not be anonymous memory (e.g. shmem) + * but exist on a real mapping, we have to lock + * the page in order to dirty it -- holding + * the page reference is not sufficient to + * prevent the inode from being truncated. + * Play safe and take the lock. + * + * However...! + * + * The mmu-notifier can be invalidated for a + * migrate_page, that is alreadying holding the lock + * on the page. Such a try_to_unmap() will result + * in us calling put_pages() and so recursively try + * to lock the page. We avoid that deadlock with + * a trylock_page() and in exchange we risk missing + * some page dirtying. + */ set_page_dirty(page); + unlock_page(page); + } mark_page_accessed(page); put_page(page);