From: "Roger Pau Monné" <roger.pau@citrix.com>
To: Paul Durrant <pdurrant@amazon.com>
Cc: <xen-devel@lists.xenproject.org>, <linux-block@vger.kernel.org>,
<linux-kernel@vger.kernel.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Jens Axboe <axboe@kernel.dk>
Subject: Re: [PATCH] xen-blkback: prevent premature module unload
Date: Wed, 11 Dec 2019 12:28:44 +0100 [thread overview]
Message-ID: <20191211112754.GM980@Air-de-Roger> (raw)
In-Reply-To: <20191210145305.6605-1-pdurrant@amazon.com>
On Tue, Dec 10, 2019 at 02:53:05PM +0000, Paul Durrant wrote:
> Objects allocated by xen_blkif_alloc come from the 'blkif_cache' kmem
> cache. This cache is destoyed when xen-blkif is unloaded so it is
> necessary to wait for the deferred free routine used for such objects to
> complete. This necessity was missed in commit 14855954f636 "xen-blkback:
> allow module to be cleanly unloaded". This patch fixes the problem by
> taking/releasing extra module references in xen_blkif_alloc/free()
> respectively.
>
> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>
One nit below.
> ---
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> Cc: "Roger Pau Monné" <roger.pau@citrix.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> ---
> drivers/block/xen-blkback/xenbus.c | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
> diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
> index e8c5c54e1d26..59d576d27ca7 100644
> --- a/drivers/block/xen-blkback/xenbus.c
> +++ b/drivers/block/xen-blkback/xenbus.c
> @@ -171,6 +171,15 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid)
> blkif->domid = domid;
> atomic_set(&blkif->refcnt, 1);
> init_completion(&blkif->drain_complete);
> +
> + /*
> + * Because freeing back to the cache may be deferred, it is not
> + * safe to unload the module (and hence destroy the cache) until
> + * this has completed. To prevent premature unloading, take an
> + * extra module reference here and release only when the object
> + * has been free back to the cache.
^ freed
> + */
> + __module_get(THIS_MODULE);
> INIT_WORK(&blkif->free_work, xen_blkif_deferred_free);
>
> return blkif;
> @@ -320,6 +329,7 @@ static void xen_blkif_free(struct xen_blkif *blkif)
>
> /* Make sure everything is drained before shutting down */
> kmem_cache_free(xen_blkif_cachep, blkif);
> + module_put(THIS_MODULE);
> }
>
> int __init xen_blkif_interface_init(void)
> --
> 2.20.1
>
next prev parent reply other threads:[~2019-12-11 11:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 14:53 [PATCH] xen-blkback: prevent premature module unload Paul Durrant
2019-12-11 11:28 ` Roger Pau Monné [this message]
2019-12-11 13:27 ` Durrant, Paul
2019-12-11 13:55 ` Roger Pau Monné
2019-12-11 13:56 ` Jürgen Groß
2019-12-11 13:57 ` Durrant, Paul
2019-12-13 9:00 ` Jürgen Groß
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=20191211112754.GM980@Air-de-Roger \
--to=roger.pau@citrix.com \
--cc=axboe@kernel.dk \
--cc=konrad.wilk@oracle.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pdurrant@amazon.com \
--cc=xen-devel@lists.xenproject.org \
/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