Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 24 Oct 2022 12:54:22 -0400
From:   Joe Korty <joe.korty@concurrent-rt.com>
To:     Marc Zyngier <maz@kernel.org>
Cc:     Mark Rutland <mark.rutland@arm.com>,
        Daniel Lezcano <daniel.lezcano@linaro.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] arm64: arch_timer: XGene-1: TVAL register math error
 breaks timer expiry calculation.
Message-ID: <20221024165422.GA51107@zipoli.concurrent-rt.com>
Reply-To: Joe Korty <joe.korty@concurrent-rt.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.21 (2010-09-15)
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EH7TnuW+j+v/nIVWTMgd5xymGgN+rVOm77xIBswWqMCiO4v3vb2SEwNGZpxp?=
 =?us-ascii?Q?gK2M2X3Rrxv4ZnpRauLFMYOrNqy9V66migHdgYpEB8VPGHEOHw7w6hPgq7h2?=
 =?us-ascii?Q?TY2HAIagE/LzKC6iwMk0iRApSdnw7xY+fqoz8hW2Pwi30wx1ynXukUcTV/FV?=
 =?us-ascii?Q?XVAdn6CIW9iH9B+1EMjbK3Q9E9UGhJ2S5HU7gxmSv4c69X9W5dzS+bjMjRQP?=
 =?us-ascii?Q?7FnfKel76KjxqaZbOgFmYyxpv3epWMdJdoHVJEfnCkVpR6hXLua6dDnTHT+S?=
 =?us-ascii?Q?zdPhWoSTQRBfttU+dyqGie7Ly+UAKKcWod4NP8pfk5PdFNWE6GYNA0XqvxSg?=
 =?us-ascii?Q?RfnNnv3cKwof6UG3Rf4cM9BzP0vvK6nsgIBezxyBQyTjGbxlMD0uqR1XrNqp?=
 =?us-ascii?Q?WElvYU4R4r44HnOe1Cx5F5HaSXQbDR+nzgi9UZi+iBVKfkyAtnYEAGliYHnO?=
 =?us-ascii?Q?aBY9P1XlrCl1fUcOYyPSllte1e7oPUc1c7Gn5L/sizq5NeMzuncBvkqabf+/?=
 =?us-ascii?Q?Tdrt7BxDjVZ2xLa8nv1QU+6foKWrbzlRJz+fZq88TlCRxMvm/Ej9NUOMf0NI?=
 =?us-ascii?Q?4jDJTDHL8zowxqPpgqmPwEd+C0tqfox8zbi9d5Wi7f97l5ktxNkyksPiBVvd?=
 =?us-ascii?Q?pctcGB/P9bqHHRhVnTntaiGuz76ER+eCtDkYH7q7T+b6tkAmSs3Sz2j9t63F?=
 =?us-ascii?Q?W3ITgOa2jI8SCt3QK0NKCG7O9ggaQFdVsv81zsKkxJg1SSsdAo/p56Yj9aHf?=
 =?us-ascii?Q?pxa18+HaJwaaUKCUWm+qksZqvIA3hClA5KoNvakYN0ur36zZ136YUHLLltpx?=
 =?us-ascii?Q?jYUmBQcNE2EBbFSzk5P3tL8chf7KejLbW+pgwtO9mY3rHtHfRwVTOIrsQDRi?=
 =?us-ascii?Q?ZpRbgXxCYKI/ETp4H2JYPu4WMc0tQG1kqo/93CgVt+hqka4Oet3I2OgyC8mH?=
 =?us-ascii?Q?fDrvdtFdtPRsN41MxT+mfYdel/gaaonnqgVtwAdJsR9wFcOx5qh3wzHNWMgo?=
 =?us-ascii?Q?PQyyXXiu0xLPn9a6whuxjU2AApAzzvjF2h9ASdkgpY/0myxEXaEFcShDUlFD?=
 =?us-ascii?Q?hqKUUbzJDM90wxW8h9EAW3GMHDdV8RhyfkNHZscsgu030NMLASqJBD2AffdF?=
 =?us-ascii?Q?ISuYJ5aRzrOZ7F1ccYdmSNg4o5A1cZOOsNz+kKy1lgCNQUWfI2moE7kh5h8V?=
 =?us-ascii?Q?KuIP6+3sWJt3LC4j/ayEGhs2z5wxa0EQhGPX4hooxL7fuJJWbNJNwhj7IC5X?=
 =?us-ascii?Q?E88kXjaLLWsP9VSJ61ax6oXcoVcB/E4acVt+WDcJzh1hdx6HFtvr6A0liygy?=
 =?us-ascii?Q?liwuHyDJI5ajzA5eoaOijj4mtKz07WvpbxeAsW1+Md+SnczG7kDYq8R0jyB0?=
 =?us-ascii?Q?BlyW21jDv+ULK8niMPh+b1lK9zVJnrKW0rav60CyTjTloLyiGOGPKlXprD+J?=
 =?us-ascii?Q?0+P6GfoCeYulT9txBYHk1BBZDuYrkOaHTXs/sPzusVfsGjXZ4X+1cd0benhH?=
 =?us-ascii?Q?4e5F6tjV3rutsvKjHQoCs3SsfldTCRuEzEv1CRXcoCmVb6dOPPHarH6xTPvn?=
 =?us-ascii?Q?p/Bx1/f6qvy1LkNrg1epR6AlojFvSAJaj01BSRU19/XOXvVYoiGWMvQBR4ZF?=
 =?us-ascii?Q?MA=3D=3D?=
