From nobody Sat Jun 13 06:01:21 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2E827384230; Sat, 9 May 2026 07:49:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312945; cv=none; b=ILjvbiOXkjsDW2G4dElG5bPF8DuJ+VzdkbIa7BT2ypzyWg3yAdnhSC3A0lCKhyPnzZXoJGN0ctp5yFQBi1bb/4YL7elkaD5Dbe3UTB/XqGatVC1PYon1xBEp/HSJoC3zlRHZ4sIW6GAu3+AdAvfUwlSPtyaDjG3l05P6NbGw2i4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312945; c=relaxed/simple; bh=80jBPLvtM9TjXxDnzYvOCYyYk/9aipkDSiSmqSsZs3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nr/7rnfHvoStasIdmRlWg0mfdDwr64VzL4GWuTSjMbr4dIAixX84ABY6u0ZVFidf9X/uX3IoBuG4nuEHxsjK8RP6nSrJCcQ2zPrZSL/2IHuCdazFQO1GI3ZPxjguZXM/Pd46Oirt36nIl7sV8HfFyhXPs9lFAR3qNbgnm3h7ouI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=Cjiy2h1F; arc=none smtp.client-ip=220.197.31.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="Cjiy2h1F" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=9C R6iIFB5mrmZQwIQIg22hDKvdy6PY+gAgCT0th2C/U=; b=Cjiy2h1FZB9rhAY9LY vuTSDBtkaj7K5rLy7Nrf+ZhXxKiKLu6x5tWEP2420aG3YzrfWpExPwduXwmmcT7S oQTp5G39YXYaP+kTE+4CYN0Cl8n+8WWEs8iZMk4bjKXbYaQtuNtZfZg8EX0FZehp f8j4OBadg7RVbLNomxSCbWELE= Received: from China-163-team (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wD3vx7H5v5pPBpuAQ--.62799S3; Sat, 09 May 2026 15:48:28 +0800 (CST) From: Wenshan Lan To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, vinicius.gomes@intel.com, dave.jiang@intel.com, vkoul@kernel.org, jetlan9@163.com Subject: [PATCH 6.6.y v2 1/2] dmaengine: idxd: Fix crash when the event log is disabled Date: Sat, 9 May 2026 15:48:21 +0800 Message-ID: <20260509074822.2587-2-jetlan9@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260509074822.2587-1-jetlan9@163.com> References: <20260509074822.2587-1-jetlan9@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD3vx7H5v5pPBpuAQ--.62799S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF13XFyUXrWkuw4ruFy3Arb_yoW8Wr45pF 45Ga4Ykryqgry3uw4UXF1I9FnxuF4vy3yFgrW7t3sI9FyfAF95WFWftFyjg3y5ArZ3GFW5 XasIq3y0gF4UA37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zEt8nUUUUUU= X-CM-SenderInfo: xmhwztjqz6il2tof0z/xtbC6w0Hz2n+5s2AOwAA3p Content-Type: text/plain; charset="utf-8" From: Vinicius Costa Gomes [ Upstream commit 52d2edea0d63c935e82631e4b9e4a94eccf97b5b ] If reporting errors to the event log is not supported by the hardware, and an error that causes Function Level Reset (FLR) is received, the driver will try to restore the event log even if it was not allocated. Also, only try to free the event log if it was properly allocated. Fixes: 6078a315aec1 ("dmaengine: idxd: Add idxd_device_config_save() and id= xd_device_config_restore() helpers") Reviewed-by: Dave Jiang Signed-off-by: Vinicius Costa Gomes Link: https://patch.msgid.link/20260121-idxd-fix-flr-on-kernel-queues-v3-v3= -2-7ed70658a9d1@intel.com Signed-off-by: Vinod Koul [ Only the idxd_device_evl_free() NULL check portion was backported in v6.6. idxd_device_config_restore() does not exist in v6.6. It was introduced=20 in 6.14. ] Signed-off-by: Wenshan Lan --- drivers/dma/idxd/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c index 44bbeb3acd14..e769e1f0d28b 100644 --- a/drivers/dma/idxd/device.c +++ b/drivers/dma/idxd/device.c @@ -810,6 +810,9 @@ static void idxd_device_evl_free(struct idxd_device *id= xd) struct device *dev =3D &idxd->pdev->dev; struct idxd_evl *evl =3D idxd->evl; =20 + if (!evl) + return; + gencfg.bits =3D ioread32(idxd->reg_base + IDXD_GENCFG_OFFSET); if (!gencfg.evl_en) return; --=20 2.43.0 From nobody Sat Jun 13 06:01:21 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EA3D35B63D; Sat, 9 May 2026 07:48:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312941; cv=none; b=Lmx1bIDpCR43ST7o1kn5rzyBV1oHWHIuKYVSnhvvny5dkahXJb2g9SzLoNQs6ndVtZQL1Z708SCyF5ehl+fIcC1Jvh2/hHhqVoxo5WTJPp6+i9BP7i0yF4fA1M7Y0mdFP5R2KWC2bKwKYVHy35irbYQ6ZZvyvgFHAPbpPgO4yVs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778312941; c=relaxed/simple; bh=0lmm43bJm6wHyWUAAmxfIVZVCishr7271DHqldppO4A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PqwcALw5zk64aHEcAhKsEIwuRfAfRCpVQjNbGWye9Nx1x033KrvNv5nL3YuPRornn4kAaqSF4+Z/+4rz2eSTqfllEv7MNMgqa1Rc3jlLwzRs/KwIgbAS70Nen7V40i3Dn5wozv+IzKaLh6AhwpZzl1fStI8cvSQ7x2k6WZvq8yU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=kK0k+5KR; arc=none smtp.client-ip=117.135.210.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="kK0k+5KR" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=ZT UWpsDi0q7O8I50MMzd6hYadrzxAun/71ZcCAsMoFA=; b=kK0k+5KRRg+sIa7OiE Ra7PIg0ANw+5Uo21LtrUCd1Lst6QoBIfTGW+tWthz7GBliiAq48CNjyU6VOCuPSW vuCJPRFoslP3/51UzDxFG/9y2Q5EBoOTij4OlIG6ukH8jlyo3QwSmDTNyMjXAhm4 VGfcYBEuo91Fi8T1z8Bh9xP5s= Received: from China-163-team (unknown []) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wD3vx7H5v5pPBpuAQ--.62799S4; Sat, 09 May 2026 15:48:30 +0800 (CST) From: Wenshan Lan To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, vinicius.gomes@intel.com, dave.jiang@intel.com, vkoul@kernel.org, jetlan9@163.com Subject: [PATCH 6.6.y v2 2/2] dmaengine: idxd: Fix leaking event log memory Date: Sat, 9 May 2026 15:48:22 +0800 Message-ID: <20260509074822.2587-3-jetlan9@163.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260509074822.2587-1-jetlan9@163.com> References: <20260509074822.2587-1-jetlan9@163.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD3vx7H5v5pPBpuAQ--.62799S4 X-Coremail-Antispam: 1Uf129KBjvJXoW7WF1DJF4kXw1fWw1UKr4fuFg_yoW8Xw17pr 4UW3WFyr9xWr17uw1UXF47ZFyYka17A3ySg3y2y3Wa9F43ZFy3WryftF1agr18Jr95Gay5 Xa4aqrWxur48Jw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zi1EEUUUUUU= X-CM-SenderInfo: xmhwztjqz6il2tof0z/xtbC7A8Hz2n+5s9zuQAA3f Content-Type: text/plain; charset="utf-8" From: Vinicius Costa Gomes [ Upstream commit ee66bc29578391c9b48523dc9119af67bd5c7c0f ] During the device remove process, the device is reset, causing the configuration registers to go back to their default state, which is zero. As the driver is checking if the event log support was enabled before deallocating, it will fail if a reset happened before. Do not check if the support was enabled, the check for 'idxd->evl' being valid (only allocated if the HW capability is available) is enough. Fixes: 244da66cda35 ("dmaengine: idxd: setup event log configuration") Reviewed-by: Dave Jiang Signed-off-by: Vinicius Costa Gomes Link: https://patch.msgid.link/20260121-idxd-fix-flr-on-kernel-queues-v3-v3= -10-7ed70658a9d1@intel.com Signed-off-by: Vinod Koul Signed-off-by: Wenshan Lan --- drivers/dma/idxd/device.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/dma/idxd/device.c b/drivers/dma/idxd/device.c index e769e1f0d28b..13af4ef2f43f 100644 --- a/drivers/dma/idxd/device.c +++ b/drivers/dma/idxd/device.c @@ -813,10 +813,6 @@ static void idxd_device_evl_free(struct idxd_device *i= dxd) if (!evl) return; =20 - gencfg.bits =3D ioread32(idxd->reg_base + IDXD_GENCFG_OFFSET); - if (!gencfg.evl_en) - return; - mutex_lock(&evl->lock); gencfg.evl_en =3D 0; iowrite32(gencfg.bits, idxd->reg_base + IDXD_GENCFG_OFFSET); --=20 2.43.0