Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755297Ab0GIW4E (ORCPT ); Fri, 9 Jul 2010 18:56:04 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:42343 "EHLO e37.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753636Ab0GIW4B (ORCPT ); Fri, 9 Jul 2010 18:56:01 -0400 Message-ID: <4C37A8FA.2020607@us.ibm.com> Date: Fri, 09 Jul 2010 15:55:54 -0700 From: Darren Hart User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100528 Thunderbird/3.0.5 MIME-Version: 1.0 To: Darren Hart CC: linux-kernel@vger.kernel.org, Thomas Gleixner , Peter Zijlstra , Ingo Molnar , Eric Dumazet , John Kacur , Steven Rostedt , Mike Galbraith , linux-rt-users@vger.kernel.org Subject: Re: [PATCH 3/4 V2] futex: free_pi_state outside of hb->lock sections References: <1278714780-788-1-git-send-email-dvhltc@us.ibm.com> <1278714780-788-4-git-send-email-dvhltc@us.ibm.com> In-Reply-To: <1278714780-788-4-git-send-email-dvhltc@us.ibm.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1810 Lines: 66 Apologies, mangled a rebase and this patch had bits of 4/4 in it. Corrected below: >From f40b8e684df6ed2b1ba9167cad3922ab43f4a717 Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Fri, 9 Jul 2010 17:07:10 -0400 Subject: [PATCH 3/4 V2] futex: free_pi_state outside of hb->lock sections free_pi_state() calls kfree() and might sleep. To prepare for raw hb->locks, get the calls to free_pi_state() out of the hb->lock() sections. Signed-off-by: Darren Hart Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Eric Dumazet Cc: John Kacur Cc: Steven Rostedt Cc: Mike Galbraith --- kernel/futex.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kernel/futex.c b/kernel/futex.c index a6cec32..2cd58a2 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1339,7 +1339,6 @@ retry_private: } else if (ret) { /* -EDEADLK */ this->pi_state = NULL; - free_pi_state(pi_state); goto out_unlock; } } @@ -1483,16 +1482,19 @@ retry: */ static void unqueue_me_pi(struct futex_q *q) { + struct futex_pi_state *pi_state = NULL; + WARN_ON(plist_node_empty(&q->list)); plist_del(&q->list, &q->list.plist); BUG_ON(!q->pi_state); - free_pi_state(q->pi_state); + pi_state = q->pi_state; q->pi_state = NULL; spin_unlock(q->lock_ptr); - drop_futex_key_refs(&q->key); + + free_pi_state(pi_state); } /* -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/