From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 DDF6A1E7C12 for ; Sun, 19 Apr 2026 07:16:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776583002; cv=none; b=Za/PbbNS/xgYxIbPMVVYaE20AX+LI8Tr47RIyujIzW9DVrKrb6CwRYKAUqcfX9tfs9VBf2xJf2tzXzFkseCBVRVuKqVSFaDBuGMnu0T8nJqI83C6gDfFyCRyulNgqtyqIKa23aNWJysjqkojjnVvU7OVFd/OdZnZONt+YaNRVRM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776583002; c=relaxed/simple; bh=nRo1l/Jv0YIdgmcFbAd0SdKioghezDFC+c/4gNa/KU8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=swsE1kzIqgjszRpRkPO19rgydiXsdRJLHSV2slzdDcgX6T9kEd9nzkWtf6ePeqRp+QonBikWPJ2DPNr1tCi652Rk5N2l6JAalirMHLUIukgEf7mb67qTzkcg/dLofQ4SEAs2Z0FDNNxjSJi2NUzpiYZN5v3vwY1Axuk7UHZEHXs= 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=s5kxVxx8; arc=none smtp.client-ip=209.85.221.53 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="s5kxVxx8" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-43d7650202fso1615645f8f.2 for ; Sun, 19 Apr 2026 00:16:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776582999; x=1777187799; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=e633J0iM4T36U0Ykk5jiq+vFzcuBQkCCmEghwzPCf5A=; b=s5kxVxx8C1WIn+RbggP/d1zGt2jgIAFZh5dimyELjVAg1ZRTB79IXMBPVZzcY8CMT1 pEFUp7L4Hc/IjwND5+dpOf6/2cXkf5KYrdW70YB5LTi+5YkcbdF/JDIQf4oGZsO9zzJ8 ERdz+5VzhbpwCPYzwQ8LcIGSh4DR9ZXTdhykX/3GalHAC0+CQbvxjBSoR46OqX9K21xo bzRJJ8YmUokbYwQ0/uEgRCXXgAdRIoEKBfopJ8Ukk6HtH73kl76SLqVFFjGhsLucVEcf j/MhnYGMUbHXsessrnl8NrLM8ybFYDU7F5NYmbVnN/TkesgpK3goH2AunvAGPLDjh215 4r9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776582999; x=1777187799; h=content-transfer-encoding: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; bh=e633J0iM4T36U0Ykk5jiq+vFzcuBQkCCmEghwzPCf5A=; b=sf85dgu4ZsRMajnzRIrrdO9PYBDShv7+CMevl2jCYlD2WxZKBO1rrFOrtVbWAPwHap 3G833Cvd+MTYSz5Z1Grzt0t9tut9WMhcm4I7YHiZ+G48HMz80SQyPrgbBqgECg/cEB0J l9mmZnFn2wraKOc3ss4WPB9Ni+7honGrivVAYl9ztTIpezg8YhuFtJUmK24ATUgdKQuC nfiw4NT2oEBW8K3q6JuydcDIqH66123oZK7BNMCXZgenn8xwMREcLqv+61HneOEBVywn A+TBz0YRc7U9WoQH9OqZqbKaoGAh4qJdWr1/LnP4bcLoWmOIazNTGTom4RJzw4x8PQEQ NUBw== X-Forwarded-Encrypted: i=1; AFNElJ9oG7OCNNnbw8/Xz1Vl8CYDULqSlpVCl7PfDAvoqv9G80+98AMjwb7QB0t+UQlic/9lTHJQOJgG5XPh/d8=@vger.kernel.org X-Gm-Message-State: AOJu0YyDldsrAHLOeIYfXqIrt39Kdy+HOuCKRVSDoBTFlig96iZDh6sY 7xnAoD2l9gFQIcvu73vGOdzWL2JEK6ugEt/c+sJPozOjtjEPQ4RLJdE1 X-Gm-Gg: AeBDieto26w2saMUAVnlxy60Pt1QXWHoRe/uptKgDIKYWy6gt+arRY7y+2skjyGVF0O xIzXL1/k3dPFRyz7hBEzZvLPyz/gPnk6Q54xzWXDyWOMjJddKum+CzWkVr2TWmi1tjObkpusQja +HVqlvnEQvs4kILf/5tkUhRfWz8OPIuKBft18ftisuY3CszXd5e6bKQyz2U5UwAG+0HID3o+O+J V+zi92lKw2zNuKYOWr3Jd8N4OJyKec/KwAeZcQg2csQzOAeMtfRpI5qFVm/OviC2iUyfEAoSdeU hlJvIReXceixUOlloyq1gd45xG7X2bhzhb48R8VgzO4AAWBwDtEQTuAYp5zVveDBURiX5YUjWNJ i6DCadVhtkZmu6EkuGciKmhl33bvHXR3gi6zowMblH4jMm4KdRl3NBoWQ/TKLtuhbV4Sh+Qxg6x iRFb4gj0wYqBdqjJhVeCCNTVpb/pKtxPP7gbXyvtJYLsW9NL0XGwTc6IvLi/sKohEyxUAFm+G5h aHl5KEUMl2cxTP5v9aikWGrkS2Cr0eoBxUewo2ut19IMnoYekMzuk3Uw73Oe57mll9s X-Received: by 2002:a05:6000:40df:b0:43d:7af0:3a93 with SMTP id ffacd0b85a97d-43fe3e14f29mr13287642f8f.34.1776582998733; Sun, 19 Apr 2026 00:16:38 -0700 (PDT) Received: from fedora.homenet.telecomitalia.it (host-80-117-127-126.pool80117.interbusiness.it. [80.117.127.126]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43fe4cc0f31sm18865676f8f.12.2026.04.19.00.16.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Apr 2026 00:16:38 -0700 (PDT) From: Adriano Vero To: maddy@linux.ibm.com, mpe@ellerman.id.au, sourabhjain@linux.ibm.com Cc: npiggin@gmail.com, chleroy@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, Adriano Vero Subject: [PATCH v2] powerpc/fadump: Add timeout to RTAS busy-wait loops Date: Sun, 19 Apr 2026 08:50:39 +0200 Message-ID: <20260419065039.23495-1-adri.vero.dev@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260406061542.22354-1-litaliano00.contact@gmail.com> References: <20260406061542.22354-1-litaliano00.contact@gmail.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 The ibm,configure-kernel-dump RTAS call sites in rtas_fadump_register(), rtas_fadump_unregister(), and rtas_fadump_invalidate() polled indefinitely while firmware returned a busy status. A misbehaving or hung firmware could stall these paths forever, blocking fadump registration at boot or preventing clean teardown. Introduce rtas_fadump_call(), a helper that wraps the common busy-wait pattern shared by all three sites. The helper accumulates the total delay and returns -ETIMEDOUT if firmware keeps returning a busy status beyond RTAS_FADUMP_MAX_WAIT_MS (60 seconds). A pr_debug() message is emitted on each busy iteration to aid diagnosis when the timeout is hit. Signed-off-by: Adriano Vero --- arch/powerpc/platforms/pseries/rtas-fadump.c | 80 ++++++++++++-------- arch/powerpc/platforms/pseries/rtas-fadump.h | 6 ++ 2 files changed, 53 insertions(+), 33 deletions(-) diff --git a/arch/powerpc/platforms/pseries/rtas-fadump.c b/arch/powerpc/platforms/pseries/rtas-fadump.c index eceb32893..3bb4ac2ab 100644 --- a/arch/powerpc/platforms/pseries/rtas-fadump.c +++ b/arch/powerpc/platforms/pseries/rtas-fadump.c @@ -179,9 +179,42 @@ static u64 rtas_fadump_get_bootmem_min(void) return RTAS_FADUMP_MIN_BOOT_MEM; } +/* + * Helper to make an ibm,configure-kernel-dump RTAS call with a bounded + * busy-wait loop. Returns the RTAS return code on completion, or + * -ETIMEDOUT if firmware keeps returning a busy status beyond + * RTAS_FADUMP_MAX_WAIT_MS milliseconds. + */ +static int rtas_fadump_call(struct fw_dump *fadump_conf, int operation, + void *fdm_ptr, unsigned int fdm_size, + const char *op_name) +{ + unsigned int wait_time, total_wait = 0; + int rc; + + do { + rc = rtas_call(fadump_conf->ibm_configure_kernel_dump, 3, 1, + NULL, operation, fdm_ptr, fdm_size); + wait_time = rtas_busy_delay_time(rc); + if (wait_time) { + pr_debug("Firmware busy during fadump %s, waiting %ums (total %ums)\n", + op_name, wait_time, total_wait); + if (total_wait >= RTAS_FADUMP_MAX_WAIT_MS) { + pr_err("Timed out waiting for firmware to complete fadump %s\n", + op_name); + return -ETIMEDOUT; + } + total_wait += wait_time; + mdelay(wait_time); + } + } while (wait_time); + + return rc; +} + static int rtas_fadump_register(struct fw_dump *fadump_conf) { - unsigned int wait_time, fdm_size; + unsigned int fdm_size; int rc, err = -EIO; /* @@ -192,16 +225,10 @@ static int rtas_fadump_register(struct fw_dump *fadump_conf) fdm_size = sizeof(struct rtas_fadump_section_header); fdm_size += be16_to_cpu(fdm.header.dump_num_sections) * sizeof(struct rtas_fadump_section); - /* TODO: Add upper time limit for the delay */ - do { - rc = rtas_call(fadump_conf->ibm_configure_kernel_dump, 3, 1, - NULL, FADUMP_REGISTER, &fdm, fdm_size); - - wait_time = rtas_busy_delay_time(rc); - if (wait_time) - mdelay(wait_time); - - } while (wait_time); + rc = rtas_fadump_call(fadump_conf, FADUMP_REGISTER, &fdm, fdm_size, + "register"); + if (rc == -ETIMEDOUT) + return -ETIMEDOUT; switch (rc) { case 0: @@ -234,19 +261,12 @@ static int rtas_fadump_register(struct fw_dump *fadump_conf) static int rtas_fadump_unregister(struct fw_dump *fadump_conf) { - unsigned int wait_time; int rc; - /* TODO: Add upper time limit for the delay */ - do { - rc = rtas_call(fadump_conf->ibm_configure_kernel_dump, 3, 1, - NULL, FADUMP_UNREGISTER, &fdm, - sizeof(struct rtas_fadump_mem_struct)); - - wait_time = rtas_busy_delay_time(rc); - if (wait_time) - mdelay(wait_time); - } while (wait_time); + rc = rtas_fadump_call(fadump_conf, FADUMP_UNREGISTER, &fdm, + sizeof(struct rtas_fadump_mem_struct), "unregister"); + if (rc == -ETIMEDOUT) + return -ETIMEDOUT; if (rc) { pr_err("Failed to un-register - unexpected error(%d).\n", rc); @@ -259,19 +279,13 @@ static int rtas_fadump_unregister(struct fw_dump *fadump_conf) static int rtas_fadump_invalidate(struct fw_dump *fadump_conf) { - unsigned int wait_time; int rc; - /* TODO: Add upper time limit for the delay */ - do { - rc = rtas_call(fadump_conf->ibm_configure_kernel_dump, 3, 1, - NULL, FADUMP_INVALIDATE, fdm_active, - sizeof(struct rtas_fadump_mem_struct)); - - wait_time = rtas_busy_delay_time(rc); - if (wait_time) - mdelay(wait_time); - } while (wait_time); + rc = rtas_fadump_call(fadump_conf, FADUMP_INVALIDATE, + (void *)fdm_active, + sizeof(struct rtas_fadump_mem_struct), "invalidate"); + if (rc == -ETIMEDOUT) + return -ETIMEDOUT; if (rc) { pr_err("Failed to invalidate - unexpected error (%d).\n", rc); diff --git a/arch/powerpc/platforms/pseries/rtas-fadump.h b/arch/powerpc/platforms/pseries/rtas-fadump.h index c109abf6b..65fdab7b5 100644 --- a/arch/powerpc/platforms/pseries/rtas-fadump.h +++ b/arch/powerpc/platforms/pseries/rtas-fadump.h @@ -41,6 +41,12 @@ #define MAX_SECTIONS 10 #define RTAS_FADUMP_MAX_BOOT_MEM_REGS 7 +/* + * Maximum time to wait for firmware to respond to an + * ibm,configure-kernel-dump RTAS call before giving up. + */ +#define RTAS_FADUMP_MAX_WAIT_MS 60000U + /* Kernel Dump section info */ struct rtas_fadump_section { __be32 request_flag; -- 2.53.0