From patchwork Tue Feb 13 10:12:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 200360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp449815dyb; Tue, 13 Feb 2024 02:40:29 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUMSHlzS5TEX3TxLEJ29xDLmyM9kxD3i7C+Wx/BZCvcj76JzRM/KWsmOPFnSLcEweeEAbGLbZAqWIIOJtOlMIxqmvJ9+w== X-Google-Smtp-Source: AGHT+IGt3E85IM+cYz0EZ/MS1YxTsLPFqFsU2MUphjqM0+gDJfioRHMmdRdejOvIhmPWFCIi8APj X-Received: by 2002:a05:6a00:9382:b0:6e0:9902:d7ce with SMTP id ka2-20020a056a00938200b006e09902d7cemr9126200pfb.10.1707820829619; Tue, 13 Feb 2024 02:40:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707820829; cv=pass; d=google.com; s=arc-20160816; b=S5gdFDATEC8dJtljOGPPxiq6i/7LejFwa/Y1cSNy/fizpPVpdD0oerMAHsN2TfQIvq C11oFeZ7ER4bVZgFW/Him5isuNAuO9ZY1ST81ofJvD07VesH5gh8MuNCxN6wPidm+okh zeieaAlenbxvbMGc5d304Cgi67duRxsPvDnju4XZC6Nn3giz8ImjuczM+3qwvKfI5Eii T6rjMRZnfjwDkN2Rv0uxoMgC1aMI/gfQqwRsl/720maIo+NMVufwZLCnCfNgh1sIUQNv Y2GGqNH4aotbXFDDzqxQoaZkrscsru/3+K2RHEigZOw9VZQ3TcKQeb5zHDMsuCQsf8Ea /SsA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=HLLg4bnrB8iB1pGKv/dn69TSqpbZyIBsXpfD0YnZCE8=; fh=ybD85Xfe6QZxiWdoE/sFM/jRv6bXonQEPtCU7DSwxvA=; b=rpltLXsiCmbX76OBJHCZQ3DtshYpU7BMqvzzfLL0MzH5M36fq3kuhWH1z8pEZyF6bF KTKYUbuznOwmOlSpo3OGEH80few1B8uYwPiQmFZ3LEPaMIwe9bKfwwO76/8sr4CSEn1y BkS94tJpU+f5zlPCM1x5z2F/lNpNgjpa9SV4P3RREEebq65UTlM85LH2NsLxuVDPvCkk xgAMDjog/TuR2ktltlMl8DYYShtji2dBdIRQH7cm16tiPOcxcUHMAtp81RIm3THYrjPs 7GNICGKbA4uZYJNVl0puyZ9sEFO/RpxrPJI8/g3nPsuoEthfu3GPuHvC+IaYNTnal7j9 d8BA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVHtuQSS; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-63318-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63318-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCU5UsR2h/iZ50NoYh9gWQUa3kafyeIQSOcVZcjLomqBXcPXDftqBBdiUXsRvT3qsxEqk8ahq83RZgHut+p/SXs4Mf+xEQ== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id w16-20020a639350000000b005dc42fd8c40si1748344pgm.404.2024.02.13.02.40.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 02:40:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63318-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oVHtuQSS; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-63318-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63318-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id ECA72B25D9A for ; Tue, 13 Feb 2024 10:13:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8076C2BAFA; Tue, 13 Feb 2024 10:12:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oVHtuQSS" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CD195225D5; Tue, 13 Feb 2024 10:12:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707819133; cv=none; b=pILWZN2DfGZzqQMwlyn4ospe/lWE/+6Rmk2rn2gwJyNAaqZrel1BLHDvBlbkIoF2S4hyjcXSnxCB9mD1DrZBB7EGr43tx/E7kWyfQwgKgawGCDykLqKYJ6JoKjG44lRE6c+OW4XAGGCSy9H43fM1tusaOjvQ/iDRKy+THjAWWSM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707819133; c=relaxed/simple; bh=mMMxy/y9GolMEAEGUBmVL1XVh2uwo1cUPLjZV/60nHA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Is4VShz02+FMk8PVLPhfHLyEnPxWpNJh8wPDIn/57wskv+emKcu3neIpivA4NKMRD1lUwwT6COWjq+vxF0kc5Qm/9a18bsVRW4zMDaYYlhuek2MKtKrSyIBTlcY0GZEJJ6pfbqySwlvgCLqlhHL49D3dbadqTsQSvSlOZxAduJM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oVHtuQSS; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72445C433B1; Tue, 13 Feb 2024 10:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707819133; bh=mMMxy/y9GolMEAEGUBmVL1XVh2uwo1cUPLjZV/60nHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oVHtuQSS5rAbZ1AVPeHYrpxwnfcRK7mrTyqmOX+JCeYl70dD1z2PApTqhGHYevjO5 N3K2/evL/evnJP6U0fIerZuDwbV62Mut9wppUt1iB7KOHNpYXq1mj4jNrAbIMQ2E/O bqaGQEjAdZftbh4sh+lzDSQzbxJaKFuluhC9yyAluDfRPxJBlKxjOA9gI5IOG+qNzR 0ilHFl59zQZGIFg0HFmi16PkNxPqgrcKEg/OBkpCeC59Zlz4+smmvsrhmqAdv9M8xR XloDmzKogJbl5rD2j4qiqkATI63NHX71toptdVRjNUsXU0mtEFpihjwu9G2DO3FgmI VJpqC1Qszz61w== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rZplr-002j7r-AO; Tue, 13 Feb 2024 10:12:11 +0000 From: Marc Zyngier To: Thomas Gleixner Cc: Kunkun Jiang , Lorenzo Pieralisi , Zenghui Yu , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 3/3] irqchip/gic-v3-its: Fix GICv4.1 VPE affinity update Date: Tue, 13 Feb 2024 10:12:06 +0000 Message-Id: <20240213101206.2137483-4-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240213101206.2137483-1-maz@kernel.org> References: <20240213101206.2137483-1-maz@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: tglx@linutronix.de, jiangkunkun@huawei.com, lpieralisi@kernel.org, yuzenghui@huawei.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790779860388114828 X-GMAIL-MSGID: 1790779934192340683 When updating the affinity of a VPE, we currently skip the VMOVP command if the two CPUs are part of the same VPE affinity. But this is wrong, as the doorbell corresponding to this VPE is still delivered on the 'old' CPU, which screws up the balancing. Furthermore, offlining that 'old' CPU results in doorbell interrupts generated for this VPE being discarded. The harsh reality is that we cannot easily elide VMOVP when a set_affinity request occurs. It needs to be obeyed, and if an optimisation is to be made, it is at the point where the affinity change request is made (such as in KVM). Drop the VMOVP elision altogether, and only use the vpe_table_mask to try and stay within the same ITS affinity group if at all possible. Fixes: dd3f050a216e (irqchip/gic-v4.1: Implement the v4.1 flavour of VMOVP) Reported-by: Kunkun Jiang Signed-off-by: Marc Zyngier Cc: stable@vger.kernel.org --- drivers/irqchip/irq-gic-v3-its.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 250b4562f308..53abd4779914 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -3826,8 +3826,9 @@ static int its_vpe_set_affinity(struct irq_data *d, bool force) { struct its_vpe *vpe = irq_data_get_irq_chip_data(d); - int from, cpu = cpumask_first(mask_val); + struct cpumask common, *table_mask; unsigned long flags; + int from, cpu; /* * Changing affinity is mega expensive, so let's be as lazy as @@ -3843,19 +3844,22 @@ static int its_vpe_set_affinity(struct irq_data *d, * taken on any vLPI handling path that evaluates vpe->col_idx. */ from = vpe_to_cpuid_lock(vpe, &flags); - if (from == cpu) - goto out; - - vpe->col_idx = cpu; + table_mask = gic_data_rdist_cpu(from)->vpe_table_mask; /* - * GICv4.1 allows us to skip VMOVP if moving to a cpu whose RD - * is sharing its VPE table with the current one. + * If we are offered another CPU in the same GICv4.1 ITS + * affinity, pick this one. Otherwise, any CPU will do. */ - if (gic_data_rdist_cpu(cpu)->vpe_table_mask && - cpumask_test_cpu(from, gic_data_rdist_cpu(cpu)->vpe_table_mask)) + if (table_mask && cpumask_and(&common, mask_val, table_mask)) + cpu = cpumask_test_cpu(from, &common) ? from : cpumask_first(&common); + else + cpu = cpumask_first(mask_val); + + if (from == cpu) goto out; + vpe->col_idx = cpu; + its_send_vmovp(vpe); its_vpe_db_proxy_move(vpe, from, cpu);