Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit edcb7efd authored by Kai-Heng Feng's avatar Kai-Heng Feng Committed by Greg Kroah-Hartman
Browse files

libata: Use per port sync for detach 



[ Upstream commit b5292111de9bb70cba3489075970889765302136 ]

Commit 130f4caf145c ("libata: Ensure ata_port probe has completed before
detach") may cause system freeze during suspend.

Using async_synchronize_full() in PM callbacks is wrong, since async
callbacks that are already scheduled may wait for not-yet-scheduled
callbacks, causes a circular dependency.

Instead of using big hammer like async_synchronize_full(), use async
cookie to make sure port probe are synced, without affecting other
scheduled PM callbacks.

Fixes: 130f4caf145c ("libata: Ensure ata_port probe has completed before detach")
Suggested-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarKai-Heng Feng <kai.heng.feng@canonical.com>
Tested-by: default avatarJohn Garry <john.garry@huawei.com>
BugLink: https://bugs.launchpad.net/bugs/1867983


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a39340ab

drivers/ata/libata-core.c

+5 −6
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ 
#include <linux/workqueue.h>

#include <linux/scatterlist.h>

#include <linux/io.h>

#include <linux/async.h>

#include <linux/log2.h>

#include <linux/slab.h>

#include <linux/glob.h>
@@ -6610,7 +6609,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht) 
	/* perform each probe asynchronously */

	for (i = 0; i < host->n_ports; i++) {

		struct ata_port *ap = host->ports[i];

		async_schedule(async_port_probe, ap);

		ap->cookie = async_schedule(async_port_probe, ap);

	}



	return 0;
@@ -6750,11 +6749,11 @@ void ata_host_detach(struct ata_host *host) 
{

	int i;



	for (i = 0; i < host->n_ports; i++) {

		/* Ensure ata_port probe has completed */

	async_synchronize_full();



	for (i = 0; i < host->n_ports; i++)

		async_synchronize_cookie(host->ports[i]->cookie + 1);

		ata_port_detach(host->ports[i]);

	}



	/* the host is dead now, dissociate ACPI */

	ata_acpi_dissociate(host);

include/linux/libata.h

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/acpi.h>

#include <linux/cdrom.h>

#include <linux/sched.h>

#include <linux/async.h>



/*

 * Define if arch has non-standard setup.  This is a _PCI_ standard
@@ -887,6 +888,8 @@ struct ata_port { 
	struct timer_list	fastdrain_timer;

	unsigned long		fastdrain_cnt;



	async_cookie_t		cookie;



	int			em_message_type;

	void			*private_data;