From: "Xue, Ken" <Ken.Xue@amd.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "mlin@kernel.org" <mlin@kernel.org>,
        "stern@rowland.harvard.edu" <stern@rowland.harvard.edu>
CC: "linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
        "Huang, Shane" <Shane.Huang@amd.com>,
        SPG_Linux_Kernel <SPG_Linux_Kernel@amd.com>,
        "aaron.lu@intel.com" <aaron.lu@intel.com>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "JBottomley@Odin.com" <JBottomley@Odin.com>,
        "Yu, Xiangliang" <Xiangliang.Yu@amd.com>
Subject: Re: [PATCH 1/2]Revert "SCSI: Fix NULL pointer dereference in runtime
 PM"
Thread-Topic: [PATCH 1/2]Revert "SCSI: Fix NULL pointer dereference in runtime
 PM"
Thread-Index: AQHQ63BCA7/13Dg28U6T33jd/fZwZp6vqPgA
Date: Fri, 27 Nov 2015 03:01:42 +0000
Message-ID: <1448593294.3216.11.camel@amd.com>
References: <1441782131.5845.73.camel@kxue-X58A-UD3R>
	 <1441851826.5845.105.camel@kxue-X58A-UD3R>
In-Reply-To: <1441851826.5845.105.camel@kxue-X58A-UD3R>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="utf-8"
Content-ID: <029AFC1A769E5C49A22524F5EDBF8032@namprd12.prod.outlook.com>
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Nov 2015 03:01:43.0001
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0430
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Transfer-Encoding: 8bit
X-MIME-Autoconverted: from base64 to 8bit by mail.home.local id tAR3GHFK006180
Content-Length: 2501
Lines: 75

On 四, 2015-09-10 at 10:23 +0800, Ken Xue wrote:

Can someone help to apply this patch series? Thanks.
http://marc.info/?l=linux-scsi&m=144185206825609&w=2
http://marc.info/?l=linux-scsi&m=144185208525611&w=2 

> Revert "SCSI: Fix NULL pointer dereference in runtime PM"
> 
> This reverts commit 49718f0fb8c9 ("SCSI: Fix NULL pointer dereference
> in
> runtime PM")
> 
> The old commit may lead to a issue that
> blk_{pre|post}_runtime_suspend and
> blk_{pre|post}_runtime_resume can not be called in pairs.
> 
> Take sr device as example, when sr device goes to runtime suspend, 
> blk_{pre|post}_runtime_suspend will be called since sr device defined
> pm->runtime_suspend. But blk_{pre|post}_runtime_resume will not be
> called
> since sr device doesn't have pm->runtime_resume. Then sr device can
> not
> resume correctly anymore.
> 
> Signed-off-by: Ken Xue <Ken.Xue@amd.com>
> Acked-by: Alan Stern <stern@rowland.harvard.edu>
> Cc: stable@vger.kernel.org
> 
> ---
>  drivers/scsi/scsi_pm.c | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/scsi/scsi_pm.c b/drivers/scsi/scsi_pm.c
> index e4b7998..459abe1 100644
> --- a/drivers/scsi/scsi_pm.c
> +++ b/drivers/scsi/scsi_pm.c
> @@ -219,13 +219,13 @@ static int sdev_runtime_suspend(struct device
> *dev)
>  	struct scsi_device *sdev = to_scsi_device(dev);
>  	int err = 0;
>  
> -	if (pm && pm->runtime_suspend) {
> -		err = blk_pre_runtime_suspend(sdev->request_queue);
> -		if (err)
> -			return err;
> +	err = blk_pre_runtime_suspend(sdev->request_queue);
> +	if (err)
> +		return err;
> +	if (pm && pm->runtime_suspend)
>  		err = pm->runtime_suspend(dev);
> -		blk_post_runtime_suspend(sdev->request_queue, err);
> -	}
> +	blk_post_runtime_suspend(sdev->request_queue, err);
> +
>  	return err;
>  }
>  
> @@ -248,11 +248,11 @@ static int sdev_runtime_resume(struct device
> *dev)
>  	const struct dev_pm_ops *pm = dev->driver ? dev->driver->pm
> : NULL;
>  	int err = 0;
>  
> -	if (pm && pm->runtime_resume) {
> -		blk_pre_runtime_resume(sdev->request_queue);
> +	blk_pre_runtime_resume(sdev->request_queue);
> +	if (pm && pm->runtime_resume)
>  		err = pm->runtime_resume(dev);
> -		blk_post_runtime_resume(sdev->request_queue, err);
> -	}
> +	blk_post_runtime_resume(sdev->request_queue, err);
> +
>  	return err;
>  }
>  ????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay?ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m????????????I?