From: John Garry <john.garry@huawei.com>
To: "Ahmed S. Darwish" <a.darwish@linutronix.de>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
Daniel Wagner <dwagner@suse.de>, Jason Yan <yanaijie@huawei.com>,
"Artur Paszkiewicz" <artur.paszkiewicz@intel.com>,
Jack Wang <jinpu.wang@cloud.ionos.com>
Cc: <linux-scsi@vger.kernel.org>, LKML <linux-kernel@vger.kernel.org>,
"Thomas Gleixner" <tglx@linutronix.de>,
"Sebastian A. Siewior" <bigeasy@linutronix.de>
Subject: Re: [PATCH 11/11] scsi: libsas: event notifiers: Remove non _gfp() variants
Date: Mon, 21 Dec 2020 17:17:13 +0000 [thread overview]
Message-ID: <68957d37-c789-0f0e-f5d1-85fef7f39f4f@huawei.com> (raw)
In-Reply-To: <20201218204354.586951-12-a.darwish@linutronix.de>
On 18/12/2020 20:43, Ahmed S. Darwish wrote:
> All call-sites of below libsas APIs:
>
> - sas_alloc_event()
> - sas_ha_struct::notify_port_event()
> - sas_ha_struct::notify_phy_event()
>
> have been converted to use the new _gfp()-suffixed version.
>
nit: Is it possible to have non- _gfp()-suffixed symbols at the end,
i.e. have same as original?
Thanks,
John
> Remove the old APIs from libsas code, headers, and documentation.
>
> Signed-off-by: Ahmed S. Darwish <a.darwish@linutronix.de>
> Cc: John Garry <john.garry@huawei.com>
> Cc: Jason Yan <yanaijie@huawei.com>
> ---
> Documentation/scsi/libsas.rst | 2 -
> drivers/scsi/libsas/sas_event.c | 72 +++++++-----------------------
> drivers/scsi/libsas/sas_init.c | 15 +------
> drivers/scsi/libsas/sas_internal.h | 2 -
> include/scsi/libsas.h | 2 -
> 5 files changed, 18 insertions(+), 75 deletions(-)
>
> diff --git a/Documentation/scsi/libsas.rst b/Documentation/scsi/libsas.rst
> index dc85d0e4c107..7e1bf710760b 100644
> --- a/Documentation/scsi/libsas.rst
> +++ b/Documentation/scsi/libsas.rst
> @@ -189,8 +189,6 @@ num_phys
> The event interface::
>
> /* LLDD calls these to notify the class of an event. */
> - void (*notify_port_event)(struct sas_phy *, enum port_event);
> - void (*notify_phy_event)(struct sas_phy *, enum phy_event);
> void (*notify_port_event_gfp)(struct sas_phy *, enum port_event, gfp_t);
> void (*notify_phy_event_gfp)(struct sas_phy *, enum phy_event, gfp_t);
>
> diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c
> index 31b733eeabf6..23aeb67f6381 100644
> --- a/drivers/scsi/libsas/sas_event.c
> +++ b/drivers/scsi/libsas/sas_event.c
> @@ -131,57 +131,21 @@ 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)
> -{
> - struct sas_ha_struct *ha = phy->ha;
> - int ret;
> -
> - BUG_ON(event >= PORT_NUM_EVENTS);
> -
> - INIT_SAS_EVENT(ev, sas_port_event_worker, phy, event);
> -
> - ret = sas_queue_event(event, &ev->work, ha);
> - if (ret != 1)
> - sas_free_event(ev);
> -
> - return ret;
> -}
> -
> static 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);
> -}
> -
> -static 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);
> -}
> -
> -static inline int __sas_notify_phy_event(struct asd_sas_phy *phy,
> - enum phy_event event,
> - struct asd_sas_event *ev)
> {
> struct sas_ha_struct *ha = phy->ha;
> + struct asd_sas_event *ev;
> int ret;
>
> - BUG_ON(event >= PHY_NUM_EVENTS);
> + BUG_ON(event >= PORT_NUM_EVENTS);
>
> - INIT_SAS_EVENT(ev, sas_phy_event_worker, phy, event);
> + 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);
> if (ret != 1)
> @@ -193,31 +157,27 @@ static inline int __sas_notify_phy_event(struct asd_sas_phy *phy,
> int sas_notify_phy_event_gfp(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;
>
> - return __sas_notify_phy_event(phy, event, ev);
> -}
> + INIT_SAS_EVENT(ev, sas_phy_event_worker, phy, event);
>
> -int sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event)
> -{
> - struct asd_sas_event *ev;
> + ret = sas_queue_event(event, &ev->work, ha);
> + if (ret != 1)
> + sas_free_event(ev);
>
> - ev = sas_alloc_event(phy);
> - if (!ev)
> - return -ENOMEM;
> -
> - return __sas_notify_phy_event(phy, event, ev);
> + return ret;
> }
>
> int sas_init_events(struct sas_ha_struct *sas_ha)
> {
> - sas_ha->notify_port_event = sas_notify_port_event;
> - sas_ha->notify_phy_event = sas_notify_phy_event;
> -
> sas_ha->notify_port_event_gfp = sas_notify_port_event_gfp;
> sas_ha->notify_phy_event_gfp = sas_notify_phy_event_gfp;
>
> diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
> index 2d2116f827c6..e08351f909fb 100644
> --- a/drivers/scsi/libsas/sas_init.c
> +++ b/drivers/scsi/libsas/sas_init.c
> @@ -590,8 +590,8 @@ 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,
> - gfp_t gfp_flags)
> +struct asd_sas_event *sas_alloc_event_gfp(struct asd_sas_phy *phy,
> + gfp_t gfp_flags)
> {
> struct asd_sas_event *event;
> struct sas_ha_struct *sas_ha = phy->ha;
> @@ -623,17 +623,6 @@ 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);
> -}
> -
> void sas_free_event(struct asd_sas_event *event)
> {
> struct asd_sas_phy *phy = event->phy;
> diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
> index 437a697b6f73..b0422d47675b 100644
> --- a/drivers/scsi/libsas/sas_internal.h
> +++ b/drivers/scsi/libsas/sas_internal.h
> @@ -48,7 +48,6 @@ 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_gfp(struct asd_sas_phy *phy, gfp_t gfp_flags);
> void sas_free_event(struct asd_sas_event *event);
>
> @@ -78,7 +77,6 @@ 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_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);
> struct domain_device *sas_find_dev_by_rphy(struct sas_rphy *rphy);
> diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
> index f7c2530bbd9d..fdd338fa65c9 100644
> --- a/include/scsi/libsas.h
> +++ b/include/scsi/libsas.h
> @@ -392,8 +392,6 @@ struct sas_ha_struct {
> * their siblings when forming wide ports */
>
> /* LLDD calls these to notify the class of an event. */
> - int (*notify_port_event)(struct asd_sas_phy *, enum port_event);
> - int (*notify_phy_event)(struct asd_sas_phy *, enum phy_event);
> int (*notify_port_event_gfp)(struct asd_sas_phy *, enum port_event, gfp_t);
> int (*notify_phy_event_gfp)(struct asd_sas_phy *, enum phy_event, gfp_t);
>
>
next prev parent reply other threads:[~2020-12-21 17:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-18 20:43 [PATCH 00/11] scsi: libsas: Remove in_interrupt() check Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 01/11] Documentation: scsi: libsas: Remove notify_ha_event() Ahmed S. Darwish
2020-12-21 9:10 ` John Garry
2020-12-18 20:43 ` [PATCH 02/11] scsi: libsas: Introduce a _gfp() variant of event notifiers Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 03/11] scsi: mvsas: Pass gfp_t flags to libsas " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 04/11] scsi: isci: port: link down: Pass gfp_t flags Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 05/11] scsi: isci: port: link up: " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 06/11] scsi: isci: port: broadcast change: " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 07/11] scsi: libsas: Pass gfp_t flags to event notifiers Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 08/11] scsi: pm80xx: Pass gfp_t flags to libsas " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 09/11] scsi: aic94xx: " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 10/11] scsi: hisi_sas: " Ahmed S. Darwish
2020-12-18 20:43 ` [PATCH 11/11] scsi: libsas: event notifiers: Remove non _gfp() variants Ahmed S. Darwish
2020-12-21 17:17 ` John Garry [this message]
2020-12-21 17:38 ` Ahmed S. Darwish
2020-12-21 10:13 ` [PATCH 00/11] scsi: libsas: Remove in_interrupt() check John Garry
2020-12-22 12:30 ` Jason Yan
2020-12-22 12:54 ` John Garry
2021-01-11 13:43 ` Ahmed S. Darwish
2021-01-11 13:59 ` John Garry
2021-01-11 14:28 ` Ahmed S. Darwish
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=68957d37-c789-0f0e-f5d1-85fef7f39f4f@huawei.com \
--to=john.garry@huawei.com \
--cc=a.darwish@linutronix.de \
--cc=artur.paszkiewicz@intel.com \
--cc=bigeasy@linutronix.de \
--cc=dwagner@suse.de \
--cc=jejb@linux.ibm.com \
--cc=jinpu.wang@cloud.ionos.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=tglx@linutronix.de \
--cc=yanaijie@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).