From nobody Thu Dec 18 23:47:14 2025 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 C2527198E6F for ; Mon, 26 Aug 2024 17:15:57 +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=1724692559; cv=none; b=g0lqf+DR8RtPnNyF3zYmX/fW6jCrIlRW18ZWdI0wa+c3rCCBiy7i7Q29UJhBUTlCPcb/HOESkUo4sEh+fVodbJzYXTxpC1YQAZ3/DiYXUVuFAcoHoJ9lyWBwjDKKkKyD4TeLMQiWzQFoqca10x8w+XT0Qlzq7CyMv2xJbSwkhno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724692559; c=relaxed/simple; bh=IHBkbRTSRs1I3VQNuuBQURPtkVM0/9Lbyd7rf++i6iU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sRp+LZtMAXDLdhAbDkEukE14T7oB3ENm/m1p/b+ADZ/4y0/ioj9IGUYYsdiCoV7cjZN82BhCn9Rdkvx5EeK+2rDL/473NL+K608qX4pE8VkHzHPsEI9cXnu96xzCXP14yDnkbuZKCph7daowaUXM7dxCE345kExA0IlN2X51fbc= 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=VcCQmfOz; 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="VcCQmfOz" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-7143ae1b48fso2566810b3a.1 for ; Mon, 26 Aug 2024 10:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724692557; x=1725297357; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=VcCQmfOzWNzC9PjM5JxdMTQkNCm71JmTD3/YBqmR/c+omxltqzQ0a9dxfVnKdNkgn8 B+NauaPITTse+b2jrlqQXeTe7Z1Ds1jwAzA+2iOWzXqwGlvOVR7GDvxfO2X6CWP5D7cW 4Ub0E7lm3c5OrMG6AMTRzIvQ218jZZNSaSq46aq2P2AUEePH3jzCxTgC3lOfaCjGI9+q FG1Q4aFHfgebBG/qqAs868whSIaUuKIUhcEO+WkNve3fC0tkiriA0efbM+aoqY9pBTvF aJdr/g/Ws+Ecfx6NU2BUnDk6pQ86BJwygM9gwkzj4B+ARoYJ912ej81MAvWjpvM9e8KW myVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724692557; x=1725297357; 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=aKDm3s2TCTU5rY2IssAZFvBpqQYJOpn3EVObKPXkHYI=; b=Y67wsChltzMDM/Tm0sv3fDAlxe3KxPGSCW5P/3RNxjZhZaxp+ldPtnUeKzk/D8QO9g TgSZ1reWhF/LzLuTMC/55UOuMXBw2+JTWXYXsZUmD3vlBekwzMjY0s35p2UaKHF1Gzgj 67EpKzPOsSVUsJk/dWqDSDmxL8i9CFKMOi14R1ipBhzKJzs9ugbfFG760gSLUyxwQrEx 16jYrLUvIGor308Ew0Orq3So+0A6sncLFaW2ityQKVu2+1TeONDHDJiEyVojh4auCYvv vB6hnFS/1DNriwKChnqjT6SMCQYRU5tBfo2cnHmiwpmRQlRqNml8kqwrILVWLBOJHFK3 IgEA== X-Forwarded-Encrypted: i=1; AJvYcCWvlFXwgX0r+dKeSJYRnbMYKfpBYFXk7bcw2Wba2D62YjgE8mXn2l+PEo6QDGSF64pEVyRtF5TTZR6dSpo=@vger.kernel.org X-Gm-Message-State: AOJu0Yxidac8BZg85JV9Q7g5kziwB+fcJHGw55G1B+rFWXvYMMsj94Nq RlXuUDFjstVIz0FP/q7Zd/YvLoBLW7rjj1R24yc+YQae0HfLxAat X-Google-Smtp-Source: AGHT+IFyw/mmqh3djt5tp2R0vCWdcanP5Sz+JyI69oHSQ3iIBkiy8Pb71WSJwf746F34gE42GQodbw== X-Received: by 2002:a05:6a21:3a46:b0:1c6:b0cc:c50f with SMTP id adf61e73a8af0-1cc8b49ba5dmr10427140637.25.1724692556800; Mon, 26 Aug 2024 10:15:56 -0700 (PDT) Received: from localhost ([2a00:79e1:2e00:1301:12e9:d196:a1e9:ab67]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7cd9ac98152sm6824309a12.3.2024.08.26.10.15.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Aug 2024 10:15:56 -0700 (PDT) From: Rob Clark To: iommu@lists.linux.dev Cc: Will Deacon , Robin Murphy , Rob Clark , Joerg Roedel , linux-arm-kernel@lists.infradead.org (moderated list:ARM SMMU DRIVERS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v8 1/4] iommu/io-pgtable-arm: Make pgtable walker more generic Date: Mon, 26 Aug 2024 10:15:38 -0700 Message-ID: <20240826171546.6777-2-robdclark@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240826171546.6777-1-robdclark@gmail.com> References: <20240826171546.6777-1-robdclark@gmail.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 Content-Type: text/plain; charset="utf-8" From: Rob Clark We can re-use this basic pgtable walk logic in a few places. Signed-off-by: Rob Clark --- drivers/iommu/io-pgtable-arm.c | 59 +++++++++++++++++++++------------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c index f5d9fd1f45bf..0132f1eff688 100644 --- a/drivers/iommu/io-pgtable-arm.c +++ b/drivers/iommu/io-pgtable-arm.c @@ -747,33 +747,31 @@ static phys_addr_t arm_lpae_iova_to_phys(struct io_pg= table_ops *ops, } =20 struct io_pgtable_walk_data { - struct iommu_dirty_bitmap *dirty; + 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; }; =20 -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); =20 -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 =3D &data->iop; arm_lpae_iopte pte =3D READ_ONCE(*ptep); =20 if (iopte_leaf(pte, lvl, iop->fmt)) { size_t size =3D ARM_LPAE_BLOCK_SIZE(lvl, data); - - 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); - } + int ret =3D walk_data->visit(walk_data, lvl, ptep, size); + if (ret) + return ret; walk_data->addr +=3D size; return 0; } @@ -782,13 +780,13 @@ static int io_pgtable_visit_dirty(struct arm_lpae_io_= pgtable *data, return -EINVAL; =20 ptep =3D 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); } =20 -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; @@ -803,7 +801,7 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae_= io_pgtable *data, =20 for (idx =3D ARM_LPAE_LVL_IDX(walk_data->addr, lvl, data); (idx < max_entries) && (walk_data->addr < walk_data->end); ++idx) { - ret =3D io_pgtable_visit_dirty(data, walk_data, ptep + idx, lvl); + ret =3D io_pgtable_visit(data, walk_data, ptep + idx, lvl); if (ret) return ret; } @@ -811,6 +809,20 @@ static int __arm_lpae_iopte_walk_dirty(struct arm_lpae= _io_pgtable *data, return 0; } =20 +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 =3D walk_data->data; + + 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, @@ -819,7 +831,8 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgta= ble_ops *ops, struct arm_lpae_io_pgtable *data =3D io_pgtable_ops_to_data(ops); struct io_pgtable_cfg *cfg =3D &data->iop.cfg; struct io_pgtable_walk_data walk_data =3D { - .dirty =3D dirty, + .data =3D dirty, + .visit =3D visit_dirty, .flags =3D flags, .addr =3D iova, .end =3D iova + size, @@ -834,7 +847,7 @@ static int arm_lpae_read_and_clear_dirty(struct io_pgta= ble_ops *ops, if (data->iop.fmt !=3D ARM_64_LPAE_S1) return -EINVAL; =20 - return __arm_lpae_iopte_walk_dirty(data, &walk_data, ptep, lvl); + return __arm_lpae_iopte_walk(data, &walk_data, ptep, lvl); } =20 static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg) --=20 2.46.0