From nobody Mon Jun 8 23:56:53 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 73583405E7; Mon, 25 May 2026 09:50:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779702602; cv=none; b=kyvOdyKl2gyGi0BVtZVGVpXQLeQ/ZQzaC+qvzlsT0+NbaaRLNbjQinI2/McAcAwEzfleZHv5NtJgetS6unV8fOIIqv8OEi5+wXDJARjeG3XUDqbKyMjsHvmPsIH0KIaiFbvM1x89PGQMXldhfGLLwf1Fvhf9a/F8puWS9Nhh1ao= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779702602; c=relaxed/simple; bh=cCbi42ybHYA2NVsRMLs5aL9DmiZNh9mQbasKc5As6so=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d8qJqmG2k/ZOYVW28NLWZOw5v4lS+aGuMC5unWdqu1K3bMZ7Q7Q8/ppAV8Pqf/e71kdFU91VGjJOUujbLFxRjznaRkZWHlqoFMZv6stymHbqpm1Ds9Ej0AkP5EXMQDRwQomle4HgADz4N/eU5JLWC9hF7nIQq2BYnZHbpWWRx/E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=T0ii8/yK; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="T0ii8/yK" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64P6WfYt119484; Mon, 25 May 2026 09:49:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=VqN21vzvn/n BLPhaHYlcmo4rXms5WRMKGKY9USyjovA=; b=T0ii8/yKWFykk/tg6D2QXTyCnyj I67W33GEjvREhOJnwsZT/+tPXNXMZWcDCkuw32UA1XB/viGf4CL3d3GVoWeZg9qA Qz2pzs+1FKtoBx1ZahcbMW6D+PlChAkkkTm7nN+8puVtZw6MGvobkKmleFkJw/oh JgMgTX1R+tSBlzv9bp165cr0pco9/SpfS/NNRitG32LLVJ1o9+fUMqU4ncZYVlCO cMHpNqHYnlsGx9T0y6MY2SkPTLcLYjhnlFpK3Sv7xygvn6032VZSMSzTIZd7VWdC m3oTqSCoZkxRFSCLUM9bEoY/fSbS69BjmZ3RGX/SSRTcKJClqnrGW2LCcEg== Received: from apblrppmta02.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eb4f3e2ra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:50 +0000 (GMT) Received: from pps.filterd (APBLRPPMTA02.qualcomm.com [127.0.0.1]) by APBLRPPMTA02.qualcomm.com (8.18.1.7/8.18.1.7) with ESMTP id 64P9nl5S019449; Mon, 25 May 2026 09:49:47 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APBLRPPMTA02.qualcomm.com (PPS) with ESMTPS id 4eb5ajeh9w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:47 +0000 (GMT) Received: from APBLRPPMTA02.qualcomm.com (APBLRPPMTA02.qualcomm.com [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.1.12) with ESMTP id 64P9nlV6019434; Mon, 25 May 2026 09:49:47 GMT Received: from hu-devc-blr-u24-a.qualcomm.com (hu-anuppate-blr.qualcomm.com [10.131.36.165]) by APBLRPPMTA02.qualcomm.com (PPS) with ESMTPS id 64P9nlQH019429 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:47 +0000 (GMT) Received: by hu-devc-blr-u24-a.qualcomm.com (Postfix, from userid 486687) id 6577422668; Mon, 25 May 2026 15:19:46 +0530 (+0530) From: Anup Patel To: Paolo Bonzini , Atish Patra , Thomas Gleixner Cc: Palmer Dabbelt , Paul Walmsley , Anup Patel , Andrew Jones , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, "Guo Ren (Alibaba DAMO Academy)" , Anup Patel Subject: [PATCH v5 1/2] irqchip/riscv-imsic: Add nr_guest_files in per-HART local config Date: Mon, 25 May 2026 15:19:44 +0530 Message-ID: <20260525094945.3721783-2-anup.patel@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260525094945.3721783-1-anup.patel@oss.qualcomm.com> References: <20260525094945.3721783-1-anup.patel@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-ORIG-GUID: uaoG8qfql68Ha4I_kExK7fwOk16HLcuE X-Authority-Analysis: v=2.4 cv=WvYb99fv c=1 sm=1 tr=0 ts=6a141b3e cx=c_pps a=Ou0eQOY4+eZoSc0qltEV5Q==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=oD6YGmB8v4GqGCjrqTEA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI1MDEwMCBTYWx0ZWRfXxh21r715OrRZ IoiofQqtz86YjHQXjcOf03tL2uGHei3y+Hfe38VSvNj8H9pmxhBFiv0Wh2SK6AedUnnuA0H+szA izW+Ok+20WB3RPgCKACEMvx0mcKxfv9AZ6BY8lV6oqbDW8loeCwlt/us2q/betZ8OHTYMGyCSGV YLk8258QeiCJYJstjGzYCgluy3LZ3KyX8hyYWN7X4obgld1PKMDDG1jVt82iA1cpcwTCcZFqdqK f8nc1/pFoDeiu5cMST5CphDyq2SK45lFTwPchT8ZXmtRib332Az0d7iSmKVXYBemBmllQ2chC/G 94j+r608Blh3v8J6KGBVV6eHk0VkF7/BxSS4Vtr196QDbJdB7yTsYUPZ1s6knFtglGuSvHrnZRp P7huH1kn5ByRp9FGNh2I+7VGX9sa4nphgTlWNUxC02rSc1qhyizSVIMeBfas7asFbwX/ALCe7n+ 4W9WKVis+zO4rxRelLw== X-Proofpoint-GUID: uaoG8qfql68Ha4I_kExK7fwOk16HLcuE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-25_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 lowpriorityscore=0 spamscore=0 clxscore=1015 phishscore=0 adultscore=0 suspectscore=0 impostorscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605250100 Content-Type: text/plain; charset="utf-8" From: "Guo Ren (Alibaba DAMO Academy)" Add nr_guest_files in per-HART local config to represent the number of guest files available on a particular HART whereas the nr_guest_files in the global config represents the number of guest files available across all HARTs. This allows KVM RISC-V to use nr_guest_files from per-HART local config for asymmetric big.Little systems. Signed-off-by: Guo Ren (Alibaba DAMO Academy) Acked-by: Thomas Gleixner Signed-off-by: Anup Patel --- drivers/irqchip/irq-riscv-imsic-state.c | 9 ++++----- include/linux/irqchip/riscv-imsic.h | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-riscv-imsic-state.c b/drivers/irqchip/irq-= riscv-imsic-state.c index e3ed874d89e7..b8d1bbbf42f7 100644 --- a/drivers/irqchip/irq-riscv-imsic-state.c +++ b/drivers/irqchip/irq-riscv-imsic-state.c @@ -920,13 +920,12 @@ int __init imsic_setup_state(struct fwnode_handle *fw= node, void *opaque) local->msi_va =3D mmios_va[index] + reloff; =20 /* - * KVM uses global->nr_guest_files to determine the available guest - * interrupt files on each CPU. Take the minimum number of guest - * interrupt files across all CPUs to avoid KVM incorrectly allocating - * an unexisted or unmapped guest interrupt file on some CPUs. + * KVM uses both local->nr_guest_files and global->nr_guest_files + * to determine the available guest interrupt files on each CPU. */ nr_guest_files =3D (resource_size(&mmios[index]) - reloff) / IMSIC_MMIO_= PAGE_SZ - 1; - global->nr_guest_files =3D min(global->nr_guest_files, nr_guest_files); + local->nr_guest_files =3D min((BIT(global->guest_index_bits) - 1), nr_gu= est_files); + global->nr_guest_files =3D min(global->nr_guest_files, local->nr_guest_f= iles); =20 nr_handlers++; } diff --git a/include/linux/irqchip/riscv-imsic.h b/include/linux/irqchip/ri= scv-imsic.h index 4b348836de7a..61af3a5bea09 100644 --- a/include/linux/irqchip/riscv-imsic.h +++ b/include/linux/irqchip/riscv-imsic.h @@ -40,6 +40,9 @@ struct imsic_local_config { phys_addr_t msi_pa; void __iomem *msi_va; + + /* Number of guest interrupt files per-HART */ + u32 nr_guest_files; }; =20 struct imsic_global_config { @@ -68,7 +71,7 @@ struct imsic_global_config { /* Number of guest interrupt identities */ u32 nr_guest_ids; =20 - /* Number of guest interrupt files per core */ + /* Number of guest interrupt files across all HARTs */ u32 nr_guest_files; =20 /* Per-CPU IMSIC addresses */ --=20 2.43.0 From nobody Mon Jun 8 23:56:53 2026 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (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 92E673446B9; Mon, 25 May 2026 09:50:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779702613; cv=none; b=Dzybeya4Sa/FDzG7olhYIRIFiWkRmS5qbg+wWxZOmCXGpTjsAVak3Z6wD5hfYddTsYXPpVrmq5Lvc3iwIP1l9SuRjv4FFFq9MEgus4AC7E2fv6Q3pyw8lJWZzj/CtYIDgNXYJdghof8r/2UrJqusrOKY3uYq0iaiVcWMeA0cCv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779702613; c=relaxed/simple; bh=vBtTxuF+6QSUb5qSCHMCNQW+GIVPoINBXctkzCtL+nM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=T+qKmotlyoJx/JyqrmcPFUgUbqRlpJhKhslUZjnq8qxI02a3Dt8wzdFCDVdpauKH/9Otxjq2d8DnrXYsq1qyTcohH1wWDKItKVa8K4VLDAYfNV9CETv/CGopJ5xqKjuj6ZDzELVrHCcb5neOrX/Y1mXWMIwk0k+06YsJvZnabvI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=O65OIzVe; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="O65OIzVe" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64P6d1Pn2602665; Mon, 25 May 2026 09:49:51 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=XSi27LaIZDS YfIkF6hAAkA0fQqKRxuANHSMrzpNnmkA=; b=O65OIzVeqFP/9Veln9cB8tAKw5W Dm4VAscQwNeI200WaQVkuUJpWe7+CyXvTDbI3a+fxuDDyNxMVjxppYz8ZKMvZBoG rcfbZx4LHFcTzkqU7qDixZPEF1X1hp7aFTD9nXKr7RY1CQ5zb8tZLtjKT12ij/h4 EOnQK1y+7+xcyP72nsD4/gts5XE9/M1L0kwZbzlGl42rBRUyjAA6tI1G1H6lNxsX 6uNR36UAvP80RDjuhrVmom/7yWqC2rh9gTrSc8OZSDVFysf3DgCdwwYZaMmVB6Uw 23MQbAbZ4zNZg7mnF2UZe8nI1GwJnTZGGLVRwFlOKxPsnt03ZFuj/ypBtlw== Received: from apblrppmta02.qualcomm.com (blr-bdr-fw-01_GlobalNAT_AllZones-Outside.qualcomm.com [103.229.18.19]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4eb36t699e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:50 +0000 (GMT) Received: from pps.filterd (APBLRPPMTA02.qualcomm.com [127.0.0.1]) by APBLRPPMTA02.qualcomm.com (8.18.1.7/8.18.1.7) with ESMTP id 64P9nleh019450; Mon, 25 May 2026 09:49:47 GMT Received: from pps.reinject (localhost [127.0.0.1]) by APBLRPPMTA02.qualcomm.com (PPS) with ESMTPS id 4eb5ajeh9v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:47 +0000 (GMT) Received: from APBLRPPMTA02.qualcomm.com (APBLRPPMTA02.qualcomm.com [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.1.12) with ESMTP id 64P9nlog019435; Mon, 25 May 2026 09:49:47 GMT Received: from hu-devc-blr-u24-a.qualcomm.com (hu-anuppate-blr.qualcomm.com [10.131.36.165]) by APBLRPPMTA02.qualcomm.com (PPS) with ESMTPS id 64P9nl3H019431 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 25 May 2026 09:49:47 +0000 (GMT) Received: by hu-devc-blr-u24-a.qualcomm.com (Postfix, from userid 486687) id 68DC32266A; Mon, 25 May 2026 15:19:46 +0530 (+0530) From: Anup Patel To: Paolo Bonzini , Atish Patra , Thomas Gleixner Cc: Palmer Dabbelt , Paul Walmsley , Anup Patel , Andrew Jones , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, "Guo Ren (Alibaba DAMO Academy)" , Anup Patel Subject: [PATCH v5 2/2] RISC-V: KVM: AIA: Make HGEI number management fully per-CPU Date: Mon, 25 May 2026 15:19:45 +0530 Message-ID: <20260525094945.3721783-3-anup.patel@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260525094945.3721783-1-anup.patel@oss.qualcomm.com> References: <20260525094945.3721783-1-anup.patel@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QCInternal: smtphost X-QCInternal: smtphost X-Proofpoint-GUID: v5yknUmkNLwe1L7yDJfaps23EAQWEf9y X-Authority-Analysis: v=2.4 cv=Fto1OWrq c=1 sm=1 tr=0 ts=6a141b3e cx=c_pps a=Ou0eQOY4+eZoSc0qltEV5Q==:117 a=Ou0eQOY4+eZoSc0qltEV5Q==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=VwQbUJbxAAAA:8 a=EUspDBNiAAAA:8 a=1Uz5Pcmo5m1ThD7f2wUA:9 X-Proofpoint-ORIG-GUID: v5yknUmkNLwe1L7yDJfaps23EAQWEf9y X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI1MDEwMCBTYWx0ZWRfX4seI+C4+kwHU 76xBci+9WAhkwC7cUZlxnCS7dSdkaC3dTJGLJ8ubq9jlPXS9IWOn52Uv2BgswDUWRcEgREGNC4+ uEfn7k4sqrfaaAU5GM3FahSMBm92WafQCA5MFL8J+UB8p+9z9FJBSEBZTsrAI7uGvoeTT9dhTE7 qXPKGWxmwZrfVqzB11R2aGunpeVgXZxNm46RTehcWVDdXyKFpaaBDDGLU+QOCgSwHmtREpTM0Tz iLTyikQcf2nWNUzcFoqX/FSxs59lJPkSrKyX6784MS8kIZcIOpbCMLx4HocYeDAg5uF8eeSbUqA YRTXJy2YUl1uD97tlODpHMoQaOS7ZMefUl6umkqUS0EENzkd/wAgM8PM8bGiLu9VhYPsgnh+Wm3 IzEcLUfHOcg5ShhUayHcv+MfjxdcUc6Ubcg9hIBJW/PNQYP80biaE6oM8O5QlJpA/kmC6M2V0Lm DUtpXWfELrDCoV+2aEw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-25_02,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 bulkscore=0 malwarescore=0 priorityscore=1501 impostorscore=0 lowpriorityscore=0 spamscore=0 clxscore=1015 adultscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605250100 Content-Type: text/plain; charset="utf-8" From: "Guo Ren (Alibaba DAMO Academy)" Previously, the number of Hypervisor Guest External Interrupt (HGEI) lines was stored in a single global variable `kvm_riscv_aia_nr_hgei` and assumed to be the same for all HARTs. This assumption does not hold on heterogeneous RISC-V SoCs where different cores may expose different HGEIE CSR widths. Introduce `nr_hgei` field into the per-CPU `struct aia_hgei_control` and probe the actual supported HGEI count for the current HART in `kvm_riscv_aia_enable()` using the standard RISC-V CSR probe technique: csr_write(CSR_HGEIE, -1UL); nr =3D fls_long(csr_read(CSR_HGEIE)); if (nr) nr--; All HGEI allocation, free and disable paths (`kvm_riscv_aia_free_hgei()`, `kvm_riscv_aia_disable()`, etc.) now use the per-CPU value instead of the global one. The global `kvm_riscv_aia_nr_hgei` now represents the minimum number of HGEI lines across HARTs and can be used to check whether HGEI support is available or not. This makes KVM AIA robust on big.LITTLE-style asymmetric platforms. Signed-off-by: Guo Ren (Alibaba DAMO Academy) Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_aia.h | 2 +- arch/riscv/kvm/aia.c | 88 +++++++++++++++++++------------- arch/riscv/kvm/aia_device.c | 4 +- arch/riscv/kvm/main.c | 8 +-- 4 files changed, 60 insertions(+), 42 deletions(-) diff --git a/arch/riscv/include/asm/kvm_aia.h b/arch/riscv/include/asm/kvm_= aia.h index b04ecdd1a860..c67ec5ac0a14 100644 --- a/arch/riscv/include/asm/kvm_aia.h +++ b/arch/riscv/include/asm/kvm_aia.h @@ -79,7 +79,7 @@ struct kvm_vcpu_aia { =20 #define irqchip_in_kernel(k) ((k)->arch.aia.in_kernel) =20 -extern unsigned int kvm_riscv_aia_nr_hgei; +extern atomic_t kvm_riscv_aia_nr_hgei; extern unsigned int kvm_riscv_aia_max_ids; DECLARE_STATIC_KEY_FALSE(kvm_riscv_aia_available); #define kvm_riscv_aia_available() \ diff --git a/arch/riscv/kvm/aia.c b/arch/riscv/kvm/aia.c index 5ec503288555..bafb009c5ce5 100644 --- a/arch/riscv/kvm/aia.c +++ b/arch/riscv/kvm/aia.c @@ -21,13 +21,15 @@ =20 struct aia_hgei_control { raw_spinlock_t lock; + bool free_bitmap_initialized; unsigned long free_bitmap; struct kvm_vcpu *owners[BITS_PER_LONG]; + unsigned int nr_hgei; }; static DEFINE_PER_CPU(struct aia_hgei_control, aia_hgei); static int hgei_parent_irq; =20 -unsigned int kvm_riscv_aia_nr_hgei; +atomic_t kvm_riscv_aia_nr_hgei; unsigned int kvm_riscv_aia_max_ids; DEFINE_STATIC_KEY_FALSE(kvm_riscv_aia_available); =20 @@ -452,7 +454,7 @@ void kvm_riscv_aia_free_hgei(int cpu, int hgei) =20 raw_spin_lock_irqsave(&hgctrl->lock, flags); =20 - if (hgei > 0 && hgei <=3D kvm_riscv_aia_nr_hgei) { + if (hgei > 0 && hgei <=3D hgctrl->nr_hgei) { if (!(hgctrl->free_bitmap & BIT(hgei))) { hgctrl->free_bitmap |=3D BIT(hgei); hgctrl->owners[hgei] =3D NULL; @@ -486,26 +488,18 @@ static irqreturn_t hgei_interrupt(int irq, void *dev_= id) =20 static int aia_hgei_init(void) { - int cpu, rc; - struct irq_domain *domain; struct aia_hgei_control *hgctrl; + struct irq_domain *domain; + int cpu, rc; =20 /* Initialize per-CPU guest external interrupt line management */ for_each_possible_cpu(cpu) { hgctrl =3D per_cpu_ptr(&aia_hgei, cpu); raw_spin_lock_init(&hgctrl->lock); - if (kvm_riscv_aia_nr_hgei) { - hgctrl->free_bitmap =3D - BIT(kvm_riscv_aia_nr_hgei + 1) - 1; - hgctrl->free_bitmap &=3D ~BIT(0); - } else - hgctrl->free_bitmap =3D 0; + hgctrl->free_bitmap_initialized =3D false; + hgctrl->free_bitmap =3D 0; } =20 - /* Skip SGEI interrupt setup for zero guest external interrupts */ - if (!kvm_riscv_aia_nr_hgei) - goto skip_sgei_interrupt; - /* Find INTC irq domain */ domain =3D irq_find_matching_fwnode(riscv_get_intc_hwnode(), DOMAIN_BUS_ANY); @@ -529,25 +523,60 @@ static int aia_hgei_init(void) return rc; } =20 -skip_sgei_interrupt: return 0; } =20 static void aia_hgei_exit(void) { - /* Do nothing for zero guest external interrupts */ - if (!kvm_riscv_aia_nr_hgei) - return; - /* Free per-CPU SGEI interrupt */ free_percpu_irq(hgei_parent_irq, &aia_hgei); } =20 void kvm_riscv_aia_enable(void) { + const struct imsic_global_config *gc; + const struct imsic_local_config *lc; + struct aia_hgei_control *hgctrl; + unsigned long flags; + int aia_nr_hgei; + if (!kvm_riscv_aia_available()) return; =20 + gc =3D imsic_get_global_config(); + lc =3D (gc) ? this_cpu_ptr(gc->local) : NULL; + hgctrl =3D this_cpu_ptr(&aia_hgei); + + /* Figure-out number of bits in HGEIE */ + csr_write(CSR_HGEIE, -1UL); + hgctrl->nr_hgei =3D fls_long(csr_read(CSR_HGEIE)); + csr_write(CSR_HGEIE, 0); + if (hgctrl->nr_hgei) + hgctrl->nr_hgei--; + + /* + * Number of usable per-HART HGEI lines should be minimum of + * per-HART IMSIC guest files and number of bits in HGEIE. + */ + if (lc) + hgctrl->nr_hgei =3D min((ulong)hgctrl->nr_hgei, lc->nr_guest_files); + else + hgctrl->nr_hgei =3D 0; + + /* Update the number of IMSIC guest files across all HARTs */ + aia_nr_hgei =3D atomic_read(&kvm_riscv_aia_nr_hgei); + do { + if (aia_nr_hgei <=3D hgctrl->nr_hgei) + break; + } while (!atomic_try_cmpxchg(&kvm_riscv_aia_nr_hgei, &aia_nr_hgei, hgctrl= ->nr_hgei)); + + raw_spin_lock_irqsave(&hgctrl->lock, flags); + if (!hgctrl->free_bitmap_initialized) { + hgctrl->free_bitmap =3D (hgctrl->nr_hgei) ? GENMASK_ULL(hgctrl->nr_hgei,= 1) : 0; + hgctrl->free_bitmap_initialized =3D true; + } + raw_spin_unlock_irqrestore(&hgctrl->lock, flags); + csr_write(CSR_HVICTL, aia_hvictl_value(false)); csr_write(CSR_HVIPRIO1, 0x0); csr_write(CSR_HVIPRIO2, 0x0); @@ -588,7 +617,7 @@ void kvm_riscv_aia_disable(void) =20 raw_spin_lock_irqsave(&hgctrl->lock, flags); =20 - for (i =3D 0; i <=3D kvm_riscv_aia_nr_hgei; i++) { + for (i =3D 0; i <=3D hgctrl->nr_hgei; i++) { vcpu =3D hgctrl->owners[i]; if (!vcpu) continue; @@ -628,26 +657,15 @@ int kvm_riscv_aia_init(void) return -ENODEV; gc =3D imsic_get_global_config(); =20 - /* Figure-out number of bits in HGEIE */ - csr_write(CSR_HGEIE, -1UL); - kvm_riscv_aia_nr_hgei =3D fls_long(csr_read(CSR_HGEIE)); - csr_write(CSR_HGEIE, 0); - if (kvm_riscv_aia_nr_hgei) - kvm_riscv_aia_nr_hgei--; - - /* - * Number of usable HGEI lines should be minimum of per-HART - * IMSIC guest files and number of bits in HGEIE - */ + /* Set initial value of IMSIC guest files across all HARTs */ if (gc) - kvm_riscv_aia_nr_hgei =3D min((ulong)kvm_riscv_aia_nr_hgei, - gc->nr_guest_files); + atomic_set(&kvm_riscv_aia_nr_hgei, gc->nr_guest_files); else - kvm_riscv_aia_nr_hgei =3D 0; + atomic_set(&kvm_riscv_aia_nr_hgei, 0); =20 /* Find number of guest MSI IDs */ kvm_riscv_aia_max_ids =3D IMSIC_MAX_ID; - if (gc && kvm_riscv_aia_nr_hgei) + if (gc) kvm_riscv_aia_max_ids =3D gc->nr_guest_ids + 1; =20 /* Initialize guest external interrupt line management */ diff --git a/arch/riscv/kvm/aia_device.c b/arch/riscv/kvm/aia_device.c index 3d1e81e2a36b..be83c2d5fc30 100644 --- a/arch/riscv/kvm/aia_device.c +++ b/arch/riscv/kvm/aia_device.c @@ -71,7 +71,7 @@ static int aia_config(struct kvm *kvm, unsigned long type, * external interrupts (i.e. non-zero * VS-level IMSIC pages). */ - if (!kvm_riscv_aia_nr_hgei) + if (!atomic_read(&kvm_riscv_aia_nr_hgei)) return -EINVAL; break; default: @@ -628,7 +628,7 @@ void kvm_riscv_aia_init_vm(struct kvm *kvm) */ =20 /* Initialize default values in AIA global context */ - aia->mode =3D (kvm_riscv_aia_nr_hgei) ? + aia->mode =3D (atomic_read(&kvm_riscv_aia_nr_hgei)) ? KVM_DEV_RISCV_AIA_MODE_AUTO : KVM_DEV_RISCV_AIA_MODE_EMUL; aia->nr_ids =3D kvm_riscv_aia_max_ids - 1; aia->nr_sources =3D 0; diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c index cb8a65273c1f..0924c75100a2 100644 --- a/arch/riscv/kvm/main.c +++ b/arch/riscv/kvm/main.c @@ -168,10 +168,6 @@ static int __init riscv_kvm_init(void) =20 kvm_info("VMID %ld bits available\n", kvm_riscv_gstage_vmid_bits()); =20 - if (kvm_riscv_aia_available()) - kvm_info("AIA available with %d guest external interrupts\n", - kvm_riscv_aia_nr_hgei); - kvm_riscv_setup_vendor_features(); =20 kvm_register_perf_callbacks(); @@ -182,6 +178,10 @@ static int __init riscv_kvm_init(void) return rc; } =20 + if (kvm_riscv_aia_available()) + kvm_info("AIA available with %d guest external interrupts\n", + atomic_read(&kvm_riscv_aia_nr_hgei)); + return 0; } module_init(riscv_kvm_init); --=20 2.43.0