From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752009AbcFNIwq (ORCPT ); Tue, 14 Jun 2016 04:52:46 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:53001 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968AbcFNIwn (ORCPT ); Tue, 14 Jun 2016 04:52:43 -0400 From: Markus Pargmann To: "Pranay Kr. Srivastava" Cc: nbd-general@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 1/5] nbd: fix might_sleep warning on socket shutdown. Date: Tue, 14 Jun 2016 10:52:02 +0200 Message-ID: <1962682.lYRJ5o9hTF@adelgunde> User-Agent: KMail/4.14.1 (Linux/4.5.0-0.bpo.2-amd64; KDE/4.14.2; x86_64; ; ) In-Reply-To: <1464863101-16805-2-git-send-email-pranjas@gmail.com> References: <3898019.JRqDjBPssX@adelgunde> <1464863101-16805-1-git-send-email-pranjas@gmail.com> <1464863101-16805-2-git-send-email-pranjas@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart1500566.OHE3B0braa"; micalg="pgp-sha256"; protocol="application/pgp-signature" X-SA-Exim-Connect-IP: 2001:67c:670:100:a61f:72ff:fe68:75ba X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --nextPart1500566.OHE3B0braa Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="us-ascii" Hi, On Thursday 02 June 2016 13:24:57 Pranay Kr. Srivastava wrote: > spinlocked ranges should be small and not contain calls into huge > subfunctions. Fix my mistake and just get the pointer to the socket > instead of doing everything with spinlock held. >=20 > Reported-by: Mikulas Patocka > Signed-off-by: Markus Pargmann >=20 > Changelog: > Pranay Kr. Srivastava: >=20 > 1) Use spin_lock instead of irq version for sock_shutdown. >=20 > 2) Use system work queue to actually trigger the shutdown of > socket. This solves the issue when kernel_sendmsg is currently > blocked while a timeout occurs. >=20 > Signed-off-by: Pranay Kr. Srivastava This looks better. Some smaller things inline. Also this patch does not= apply on my tree anymore. Can you please rebase it onto: =09http://git.pengutronix.de/?p=3Dmpa/linux-nbd.git;a=3Dshortlog;h=3Dre= fs/heads/master > --- > drivers/block/nbd.c | 65 ++++++++++++++++++++++++++++++++++---------= =2D--------- > 1 file changed, 42 insertions(+), 23 deletions(-) >=20 > diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c > index 31e73a7..0339d40 100644 > --- a/drivers/block/nbd.c > +++ b/drivers/block/nbd.c > @@ -39,6 +39,7 @@ > #include > =20 > #include > +#include > =20 > struct nbd_device { > =09u32 flags; > @@ -69,6 +70,10 @@ struct nbd_device { > #if IS_ENABLED(CONFIG_DEBUG_FS) > =09struct dentry *dbg_dir; > #endif > +=09/* > +=09 *This is specifically for calling sock_shutdown, for now. > +=09 */ > +=09struct work_struct ws_shutdown; > }; > =20 > #if IS_ENABLED(CONFIG_DEBUG_FS) > @@ -95,6 +100,11 @@ static int max_part; > */ > static DEFINE_SPINLOCK(nbd_lock); > =20 > +/* > + * Shutdown function for nbd_dev work struct. > + */ > +static void nbd_ws_func_shutdown(struct work_struct *); > + > static inline struct device *nbd_to_dev(struct nbd_device *nbd) > { > =09return disk_to_dev(nbd->disk); > @@ -172,39 +182,35 @@ static void nbd_end_request(struct nbd_device *= nbd, struct request *req) > */ > static void sock_shutdown(struct nbd_device *nbd) > { > -=09spin_lock_irq(&nbd->sock_lock); > - > -=09if (!nbd->sock) { > -=09=09spin_unlock_irq(&nbd->sock_lock); > -=09=09return; > -=09} > +=09struct socket *sock; > =20 > -=09dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n"); > -=09kernel_sock_shutdown(nbd->sock, SHUT_RDWR); > -=09sockfd_put(nbd->sock); > +=09spin_lock(&nbd->sock_lock); > +=09sock =3D nbd->sock; > =09nbd->sock =3D NULL; > -=09spin_unlock_irq(&nbd->sock_lock); > +=09spin_unlock(&nbd->sock_lock); > + > +=09if (!sock) > +=09=09return; > =20 > =09del_timer(&nbd->timeout_timer); > +=09dev_warn(disk_to_dev(nbd->disk), "shutting down socket\n"); > +=09kernel_sock_shutdown(sock, SHUT_RDWR); > +=09sockfd_put(sock); > } > =20 > static void nbd_xmit_timeout(unsigned long arg) > { > =09struct nbd_device *nbd =3D (struct nbd_device *)arg; > -=09unsigned long flags; > =20 > =09if (list_empty(&nbd->queue_head)) > =09=09return; > - > -=09spin_lock_irqsave(&nbd->sock_lock, flags); > - > =09nbd->timedout =3D true; > - > -=09if (nbd->sock) > -=09=09kernel_sock_shutdown(nbd->sock, SHUT_RDWR); > - > -=09spin_unlock_irqrestore(&nbd->sock_lock, flags); > - > +=09schedule_work(&nbd->ws_shutdown); > +=09/* > +=09 * Make sure sender thread sees nbd->timedout. > +=09 */ > +=09smp_wmb(); I am not sure that we need this memory barrier here. But as it is just the timeout path it probably won't hurt. > +=09wake_up(&nbd->waiting_wq); > =09dev_err(nbd_to_dev(nbd), "Connection timed out, shutting down con= nection\n"); > } > =20 > @@ -592,7 +598,11 @@ static int nbd_thread_send(void *data) > =09=09spin_unlock_irq(&nbd->queue_lock); > =20 > =09=09/* handle request */ > -=09=09nbd_handle_req(nbd, req); > +=09=09if (nbd->timedout) { > +=09=09=09req->errors++; > +=09=09=09nbd_end_request(nbd, req); > +=09=09} else > +=09=09=09nbd_handle_req(nbd, req); > =09} > =20 > =09nbd->task_send =3D NULL; > @@ -672,6 +682,7 @@ static void nbd_reset(struct nbd_device *nbd) > =09set_capacity(nbd->disk, 0); > =09nbd->flags =3D 0; > =09nbd->xmit_timeout =3D 0; > +=09INIT_WORK(&nbd->ws_shutdown, nbd_ws_func_shutdown); > =09queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue); > =09del_timer_sync(&nbd->timeout_timer); > } > @@ -804,15 +815,15 @@ static int __nbd_ioctl(struct block_device *bde= v, struct nbd_device *nbd, > =09=09nbd_dev_dbg_close(nbd); > =09=09kthread_stop(thread); > =20 > -=09=09mutex_lock(&nbd->tx_lock); > - > =09=09sock_shutdown(nbd); > +=09=09mutex_lock(&nbd->tx_lock); > =09=09nbd_clear_que(nbd); > =09=09kill_bdev(bdev); > =09=09nbd_bdev_reset(bdev); > =20 > =09=09if (nbd->disconnect) /* user requested, ignore socket errors *= / > =09=09=09error =3D 0; > + Random newline here. Best Regards, Markus > =09=09if (nbd->timedout) > =09=09=09error =3D -ETIMEDOUT; > =20 > @@ -863,6 +874,14 @@ static const struct block_device_operations nbd_= fops =3D > =09.compat_ioctl =3D=09nbd_ioctl, > }; > =20 > +static void nbd_ws_func_shutdown(struct work_struct *ws_nbd) > +{ > +=09struct nbd_device *nbd_dev =3D container_of(ws_nbd, struct nbd_de= vice, > +=09=09=09=09=09=09=09ws_shutdown); > + > +=09sock_shutdown(nbd_dev); > +} > + > #if IS_ENABLED(CONFIG_DEBUG_FS) > =20 > static int nbd_dbg_tasks_show(struct seq_file *s, void *unused) >=20 =2D-=20 Pengutronix e.K. | = | Industrial Linux Solutions | http://www.pengutronix.de/= | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 = | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-555= 5 | --nextPart1500566.OHE3B0braa Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part. Content-Transfer-Encoding: 7Bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJXX8XYAAoJENnm3voMNZul1B8P/3z2ljVg1ndp3+f9MORuY2mi f5mQypuARZ61AimYpZc2znyWqRdH9zdYVBj61brj1seB2rCKgj4QDOjR21QWkVJ1 zx/CfNyFDVAggV6RChyU1wKs3ffEEyQjyf26sALqWy1oSg/kb3OdSZZiq6U3ffCc 5fyM5AQYWPjzDTkuxCuI/5fLXJpVEz6OcSm9U7jiOA17YQDVfgIaTQqeTo/lV8SH hlos1lpoJxVJ2w/uz9Y8CMvjz8sLV5ToICuZoyeRjYmsGpGtRLL3hyYYyAuL8CiZ dVR3IuI3oY/y6Uot0XlxOgINgBHcsviorU8pb4ds4DlEXTUWfVMg9ymu3SFcVeZn +refZH72lLheyItFFBSJQ6GmYHZoJZtYh5/pUYRuEvmExuHpLqMC2dBPHPYRsAne 2TbzRkOZ6lxIkr/V6PmJsmMEv12LUrxvF7UFDpbJjmdVZUMG4Bj2cmS+YUZRdFUz 0uRSrMvmg/jwWQ/2UEIUsjGInaDu8miMD+scZVOkLbQNrQ6NBKG4TOO2j1BD5yCH eas3M65xhOfwPagES1cs2hyEsEj/Fj3CcRkvAbOh2KkICTnSk6sI9g1mAMWPCirp AyU11L4kd4bqWTh2R5fZkcPd0g9WIaLIaQQUtErPExJIqk2ZN767tF7piFSHzMHz bqS27hrVvYVvNu8c3nTd =SzRl -----END PGP SIGNATURE----- --nextPart1500566.OHE3B0braa--