On 12/08/2017 10:42 AM, Jason Yan wrote:
> There are two places queuing the disco event DISCE_REVALIDATE_DOMAIN.
> One is in sas_porte_broadcast_rcvd() and uses sas_chain_event() to queue
> the event. The other is in sas_enable_revalidation() and uses
> sas_queue_event() to queue the event. We have diffrent work queues for
> event and discovery now, so the DISCE_REVALIDATE_DOMAIN event may be
> processed in both event queue and discovery queue.
>
> Now since we do synchronous event handling, we cannot do it in discovery
> queue, so have to trigger a fake broadcast event to re-trigger the
> revalidation from event queue.
>
> Signed-off-by: Jason Yan
> CC: John Garry
> CC: Johannes Thumshirn
> CC: Ewan Milne
> CC: Christoph Hellwig
> CC: Tomas Henzl
> CC: Dan Williams
> ---
> drivers/scsi/libsas/sas_event.c | 8 +++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c
> index 8c82c00..ae923eb 100644
> --- a/drivers/scsi/libsas/sas_event.c
> +++ b/drivers/scsi/libsas/sas_event.c
> @@ -116,11 +116,17 @@ void sas_enable_revalidation(struct sas_ha_struct *ha)
> struct asd_sas_port *port = ha->sas_port[i];
> const int ev = DISCE_REVALIDATE_DOMAIN;
> struct sas_discovery *d = >disc;
> + struct asd_sas_phy *sas_phy;
>
> if (!test_and_clear_bit(ev, >pending))
> continue;
>
> - sas_queue_event(ev, >disc_work[ev].work, ha);
> + if (list_empty(>phy_list))
> + continue;
> +
> + sas_phy = container_of(port->phy_list.next, struct asd_sas_phy,
> + port_phy_el);
> + ha->notify_port_event(sas_phy, PORTE_BROADCAST_RCVD);
> }
> mutex_unlock(>disco_mutex);
> }
>
Reviewed-by: Hannes Reinecke
Cheers,
Hannes
--
Dr. Hannes ReineckeTeamlead Storage & Networking
h...@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)