From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938581AbcKNCdT (ORCPT ); Sun, 13 Nov 2016 21:33:19 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:47330 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933209AbcKNCdM (ORCPT ); Sun, 13 Nov 2016 21:33:12 -0500 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Rob Clark" Date: Mon, 14 Nov 2016 00:14:20 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 227/346] drm/msm: use mutex_lock_interruptible for submit ioctl In-Reply-To: X-SA-Exim-Connect-IP: 2a02:8011:400e:2:6f00:88c8:c921:d332 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.39-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Rob Clark commit b5b4c264df4d270819676b290cef9a11d04c35f0 upstream. Be kinder to things that do lots of signal handling (ie. Xorg) Signed-off-by: Rob Clark [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings --- --- a/drivers/gpu/drm/msm/msm_gem_submit.c +++ b/drivers/gpu/drm/msm/msm_gem_submit.c @@ -339,12 +339,14 @@ int msm_ioctl_gem_submit(struct drm_devi if (args->nr_cmds > MAX_CMDS) return -EINVAL; - mutex_lock(&dev->struct_mutex); + ret = mutex_lock_interruptible(&dev->struct_mutex); + if (ret) + return ret; submit = submit_create(dev, gpu, args->nr_bos); if (!submit) { ret = -ENOMEM; - goto out; + goto out_unlock; } ret = submit_lookup_objects(submit, args, file); @@ -422,6 +424,7 @@ int msm_ioctl_gem_submit(struct drm_devi out: if (submit) submit_cleanup(submit, !!ret); +out_unlock: mutex_unlock(&dev->struct_mutex); return ret; }