X-OriginatorOrg: concurrent-rt.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d4f455d0-2031-45cf-4f87-08dab5e069e7
X-MS-Exchange-CrossTenant-AuthSource: DB8PR09MB3580.eurprd09.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2022 16:54:28.1496
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 6cce74a3-3975-45e0-9893-b072988b30b6
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oNjjwn8PM2TE2h6FqnCFsfR8J6yfx9Xq2rSd1fgTJk7spJjnhK31mRvjrfMWwtqdrZPuFgwchL0FA+C7hUYMezYUIcM/wCry72nVbKBpkoI=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR09MB3601
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

arm64: arch_timer: XGene-1: TVAL register math error breaks timer expiry calculation.

The TVAL register is 32 bit signed.  Thus only the lower 31 bits are
available to specify when an interrupt is to occur at some time in the
near future.  Attempting to specify a larger interval with TVAL results
in a negative time delta which means the timer fires immediately upon
being programmed, rather than firing at that expected future time.

The solution is for linux to declare that TVAL is a 31 bit register rather
than give its true size of 32 bits.  This prevents linux from programming
TVAL with a too-large value.  Note that, prior to 5.16, this little trick
was the standard way to handle TVAL in linux, so there is nothing new
happening here on that front.

Test procedure: for some reason, the lockup watchdog is sensitive to
this bug.  When we turn the watchdog off, then run a little 'hello world'
program in each of the CPUs, there will often be one that 1) hangs up
forever, 2) hangs up what seems like forever, but actully contines after
a few minutes.  In either case, the program cannot be freed by a ^C.
This test sequence requires CONFIG_SOFTLOCKUP_DETECTOR, and probably
requires that one of the NO_HZ Kconfig options be specified.

The sequence is, for an 8 cpu Mustang XGene-1:

   echo 0 >/proc/sys/kernel/watchdog
   for i in {0..7}; do taskset -c $i echo hi there $i; done

Note that though the hangup usually happens, it does not
always happen.

Some comments on the v1 version of this patch by Marc Zyngier:

  XGene implements CVAL (a 64bit comparator) in terms of TVAL (a countdown
  register) instead of the other way around. TVAL being a 32bit register,
  the width of the counter should equally be 32.  However, TVAL is a
  *signed* value, and keeps counting down in the negative range once the
  timer fires.

  It means that any TVAL value with bit 31 set will fire immediately,
  as it cannot be distinguished from an already expired timer. Reducing
  the timer range back to a paltry 31 bits papers over the issue.

  Another problem cannot be fixed though, which is that the timer interrupt
  *must* be handled within the negative countdown period, or the interrupt
  will be lost (TVAL will rollover to a positive value, indicative of a
  new timer deadline).

 [ v2: Expanded CC list - jak ]
 [ v2: Revamped changelog - jak ] 
 [ v2: streamlined inlined comments - jak ] 

Cc: stable@vger.kernel.org # 5.16+
Fixes: 012f18850452 ("clocksource/drivers/arm_arch_timer: Work around broken CVAL implementations")
Signed-off-by: Joe Korty <joe.korty@concurrent-rt.com>
---
base-commit: v6.0
Index: b/drivers/clocksource/arm_arch_timer.c
===================================================================
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -804,6 +804,9 @@ static u64 __arch_timer_check_delta(void
 		/*
 		 * XGene-1 implements CVAL in terms of TVAL, meaning
 		 * that the maximum timer range is 32bit. Shame on them.
+		 *
+		 * Note that TVAL is signed, thus has only 31 of its
+		 * 32 bits to express magnitude.
 		 */
 		MIDR_ALL_VERSIONS(MIDR_CPU_MODEL(ARM_CPU_IMP_APM,
 						 APM_CPU_PART_POTENZA)),
@@ -811,8 +814,8 @@ static u64 __arch_timer_check_delta(void
 	};
 
 	if (is_midr_in_range_list(read_cpuid_id(), broken_cval_midrs)) {
-		pr_warn_once("Broken CNTx_CVAL_EL1, limiting width to 32bits");
-		return CLOCKSOURCE_MASK(32);
+		pr_warn_once("Broken CNTx_CVAL_EL1, using 32 bit TVAL instead.\n");
+		return CLOCKSOURCE_MASK(31);
 	}
 #endif
 	return CLOCKSOURCE_MASK(arch_counter_get_width());