Received-SPF: pass (google.com: domain of linux-kernel+bounces-75664-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
From: Michael Kelley <mhklinux@outlook.com>
To: Will Deacon <will@kernel.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>
CC: "kernel-team@android.com" <kernel-team@android.com>,
	"iommu@lists.linux.dev" <iommu@lists.linux.dev>, Christoph Hellwig
	<hch@lst.de>, Marek Szyprowski <m.szyprowski@samsung.com>, Robin Murphy
	<robin.murphy@arm.com>, Petr Tesarik <petr.tesarik1@huawei-partners.com>,
	Dexuan Cui <decui@microsoft.com>, Nicolin Chen <nicolinc@nvidia.com>
Subject: RE: [PATCH v4 3/5] swiotlb: Honour dma_alloc_coherent() alignment in
 swiotlb_alloc()
Thread-Topic: [PATCH v4 3/5] swiotlb: Honour dma_alloc_coherent() alignment in
 swiotlb_alloc()
Thread-Index: AQHaZLoQP5pvu7LIN0ifIewA9hPQArEVb2LA
Date: Wed, 21 Feb 2024 23:36:40 +0000
Message-ID:
 <SN6PR02MB4157AE0780AB094784F0DF56D4572@SN6PR02MB4157.namprd02.prod.outlook.com>
References: <20240221113504.7161-1-will@kernel.org>
 <20240221113504.7161-4-will@kernel.org>
In-Reply-To: <20240221113504.7161-4-will@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?us-ascii?Q?eMFjZtngE6VKjxZpoVwzoth/uYWFmH+hgmCQL5N1v1k3eSS7VHbcd/s2ArA1?=
 =?us-ascii?Q?9KGtZ8tYXQPCeXyRRlJC1ZD6wmos4odMjzGXK0KgFAmI/vwBWoxIWrKUc9rD?=
 =?us-ascii?Q?plswgUr8DgUYN3Zjs18l2+YNgLPCkXPDvCSviH2p65esuEm7Xv47QOOKVwDu?=
 =?us-ascii?Q?dVDFY6PZXZujEE6PnGLzjGxn2X1SJcDRXNsRqSkHEq9mcte6Nw6HlLL4D6PZ?=
 =?us-ascii?Q?/LwojULvssSYwIvU98NcdblBGNXsx/QhG0uOHBTiCoehOq7MlFBbaSPPougV?=
 =?us-ascii?Q?az+EOT22v23mtFDja/FUEfBmwEaBUQMu/aRBCK0zh9ScD5IKQEmjijCqfVFj?=
 =?us-ascii?Q?PEr6zfu4nKfjU2l+rmxkXLlR1zP7kyiDrQ4fBUd6rbN05gDciIY+S3cgWlOW?=
 =?us-ascii?Q?uIS8/oXy6SRTCzL6UhfqpdH46eaUcH9yRrk00ZDwVguPe6bNjvBRrUCwe30j?=
 =?us-ascii?Q?ZFB9mdM4YTDE3vlZ3IuNvoyWHzJwFfApZOTwOY+WGL+LHbliG7lavO6H5N/n?=
 =?us-ascii?Q?mcH0d8oD9sJZJHtjQ7RK+jCryr72dF4zBIj4SwCYAm8cj3LV1WdnGla/vACL?=
 =?us-ascii?Q?fKzyWWQBOx5zxqCeA4ZAg7FyWcRBay4F6GmHKdBFWfoyTZnBZXSbKYaHi6ji?=
 =?us-ascii?Q?sw9DUhzal+LasFezPr+Y7nvdGdcSiqjiO0aOO+EW8P/zhJQJf1wDn9QjE0v6?=
 =?us-ascii?Q?mWxIxnzB6bPfW1EJmm94RVVdFfpcapwZApSp8UIK9VQyBoQ2EVPq/ey6PAnD?=
 =?us-ascii?Q?uWzdP8igpi8wFqCKu+Q0fo7tk4V3ZYFGBhkeTcNXqLldpkA2lxUwgnMzbQk4?=
 =?us-ascii?Q?9XHB6nqRZKVpJzoLRGcB4tlW6tt/OPBMN3ohUyqOMlVZD7GG1PEIwmwt3BBz?=
 =?us-ascii?Q?nPQ0Rj6jse2Ig9noKHa7kKpQU7bNN4JIGMyBMH8ycxqND1CokcUWxJ+ey2o4?=
 =?us-ascii?Q?7Me/vwpdivvmzNJPRHJj5kNeb2b8+vWvJ5rftvK32ZvEFtrryrKVeFZsRcCq?=
 =?us-ascii?Q?CV7xf8hfkrejjE52Ekyh/R94RrYuMGsHTktBTME5ZJ7+W+EW7L7LBOY9tMuB?=
 =?us-ascii?Q?uBmAayOE8+KWoVVDX6x944PpQ26CH/8oX49bUK0OdUZwLBySKyYU59jZliO0?=
 =?us-ascii?Q?hXanSwx1Oo6ApvzvV76fedntYOLVrRcTKng+GzQYQ1OhF/s4245hWPZ1e74+?=
 =?us-ascii?Q?8UwOdqp+fJnSQ5nU8cd0/7l0j305hw/P4m708Q=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SN6PR02MB4157.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-Network-Message-Id: 5a7292ba-b484-424c-6a30-08dc3335f48a
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2024 23:36:40.8666
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR02MB9754

From: Will Deacon <will@kernel.org> Sent: Wednesday, February 21, 2024 3:35=
 AM
>=20
> core-api/dma-api-howto.rst states the following properties of
> dma_alloc_coherent():
>=20
>   | The CPU virtual address and the DMA address are both guaranteed to
>   | be aligned to the smallest PAGE_SIZE order which is greater than or
>   | equal to the requested size.
>=20
> However, swiotlb_alloc() passes zero for the 'alloc_align_mask'
> parameter of swiotlb_find_slots() and so this property is not upheld.
> Instead, allocations larger than a page are aligned to PAGE_SIZE,
>=20
> Calculate the mask corresponding to the page order suitable for holding
> the allocation and pass that to swiotlb_find_slots().
>=20
> Cc: Christoph Hellwig <hch@lst.de>
> Cc: Marek Szyprowski <m.szyprowski@samsung.com>
> Cc: Robin Murphy <robin.murphy@arm.com>
> Cc: Dexuan Cui <decui@microsoft.com>
> Fixes: e81e99bacc9f ("swiotlb: Support aligned swiotlb buffers")
> Reviewed-by: Petr Tesarik <petr.tesarik1@huawei-partners.com>
> Signed-off-by: Will Deacon <will@kernel.org>
> ---
>  kernel/dma/swiotlb.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>=20
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index ab7fbb40bc55..c20324fba814 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -1633,12 +1633,14 @@ struct page *swiotlb_alloc(struct device *dev,
> size_t size)
>  	struct io_tlb_mem *mem =3D dev->dma_io_tlb_mem;
>  	struct io_tlb_pool *pool;
>  	phys_addr_t tlb_addr;
> +	unsigned int align;
>  	int index;
>=20
>  	if (!mem)
>  		return NULL;
>=20
> -	index =3D swiotlb_find_slots(dev, 0, size, 0, &pool);
> +	align =3D (1 << (get_order(size) + PAGE_SHIFT)) - 1;
> +	index =3D swiotlb_find_slots(dev, 0, size, align, &pool);
>  	if (index =3D=3D -1)
>  		return NULL;
>=20
> --
> 2.44.0.rc0.258.g7320e95886-goog

Reviewed-by: Michael Kelley <mhklinux@outlook.com>