Commit 5d6a75a1 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Martin K. Petersen
Browse files

scsi: libsas: Add gfp_t flags parameter to event notifications 

All call-sites of below libsas APIs:

  - sas_alloc_event()
  - sas_notify_port_event()
  - sas_notify_phy_event()

have been converted to use the _gfp()-suffixed version.  Modify the
original APIs above to take a gfp_t flags parameter by default.

For bisectability, call-sites will be modified again to use the original
libsas APIs (while passing gfp_t). The temporary _gfp()-suffixed versions
can then be removed.

Link: https://lore.kernel.org/r/20210118100955.1761652-13-a.darwish@linutronix.de


Cc: Jason Yan <yanaijie@huawei.com>
Reviewed-by: default avatarJohn Garry <john.garry@huawei.com>
Signed-off-by: default avatarAhmed S. Darwish <a.darwish@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 26c7efc3

Documentation/scsi/libsas.rst

+2 −2
Original line number Diff line number Diff line
@@ -189,8 +189,8 @@ num_phys 
The event interface::



	/* LLDD calls these to notify the class of an event. */

	void sas_notify_port_event(struct sas_phy *, enum port_event);

	void sas_notify_phy_event(struct sas_phy *, enum phy_event);

	void sas_notify_port_event(struct sas_phy *, enum port_event, gfp_t);

	void sas_notify_phy_event(struct sas_phy *, enum phy_event, gfp_t);

	void sas_notify_port_event_gfp(struct sas_phy *, enum port_event, gfp_t);

	void sas_notify_phy_event_gfp(struct sas_phy *, enum phy_event, gfp_t);

drivers/scsi/libsas/sas_event.c

+18 −44
Original line number Diff line number Diff line
@@ -132,15 +132,19 @@ static void sas_phy_event_worker(struct work_struct *work) 
	sas_free_event(ev);

}



static int __sas_notify_port_event(struct asd_sas_phy *phy,

				   enum port_event event,

				   struct asd_sas_event *ev)

int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,

			  gfp_t gfp_flags)

{

	struct sas_ha_struct *ha = phy->ha;

	struct asd_sas_event *ev;

	int ret;



	BUG_ON(event >= PORT_NUM_EVENTS);



	ev = sas_alloc_event_gfp(phy, gfp_flags);

	if (!ev)

		return -ENOMEM;



	INIT_SAS_EVENT(ev, sas_port_event_worker, phy, event);



	ret = sas_queue_event(event, &ev->work, ha);
@@ -149,41 +153,28 @@ static int __sas_notify_port_event(struct asd_sas_phy *phy, 


	return ret;

}

EXPORT_SYMBOL_GPL(sas_notify_port_event);



int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event,

			      gfp_t gfp_flags)

{

	struct asd_sas_event *ev;



	ev = sas_alloc_event_gfp(phy, gfp_flags);

	if (!ev)

		return -ENOMEM;



	return __sas_notify_port_event(phy, event, ev);

	return sas_notify_port_event(phy, event, gfp_flags);

}

EXPORT_SYMBOL_GPL(sas_notify_port_event_gfp);



int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event)

{

	struct asd_sas_event *ev;



	ev = sas_alloc_event(phy);

	if (!ev)

		return -ENOMEM;



	return __sas_notify_port_event(phy, event, ev);

}

EXPORT_SYMBOL_GPL(sas_notify_port_event);



static inline int __sas_notify_phy_event(struct asd_sas_phy *phy,

					 enum phy_event event,

					 struct asd_sas_event *ev)

int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t gfp_flags)

{

	struct sas_ha_struct *ha = phy->ha;

	struct asd_sas_event *ev;

	int ret;



	BUG_ON(event >= PHY_NUM_EVENTS);



	ev = sas_alloc_event_gfp(phy, gfp_flags);

	if (!ev)

		return -ENOMEM;



	INIT_SAS_EVENT(ev, sas_phy_event_worker, phy, event);



	ret = sas_queue_event(event, &ev->work, ha);
@@ -192,28 +183,11 @@ static inline int __sas_notify_phy_event(struct asd_sas_phy *phy, 


	return ret;

}

EXPORT_SYMBOL_GPL(sas_notify_phy_event);



int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,

			     gfp_t gfp_flags)

{

	struct asd_sas_event *ev;



	ev = sas_alloc_event_gfp(phy, gfp_flags);

	if (!ev)

		return -ENOMEM;



	return __sas_notify_phy_event(phy, event, ev);

	return sas_notify_phy_event(phy, event, gfp_flags);

}

EXPORT_SYMBOL_GPL(sas_notify_phy_event_gfp);
 


int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event)

{

	struct asd_sas_event *ev;



	ev = sas_alloc_event(phy);

	if (!ev)

		return -ENOMEM;



	return __sas_notify_phy_event(phy, event, ev);

}

EXPORT_SYMBOL_GPL(sas_notify_phy_event);

drivers/scsi/libsas/sas_init.c

+4 −8
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ sas_domain_attach_transport(struct sas_domain_function_template *dft) 
}

EXPORT_SYMBOL_GPL(sas_domain_attach_transport);



static struct asd_sas_event *__sas_alloc_event(struct asd_sas_phy *phy,

struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy,

				      gfp_t gfp_flags)

{

	struct asd_sas_event *event;
@@ -619,15 +619,11 @@ static struct asd_sas_event *__sas_alloc_event(struct asd_sas_phy *phy, 
	return event;

}



struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy)

{

	return __sas_alloc_event(phy, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);

}



struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy,

					  gfp_t gfp_flags)

{

	return __sas_alloc_event(phy, gfp_flags);



	return sas_alloc_event(phy, gfp_flags);

}



void sas_free_event(struct asd_sas_event *event)

drivers/scsi/libsas/sas_internal.h

+3 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int sas_show_oob_mode(enum sas_oob_mode oob_mode, char *buf); 
int  sas_register_phys(struct sas_ha_struct *sas_ha);

void sas_unregister_phys(struct sas_ha_struct *sas_ha);



struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy);

struct asd_sas_event *sas_alloc_event(struct asd_sas_phy *phy, gfp_t gfp_flags);

struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy,

					  gfp_t gfp_flags);

void sas_free_event(struct asd_sas_event *event);
@@ -78,7 +78,8 @@ int sas_smp_phy_control(struct domain_device *dev, int phy_id, 
			enum phy_func phy_func, struct sas_phy_linkrates *);

int sas_smp_get_phy_events(struct sas_phy *phy);



int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event);

int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t flags);

int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,

			     gfp_t flags);

void sas_device_set_phy(struct domain_device *dev, struct sas_port *port);

include/scsi/libsas.h

+4 −2
Original line number Diff line number Diff line
@@ -702,8 +702,10 @@ struct sas_phy *sas_get_local_phy(struct domain_device *dev); 


int sas_request_addr(struct Scsi_Host *shost, u8 *addr);



int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event);

int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event);

int sas_notify_port_event(struct asd_sas_phy *phy, enum port_event event,

			  gfp_t gfp_flags);

int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event,

			 gfp_t gfp_flags);

int sas_notify_port_event_gfp(struct asd_sas_phy *phy, enum port_event event,

			      gfp_t gfp_flags);

int sas_notify_phy_event_gfp(struct asd_sas_phy *phy, enum phy_event event,