Received-SPF: pass (google.com: domain of linux-kernel+bounces-97492-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
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 v6 6/6] swiotlb: Reinstate page-alignment for mappings >=
 PAGE_SIZE
Thread-Topic: [PATCH v6 6/6] swiotlb: Reinstate page-alignment for mappings >=
 PAGE_SIZE
Thread-Index: AQHacW1Xe8drQ9jqnUu26if2JOMrnrEuMy1A
Date: Fri, 8 Mar 2024 19:02:21 +0000
Message-ID:
 <SN6PR02MB4157DBE41292B3E1B380D9F0D4272@SN6PR02MB4157.namprd02.prod.outlook.com>
References: <20240308152829.25754-1-will@kernel.org>
 <20240308152829.25754-7-will@kernel.org>
In-Reply-To: <20240308152829.25754-7-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?hfGUoj+sT6P+PpTqlMrGRChamlRiXep1zeEdnRVP84CQgXY5ePKSV/kkTrrn?=
 =?us-ascii?Q?HjuZdvKP8UwEY3XUSqb0X0mMh0KlnoGl5eB4Kof5mED+lovWGsRra4eeFz9E?=
 =?us-ascii?Q?Mdbpp4YMUsBPD2B8OlVWs28+oag2m99p8rDEVpWmUiYvRqZrB06d2lX5yJjP?=
 =?us-ascii?Q?QhPi5p/Zr2Uvt/jU6ddV0KDD2NhT+l/xmDAuUf1dpDhA5ETRdxm+FayqQRID?=
 =?us-ascii?Q?Nzk+Mfl+IooUJltSC7r0pYhzKNn2MKhrt7o/atqC0QigZmk3MOy9CDan47uB?=
 =?us-ascii?Q?nrwsqL/WFqPOWYOZnxXjsS4ctrNsb6wPawkgwVpEGdhRKUA8qhs+P8tLfj5Z?=
 =?us-ascii?Q?NxLsgvi5tdmdTUXjngA1a37Yg/w3QFr+ndvvfiiE+lVS8e0Vsq+uR55cKkSb?=
 =?us-ascii?Q?Du5ViwgSoBMt6eDraG5WTRDQncQ5lfk3uGRMaJwgjlLusSmGmtZvz4vnDzsD?=
 =?us-ascii?Q?XkDZCdOPv9B43spA5QGrGSbTnriL+2bEDY3oUzbN1Y47e7pMcWFcnmFn6iPH?=
 =?us-ascii?Q?n2aQkWnpkZOTtKHgw5M1Ayk/MScEoO4wxp65DsU0drYsoDvyAwH6UAUPsWh1?=
 =?us-ascii?Q?PPu/RlEFFvoVhXIUTrIMmoBxxCHJ1TH/BNwsjjIMQr8g5VboWV8dpiAP2hUd?=
 =?us-ascii?Q?u8WVD0xaH9tfGDjvTGmS+ZtQLl0Qic5AG/PIcgJyeDU3S7foDhMesb3o7G/k?=
 =?us-ascii?Q?LKhwl/yzkXfOPRkRzm86Ow5WTdSKEHnh5+0yKFU2fDp9Pn8QnWfLU98AzVm2?=
 =?us-ascii?Q?y6SMA9cVlvwDnpcGjUYG68mej4n3+RaQtiCr8+1ffdzr8oXaL23r2fsSQhSK?=
 =?us-ascii?Q?OUAmxWYKZSrBknnKwzZnJFtLpauiNzLRZ9sADmXkdmp/ophrDc8AykWiiVAu?=
 =?us-ascii?Q?OTr0IToZ5HBEfNW54W/jo3GdIOInZz5MIobM0aRO6BVWu5gAZI+rw8YZ4JM+?=
 =?us-ascii?Q?RBz+TE2YQDhXCXA1XSlPKSMiK7dy7m7SSWmkAXdHOu77G2JhNQhFlcOqW/Xs?=
 =?us-ascii?Q?8O4XF8PvMfv83nCUdgZN6I7aSJHphWwyqaais9qrnJISTATeDini8qEr/xRW?=
 =?us-ascii?Q?rtXINHQQgi0g1ZB7y+PsTcblOc90o0CeUWAxNGKQcnqSwEo6nS/oVROlDtgS?=
 =?us-ascii?Q?extaJcNp/X0tmPbM9Mkve4K1pyJKeEnTrO/+8/JkrsB11oRoodAVCARWxdtw?=
 =?us-ascii?Q?7YTeXyfIzfwatnO2SdwKqa2NBZ2+e78ejUDxtA=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: 8015f6a1-0f9e-48aa-3599-08dc3fa248dc
X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-CrossTenant-originalarrivaltime: 08 Mar 2024 19:02:21.9336
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR02MB10152

From: Will Deacon <will@kernel.org> Sent: Friday, March 8, 2024 7:28 AM
>=20
> For swiotlb allocations >=3D PAGE_SIZE, the slab search historically
> adjusted the stride to avoid checking unaligned slots. This had the
> side-effect of aligning large mapping requests to PAGE_SIZE, but that
> was broken by 0eee5ae10256 ("swiotlb: fix slot alignment checks").
>=20
> Since this alignment could be relied upon drivers, reinstate PAGE_SIZE
> alignment for swiotlb mappings >=3D PAGE_SIZE.
>=20
> Reported-by: Michael Kelley <mhklinux@outlook.com>
> Signed-off-by: Will Deacon <will@kernel.org>

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

> ---
>  kernel/dma/swiotlb.c | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
>=20
> diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
> index c381a7ed718f..c5851034523f 100644
> --- a/kernel/dma/swiotlb.c
> +++ b/kernel/dma/swiotlb.c
> @@ -992,6 +992,17 @@ static int swiotlb_search_pool_area(struct device *d=
ev, struct io_tlb_pool *pool
>  	BUG_ON(!nslots);
>  	BUG_ON(area_index >=3D pool->nareas);
>=20
> +	/*
> +	 * Historically, swiotlb allocations >=3D PAGE_SIZE were guaranteed to =
be
> +	 * page-aligned in the absence of any other alignment requirements.
> +	 * 'alloc_align_mask' was later introduced to specify the alignment
> +	 * explicitly, however this is passed as zero for streaming mappings
> +	 * and so we preserve the old behaviour there in case any drivers are
> +	 * relying on it.
> +	 */
> +	if (!alloc_align_mask && !iotlb_align_mask && alloc_size >=3D PAGE_SIZE=
)
> +		alloc_align_mask =3D PAGE_SIZE - 1;
> +
>  	/*
>  	 * Ensure that the allocation is at least slot-aligned and update
>  	 * 'iotlb_align_mask' to ignore bits that will be preserved when
> @@ -1006,13 +1017,6 @@ static int swiotlb_search_pool_area(struct device =
*dev, struct io_tlb_pool *pool
>  	 */
>  	stride =3D get_max_slots(max(alloc_align_mask, iotlb_align_mask));
>=20
> -	/*
> -	 * For allocations of PAGE_SIZE or larger only look for page aligned
> -	 * allocations.
> -	 */
> -	if (alloc_size >=3D PAGE_SIZE)
> -		stride =3D umax(stride, PAGE_SHIFT - IO_TLB_SHIFT + 1);
> -
>  	spin_lock_irqsave(&area->lock, flags);
>  	if (unlikely(nslots > pool->area_nslabs - area->used))
>  		goto not_found;
> --
> 2.44.0.278.ge034bb2e1d-goog