From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6454606A330 for ; Wed, 18 Nov 2026 15:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=Rm3od5iK; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.a=rsa-sha256 header.s=desiato.20200630 header.b=BvWl24tk; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=xKSb0yMy DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Unsubscribe-Post: List-Owner; bh=4abZZAGFr+op4Fiin9qqMvU61lk2F4uPWmmjiHuLcbQ=; b=Rm3od5iKOWdtKI NplJfp6u3SZG6BgiM+qrX3/o8d+q0sW5K/+LIsk7lFJQxPms0ZWxT4mm9hcRb+EPeeOcGbaxkF98W LepgRHwWFqHThGZ3QZew50I4ufp8P9GJfS8CrE3bskQGjs7WXPjLYgsNnvEhN7G2CU0PMjNxeuCzu Q/ZBSUkh8Qq2i8Az6L05I0u7Q4milbzfn+bv6cB312kmXvpEnOgw5ROCPAlAv/pwAjUqosp2xQAx7 A1WM/Drk4ef5Hp8nSEn1EoLTOXQtZpkBKaXVae/BgyeSWKdDf925MYRTs6eALj+9AF3wxtv9PQrDq hYi8kRuCfl1DiI1zGwtw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.100.1 #2 (Red Hat Linux)) id 1xThSE-00000009F77-3Tkw; Wed, 18 Nov 2026 15:20:10 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xThRr-00000009EnE-3rhs for linux-arm-kernel@bombadil.infradead.org; Wed, 18 Nov 2026 15:19:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=4abZZAGFr+op4Fiin9qqMvU61lk2F4uPWmmjiHuLcbQ=; b=BvWl24tkNpjKbg0eJufJalOa90 8Trbdvyy+7Wq9Kids7kp2/pwHWaSYyKXBt9SHWueT7Gi9ETIpNvX5cwifPjdlsR21504b+2ooIsvV 6vHbTDbholzBmcEn7ChrgzZd2wJKkcpCYtoxlaz2S9l4GIR8K/X5+oHMXluSbdkSDRuEzgZxtyj4O aXIuX/IzmNts6WYD1qulM4jzoYfgWV6i64XXrE5rTO3+KplqqBSdHpflo7r1UMjBX45z7w5JPRXjm wYwyj//lFmNTdJvhaoQchwInNYULgnBjtG8r4dWiWTsAfg0eft3bOw69sglUCutqYdRYV13fEB9xO vKeD7nRQ==; Received: from out-51.mta0.migadu.com ([2001:41d0:1004:224b::33] helo=mta0.migadu.com) by desiato.infradead.org with esmtps (Exim 4.100.1 #2 (Red Hat Linux)) id 1xThRm-0000000GC8Z-0J34 for linux-arm-kernel@lists.infradead.org; Wed, 18 Nov 2026 15:19:46 +0000 X-Envelope-To: linux-arm-kernel@lists.infradead.org DKIM-Signature: a=rsa-sha256; bh=AgR9DTR2Y4DJllQF/5/cjrLNXKWsG0SIqMY2siOpC2M=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1795015178; v=1; x=1795619978; b=xKSb0yMy4rDzsorbN5K8uw5G5Ki/2BIcjXZhP4T1iud4f7XIHrWONQYM6C1/SZBbOeUApbbm zYzPhmYs3W+EZAgHyOyLanZhr0EqVESo+2vlI4jJUEn4Tj9uDVbeTQAg7PvaSy3h8MTsvzU+xka i8mPaFJd6cuDBOvkwg8aDyPc= X-Envelope-To: linux-arm-kernel@lists.infradead.org Received: by smtp.migadu.com with ESMTPS id dc4acb5ede39579a; Wed, 18 Nov 2026 15:19:38 +0000 X-Mizu-Trace-ID: dc4acb5ede39579a X-Migadu-Flow: FLOW_OUT From: Fuad Tabba To: Marc Zyngier , Oliver Upton Cc: Will Deacon , Catalin Marinas , Joey Gouly , Mark Rutland , Suzuki K Poulose , Raghavendra Rao Ananta , Sascha Bischoff , Thomas Gleixner , Sebastian Ene , =?UTF-8?q?Bart=C5=82omiej=20Grzesik?= , Mostafa Saleh , Vincent Donnefort , Vladimir Murzin , Zenghui Yu , Zenghui Yu , Steffen Eiden , Radu Rendec , Fuad Tabba , kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 05/13] irqchip/gic-v3-its: Compute the wait target under the ITS lock Date: Wed, 18 Nov 2026 15:18:56 +0000 Message-ID: <20261118151904.4099560-6-fuad.tabba@linux.dev> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261118151904.4099560-1-fuad.tabba@linux.dev> References: <20261118151904.4099560-1-fuad.tabba@linux.dev> X-Archived-By: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20261118_151942_036997_28279434 X-CRM114-Status: GOOD ( 14.55 ) X-Spam-Score: -0.2 (/) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=4.0.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on aws-us-west-2-korg-listserv-alma10-1 its_wait_for_range_completion() converts the posted command pointer into a queue offset against its->cmd_base, after the caller has dropped its->lock. That's fine while cmd_base never changes, but the pKVM takeover in a subsequent patch switches cmd_base to a copy of the queue while the other CPUs are stopped, and a CPU stopped in the wait before it has converted the pointer would compute its target against the wrong base. Compute the offset in its_post_commands(), under the lock, and pass it to the wait instead of the pointer. No functional change intended. Signed-off-by: Fuad Tabba --- drivers/irqchip/irq-gic-v3-its.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index bbfea565149bb..734fe4fb52bd6 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -1144,13 +1144,13 @@ static struct its_cmd_block *its_allocate_entry(struct its_node *its) return cmd; } -static struct its_cmd_block *its_post_commands(struct its_node *its) +static u64 its_post_commands(struct its_node *its) { u64 wr = its_cmd_ptr_to_offset(its, its->cmd_write); writel_relaxed(wr, its->base + GITS_CWRITER); - return its->cmd_write; + return wr; } static void its_flush_cmd(struct its_node *its, struct its_cmd_block *cmd) @@ -1167,13 +1167,12 @@ static void its_flush_cmd(struct its_node *its, struct its_cmd_block *cmd) static int its_wait_for_range_completion(struct its_node *its, u64 prev_idx, - struct its_cmd_block *to) + u64 to_idx) { - u64 rd_idx, to_idx, linear_idx; + u64 rd_idx, linear_idx; u32 count = 1000000; /* 1s! */ /* Linearize to_idx if the command set has wrapped around */ - to_idx = its_cmd_ptr_to_offset(its, to); if (to_idx < prev_idx) to_idx += ITS_CMD_QUEUE_SZ; @@ -1216,10 +1215,10 @@ void name(struct its_node *its, \ buildtype builder, \ struct its_cmd_desc *desc) \ { \ - struct its_cmd_block *cmd, *sync_cmd, *next_cmd; \ + struct its_cmd_block *cmd, *sync_cmd; \ synctype *sync_obj; \ unsigned long flags; \ - u64 rd_idx; \ + u64 rd_idx, wr_idx; \ \ raw_spin_lock_irqsave(&its->lock, flags); \ \ @@ -1242,10 +1241,10 @@ void name(struct its_node *its, \ \ post: \ rd_idx = readl_relaxed(its->base + GITS_CREADR); \ - next_cmd = its_post_commands(its); \ + wr_idx = its_post_commands(its); \ raw_spin_unlock_irqrestore(&its->lock, flags); \ \ - if (its_wait_for_range_completion(its, rd_idx, next_cmd)) \ + if (its_wait_for_range_completion(its, rd_idx, wr_idx)) \ pr_err_ratelimited("ITS cmd %ps failed\n", builder); \ } -- 2.47.3