From: Yi Zhang <yi.zhang@redhat.com>
To: Ming Lei <ming.lei@redhat.com>
Cc: "Martin K . Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org, Changhui Zhong <czhong@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Subject: Re: [PATCH V3] scsi: core: put LLD module refcnt after SCSI device is released
Date: Tue, 5 Oct 2021 11:07:35 +0800 [thread overview]
Message-ID: <CAHj4cs9QMLhnaf_tZF2ypVeEJmAXpHN9c9YsUjKDUbM5rrixfw@mail.gmail.com> (raw)
In-Reply-To: <20210930124415.1160754-1-ming.lei@redhat.com>
Tested-by: Yi Zhang <yi.zhang@redhat.com>
This patch fixed one panic issue which I found on s390x with blktests srp tests.
https://lore.kernel.org/linux-block/CAHj4cs8XNtkzbbiLnFmVu82wYeQpLkVp6_wCtrnbhODay+OP9w@mail.gmail.com/#t
On Thu, Sep 30, 2021 at 8:44 PM Ming Lei <ming.lei@redhat.com> wrote:
>
> SCSI host release is triggered when SCSI device is freed, and we have to
> make sure that LLD module won't be unloaded before SCSI host instance is
> released because shost->hostt is required in host release handler.
>
> So make sure to put LLD module refcnt after SCSI device is released.
>
> Fix one kernel panic of 'BUG: unable to handle page fault for address'
> reported by Changhui and Yi.
>
> Reported-by: Changhui Zhong <czhong@redhat.com>
> Reported-by: Yi Zhang <yi.zhang@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
> drivers/scsi/scsi.c | 4 +++-
> drivers/scsi/scsi_sysfs.c | 12 ++++++++++++
> include/scsi/scsi_device.h | 1 +
> 3 files changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
> index b241f9e3885c..291ecc33b1fe 100644
> --- a/drivers/scsi/scsi.c
> +++ b/drivers/scsi/scsi.c
> @@ -553,8 +553,10 @@ EXPORT_SYMBOL(scsi_device_get);
> */
> void scsi_device_put(struct scsi_device *sdev)
> {
> - module_put(sdev->host->hostt->module);
> + struct module *mod = sdev->host->hostt->module;
> +
> put_device(&sdev->sdev_gendev);
> + module_put(mod);
> }
> EXPORT_SYMBOL(scsi_device_put);
>
> diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
> index 86793259e541..9ada26814011 100644
> --- a/drivers/scsi/scsi_sysfs.c
> +++ b/drivers/scsi/scsi_sysfs.c
> @@ -449,9 +449,16 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
> struct scsi_vpd *vpd_pg80 = NULL, *vpd_pg83 = NULL;
> struct scsi_vpd *vpd_pg0 = NULL, *vpd_pg89 = NULL;
> unsigned long flags;
> + struct module *mod;
> + bool put_mod = false;
>
> sdev = container_of(work, struct scsi_device, ew.work);
>
> + if (sdev->put_lld_mod_ref) {
> + mod = sdev->host->hostt->module;
> + put_mod = true;
> + }
> +
> scsi_dh_release_device(sdev);
>
> parent = sdev->sdev_gendev.parent;
> @@ -502,11 +509,16 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
>
> if (parent)
> put_device(parent);
> + if (put_mod)
> + module_put(mod);
> }
>
> static void scsi_device_dev_release(struct device *dev)
> {
> struct scsi_device *sdp = to_scsi_device(dev);
> +
> + sdp->put_lld_mod_ref = try_module_get(sdp->host->hostt->module);
> +
> execute_in_process_context(scsi_device_dev_release_usercontext,
> &sdp->ew);
> }
> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
> index 430b73bd02ac..54b46d590e2d 100644
> --- a/include/scsi/scsi_device.h
> +++ b/include/scsi/scsi_device.h
> @@ -206,6 +206,7 @@ struct scsi_device {
> unsigned rpm_autosuspend:1; /* Enable runtime autosuspend at device
> * creation time */
> unsigned ignore_media_change:1; /* Ignore MEDIA CHANGE on resume */
> + unsigned put_lld_mod_ref:1; /* Put LLD module ref in release */
>
> bool offline_already; /* Device offline message logged */
>
> --
> 2.31.1
>
--
Best Regards,
Yi Zhang
next prev parent reply other threads:[~2021-10-05 3:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-30 12:44 [PATCH V3] scsi: core: put LLD module refcnt after SCSI device is released Ming Lei
2021-10-05 3:07 ` Yi Zhang [this message]
2021-10-05 13:35 ` Greg Kroah-Hartman
2021-10-07 7:12 ` Ming Lei
2021-10-07 7:19 ` Greg Kroah-Hartman
2021-10-08 3:03 ` Ming Lei
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=CAHj4cs9QMLhnaf_tZF2ypVeEJmAXpHN9c9YsUjKDUbM5rrixfw@mail.gmail.com \
--to=yi.zhang@redhat.com \
--cc=czhong@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.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).