Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752895AbcLNAAO (ORCPT ); Tue, 13 Dec 2016 19:00:14 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41164 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751905AbcLNAAL (ORCPT ); Tue, 13 Dec 2016 19:00:11 -0500 Subject: Re: [PATCH 4.4 01/16] powerpc/eeh: Fix deadlock when PE frozen state cant be cleared To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org References: <20161213171518.862135257@linuxfoundation.org> <20161213171519.044222027@linuxfoundation.org> Cc: stable@vger.kernel.org, Pradipta Ghosh , Russell Currey , Michael Ellerman From: Andrew Donnellan Date: Wed, 14 Dec 2016 10:59:32 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.5.1 MIME-Version: 1.0 In-Reply-To: <20161213171519.044222027@linuxfoundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16121323-0040-0000-0000-000002D6DB5C X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16121323-0041-0000-0000-00000BE0EA2B Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-12-13_15:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1612130360 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1339 Lines: 34 On 14/12/16 04:15, Greg Kroah-Hartman wrote: > 4.4-stable review patch. If anyone has any objections, please let me know. > > ------------------ > > From: Andrew Donnellan > > commit 409bf7f8a02ef88db5a0f2cdcf9489914f4b8508 upstream. > > In eeh_reset_device(), we take the pci_rescan_remove_lock immediately after > after we call eeh_reset_pe() to reset the PCI controller. We then call > eeh_clear_pe_frozen_state(), which can return an error. In this case, we > bail out of eeh_reset_device() without calling pci_unlock_rescan_remove(). > > Add a call to pci_unlock_rescan_remove() in the eeh_clear_pe_frozen_state() > error path so that we don't cause a deadlock later on. > > Reported-by: Pradipta Ghosh > Fixes: 78954700631f ("powerpc/eeh: Avoid I/O access during PE reset") > Signed-off-by: Andrew Donnellan > Acked-by: Russell Currey > Signed-off-by: Michael Ellerman > Signed-off-by: Greg Kroah-Hartman It seems that something in your scripts munged the apostrophe in the summary line when generating these emails. Though it looks fine in the actual tree. Andrew -- Andrew Donnellan OzLabs, ADL Canberra andrew.donnellan@au1.ibm.com IBM Australia Limited