From patchwork Tue Dec 10 16:51:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13901778 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FD59230D30; Tue, 10 Dec 2024 16:51:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849508; cv=none; b=QPCelLWeEW9a7xGrCwWoyqRGJ1EgRPiT4K6uvFYByQiTlxnbWZtxslBpVJDM40TF2GsKvGO/6K5XfXLi8qlgLwb4oVeOmQ3nu/+3JHOZJE8Ium7FJDMOOUcvFDK+0b9FUwhPbo2WPLEPuzugIbBKsvY9CTNlbBfYNnNlZ07wRZQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849508; c=relaxed/simple; bh=HQjazjHoVqCC77TI+HmmJVcQ/ST4rzg2hFCio5lxu0o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BdQQT9NisFERcUtG2uYyqew1d32W3UYpHfIfG78ZPfL0s2mpV7uG7xsPfAO74YeQR64LNYSTIA2eFxSaLlakRUnsfb5xo2IlqTbTog3z2AvgWNEMgjOWZ6nSB25cqrKNwEkK+IdbOndQhYAyl3ovvE9ubCqRqRKKvf9C2vc7KG4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BKnlBPMO; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BKnlBPMO" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2166651f752so18714625ad.3; Tue, 10 Dec 2024 08:51:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733849506; x=1734454306; 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; bh=qXOH6pZZi9eL22B8MhhX9UUu8EkOGTpVPSjjBt9TTq4=; b=BKnlBPMORpIP18dP45usOKGLZi494snLFGzM9uRadp2/ByLF/0JqfhcEg+Fx2hw5+d 4pv4eoTgKbn8L7fKTUG5gIOJyCRSC+YnYckpVUFupTEe5NlNklWOJc1MrimicXIHLhmK M3szq99QV4UtgK/TC9yJ2b5dXhldeRv8ThOWfJm0V2WuLNR0eRXfWzM49LOUib0XbaA2 wtIKz5LiieQrlCkTjUKdbKaqBx00V47hSO5E54bUs9YizHM0lmdFdnuLRN5xf9cRwGmj 47N8hanqSy3wu1e2LNklBzVPLLF+SXoMuyO2eGxBdBNxDjOgFRY2exmSxP78xjkA4XMq X21w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733849506; x=1734454306; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qXOH6pZZi9eL22B8MhhX9UUu8EkOGTpVPSjjBt9TTq4=; b=UC/GEuva9xC9T6BC1a8TnkZ6FvZYw7GV0HYzElLRd9JSShPd0rqHQGZQVYfSis2owd v8htdHwkaCiLb8Dm8Qmwm4gpTsDSoGiE1x2YwwN3jCvZEy2aFDR3oncSMn7qN8Jjp3cj fPf70GlLzyjFk+8Y8bhSDrKgrgsn2F5ZARS6R5BhwJBdekV0cM5XZKWn2IsCBGTMsRL0 yEnTiin462BaCWkiBv6DiNB7fetZwyb0irq1/37E7/kAOzn/xNgaQ0Nj5AuhEOLkJTkO ug7X+hr5IIzapdzCnLNxorVYUun4o8TwhM0tu+xrtg+hqfYwswHol4aOUoMsJqcRS8mF B0MQ== X-Forwarded-Encrypted: i=1; AJvYcCVHzs8JP6uwOAc6sLBkZczOl90vBD6Tnih354qXM5VCpV+rsuCIlhZIsbVFTLZfgD4cu1NhiAgwPH524ks=@vger.kernel.org X-Gm-Message-State: AOJu0YyW9UZr5Ho4YzUZipcLHH5HiTjNJQ3xj0fqkHatpclgcLACE+zq aHs67i2N78+bzuevSBkSHQIkcbkgeVANWUFfZJVisPmzkMearqDP X-Gm-Gg: ASbGncsNUgKaWTxAWM4aAwbMsEK9R5fOJ+ITTxXY4o0tSoFoyLtyGlCnIbxQgiDFYAP tSp4/FQfjiK+pgTGRiVyfx9I32FC1PEiXybyppmWkyJTYU7mjY7flMCqXUepQOTL9Qhj63fk7Lt 2RJ1ACalWeWgk/rDnpESzrCdmx0Z7X441G69h5cSkCC08wjuFvn+YPje7CwDxu5NYZSN6N02wvj CXEAk7ZP33d+73uVn1+Aw5DswWe9v9ZsT4uXHL8xQ8dWiYgq5BXGVkjZx9LJhIGUPz/6CldEFC0 7g3jErc/g83+CfJ2jXBV5cTwkrli X-Google-Smtp-Source: AGHT+IGzJ9YtJRIXUx2WRftwh52jZYFp+OAl8TSYa6XERyxw2e0dtG6AQ2EjYin88gd4uM+Xi+ABrA== X-Received: by 2002:a17:902:e94d:b0:216:7761:cc48 with SMTP id d9443c01a7336-2167761cd20mr46263785ad.40.1733849506543; Tue, 10 Dec 2024 08:51:46 -0800 (PST) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-215f8ef9fcdsm91889225ad.146.2024.12.10.08.51.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 08:51:46 -0800 (PST) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v11 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Tue, 10 Dec 2024 08:51:19 -0800 Message-ID: <20241210165127.600817-2-robdclark@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210165127.600817-1-robdclark@gmail.com> References: <20241210165127.600817-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark We can re-use this basic pgtable walk logic in a few places. Signed-off-by: Rob Clark Reviewed-by: Mostafa Saleh --- drivers/iommu/io-pgtable-arm.c | 67 ++++++++++++++++++++++------------ 1 file changed, 43 insertions(+), 24 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 0e67f1721a3d..7e9c0f8ae138 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -749,33 +749,33 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, } struct io_pgtable_walk_data { - struct iommu_dirty_bitmap *dirty; + struct io_pgtable *iop; + void *data; + int (*visit)(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size); unsigned long flags; u64 addr; const u64 end; }; -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl); +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl); -static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, int lvl) +static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, int lvl) { struct io_pgtable *iop = &data->iop; arm_lpae_iopte pte = READ_ONCE(*ptep); - if (iopte_leaf(pte, lvl, iop->fmt)) { - size_t size = ARM_LPAE_BLOCK_SIZE(lvl, data); + size_t size = ARM_LPAE_BLOCK_SIZE(lvl, data); + int ret = walk_data->visit(walk_data, lvl, ptep, size); + if (ret) + return ret; - if (iopte_writeable_dirty(pte)) { - iommu_dirty_bitmap_record(walk_data->dirty, - walk_data->addr, size); - if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) - iopte_set_writeable_clean(ptep); - } + if (iopte_leaf(pte, lvl, iop->fmt)) { walk_data->addr += size; return 0; } @@ -784,13 +784,13 @@ static int io_pgtable_visit_dirty(struct arm_lpae_io_pgtable *data, return -EINVAL; ptep = iopte_deref(pte, data); - return __arm_lpae_iopte_walk_dirty(data, walk_data, ptep, lvl + 1); + return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); } -static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, - struct io_pgtable_walk_data *walk_data, - arm_lpae_iopte *ptep, - int lvl) +static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, + struct io_pgtable_walk_data *walk_data, + arm_lpae_iopte *ptep, + int lvl) { u32 idx; int max_entries, ret; @@ -805,7 +805,7 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, for (idx = ARM_LPAE_LVL_IDX(walk_data->addr, lvl, data); (idx < max_entries) && (walk_data->addr < walk_data->end); ++idx) { - ret = io_pgtable_visit_dirty(data, walk_data, ptep + idx, lvl); + ret = io_pgtable_visit(data, walk_data, ptep + idx, lvl); if (ret) return ret; } @@ -813,6 +813,23 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_io_pgtable *data, return 0; } +static int visit_dirty(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct iommu_dirty_bitmap *dirty = walk_data->data; + + if (!iopte_leaf(*ptep, lvl, walk_data->iop->fmt)) + return 0; + + if (iopte_writeable_dirty(*ptep)) { + iommu_dirty_bitmap_record(dirty, walk_data->addr, size); + if (!(walk_data->flags & IOMMU_DIRTY_NO_CLEAR)) + iopte_set_writeable_clean(ptep); + } + + return 0; +} + static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, @@ -821,7 +838,9 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); struct io_pgtable_cfg *cfg = &data->iop.cfg; struct io_pgtable_walk_data walk_data = { - .dirty = dirty, + .iop = &data->iop, + .data = dirty, + .visit = visit_dirty, .flags = flags, .addr = iova, .end = iova + size, @@ -836,7 +855,7 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgtable_ops *ops, if (data->iop.fmt != ARM_64_LPAE_S1) return -EINVAL; - return __arm_lpae_iopte_walk_dirty(data, &walk_data, ptep, lvl); + return __arm_lpae_iopte_walk(data, &walk_data, ptep, lvl); } static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) From patchwork Tue Dec 10 16:51:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13901779 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22966233150; Tue, 10 Dec 2024 16:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849510; cv=none; b=c6zJ1YzZCJP3ojFlw0mKRQTo0pHvdJXxzdjkt79SKhPEw75V7p/xeWYJacW2etW64tC0/GwYYxxtiqNi91XEb/PZrKvZnf2eHzzHYG+ybyb63/TTPRtMI5K3+2x+LvEv4GU7PwHQ8RSrwBBy3flIOPkPk9svHRlOqIGIeX+2nZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849510; c=relaxed/simple; bh=kX0r99riBAaE8TpUV/flACMdXCRPn6tHp+x0bux6TeY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WVsOoqMyg25oxWWgMFUwZ8IiPjHvzGlq9UmIkypz+SAa0kC/PLYpdpdw6iWW1llSUviByumAb03HC4UA5ybB4J2e71FvZHIQCUVDePp6xY0klBICbvQ6hzvafkoECEx5iIQ3UCzned6GbnSir0vxu14JOODvIDSAZ4yD7edPVuI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LvJUZ/4E; arc=none smtp.client-ip=209.85.214.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LvJUZ/4E" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-21628b3fe7dso33166775ad.3; Tue, 10 Dec 2024 08:51:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733849508; x=1734454308; 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; bh=8ldrDCueE7EtAyArj20F66jLgkk2NNyODodRKr0ilU8=; b=LvJUZ/4E7MNKVVccxZ3sXbixK7g/hXO4PrE/rmLapeg7D49KWEnQlExqMR/wiyVSji DIAxyQMsVr1Lt+cpqPH9JiIkSfjd9/4iH3f957OzenjsFRr5TM6vLka+SCm6krtgGuSW jRRgPkz2m52fNq6VcjHOR31zKlNP2TWVSqntP4I6L+u63eN15J4qQUYhS33mkhoXNZkB Q2mTkqG9PEo3sZw7HvlsuF8YYc455BBal7nNzJZkySw5Jgjwxqaf+76+E4ZcDtCP02L2 x7Uf7UEbyszWdEyEqjf3rbzLMYAvmpAKIUEgGZLLZ4pgjHjfVC87aoBoXjs2REVhL1x5 87gA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733849508; x=1734454308; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8ldrDCueE7EtAyArj20F66jLgkk2NNyODodRKr0ilU8=; b=nYEgQYs6N7bFcpRCFU5yHgsTpusLI4eKeJTcMSMOmR2x9M5bd5grWEg8sX/JKWkyDr fN4QwERwP5iIr+Jw7hQrklS0oRgdEuaouDl9aSULddArPUAy8dxRLtnUUxeXSSzI6Oln YT0JDPcZHAIZt/uefSxCMw7XGIG4mubUVddETCEiv5I5stj5u0LFhQXRPxEnI/yHmJHf xCHCLsyK5tKD0lzHoI2TbCR7aeEtRHWU+nxZeZXrlKn9+WY9RFXF/i0a7sbe1DkRl0jd gVo8fnFRkerr3V5kGOkvmQff5GS5ybxH54z+QUri4ECHAeLf1i7aX9eN/XlkRaSOtEtO /cNA== X-Forwarded-Encrypted: i=1; AJvYcCVjsRUxbG/DPCFYvsYSn1X/4eOUXLBZKCqISQ8J7C+9Nj5fhHvDLn8GQ0kwm6Nm7IwrG3B7jEZ4agPqyAU=@vger.kernel.org X-Gm-Message-State: AOJu0YyOmgudzOgDOFDPodo3lxBwSKFXrumquh8gwahZ9VgzPOe8qimL 9SHSjTL3azEDxQ0FDlzM8QOcQb7AeDYRxt+i77b/Bm2b6tT8mt+F X-Gm-Gg: ASbGncuLcGr4bEWSKgHl7QItGZZKuAzUjaGP6ZDDWxsWZriZAj0zNlfGLngM/vwzzP3 GXnCe95aayk9G476/rajEtzyKuzI6HYjiRLTPjLjPu+2SNheFI2nKHlX7HYTEPDvzrIsObFMSBX dn6Zmp08hxKkV/QJJmAynvUrKi/Zb25uPl+TPqksSP2ABsOZ7wkhgxNl4MPErzdQlRWnhttSVe6 E12bVFLZEIawJ8NnumuesO5b3xBi7ElMF7RkpoWvGf2NN9Wg1LozW67OSYSny3pNe/FkFJE9Zar CNC1hqvTAK3pykXsl8QnjBXxCRF5 X-Google-Smtp-Source: AGHT+IHS0LaxpkQDW28nSbT1wx8gEP6+R1uzXYbRGTNeVekseOAHAqPvkFtV0qVh9HekmfV/jSF44A== X-Received: by 2002:a17:902:d2c5:b0:216:725c:a122 with SMTP id d9443c01a7336-216725ca362mr51995685ad.19.1733849508260; Tue, 10 Dec 2024 08:51:48 -0800 (PST) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-215f8f093a3sm91911265ad.192.2024.12.10.08.51.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 08:51:47 -0800 (PST) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v11 2/4] iommu/io-pgtable-arm: Re-use the pgtable walk for iova_to_phys Date: Tue, 10 Dec 2024 08:51:20 -0800 Message-ID: <20241210165127.600817-3-robdclark@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210165127.600817-1-robdclark@gmail.com> References: <20241210165127.600817-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark Re-use the generic pgtable walk path. Signed-off-by: Rob Clark Reviewed-by: Mostafa Saleh --- drivers/iommu/io-pgtable-arm.c | 74 +++++++++++++++++----------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 7e9c0f8ae138..88b128c77893 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -712,42 +712,6 @@ static size_t arm_lpae_unmap_pages(struct io_pgtable_ops *ops, unsigned long iov data->start_level, ptep); } -static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, - unsigned long iova) -{ - struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); - arm_lpae_iopte pte, *ptep = data->pgd; - int lvl = data->start_level; - - do { - /* Valid IOPTE pointer? */ - if (!ptep) - return 0; - - /* Grab the IOPTE we're interested in */ - ptep += ARM_LPAE_LVL_IDX(iova, lvl, data); - pte = READ_ONCE(*ptep); - - /* Valid entry? */ - if (!pte) - return 0; - - /* Leaf entry? */ - if (iopte_leaf(pte, lvl, data->iop.fmt)) - goto found_translation; - - /* Take it to the next level */ - ptep = iopte_deref(pte, data); - } while (++lvl < ARM_LPAE_MAX_LEVELS); - - /* Ran out of page tables to walk */ - return 0; - -found_translation: - iova &= (ARM_LPAE_BLOCK_SIZE(lvl, data) - 1); - return iopte_to_paddr(pte, data) | iova; -} - struct io_pgtable_walk_data { struct io_pgtable *iop; void *data; @@ -763,6 +727,41 @@ static int __arm_lpae_iopte_walk(struct arm_lpae_io_pgtable *data, arm_lpae_iopte *ptep, int lvl); +struct iova_to_phys_data { + arm_lpae_iopte pte; + int lvl; +}; + +static int visit_iova_to_phys(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct iova_to_phys_data *data = walk_data->data; + data->pte = *ptep; + data->lvl = lvl; + return 0; +} + +static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, + unsigned long iova) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct iova_to_phys_data d; + struct io_pgtable_walk_data walk_data = { + .data = &d, + .visit = visit_iova_to_phys, + .addr = iova, + .end = iova + 1, + }; + int ret; + + ret = __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); + if (ret) + return 0; + + iova &= (ARM_LPAE_BLOCK_SIZE(d.lvl, data) - 1); + return iopte_to_paddr(d.pte, data) | iova; +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -780,8 +779,9 @@ static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, return 0; } - if (WARN_ON(!iopte_table(pte, lvl))) + if (!iopte_table(pte, lvl)) { return -EINVAL; + } ptep = iopte_deref(pte, data); return __arm_lpae_iopte_walk(data, walk_data, ptep, lvl + 1); From patchwork Tue Dec 10 16:51:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13901780 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 16405230D2C; Tue, 10 Dec 2024 16:52:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849522; cv=none; b=IQ3in179Dh+Uai4zN+EmpQ15Y/ozIaUu+/+ydJXCGMfmPJh5nmIGS3JK+zEDA9CWd0mcGqDOzr1EUq5m43In4gflMWYSRAHLNg5o4dmKgtehPFP45cQNW58rYjy1jo1SZ7GlYkbI/++KcJZmo5AZa2wVUJ0bBLTk5IyVbbPPJQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849522; c=relaxed/simple; bh=/euwcJ37lmgggUB2kgCU779rDOTrO1t4pPXCh1a2HCI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KEvDQp3U117DtxxhdwygJi854ZvJbafe+3B0Q4eIgkyv9lOn7d9M938CPYOZloW90ja6/PK6AqyIDHbecb1o3HpXv9HkAfOHVyr35fSBPFjMcvOD/eR2dg1xfobWnL+NTfbyl2PzDh4suz60+7lc8b4pWiyivjoN6iErylS3NGM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N8K4ClAD; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N8K4ClAD" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7273967f2f0so1884736b3a.1; Tue, 10 Dec 2024 08:52:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733849520; x=1734454320; 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; bh=KlC6t8gjI6tvzSf5j3uS4n/ZcFOyWrhFgx3uHy4obYw=; b=N8K4ClADbY8JSZTxiLmYnrKpOaqknjfcEStQ0XPXm0lpcArX+aUMZ9Ju6Q2o5edO25 8UCcQeCYFJUZLSHLRKzihA0oydIFOsyYYaBaa5gDK1emRrFz91KkVeQ+RAoT5tjEHrUp k4U8VL6wzh5KMG/WEAU8jGlptH3hqene3x4t6Bjc4Rdx89ivMxSZ+KbNraFcSOP31Vts LOBd0vBMytpN6o6/eERVfiFhxVT2l1hG5YDYZO/woqN7//I6ZBoI8bVMAJqMtoDxvE6P IPm0aASottBnRWXhDjSuAG66epTwyEixTPwbJFGFRCAfXqIKHK6d9GdBSieKcTMSlu5q 3EnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733849520; x=1734454320; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KlC6t8gjI6tvzSf5j3uS4n/ZcFOyWrhFgx3uHy4obYw=; b=uC1k5bKIqeRHuqa50SHryuLQSWj1U9czbYhlGl1eelf+bD1Min2z5ZD7yie7Bwkyub 6EMHn8nPippOdQZq8ksx82Muxco6y4DHAWtDwdDJuwDA5qlsiZF8GHZNkNyju//haDK/ 20XDxyjxwKKT1RiqNl3ump/GmlV1TSO9JmJ3e4h2MyCmIavA1vsyoaTz+sgZuhxjLvnc HshDNYlvMAXcLZoyTafbj4Zs0eVHD731orxjXR96E7eRjZwDpPfOjzgRocHjmTCrUbwE XhzEDHT4gQm/bzwZLOIw+3Js3jiQXkbnrj53Q/YEs+/wB80Y6z+eS4/HuBb3URAGs4qh SyGA== X-Forwarded-Encrypted: i=1; AJvYcCV5OLCTs1PmpiQbIQiCZXX9DruqzZyR6AIg5fW2ttoetbb32NwoMqR6GjCnTTRD0nbCGgyadAiMzdQLUmM=@vger.kernel.org X-Gm-Message-State: AOJu0YxMdqnbdcsmYK8OIThkzsxn+zcCsC6lbuAdsaPU1L0t28HcBhqI BJ9Z/zXhvITBgDl4JJaZdCla0iE9HrxYoQ3OFyn53rAHOq09Zzkw X-Gm-Gg: ASbGncu9OTxp+oOFsAokZMwUWOUNLnfbExEYoEivUUkcsYLtql+NvYiMDN6xsmwHGKE k+xW6B2nPOEPDAppGpD07dB1wgSh75m2JbEz+yJ5FmomsigPwg32btNK2UG8uGVAhpOVC3EcbhU HtqILvrAyzQdVaEiNlp3SQO9kHJMyKhnzayt9INmqc94fokSwKG39GbOeNtXFFtb71N/SqN/80y YnHyHYSHSZ7aOpZlbxj+Hy1TGCl/RiA2A3oGSbwjtjkPg+ba37JKAtqXmklTIE1kjpbfHh5O4dd lPrO7gaq5p7T/Nt5in6qPohXvMAvoq4= X-Google-Smtp-Source: AGHT+IH1n6c0fXB/5rusM6KflQSKemThS3VyuHQY8wT9jvY3JVEpZqXFRbfZPqjeknRfEZ0z87Krzw== X-Received: by 2002:a05:6a00:c89:b0:725:f376:f4ff with SMTP id d2e1a72fcca58-7273cb14556mr7832493b3a.13.1733849520359; Tue, 10 Dec 2024 08:52:00 -0800 (PST) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7261829be9dsm3195343b3a.89.2024.12.10.08.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 08:51:59 -0800 (PST) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Robin Murphy , Joerg Roedel , Jason Gunthorpe , Shameer Kolothum , Nicolin Chen , Ryan Roberts , Joao Martins , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v11 3/4] iommu/io-pgtable-arm: Add way to debug pgtable walk Date: Tue, 10 Dec 2024 08:51:21 -0800 Message-ID: <20241210165127.600817-4-robdclark@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210165127.600817-1-robdclark@gmail.com> References: <20241210165127.600817-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark Add an io-pgtable method to walk the pgtable returning the raw PTEs that would be traversed for a given iova access. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 26 ++++++++++++++++++++++++++ include/linux/io-pgtable.h | 15 +++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index 88b128c77893..c51c48851f9f 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -762,6 +762,31 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops, return iopte_to_paddr(d.pte, data) | iova; } +static int visit_pgtable_walk(struct io_pgtable_walk_data *walk_data, int lvl, + arm_lpae_iopte *ptep, size_t size) +{ + struct arm_lpae_io_pgtable_walk_data *data = walk_data->data; + data->ptes[lvl] = *ptep; + data->level = lvl + 1; + return 0; +} + +static int arm_lpae_pgtable_walk(struct io_pgtable_ops *ops, unsigned long iova, + void *wd) +{ + struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops); + struct io_pgtable_walk_data walk_data = { + .data = wd, + .visit = visit_pgtable_walk, + .addr = iova, + .end = iova + 1, + }; + + ((struct arm_lpae_io_pgtable_walk_data *)wd)->level = 0; + + return __arm_lpae_iopte_walk(data, &walk_data, data->pgd, data->start_level); +} + static int io_pgtable_visit(struct arm_lpae_io_pgtable *data, struct io_pgtable_walk_data *walk_data, arm_lpae_iopte *ptep, int lvl) @@ -937,6 +962,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg) .unmap_pages = arm_lpae_unmap_pages, .iova_to_phys = arm_lpae_iova_to_phys, .read_and_clear_dirty = arm_lpae_read_and_clear_dirty, + .pgtable_walk = arm_lpae_pgtable_walk, }; return data; diff --git a/include/linux/io-pgtable.h b/include/linux/io-pgtable.h index b1ecfc3cd5bc..d7bfbf351975 100644 --- a/include/linux/io-pgtable.h +++ b/include/linux/io-pgtable.h @@ -178,12 +178,26 @@ struct io_pgtable_cfg { }; }; +/** + * struct arm_lpae_io_pgtable_walk_data - information from a pgtable walk + * + * @ptes: The recorded PTE values from the walk + * @level: The level of the last PTE + * + * @level also specifies the last valid index in @ptes + */ +struct arm_lpae_io_pgtable_walk_data { + u64 ptes[4]; + int level; +}; + /** * struct io_pgtable_ops - Page table manipulation API for IOMMU drivers. * * @map_pages: Map a physically contiguous range of pages of the same size. * @unmap_pages: Unmap a range of virtually contiguous pages of the same size. * @iova_to_phys: Translate iova to physical address. + * @pgtable_walk: (optional) Perform a page table walk for a given iova. * * These functions map directly onto the iommu_ops member functions with * the same names. @@ -197,6 +211,7 @@ struct io_pgtable_ops { struct iommu_iotlb_gather *gather); phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops, unsigned long iova); + int (*pgtable_walk)(struct io_pgtable_ops *ops, unsigned long iova, void *wd); int (*read_and_clear_dirty)(struct io_pgtable_ops *ops, unsigned long iova, size_t size, unsigned long flags, From patchwork Tue Dec 10 16:51:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 13901781 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A464233123; Tue, 10 Dec 2024 16:52:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849524; cv=none; b=rg7Tiiyk6efQxP0CEIEtpFxiy9fGuWnAuFK/sgYie21zB0vQE8Cy5FESLlqhODOKMAnXRr4xKIfyin9DRoaStQisx7T+9lruI/S78T7TKqti+tKV1Uo7xuxXZqLNWD+ABObwPl407eMf0tFpqrnSeiNbrSaZPgmi3ozucipSCDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733849524; c=relaxed/simple; bh=JBMkrQG/8cFEwbKJFanSCuDvcbSxAx5wFpFltTn+IAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NMu6tpnShESYID0zI0hC5UWPzJGlfuXcq7zzPidDPqa1+5QDjp13pl6UjfZWFnVmcSoAuAwikO4h0Pf6XU5m720v7hl+gY+HWyGKug0tGKnmMEJktfgbvGO+QYaUaE3oGt8hOQbO+J8Vgn744mHPtt5rAE4/ofq18ZeiSWmlcTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=I8xNTSVL; arc=none smtp.client-ip=209.85.214.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="I8xNTSVL" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-21669fd5c7cso16963015ad.3; Tue, 10 Dec 2024 08:52:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1733849522; x=1734454322; 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; bh=qh7p2d7+E2GMmgZFCCSWmo87bNDM3/nkgcYOWm/PC60=; b=I8xNTSVLW4WmlaCFJESUMkzUG6WumCoIHBmQF176LyL9wI/sOjySVTCiPGkU5FVvr5 hlFntpbrRe7Ndoix+/kIEj+bvyW/iaLp8dsoficYhPA/uF0r7PeX6t1P4iFuEvUxs+oR rYsbCEN+HqOChZOcASXb2IZ4XY1vk288NdBgpOtD1jx/PZFZ3BxqiGi6iSJQnqLrAcbw nqLd/UkP0PYuinDjEL3sF7/FGjG+s33JJ7Spl0mm2090dl3EHu6NrpoKhZiH66CgaZNT bx853AMdfDSpp0JhQBu1zjdv5/dDS6RrCaPJRKyhRtlVuj5qggrSVNtfsl0QeYdYJTFp 7RHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733849522; x=1734454322; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qh7p2d7+E2GMmgZFCCSWmo87bNDM3/nkgcYOWm/PC60=; b=YqFEGAcRu7Tt5JHnVhYAfzcv1/a6fGUB3LF49dvXffAxh1RlMA2fRDvdwur3z6+co8 F8KeuP+kz+dZLp4IMEadhAiJTuO92wnarDTy2Eel3mpV4Rmttrf1ozNTZpvA6tikt3jF maFxW4mTotRtHIc10mVwiTPZpSJpZ/ZkUG+hHw5s1m/VfAzW1pVzOIIL4cZC4zZ7nrij NMNqxF22cAwZi7uwxpQxh8ABIVV0uTgh9H04Mo4XljL6BneJzn+ofTIbCyrJwYCBT8Pl Ijd3L6wgOh8MpG3B5CIOEIqZauymCRO1UUA8pe8I1zhHR0j48qoU3aNOKh2FKJ8IKvHE LVJw== X-Forwarded-Encrypted: i=1; AJvYcCU3/fnZ0aIVVAmaugL2I9Kkl/xj7RQO/J6roYkbJ69oNBNBh+iIxIcL+FZ5E/+z6LKiC8XL7i7ZCR1U8uc=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6wxpfDcFers8OsKJk8RaIMK897ctF0Xf6djunM3W/8qxHHUit Dhapk93FMHI6WONLh/9zTHoVYfkVOOKvod+vRZM/IcTgDtJcOgVU X-Gm-Gg: ASbGnct8aGRCjM3aBsywK1ajSScnJD2C/LfwMzvIvpWJs2eqBlg+oI8HQmVy+fwKX5W s9f10tX7znYCwM4Gh3305Hv2tW93OMRyeQToVcapbnd2ThporPLZyciH5hf+A2luxEm3f4N2GAu 1hnoZHFQj8f35CpTkFDdvWFx3336BfBqQFlh7l116443W5KzhKzeMZrvWtObB/Gi0t+sW/3fW8O L3ccvHag+ZZNnp+5Y/5W9a/tebh68ww6OZwbqROoomMb/38jAU60NjLR448PzrjHDj01epKN9hF e3ctdsy0yJGoez6MF8c1D2b12H9L X-Google-Smtp-Source: AGHT+IGyppZ/XUmktj28oKiZ+5yOlPQdJYESYN99eWYi54gnG85QRxp2tq+GL1giES6A+moTdOjNmQ== X-Received: by 2002:a17:902:f684:b0:216:386e:dbc with SMTP id d9443c01a7336-216386e1127mr132673815ad.13.1733849522435; Tue, 10 Dec 2024 08:52:02 -0800 (PST) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-21632c4fd4dsm55201575ad.232.2024.12.10.08.52.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Dec 2024 08:52:01 -0800 (PST) From: Rob Clark To: iommu@lists.linux.dev Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Mostafa Saleh , Will Deacon , Rob Clark , Rob Clark , Sean Paul , Konrad Dybcio , Abhinav Kumar , Dmitry Baryshkov , Marijn Suijten , David Airlie , Simona Vetter , dri-devel@lists.freedesktop.org (open list:DRM DRIVER for Qualcomm Adreno GPUs), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v11 4/4] drm/msm: Extend gpu devcore dumps with pgtbl info Date: Tue, 10 Dec 2024 08:51:22 -0800 Message-ID: <20241210165127.600817-5-robdclark@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241210165127.600817-1-robdclark@gmail.com> References: <20241210165127.600817-1-robdclark@gmail.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Rob Clark In the case of iova fault triggered devcore dumps, include additional debug information based on what we think is the current page tables, including the TTBR0 value (which should match what we have in adreno_smmu_fault_info unless things have gone horribly wrong), and the pagetable entries traversed in the process of resolving the faulting iova. Signed-off-by: Rob Clark --- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 10 ++++++++++ drivers/gpu/drm/msm/msm_gpu.c | 9 +++++++++ drivers/gpu/drm/msm/msm_gpu.h | 8 ++++++++ drivers/gpu/drm/msm/msm_iommu.c | 22 ++++++++++++++++++++++ drivers/gpu/drm/msm/msm_mmu.h | 3 ++- 5 files changed, 51 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.c b/drivers/gpu/drm/msm/adreno/adreno_gpu.c index 076be0473eb5..f1d6e6665c30 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.c +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.c @@ -868,6 +868,16 @@ void adreno_show(struct msm_gpu *gpu, struct msm_gpu_state *state, drm_printf(p, " - dir=%s\n", info->flags & IOMMU_FAULT_WRITE ? "WRITE" : "READ"); drm_printf(p, " - type=%s\n", info->type); drm_printf(p, " - source=%s\n", info->block); + + /* Information extracted from what we think are the current + * pgtables. Hopefully the TTBR0 matches what we've extracted + * from the SMMU registers in smmu_info! + */ + drm_puts(p, "pgtable-fault-info:\n"); + drm_printf(p, " - ttbr0: %.16llx\n", (u64)info->pgtbl_ttbr0); + drm_printf(p, " - asid: %d\n", info->asid); + drm_printf(p, " - ptes: %.16llx %.16llx %.16llx %.16llx\n", + info->ptes[0], info->ptes[1], info->ptes[2], info->ptes[3]); } drm_printf(p, "rbbm-status: 0x%08x\n", state->rbbm_status); diff --git a/drivers/gpu/drm/msm/msm_gpu.c b/drivers/gpu/drm/msm/msm_gpu.c index 0d4a3744cfcb..82f204f3bb8f 100644 --- a/drivers/gpu/drm/msm/msm_gpu.c +++ b/drivers/gpu/drm/msm/msm_gpu.c @@ -281,6 +281,15 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu, if (submit) { int i; + if (state->fault_info.ttbr0) { + struct msm_gpu_fault_info *info = &state->fault_info; + struct msm_mmu *mmu = submit->aspace->mmu; + + msm_iommu_pagetable_params(mmu, &info->pgtbl_ttbr0, + &info->asid); + msm_iommu_pagetable_walk(mmu, info->iova, info->ptes); + } + state->bos = kcalloc(submit->nr_bos, sizeof(struct msm_gpu_state_bo), GFP_KERNEL); diff --git a/drivers/gpu/drm/msm/msm_gpu.h b/drivers/gpu/drm/msm/msm_gpu.h index 7cabc8480d7c..e25009150579 100644 --- a/drivers/gpu/drm/msm/msm_gpu.h +++ b/drivers/gpu/drm/msm/msm_gpu.h @@ -101,6 +101,14 @@ struct msm_gpu_fault_info { int flags; const char *type; const char *block; + + /* Information about what we think/expect is the current SMMU state, + * for example expected_ttbr0 should match smmu_info.ttbr0 which + * was read back from SMMU registers. + */ + phys_addr_t pgtbl_ttbr0; + u64 ptes[4]; + int asid; }; /** diff --git a/drivers/gpu/drm/msm/msm_iommu.c b/drivers/gpu/drm/msm/msm_iommu.c index 2a94e82316f9..3e692818ba1f 100644 --- a/drivers/gpu/drm/msm/msm_iommu.c +++ b/drivers/gpu/drm/msm/msm_iommu.c @@ -195,6 +195,28 @@ struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu) return &iommu->domain->geometry; } +int +msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]) +{ + struct msm_iommu_pagetable *pagetable; + struct arm_lpae_io_pgtable_walk_data wd = {}; + + if (mmu->type != MSM_MMU_IOMMU_PAGETABLE) + return -EINVAL; + + pagetable = to_pagetable(mmu); + + if (!pagetable->pgtbl_ops->pgtable_walk) + return -EINVAL; + + pagetable->pgtbl_ops->pgtable_walk(pagetable->pgtbl_ops, iova, &wd); + + for (int i = 0; i < ARRAY_SIZE(wd.ptes); i++) + ptes[i] = wd.ptes[i]; + + return 0; +} + static const struct msm_mmu_funcs pagetable_funcs = { .map = msm_iommu_pagetable_map, .unmap = msm_iommu_pagetable_unmap, diff --git a/drivers/gpu/drm/msm/msm_mmu.h b/drivers/gpu/drm/msm/msm_mmu.h index 88af4f490881..96e509bd96a6 100644 --- a/drivers/gpu/drm/msm/msm_mmu.h +++ b/drivers/gpu/drm/msm/msm_mmu.h @@ -53,7 +53,8 @@ static inline void msm_mmu_set_fault_handler(struct msm_mmu *mmu, void *arg, struct msm_mmu *msm_iommu_pagetable_create(struct msm_mmu *parent); int msm_iommu_pagetable_params(struct msm_mmu *mmu, phys_addr_t *ttbr, - int *asid); + int *asid); +int msm_iommu_pagetable_walk(struct msm_mmu *mmu, unsigned long iova, uint64_t ptes[4]); struct iommu_domain_geometry *msm_iommu_get_geometry(struct msm_mmu *mmu); #endif /* __MSM_MMU_H__ */