From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.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 5AAD64DE718; Mon, 19 Oct 2026 10:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792405162; cv=none; b=ASld5vDeWMQob3dJIb450QjsK/okeOKyQrX2f3goiWtNZnHIl+h8QS8NBSyQHHb9Q7L7J9HW/t1DCOc18gLeM81a/wk2m4scipR4fr5mu6QSJ3T3KQTd1TMB1fto5WUHX4GQ8iMhtbWEOiP7xo8vbfZLK4wptnwaUW9YI6VyIaU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792405162; c=relaxed/simple; bh=qcCdSEawB/v2bQsSg/rHrduRvBTvhKs7Oo4gxGeNMw8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HRO29TMnn68kRXr+BEUMbEsah9bCA6Y79RYYD1P5uERZUA6UVlGO+DkyVNjVQ+CNtvqXg5owdFEfqqir9EmQwpLQxrq9d6mOOig7en+Fs4Me2VXNy9k+mdyAklClvsACrXIUPPGGMVhzJ86lSo8+95EGxvMwYfJkRx+3ConDN/c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=AA+2yoP3; arc=none smtp.client-ip=148.163.158.5 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="AA+2yoP3" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 69J8iJwA3250808; Mon, 19 Oct 2026 10:19:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=LYOdpVEC0izHFA83j ZHUvAEP7bEsslT2ZePrzH2r214=; b=AA+2yoP3Xt4FnDx/UZYFRvoSiPhiQfYpz BiG3HNZzrF4Fnrmc9uV25wAc6vhSeJSjWrnCdfk7rRR0owcQSjzvJ59eXjbCXFjy MmJiUHUqNXOKjARRzogedlt+SHvdGYxr4i5fUtbgIXjIHKWbLsqRmozF82RrUK99 fbMgmY0osy99EG5FnkZiI5tuGBq9UxYoLnKqkY6lZc8nFpIF/+9g1UtlhQd/BwSz Qan+AdUmk1ebjeY5ja+zAQC/juthvZMes1vcsOHwwJ4CrU/zZfQwUWxmewwSejaC kBei0Qfq8XogTffYAoQSZcPZdF8OPDM+b/tZkHf1C0gnWJLUf9hnA== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4hbxeht4h0-1 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Mon, 19 Oct 2026 10:19:05 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.11/8.18.1.11) with ESMTP id 69J8YuRR2651397; Mon, 19 Oct 2026 10:19:05 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4hcnjgw1w6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 19 Oct 2026 10:19:04 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (smtpav03.fra02v.mail.ibm.com [10.20.54.102]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 69JAJ1pk48038304 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 19 Oct 2026 10:19:01 GMT Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 45F482005A; Mon, 19 Oct 2026 10:19:01 +0000 (GMT) Received: from smtpav03.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 920BF2004D; Mon, 19 Oct 2026 10:18:57 +0000 (GMT) Received: from Narayanas-MacBook-Pro.ibm.com (unknown [9.124.217.62]) by smtpav03.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 19 Oct 2026 10:18:57 +0000 (GMT) From: Narayana Murty N To: Mahesh J Salgaonkar , Madhavan Srinivasan , "Oliver O'Halloran" , Timothy Pearson , Alex Williamson Cc: Michael Ellerman , Nicholas Piggin , Christophe Leroy , Ritesh Harjani , Shrikanth Hegde , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, sbhat@linux.ibm.com, harshpb@linux.ibm.com Subject: [PATCH v5 3/5] powerpc/pseries/eeh: Implement RTAS-based EEH error injection Date: Mon, 19 Oct 2026 15:48:11 +0530 Message-ID: <20261019101813.45085-4-nnmlinux@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20261019101813.45085-1-nnmlinux@linux.ibm.com> References: <20261019101813.45085-1-nnmlinux@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYxMDE5MDA0MCBTYWx0ZWRfX13FAXfgYiaoz AxSfWyDSdWkEdmLb7ZKD8QTTcp75zsLokXvdiRY1fVUliaCFA8gsdzrxi7wXQDAiYAXdMKq56Yb uZ+F9MiwkhhCf6Gpu+lhk+Dsr3DVRH55BIqq+qwxkDzsuxfqQaFD2bQdXV+EJ6YX/KAt7FyE5xl RfhNuuNB8bj06BthHznQNIv1qa5h1Cg/IJ3tqeEzC4stA4/NThDSaIr+rXzRCqzpfGcIrdq/juH uAPqdKXpt/vRurr1orTY+0tlPBPuwxaSw7T94FXzjdIJaAi3QmygWEO9UPfBSjg+2l138WONXdU MyD7xyt83MGj754iBUG93JryFYcesMgcJZwaH9pTaPvuXqE6ACjg1cBlFJBmPAg0UAu7BI/Nc/E 7hwLwlyAm0lDYQJkrnVeZPpY2E3W1KyMYeJA5pmijk2p4pposPGFsTj9I99vsKvcFcJGZmdvfsn pI8FhHmZFh3gV5ejT+A== X-Proofpoint-Spam-Info: AW1haW4tMjYxMDE5MDA0MCBTYWx0ZWRfX/D+XiF0d2VAd g1lpl97Je0EpufG6YwXsZSVNDxIEG46DpYcuTC7y+fAjcJEmFOKVhpvQRLjKsjq9DKU4Mf6Y8YU N/OeJEBo2xySk4EImg2d+6WfdjeofYE= X-Proofpoint-GUID: NGTSjjIvyhMK1itwEZmU1EsFwvspNKyu X-Proofpoint-ORIG-GUID: 12im-ohpbBP--KLqTP8wzrxrZ-tVHAPD X-Authority-Analysis: v=2.4 cv=OZQNnRTY c=1 sm=1 tr=0 ts=6ad5ee9a cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=660iZSQnnn4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=bPTTwr8VSQXA1ycvqXoA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-10-19_03,2026-10-14_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 lowpriorityscore=0 bulkscore=0 spamscore=0 suspectscore=0 phishscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2610080000 definitions=main-2610190040 Replace the legacy MMIO stub in pseries_eeh_err_inject() with a full PAPR-compliant RTAS error injection path. Serialize each ibm,open-errinjct / ibm,errinjct / ibm,close-errinjct session with errinjct_mutex because RTAS maintains state between these calls. Once ibm,open-errinjct succeeds, ibm,close-errinjct is attempted after parameter preparation or ibm,errinjct failures. The RTAS work area is allocated after a successful open to avoid holding it while waiting for the mutex or if open fails. VFIO EEH error injection exposes a generic userspace ABI. pSeries maps the generic EEH error types to RTAS ibm,errinjct encodings via pseries_eeh_type_to_rtas(). EEH_ERR_TYPE_32 and EEH_ERR_TYPE_64 are unchanged; their values are defined in arch/powerpc/include/uapi/asm/eeh.h and are not renumbered. The RTAS work-area allocator guarantees that returned memory is within the range accessible by RTAS (below min(ppc64_rma_size, RTAS_INSTANTIATE_MAX), which is at most RTAS_INSTANTIATE_MAX = 1 GiB), so the physical address fits in the 32-bit RTAS argument without truncation. Remove the now-unused eeh_pe_inject_mmio_error() helper and its declaration; this patch removes its only caller. Tested with corresponding QEMU patches: https://lore.kernel.org/all/20251029150618.186803-1-nnmlinux@linux.ibm.com/ Signed-off-by: Narayana Murty N --- arch/powerpc/include/asm/eeh.h | 2 - arch/powerpc/kernel/eeh.c | 5 - arch/powerpc/platforms/pseries/eeh_pseries.c | 114 +++++++++++++++---- 3 files changed, 91 insertions(+), 30 deletions(-) diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h index b7ebb4ac2c71..083ac58e7eb7 100644 --- a/arch/powerpc/include/asm/eeh.h +++ b/arch/powerpc/include/asm/eeh.h @@ -310,8 +310,6 @@ int eeh_pe_reset(struct eeh_pe *pe, int option, bool include_passed); int eeh_pe_configure(struct eeh_pe *pe); int eeh_pe_inject_err(struct eeh_pe *pe, int type, int func, unsigned long addr, unsigned long mask); -int eeh_pe_inject_mmio_error(struct pci_dev *pdev); - /** * EEH_POSSIBLE_ERROR() -- test for possible MMIO failure. * diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index bb836f02101c..369aad298f75 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -1664,11 +1664,6 @@ static int eeh_break_device(struct pci_dev *pdev) return 0; } -int eeh_pe_inject_mmio_error(struct pci_dev *pdev) -{ - return eeh_break_device(pdev); -} - #ifdef CONFIG_DEBUG_FS diff --git a/arch/powerpc/platforms/pseries/eeh_pseries.c b/arch/powerpc/platforms/pseries/eeh_pseries.c index 999b3065e09b..52d001042663 100644 --- a/arch/powerpc/platforms/pseries/eeh_pseries.c +++ b/arch/powerpc/platforms/pseries/eeh_pseries.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include /* RTAS tokens */ static int ibm_set_eeh_option; @@ -1006,41 +1008,107 @@ static int prepare_errinjct_buffer(void *buf, struct eeh_pe *pe, return 0; } +/* Serializes the open/inject/close RTAS error injection session */ +static DEFINE_MUTEX(errinjct_mutex); + /** * pseries_eeh_err_inject - Inject specified error to the indicated PE * @pe: the indicated PE - * @type: error type - * @func: specific error type - * @addr: address - * @mask: address mask - * The routine is called to inject specified error, which is - * determined by @type and @func, to the indicated PE + * @type: generic EEH error type (EEH_ERR_TYPE_32 or EEH_ERR_TYPE_64) + * @func: specific error function + * @addr: address argument (type-dependent, may be zero) + * @mask: address mask (type-dependent, may be zero) + * + * Implements PAPR-compliant error injection using: + * ibm,open-errinjct -> ibm,errinjct -> ibm,close-errinjct + * + * errinjct_mutex serializes the open/inject/close session sequence + * because RTAS maintains state between these calls. A short-lived + * RTAS work area is allocated after a successful open and freed before + * close. + * + * Return: 0 on success, negative errno on failure. */ static int pseries_eeh_err_inject(struct eeh_pe *pe, int type, int func, unsigned long addr, unsigned long mask) { - struct eeh_dev *pdev; + struct rtas_work_area *area; + phys_addr_t area_phys; + void *buf; + int open_token, errinjct_token, close_token; + int session_token; + int rtas_err_type; + int close_rc; + int rc; + + rc = validate_errinjct_args(pe, type, func, addr, mask); + if (rc) + return rc; - /* Check on PCI error type */ - if (type != EEH_ERR_TYPE_32 && type != EEH_ERR_TYPE_64) + rtas_err_type = pseries_eeh_type_to_rtas(type); + if (rtas_err_type < 0) return -EINVAL; - switch (func) { - case EEH_ERR_FUNC_LD_MEM_ADDR: - case EEH_ERR_FUNC_LD_MEM_DATA: - case EEH_ERR_FUNC_ST_MEM_ADDR: - case EEH_ERR_FUNC_ST_MEM_DATA: - /* injects a MMIO error for all pdev's belonging to PE */ - pci_lock_rescan_remove(); - list_for_each_entry(pdev, &pe->edevs, entry) - eeh_pe_inject_mmio_error(pdev->pdev); - pci_unlock_rescan_remove(); - break; - default: - return -ERANGE; + open_token = rtas_function_token(RTAS_FN_IBM_OPEN_ERRINJCT); + errinjct_token = rtas_function_token(RTAS_FN_IBM_ERRINJCT); + close_token = rtas_function_token(RTAS_FN_IBM_CLOSE_ERRINJCT); + + if (open_token == RTAS_UNKNOWN_SERVICE || + errinjct_token == RTAS_UNKNOWN_SERVICE || + close_token == RTAS_UNKNOWN_SERVICE) + return -ENODEV; + + mutex_lock(&errinjct_mutex); + + do { + rc = rtas_call(open_token, 0, 2, &session_token); + } while (rtas_busy_delay(rc)); + + if (rc) { + pr_err("ibm,open-errinjct failed: status=%d\n", rc); + rc = rtas_error_rc(rc); + goto out_unlock; } - return 0; + area = rtas_work_area_alloc(RTAS_ERRINJCT_BUF_SIZE); + buf = rtas_work_area_raw_buf(area); + area_phys = rtas_work_area_phys(area); + + rc = prepare_errinjct_buffer(buf, pe, rtas_err_type, func, addr, mask); + if (rc) + goto out_free_area; + + /* + * RTAS work areas are allocated below RTAS_INSTANTIATE_MAX, so + * area_phys fits in the 32-bit RTAS argument. + */ + do { + rc = rtas_call(errinjct_token, 3, 1, NULL, + rtas_err_type, session_token, + (u32)area_phys); + } while (rtas_busy_delay(rc)); + + if (rc) { + pr_err("ibm,errinjct failed: status=%d\n", rc); + rc = rtas_error_rc(rc); + } + +out_free_area: + rtas_work_area_free(area); + + do { + close_rc = rtas_call(close_token, 1, 1, NULL, session_token); + } while (rtas_busy_delay(close_rc)); + + if (close_rc) { + pr_warn("ibm,close-errinjct failed: status=%d\n", close_rc); + if (!rc) + rc = rtas_error_rc(close_rc); + } + +out_unlock: + mutex_unlock(&errinjct_mutex); + return rc; } static struct eeh_ops pseries_eeh_ops = { -- 2.54.0