From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D663341D112 for ; Sun, 27 Sep 2026 16:55:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.140 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790528133; cv=none; b=Qxb1S16e+46WzGewcIVkq6+FWHVu4NxlhLyDbsbJSJ33L0AL/uFmrHxA8lWB6WIZWC34aEexpGPyZLIe9TObx2j6mSP/wFDU5hKJ4rYlD26BHOYy7gtr15uIaqtY8lt+0XYX02jiK3u4WcATmNVzFj6AGlLzrir/3s8QvCPcxQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790528133; c=relaxed/simple; bh=qz22BclCWEW4HoY/cJueFvDrcT9HVthELBY9+AHM8j0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GvhbogVmjhhERiw+KQOea49euOcRPtLU4nxlrpa+kor19oSh3jOLpuXiGTERow6d2VLCtjV7qLJ0vtnjVO+BOJsDRvMwZ9cv4ypGfhxLJQvki1FB3EXVN1bRbNyT1ANcEXNW1x3k9ToVfo3k2WafLdceShSaVhztAkfDDiYDdvI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Ie0hJT5F; arc=none smtp.client-ip=74.125.225.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ie0hJT5F" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49b912df756so18032195e9.3 for ; Sun, 27 Sep 2026 09:55:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790528129; x=1791132929; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=9XImCPy7QHPoN4quLQ1lus3OWNtmBZ9BuTXdaG3JBgc=; b=Ie0hJT5FoMRxNi9oz70cm/GVTYAftfNa3bcFK/zoRfzhpnNR6W4a/pNERinobn6TXg FEMKVu+EK5Cxi93wTb0S4zjH4y1UxyTPeYuwuEMmuorL6euj6bjMOAFNodxUJIY3nADh PJEwYowhmQltxzrE9r/fA9MKrNiSMsLHgwjP6jbN4S95AVGk1nPFHBZ1X5yzDN97daX6 eOoeplfAxEn2/QhEmQ4CCKpyXRH09/l72qnBERI9lsHgdg0nfTWTxIBbn2yjB0s/2or/ HNRFAN4hBLZGBomkvCAcm5e6wVFNQqFQGDqvda7LaIWY5F36W3+o35Boy9w6c+8xD8tx XCJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790528129; x=1791132929; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=9XImCPy7QHPoN4quLQ1lus3OWNtmBZ9BuTXdaG3JBgc=; b=OZCLwFkIcXEVaaGlmoLa8XNZIetWf8+5y6qJqSFiFLeCA8zlWJAoC4/sV0/FN5AI/+ OgOcHWd5Cjw8f0nDNJ+CFu8w2c0u0BDCQSJ6YWTEwbHL2nmthgrhV20M48CarN1ZdiRl gpvh8DHsg/AZeUU9lWkZBSqe5bHlMGN8g6w3aSfGhr9ewcYlkvoX4NjHaUuXeGRn6qbp dcwGM5Z9JR5F79kCIlyrPtYGq0poSlPq9N8H+VtQ2GV3MF3Db14Azey1u0pR6wpjroF6 j0lxUHJOQ9hVpni7lQmCnG/4nLYTrIXiBclu060QF0TWLnXPiITiqwKeuKT4OaCi/OKK rFcw== X-Forwarded-Encrypted: i=1; AKwUvBz2PmZDuJE9wFhFqYaRxQPI7qmZcmKl0A5XTvaypNSk39BwLiFEP4iZOQ16Mv0Q1EllU0njpbkG7o+r6pw=@vger.kernel.org X-Gm-Message-State: AFuF++nrfyfCfOvGj1n+WgDzp9fUmzzFX2ZAN5oDjp47gNIJYnmnuD1h cjt1Z+GRa0pRSrKYqnWI/FN8zIebdL9PCeMGnRexLVuZtNiJkbfJFt6g X-Gm-Gg: AYBFou1BLcTz8jSfqhSfEnwYczn/MPTMo+STqwVtHcojtJL5ryCmO+teTm3oc+Wy0kH ofcfCI22HGOk0+9MOuWtFqHVfbNPjgze9j6bAk8x06AlKLpiK3nF6UHybJ43Cx01KQN1iQH8cXW iY1if1M8MQHpdv8Z0b6vdtQ0fHigmSVKalcJOXvhI+P7pClAu04Ng18sh4TNCBWMiOReuj0YOrO i74Nv42u35I0JJok9mr+ojcaX0XArEMZhjzb0doGLNJ7xbrHyvyO0udpABO4KAXOuqJmJ0Gk1Tn mWeyyqP4/RnEwim4vYaUel3+7U+AOofkWtytbpbdnqHLM96d43jLsOPdtjRZsLym3OTQXmWcaIC HL6oCQV8lqcJaje+vJTFbH8V/zGXTjfksgS5Gz6h7Jk8XEuB9vf06J0iV7PXK1D3G95Pi0J+TgM kLTGSHj63Czz+fX9AWGJcqZrTjNx3uHhcRGEYPhb6YpTn6qSxRj2ioScH9yqPK0iTwZkSiDBbCm Pw8qRveIdUyOla0Oh7vAb1y1ZT1JRE/HkIP9bzHerGVgnR/VU4Ifqe3RPVXbWFcUE0= X-Received: by 2002:a05:600c:4745:b0:49d:10d6:fd55 with SMTP id 5b1f17b1804b1-49fe66abd7fmr201177145e9.1.1790528129026; Sun, 27 Sep 2026 09:55:29 -0700 (PDT) Received: from f3a6eae2255e.fritz.box (dynamic-002-214-014-217.2.214.pool.telefonica.de. [2.214.14.217]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4a00178bebasm76167695e9.11.2026.09.27.09.55.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Sep 2026 09:55:28 -0700 (PDT) From: Abhin Parekadan Jose To: Bjorn Helgaas , Lukas Wunner , "Michael S. Tsirkin" Cc: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Shuai Xue , Kees Cook , Mahesh J Salgaonkar , Oliver O'Halloran , linux-pci@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Abhin Parekadan Jose Subject: [PATCH RFC v2 5/5] misc: Add edu_srpoc surprise removal POC driver Date: Sun, 27 Sep 2026 16:54:58 +0000 Message-ID: <20260927165459.829900-6-abhinjoses@gmail.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20260927165459.829900-1-abhinjoses@gmail.com> References: <20260927165459.829900-1-abhinjoses@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A test driver for the QEMU edu device that reproduces the surprise removal hang described in MST's RFC v5 thread. - hacked in a reg to the edu device on qemu to raise a delayed irq - This driver writes to that reg in remove and waits for the irq to be handled. This simulates del_gendisk() blocked in blk_mq_freeze_queue_wait() remove() blocks until the delayed interrupt arrives, 600 seconds after it is requested, or until the device is surprise removed and its disconnect work runs. That is the purpose of the driver, so a normal unbind takes 600 seconds, and on a QEMU without the delayed interrupt register it never returns. It is only built with CONFIG_EDU_SRPOC. Assisted-by: LLM Signed-off-by: Abhin Parekadan Jose --- Changes since RFC v1: - Build only with CONFIG_EDU_SRPOC, which depends on PCI, instead of unconditionally. (Sashiko) - Don't claim the interrupt if the status register reads all ones, i.e. the device is gone. (Sashiko) - Clear bus mastering in the probe error path and in remove(). (Sashiko) - Document that remove() blocks by design. (Sashiko) - Fixed a checkpatch warning about braced if() blocks. RFC v1: https://lore.kernel.org/all/20260905183905.997833-4-abhinjoses@gmail.com/ Sashiko review: https://lore.kernel.org/all/20260905185027.291191F00A3A@smtp.kernel.org/ --- drivers/misc/Kconfig | 11 +++ drivers/misc/Makefile | 1 + drivers/misc/edu_srpoc.c | 171 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 drivers/misc/edu_srpoc.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 7364931dad3a1..99457e53d21cf 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -57,6 +57,17 @@ config DUMMY_IRQ The sole purpose of this module is to help with debugging of systems on which spurious IRQs would happen on disabled IRQ vector. +config EDU_SRPOC + tristate "QEMU edu surprise removal POC driver" + depends on PCI + help + Test driver for the QEMU edu device. Its remove() callback blocks + until the device raises a delayed interrupt or is surprise removed, + to reproduce a hang in remove() during surprise removal. Needs an + edu device with the delayed interrupt register at BAR0 0x30. + + If unsure, say N. + config IBMVMC tristate "IBM Virtual Management Channel support" depends on PPC_PSERIES diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index e8d8d5d88c0df..9ebcc6ce60f34 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -9,6 +9,7 @@ obj-$(CONFIG_AD525X_DPOT_I2C) += ad525x_dpot-i2c.o obj-$(CONFIG_AD525X_DPOT_SPI) += ad525x_dpot-spi.o obj-$(CONFIG_ATMEL_SSC) += atmel-ssc.o obj-$(CONFIG_DUMMY_IRQ) += dummy-irq.o +obj-$(CONFIG_EDU_SRPOC) += edu_srpoc.o obj-$(CONFIG_ICS932S401) += ics932s401.o obj-$(CONFIG_LKDTM) += lkdtm/ obj-$(CONFIG_TI_FPC202) += ti_fpc202.o diff --git a/drivers/misc/edu_srpoc.c b/drivers/misc/edu_srpoc.c new file mode 100644 index 0000000000000..b74a95109dba9 --- /dev/null +++ b/drivers/misc/edu_srpoc.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * edu_srpoc.c Surprise Removal POC driver for the QEMU edu device + * + * In remove(), schedules a delayed interrupt on the edu device and + * blocks waiting for it to complete. This simulates del_gendisk() + * blocked in blk_mq_freeze_queue_wait() on slow in-flight I/O. + * + * Surprise-remove the device during this window to reproduce the hang. + * + * edu BAR 0 registers used: + * 0x08 Factorial: write N to compute N! asynchronously + * 0x20 Status: write EDU_STATUS_IRQFACT to enable IRQ on completion + * 0x24 IRQ status: bit 0 = FACT_IRQ, bit 9 = DELAY_IRQ + * 0x30 Delayed IRQ: write N (ms). Hacked in this functionality(not upstream). + * 0x64 IRQ lower: write bitmask to ack + */ + +#include +#include +#include +#include +#include + +#define PCI_VENDOR_ID_EDU 0x1234 +#define PCI_DEVICE_ID_EDU 0x11e8 + +#define EDU_REG_FACT 0x08 +#define EDU_REG_STATUS 0x20 +#define EDU_REG_DELAYED_IRQ 0x30 +#define EDU_REG_IRQ_STATUS 0x24 +#define EDU_REG_IRQ_LOWER 0x64 + +#define EDU_STATUS_IRQFACT 0x80 +#define EDU_FACT_IRQ BIT(0) +#define EDU_DELAY_IRQ BIT(9) + +struct edu_dev { + struct pci_dev *pdev; + void __iomem *regs; + struct completion irq_done; +}; + +static irqreturn_t edu_irq_handler(int irq, void *data) +{ + struct edu_dev *edu = data; + u32 status; + + status = ioread32(edu->regs + EDU_REG_IRQ_STATUS); + /* All ones means the device is gone; the interrupt is not ours */ + if (!status || PCI_POSSIBLE_ERROR(status)) + return IRQ_NONE; + + iowrite32(status, edu->regs + EDU_REG_IRQ_LOWER); + + if (status & (EDU_FACT_IRQ | EDU_DELAY_IRQ)) + complete(&edu->irq_done); + + return IRQ_HANDLED; +} + +static void edu_disconnect(struct work_struct *work) +{ + struct pci_dev *pdev = container_of(work, struct pci_dev, + disconnect_work); + struct edu_dev *edu = pci_get_drvdata(pdev); + + if (!pci_test_and_clear_disconnect_enable(pdev)) + return; + + if (!edu) + return; + + dev_info(&pdev->dev, "disconnect_work fired — unblocking remove()\n"); + complete(&edu->irq_done); +} + +static int edu_probe(struct pci_dev *pdev, const struct pci_device_id *id) +{ + struct edu_dev *edu; + int err; + + edu = devm_kzalloc(&pdev->dev, sizeof(*edu), GFP_KERNEL); + if (!edu) + return -ENOMEM; + + edu->pdev = pdev; + init_completion(&edu->irq_done); + + err = pci_enable_device(pdev); + if (err) + return err; + + err = pci_request_regions(pdev, "edu_srpoc"); + if (err) + goto err_disable; + + edu->regs = pci_iomap(pdev, 0, 0); + if (!edu->regs) { + err = -ENOMEM; + goto err_release; + } + + pci_set_master(pdev); + + err = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_MSI | PCI_IRQ_INTX); + if (err < 0) + goto err_iounmap; + + err = request_irq(pci_irq_vector(pdev, 0), edu_irq_handler, + IRQF_SHARED, "edu_srpoc", edu); + if (err) + goto err_free_vectors; + + pci_set_drvdata(pdev, edu); + + INIT_WORK(&pdev->disconnect_work, edu_disconnect); + pci_set_disconnect_work(pdev); + + dev_info(&pdev->dev, "edu_srpoc probed\n"); + return 0; + +err_free_vectors: + pci_free_irq_vectors(pdev); +err_iounmap: + pci_clear_master(pdev); + pci_iounmap(pdev, edu->regs); +err_release: + pci_release_regions(pdev); +err_disable: + pci_disable_device(pdev); + return err; +} + +static void edu_remove(struct pci_dev *pdev) +{ + struct edu_dev *edu = pci_get_drvdata(pdev); + + iowrite32(EDU_STATUS_IRQFACT, edu->regs + EDU_REG_STATUS); + iowrite32(600000, edu->regs + EDU_REG_DELAYED_IRQ); + + dev_info(&pdev->dev, "Waiting for IRQ in remove()\n"); + wait_for_completion(&edu->irq_done); + dev_info(&pdev->dev, "Unblocked, cleaning up\n"); + + pci_clear_disconnect_work(pdev); + free_irq(pci_irq_vector(pdev, 0), edu); + pci_free_irq_vectors(pdev); + pci_clear_master(pdev); + pci_iounmap(pdev, edu->regs); + pci_release_regions(pdev); + pci_disable_device(pdev); +} + +static const struct pci_device_id edu_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_EDU, PCI_DEVICE_ID_EDU) }, + { 0 } +}; +MODULE_DEVICE_TABLE(pci, edu_ids); + +static struct pci_driver edu_driver = { + .name = "edu_srpoc", + .id_table = edu_ids, + .probe = edu_probe, + .remove = edu_remove, +}; + +module_pci_driver(edu_driver); +MODULE_AUTHOR("Abhin Parekadan Jose"); +MODULE_DESCRIPTION("edu surprise removal POC driver"); +MODULE_LICENSE("GPL"); -- 2.51.1