From patchwork Thu Jun 30 21:37:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 586490 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D406C43334 for ; Thu, 30 Jun 2022 21:37:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236794AbiF3Vhp (ORCPT ); Thu, 30 Jun 2022 17:37:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235422AbiF3Vho (ORCPT ); Thu, 30 Jun 2022 17:37:44 -0400 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 078D852395 for ; Thu, 30 Jun 2022 14:37:44 -0700 (PDT) Received: by mail-pj1-f54.google.com with SMTP id w24so704561pjg.5 for ; Thu, 30 Jun 2022 14:37:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zdPo0AGtAKzj7cgayrchgsMnlGLIIHjbow2/bR1BTH8=; b=NmawTTtga41MoYLiEbH+51jHdjpdIYBYSeDopcZ4V4ZCkJM+Dk7AEFpseGC2nsyLa0 WOiqKE7gO1uu6J+FLBdQMGFmMzIEcWVfr1hA0+yNn/q5hgMq6MmOdr7u8qy5/vUdlXBa d7JFGZPNOWcIy0u8Aiwu5R9+BVW5La1S1I8ECWEsO8l1tcLHVJ/jaK62jA6EXZVVEwPF 46+oCgbr+2t9EQABF+FsZpgstd3lW0OFu1lsSr4PfVM0/pLGW963jCiGTLrOGEkG6L3K rGDuCbbCbkrCpJ1834WYomoW90egNZhtrDGdQlRaiREZjjEoSf8YZvkaNSnmh2pbOiG/ I6Bg== X-Gm-Message-State: AJIora+Z38GMancC2Qj5wI4q4ZBMYCssfktTumieeJhgsfxrzpaMBdkb RAWG1lIxFwtRkPqNpeKMI5c= X-Google-Smtp-Source: AGRyM1t/mQNFtmkXkI6PT+n7QNzUP6gLWJCBwHkF72lupx6jYwI4NYcdyjT+PAALDfLtUM8uvO8OvQ== X-Received: by 2002:a17:90b:278e:b0:1ee:f086:9c9d with SMTP id pw14-20020a17090b278e00b001eef0869c9dmr13956369pjb.182.1656625063389; Thu, 30 Jun 2022 14:37:43 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:feaa:14ff:fe9d:6dbd]) by smtp.gmail.com with ESMTPSA id mt18-20020a17090b231200b001e0899052f1sm2484701pjb.3.2022.06.30.14.37.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 14:37:42 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , linux-scsi@vger.kernel.org, Bart Van Assche , Christoph Hellwig , Ming Lei , Hannes Reinecke , John Garry Subject: [PATCH v2 1/3] scsi: Simplify scsi_forget_host() Date: Thu, 30 Jun 2022 14:37:31 -0700 Message-Id: <20220630213733.17689-2-bvanassche@acm.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630213733.17689-1-bvanassche@acm.org> References: <20220630213733.17689-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org scsi_forget_host() has only one caller, namely scsi_remove_host(). That function may sleep. Additionally, scsi_forget_host() calls a function that may sleep (__scsi_remove_device()). Simplify scsi_forget_host() by removing support for saving and restoring the interrupt state. Cc: Christoph Hellwig Cc: Ming Lei Cc: Hannes Reinecke Cc: John Garry Signed-off-by: Bart Van Assche Reviewed-by: Ming Lei --- drivers/scsi/scsi_scan.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 91ac901a6682..5c3bb4ceeac3 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1964,17 +1964,18 @@ EXPORT_SYMBOL(scsi_scan_host); void scsi_forget_host(struct Scsi_Host *shost) { struct scsi_device *sdev; - unsigned long flags; + + might_sleep(); restart: - spin_lock_irqsave(shost->host_lock, flags); + spin_lock_irq(shost->host_lock); list_for_each_entry(sdev, &shost->__devices, siblings) { if (sdev->sdev_state == SDEV_DEL) continue; - spin_unlock_irqrestore(shost->host_lock, flags); + spin_unlock_irq(shost->host_lock); __scsi_remove_device(sdev); goto restart; } - spin_unlock_irqrestore(shost->host_lock, flags); + spin_unlock_irq(shost->host_lock); } From patchwork Thu Jun 30 21:37:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 586273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84137C43334 for ; Thu, 30 Jun 2022 21:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232968AbiF3Vhq (ORCPT ); Thu, 30 Jun 2022 17:37:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237074AbiF3Vhq (ORCPT ); Thu, 30 Jun 2022 17:37:46 -0400 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97F0452389 for ; Thu, 30 Jun 2022 14:37:45 -0700 (PDT) Received: by mail-pj1-f43.google.com with SMTP id i8-20020a17090aee8800b001ecc929d14dso4048430pjz.0 for ; Thu, 30 Jun 2022 14:37:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ruy+HzkJh5fyvvy7vygnAW78d3wREw7aR0/vgCotARc=; b=rvV5BooFaJJhI6v3cS9fWzjvDEIRUZqWigculuUuYZdxwJESu/mVwPIO1f4flrsq6+ xek6sG9f13zXQ/Z1hD1AQ0Cjp/C0NSBCHsRYSgObeAA5fuonm9neBqRf9bEDuS1xBeBK 15ZX4EGLEwUQz3fC8XyBCscLTOuavkhb7QQ9k90eQ8D/67UGWmoYhtDNr9zDlO0NAk+x 01UWeWasdYknfP2rWsIUWfp9WpyI9puHYSxW6CjlA/uox4F+gV/leoqFo9PgeIzQJN47 KtK6CRl9DdpmfvPgcxC6H8mOXQrqI8u7qdk8M6q8xs7YeCCL4z8UO66wAi8FUggn/Gnz 5UWg== X-Gm-Message-State: AJIora+XOwKKDcXN+dZ0kwghI6fez5NY9z3VIckPvBXyURG7XYu9P06s ZXCGMDsfYGbQkg+evdkX7G0= X-Google-Smtp-Source: AGRyM1uhuboo0hA4QEo/25C/K1WRq2HQVMmp0NWXycuCldKvBFWxeP5ERcFlA+2W+9/491ebZQJjJw== X-Received: by 2002:a17:902:f708:b0:153:839f:bf2c with SMTP id h8-20020a170902f70800b00153839fbf2cmr17451066plo.113.1656625064970; Thu, 30 Jun 2022 14:37:44 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:feaa:14ff:fe9d:6dbd]) by smtp.gmail.com with ESMTPSA id mt18-20020a17090b231200b001e0899052f1sm2484701pjb.3.2022.06.30.14.37.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 14:37:44 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , linux-scsi@vger.kernel.org, Bart Van Assche , Christoph Hellwig , Ming Lei , Hannes Reinecke , John Garry Subject: [PATCH v2 2/3] scsi: Make scsi_forget_host() wait for request queue removal Date: Thu, 30 Jun 2022 14:37:32 -0700 Message-Id: <20220630213733.17689-3-bvanassche@acm.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630213733.17689-1-bvanassche@acm.org> References: <20220630213733.17689-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org Prepare for freeing the host tag set earlier by making scsi_forget_host() wait until all activity on the host tag set has stopped. Cc: Christoph Hellwig Cc: Ming Lei Cc: Hannes Reinecke Cc: John Garry Signed-off-by: Bart Van Assche --- drivers/scsi/scsi_scan.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 5c3bb4ceeac3..c8331ccdde95 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -1961,6 +1961,16 @@ void scsi_scan_host(struct Scsi_Host *shost) } EXPORT_SYMBOL(scsi_scan_host); +/** + * scsi_forget_host() - Remove all SCSI devices from a host. + * @shost: SCSI host to remove devices from. + * + * Removes all SCSI devices that have not yet been removed. For the SCSI devices + * for which removal started before scsi_forget_host(), wait until the + * associated request queue has reached the "dead" state. In that state it is + * guaranteed that no new requests will be allocated and also that no requests + * are in progress anymore. + */ void scsi_forget_host(struct Scsi_Host *shost) { struct scsi_device *sdev; @@ -1970,8 +1980,21 @@ void scsi_forget_host(struct Scsi_Host *shost) restart: spin_lock_irq(shost->host_lock); list_for_each_entry(sdev, &shost->__devices, siblings) { - if (sdev->sdev_state == SDEV_DEL) + if (sdev->sdev_state == SDEV_DEL && + blk_queue_dead(sdev->request_queue)) { continue; + } + if (sdev->sdev_state == SDEV_DEL) { + get_device(&sdev->sdev_gendev); + spin_unlock_irq(shost->host_lock); + + while (!blk_queue_dead(sdev->request_queue)) + msleep(10); + + spin_lock_irq(shost->host_lock); + put_device(&sdev->sdev_gendev); + goto restart; + } spin_unlock_irq(shost->host_lock); __scsi_remove_device(sdev); goto restart; From patchwork Thu Jun 30 21:37:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 586489 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4029C43334 for ; Thu, 30 Jun 2022 21:37:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237074AbiF3Vht (ORCPT ); Thu, 30 Jun 2022 17:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233523AbiF3Vhs (ORCPT ); Thu, 30 Jun 2022 17:37:48 -0400 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46AF752396 for ; Thu, 30 Jun 2022 14:37:47 -0700 (PDT) Received: by mail-pg1-f178.google.com with SMTP id s206so574864pgs.3 for ; Thu, 30 Jun 2022 14:37:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C8A1tJBtGVfB7BIe1SGk9cvQJRe9KmUpBgpcoVMDFVY=; b=8Le4cJYaKPifeFP3ioyaKGVHQNmc8GxE3ydDF8LO5eOfjNQTntzySmPXsmoRbVLsYS MXvxwgbClqfPnFp9KkZ74KYCnee6j2sKfeQk3dxIkjwStTITBKLfPIhTYQLeeO3L+igU Ig0DOmqQXQdFluZiCBWk9ptg04dMgq4xw2Nyr/HvNUrogF8mInJBQ58ZnG2+xIfkHXgq fd5OskCtj57IwhTLrp3Bw1Cuwd2SK7m3cFVKWpaqoa3AO0NdflVIqD3bVSMlnGDxczzl yQpuRQInKC9loIAO41ayrwjAZaG8d60MxoYp2UQQmKnnoI8G6INGh12U4AV52zJCVBRQ lSUQ== X-Gm-Message-State: AJIora9acN4mQd8wSQzCapnpr11AeL0e37WH+tBGC6fXo2dGP4u4smYs qcZjMv2bR51UuDHVQLmBvoQ= X-Google-Smtp-Source: AGRyM1sfu3eHRO9F736bhs+BSJEVg3S4Pl9q4EiKECmEMEaoh0FbIECiajHFlbH+e+Otz+Bhps7BDg== X-Received: by 2002:a05:6a00:a8b:b0:4cd:6030:4df3 with SMTP id b11-20020a056a000a8b00b004cd60304df3mr16426634pfl.40.1656625066598; Thu, 30 Jun 2022 14:37:46 -0700 (PDT) Received: from asus.hsd1.ca.comcast.net ([2601:647:4000:d7:feaa:14ff:fe9d:6dbd]) by smtp.gmail.com with ESMTPSA id mt18-20020a17090b231200b001e0899052f1sm2484701pjb.3.2022.06.30.14.37.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Jun 2022 14:37:45 -0700 (PDT) From: Bart Van Assche To: "Martin K . Petersen" Cc: Jaegeuk Kim , linux-scsi@vger.kernel.org, Bart Van Assche , Christoph Hellwig , Ming Lei , Hannes Reinecke , John Garry , Li Zhijian Subject: [PATCH v2 3/3] scsi: core: Call blk_mq_free_tag_set() earlier Date: Thu, 30 Jun 2022 14:37:33 -0700 Message-Id: <20220630213733.17689-4-bvanassche@acm.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220630213733.17689-1-bvanassche@acm.org> References: <20220630213733.17689-1-bvanassche@acm.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org There are two .exit_cmd_priv implementations. Both implementations use resources associated with the SCSI host. Make sure that these resources are still available when .exit_cmd_priv is called by moving the .exit_cmd_priv calls from scsi_host_dev_release() to scsi_forget_host(). Moving blk_mq_free_tag_set() from scsi_host_dev_release() to scsi_forget_host() is safe because scsi_forget_host() drains all the request queues that use the host tag set. This guarantees that no requests are in flight and also that no new requests will be allocated from the host tag set. This patch fixes the following use-after-free: ================================================================== BUG: KASAN: use-after-free in srp_exit_cmd_priv+0x27/0xd0 [ib_srp] Read of size 8 at addr ffff888100337000 by task multipathd/16727 Call Trace: dump_stack_lvl+0x34/0x44 print_report.cold+0x5e/0x5db kasan_report+0xab/0x120 srp_exit_cmd_priv+0x27/0xd0 [ib_srp] scsi_mq_exit_request+0x4d/0x70 blk_mq_free_rqs+0x143/0x410 __blk_mq_free_map_and_rqs+0x6e/0x100 blk_mq_free_tag_set+0x2b/0x160 scsi_host_dev_release+0xf3/0x1a0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_device_dev_release_usercontext+0x4c1/0x4e0 execute_in_process_context+0x23/0x90 device_release+0x54/0xe0 kobject_put+0xa5/0x120 scsi_disk_release+0x3f/0x50 device_release+0x54/0xe0 kobject_put+0xa5/0x120 disk_release+0x17f/0x1b0 device_release+0x54/0xe0 kobject_put+0xa5/0x120 dm_put_table_device+0xa3/0x160 [dm_mod] dm_put_device+0xd0/0x140 [dm_mod] free_priority_group+0xd8/0x110 [dm_multipath] free_multipath+0x94/0xe0 [dm_multipath] dm_table_destroy+0xa2/0x1e0 [dm_mod] __dm_destroy+0x196/0x350 [dm_mod] dev_remove+0x10c/0x160 [dm_mod] ctl_ioctl+0x2c2/0x590 [dm_mod] dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 dm_ctl_ioctl+0x5/0x10 [dm_mod] __x64_sys_ioctl+0xb4/0xf0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x46/0xb0 Cc: Christoph Hellwig Cc: Ming Lei Cc: Hannes Reinecke Cc: John Garry Cc: Li Zhijian Reported-by: Li Zhijian Tested-by: Li Zhijian Fixes: 65ca846a5314 ("scsi: core: Introduce {init,exit}_cmd_priv()") Signed-off-by: Bart Van Assche --- drivers/scsi/hosts.c | 10 +++++----- drivers/scsi/scsi_lib.c | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index ef6c0e37acce..74bfa187fe19 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -182,6 +182,8 @@ void scsi_remove_host(struct Scsi_Host *shost) mutex_unlock(&shost->scan_mutex); scsi_proc_host_rm(shost); + scsi_mq_destroy_tags(shost); + spin_lock_irqsave(shost->host_lock, flags); if (scsi_host_set_state(shost, SHOST_DEL)) BUG_ON(scsi_host_set_state(shost, SHOST_DEL_RECOVERY)); @@ -295,8 +297,8 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, return error; /* - * Any host allocation in this function will be freed in - * scsi_host_dev_release(). + * Any resources associated with the SCSI host in this function except + * the tag set will be freed by scsi_host_dev_release(). */ out_del_dev: device_del(&shost->shost_dev); @@ -312,6 +314,7 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, pm_runtime_disable(&shost->shost_gendev); pm_runtime_set_suspended(&shost->shost_gendev); pm_runtime_put_noidle(&shost->shost_gendev); + scsi_mq_destroy_tags(shost); fail: return error; } @@ -345,9 +348,6 @@ static void scsi_host_dev_release(struct device *dev) kfree(dev_name(&shost->shost_dev)); } - if (shost->tag_set.tags) - scsi_mq_destroy_tags(shost); - kfree(shost->shost_data); ida_free(&host_index_ida, shost->host_no); diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 6ffc9e4258a8..1aa1a279f8f3 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1990,7 +1990,10 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost) void scsi_mq_destroy_tags(struct Scsi_Host *shost) { + if (!shost->tag_set.tags) + return; blk_mq_free_tag_set(&shost->tag_set); + WARN_ON_ONCE(shost->tag_set.tags); } /**