From mboxrd@z Thu Jan 1 00:00:00 1970 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 A7B944CA77D for ; Fri, 25 Sep 2026 15:17:20 +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=1790349450; cv=none; b=YAauPfXSF9znqDb6bnuoyCmCIBjtENDZz/eqJQhhjtTlhJoYzx43KGFEX0peOxeuUUrWkEmmy8ub9UY86yxDxdLJYxT+9xAyKIsLqIGCGFISmiUzZru2fCuRy7Zn6EEl44WdaJXf4HiJdZXuCgsCqbT0FBJte3KvQbtbQEj7LWE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790349450; c=relaxed/simple; bh=LvZhH5njK4fSFRkj4zzE8p8wLm7oRw4kD4otyjMdQj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=l25y6GA8L/mMLxBKI0smrbEU7fOTjmanyMX9y74UluLloCXOlc/2OHCfvzsdw7TM3n36KV9IJQYTklgUnZbHAHkxsMU05ASr6Ym0IS3TgrOV/hMn5LrDBqwsX3fLeUfuUYkzUGY5EAUi6+1FVWO3GrSwWXvwpPAD5qeFm+fW7AE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=CBTDVzkw; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bsQFqqWT; 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=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="CBTDVzkw"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bsQFqqWT" 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 68PDXiTg208802 for ; Fri, 25 Sep 2026 15:17:15 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=GkUPFWh53t5 B1pacQo9bQeDytgQRc2XAp9x9CQAXz9M=; b=CBTDVzkwbQvAmJVtPNFkvezmnAF cY0gxD0kp2Z2yKyr5/zpv+w3B99pFhxzDOSl76QAvgtLwiaDG+/V41OOSBmgf4ZI TekBJlY8Ul2m/k+hxOQt9XnturdAl6OJaLKDLwPjpjW9X1wHkP+EgsHg2Z3XI8Qo Td6knKbLuBwiFle5O3s2qqObgumkEt+LLqPeV/uZqHy6ttgvKNdhNCxwkyItC1dm kzdU6uop9nagF0hiBuSiek00bBOSMsasXFngjCLzPzeqWWdYCjCT0e36tjIEdVho KbdHTJ+RHZzGya6N82W9HSVgC662cOwc22BLmcj6NL18IJIldd56FbQvMLg== Received: from mail-vs1-f72.google.com (mail-vs1-f72.google.com [209.85.217.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4gw898v3cn-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 25 Sep 2026 15:17:15 +0000 (GMT) Received: by mail-vs1-f72.google.com with SMTP id ada2fe7eead31-7b2e69f3023so294615137.2 for ; Fri, 25 Sep 2026 08:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1790349434; x=1790954234; 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:content-type; bh=GkUPFWh53t5B1pacQo9bQeDytgQRc2XAp9x9CQAXz9M=; b=bsQFqqWT1yJ5gLO7E36xAo/WaNVjkmAgYc8G63AZ4BS+fG25SkQAaCunyKkEam0Bpg TiBF+BIv4+9QBAg+WnBOuWdpeOkCb0GoxdNhoedsqk0eZa8Rld1RlGXB/5WHTpGOt8NF 1bZCYF99QtF5GU3vnAiKx6NX6ECVE9cTDO0Vxa77gU5TA/sNZWnm1aY+Se+QqDOH+6zc g62I2F1byCxrUWoCcsZOpCN9WVg8ILsXTzn2Iab1YO15UnfKanX2bnxUFM6EO4sugY/8 1cwHRorMOCQGGI8VWiam3+1e8RFLTrBD5zHawjqs6+E//OSpQG89oqMlr5oAqFCUScfV Bcww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790349434; x=1790954234; 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:content-type; bh=GkUPFWh53t5B1pacQo9bQeDytgQRc2XAp9x9CQAXz9M=; b=b6RUZoFgg1rhiIaowaHFx5Fx2DL2RNUFAUbFlmZKD6kqZHKnIYnUkIE8ibC/XiuOJ3 bMsK8hmukQ52TygVC9vfjd7DDn01RRkruOkMtIaEoB7I9IYIptbjgM5uPoYtnUXZryvk ALFf3Zcv2mVtPPs4noaXjnZHj1Xt7qnAz+gth58BE5zQlNyvk2Y3q7UdnliDftj0d59I RM45wID4U6WUEoucddrxrsT1W6fVMJWDv9J2PA2aOWnsEb7ioUvaSW7A/pIwpahLapTB L+qoQABI/za2NR3DwCqb8Q2g6SgOQrqwpxFweJoFhembqSxQp2SBFtPRCIfUD7AtxBnY AZDw== X-Gm-Message-State: AFuF++lm+ykZAliNVk+siCPQo3/vh2TyGArkADKp7nGBavWKA1d/oAiW MsJSKKXP3xaL3nlbIUHJ2mWuCZVghx+ESLv/cnxTw8WQePW+bXab2jEOCLfiCMEgt6YLWTBnLxH SPGtiRpMMyYRqYFTnjD0Pt3eUyq3mIEHoNByCCI/X7Yj7lDrildhsS4h9CPN46bEvIp4= X-Gm-Gg: AYBFou1Z4XjKjui/yYlY8+UKt4I1656tonVdEcmIgw78HikznzM0cmL+kP9r8lICRkl oASpnyP2V7dzm5LOLEbPGWusJfHjMllLrxN23hTnufsI4BQCNXZpb4qpgYdhXsB7nA82SutJCRj XFHXY0RcM2J0VY++UQegHysW343iZmwa+QbBZ2yAepIGtcRjCOVj1EuAyjYx0Ducuj9LF04Jj8H HJXmDmq2usOWFGDRianI+GDkAApCkLV2og/kX4XZ9hXksBA3IGmRZ5BBWhPldlrXH0/r0A0UFRJ 3xdDPx8oytKppXAIsm/CNAjZ0fsIiVU40nPf4uOZ9LRAm+/YQ2Z/dUBkpEgaOBTm95xgLb0Oqwr Zc5BQBvvKo/Kk2C22KxEW2SYVZbspkmdFE1smIbIU2YaZBDxg X-Received: by 2002:a05:6102:160d:b0:7a1:f7e2:aae1 with SMTP id ada2fe7eead31-7af1e6f3633mr2841425137.19.1790349434294; Fri, 25 Sep 2026 08:17:14 -0700 (PDT) X-Received: by 2002:a05:6102:160d:b0:7a1:f7e2:aae1 with SMTP id ada2fe7eead31-7af1e6f3633mr2841410137.19.1790349433786; Fri, 25 Sep 2026 08:17:13 -0700 (PDT) Received: from localhost (ip-86-49-245-11.bb.vodafone.cz. [86.49.245.11]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fe5cd4c8dsm176773155e9.3.2026.09.25.08.17.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Sep 2026 08:17:13 -0700 (PDT) From: Andrew Jones To: linux-riscv@lists.infradead.org, iommu@lists.linux.dev Cc: linux-kernel@vger.kernel.org, tomasz.jeznach@linux.dev, tjeznach@rivosinc.com, jgg@ziepe.ca, jgg@nvidia.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, pjw@kernel.org, palmer@dabbelt.com, anup@brainfault.org, tglx@kernel.org, kevin.tian@intel.com, fangyu.yu@linux.alibaba.com Subject: [PATCH v6 06/16] iommufd: Install software MSI map ranges atomically Date: Fri, 25 Sep 2026 17:16:49 +0200 Message-ID: <20260925151659.419512-7-andrew.jones@oss.qualcomm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260925151659.419512-1-andrew.jones@oss.qualcomm.com> References: <20260925151659.419512-1-andrew.jones@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: 8bit X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwOTI1MDA2MCBTYWx0ZWRfX+0e1WX5XAmnl +m1MQo55JTV7mXwxVlOB8wCuczqj/eXumcVoTJv8YZUnu68YbMyVjnbY4rmk7g3o3TsdeVs05DA NeLLh7Fn4iJ0/uUIugigz4YWVBwxA/d4dGwoxAZhy+t0/apKx1JNRZmkk8V42ldgVotsGmCQM/D QJ2H19VpBx10IhUoNTPplLKdS63RKmMsscAIjW1gTxuMgKt6KLOW++3ZJ6tVGd+qSImIzET87A2 PaMobHaLKJu71XUE/oRTJu4PUlRw5+3RDw+gTTKS39lblyUtz+x2N/8/W/YVkzasR5Lj2akn3kF XQLh2kD9AKopmMyNV9XsE3pFHDTTQ4j09NC2mVknYmHmZKy5a7AM+3ejzTVTxG8e3fgxnUYEqFj dQzaKjUcC93UmuNRTcl7v6KChCcTxQ/wPQO87F0Eyit0y9XF4DYrGgxJrxhTF/++aFzgdYt3iQQ MXnIc0rOB6AzSqpbjOA== X-Proofpoint-Spam-Info: AW1haW4tMjYwOTI1MDA2MCBTYWx0ZWRfX8tWXQgVhwBwa rEUNhZF6vcVLz308LGWNIFacodsRtYpWh/g73DVV6dMyOXNhzgdpoPYQqPsOyIfOSDiHRyhKYer YQBIc2NGzt+6/YtbsV4bMTqpLdeZMiM= X-Proofpoint-GUID: KDntEFB50G1cpla8iiDeuIz1yLVWvSAI X-Proofpoint-ORIG-GUID: KDntEFB50G1cpla8iiDeuIz1yLVWvSAI X-Authority-Analysis: v=2.4 cv=EJWTQFZC c=1 sm=1 tr=0 ts=6ab6907b cx=c_pps a=DUEm7b3gzWu7BqY5nP7+9g==:117 a=4CXLxsOAgPM/krjtHEZQyA==:17 a=VdqzKS8jKosA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=SRrdq9N9AAAA:8 a=0NqqyPg6VgUUedX_kk0A:9 a=-aSRE8QhW-JAV6biHavz:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-09-25_02,2026-09-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 clxscore=1015 spamscore=0 lowpriorityscore=0 suspectscore=0 impostorscore=0 bulkscore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2609040000 definitions=main-2609250060 Add a range installation helper which installs every map in a contiguous software MSI range and rolls back only mappings added by the failed operation. Use the helper when replaying range mappings into a new paging domain. This prepares iommufd to publish and install physical address lists without exposing partially installed ranges. Signed-off-by: Andrew Jones Tested-by: Fangyu Yu --- drivers/iommu/iommufd/driver.c | 76 ++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 8 deletions(-) diff --git a/drivers/iommu/iommufd/driver.c b/drivers/iommu/iommufd/driver.c index 8b8f132ef3c5..3aff04d9dd04 100644 --- a/drivers/iommu/iommufd/driver.c +++ b/drivers/iommu/iommufd/driver.c @@ -178,6 +178,17 @@ int iommufd_viommu_report_event(struct iommufd_viommu *viommu, EXPORT_SYMBOL_NS_GPL(iommufd_viommu_report_event, "IOMMUFD"); #ifdef CONFIG_IRQ_MSI_IOMMU +static bool iommufd_sw_msi_range_index(const struct iommufd_sw_msi_map *map, + const struct iommufd_sw_msi_map *base_map, + unsigned int nr_addrs, unsigned int *index) +{ + if (map->sw_msi_start != base_map->sw_msi_start || map->pgoff < base_map->pgoff) + return false; + + *index = map->pgoff - base_map->pgoff; + return *index < nr_addrs; +} + /* * Get an iommufd_sw_msi_map for the msi physical addresses requested by the irq * layer. The mapping to IOVA is global to the iommufd file descriptor, every @@ -207,11 +218,7 @@ iommufd_sw_msi_get_map(struct iommufd_ctx *ictx, const phys_addr_t *phys_addrs, list_for_each_entry(cur, &ictx->sw_msi_list, sw_msi_item) { unsigned int index; - if (cur->sw_msi_start != sw_msi_range->start || - cur->pgoff < msi_map->pgoff) - continue; - index = cur->pgoff - msi_map->pgoff; - if (index >= nr_addrs) + if (!iommufd_sw_msi_range_index(cur, msi_map, nr_addrs, &index)) continue; if (cur->msi_addr != phys_addrs[index]) break; @@ -306,9 +313,9 @@ iommufd_sw_msi_alloc_map(struct iommufd_ctx *ictx, const phys_addr_t *phys_addrs return ERR_PTR(-ENOMEM); } -int iommufd_sw_msi_install(struct iommufd_ctx *ictx, - struct iommufd_hwpt_paging *hwpt_paging, - struct iommufd_sw_msi_map *msi_map) +static int iommufd_sw_msi_install_one(struct iommufd_ctx *ictx, + struct iommufd_hwpt_paging *hwpt_paging, + struct iommufd_sw_msi_map *msi_map) { unsigned long iova; int rc; @@ -332,6 +339,59 @@ int iommufd_sw_msi_install(struct iommufd_ctx *ictx, __set_bit(msi_map->id, hwpt_paging->present_sw_msi.bitmap); return 0; } + +int iommufd_sw_msi_install(struct iommufd_ctx *ictx, + struct iommufd_hwpt_paging *hwpt_paging, + struct iommufd_sw_msi_map *base_map) +{ + struct iommufd_sw_msi_map *msi_map; + struct list_head *msi_maps = &ictx->sw_msi_list; + unsigned long *newly_mapped; + unsigned int nr_addrs = base_map->range_size ? base_map->range_size / PAGE_SIZE : 1; + unsigned int nr_found = 0; + unsigned int index; + int rc = 0; + + newly_mapped = bitmap_zalloc(nr_addrs, GFP_KERNEL_ACCOUNT); + if (!newly_mapped) + return -ENOMEM; + + list_for_each_entry(msi_map, msi_maps, sw_msi_item) { + if (!iommufd_sw_msi_range_index(msi_map, base_map, nr_addrs, &index)) + continue; + if (iommufd_sw_msi_maps_test_bit(&hwpt_paging->present_sw_msi, msi_map->id)) { + nr_found++; + continue; + } + rc = iommufd_sw_msi_install_one(ictx, hwpt_paging, msi_map); + if (rc) + goto err_unmap; + __set_bit(index, newly_mapped); + nr_found++; + } + if (nr_found != nr_addrs) { + rc = -EINVAL; + goto err_unmap; + } + + bitmap_free(newly_mapped); + return 0; + +err_unmap: + list_for_each_entry(msi_map, msi_maps, sw_msi_item) { + unsigned long iova; + + if (!iommufd_sw_msi_range_index(msi_map, base_map, nr_addrs, &index) || + !test_bit(index, newly_mapped)) + continue; + + iova = msi_map->sw_msi_start + msi_map->pgoff * PAGE_SIZE; + WARN_ON_ONCE(iommu_unmap(hwpt_paging->common.domain, iova, PAGE_SIZE) != PAGE_SIZE); + __clear_bit(msi_map->id, hwpt_paging->present_sw_msi.bitmap); + } + bitmap_free(newly_mapped); + return rc; +} EXPORT_SYMBOL_NS_GPL(iommufd_sw_msi_install, "IOMMUFD_INTERNAL"); /* -- 2.43.0