From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CFE131DFE3B; Wed, 6 Nov 2024 12:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897985; cv=none; b=QxeDscfB0ixiakVa5jcwD4sgXLOuDLS8Y4caY361zwuqnckbzboWEeabvyhzas+W/q7f90VGDhhhF+2DhP4MIhj5qorBewl+F5gmZ8buHS5nUcWzzmw/1OHfSNAC/ROGQlPVB8UeesYfNNE15wPWiYfNFbwU0XGrCnFCsdN1+Lk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730897985; c=relaxed/simple; bh=yglto4tuJoJK5FhKsd3xJJ4zmGnJxw35/7msyLNr0NI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ox0cwIvfJSLPfIOQsIouR1k+1owC9t6ARwiKhmJCVd1iy5sII96YvPYk6PTdJD17sXoTeXUpFbnnSkI+PvvK+0yjDeqx8z94YAgfvroicN1+QqbqE4Z0G0vMDzrnfWAr1DZ0B1x0R4PrSyUdGo2TxbZYIHpGD5COmGQhvBwduxw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gtkCixQ1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gtkCixQ1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10152C4CECD; Wed, 6 Nov 2024 12:59:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730897985; bh=yglto4tuJoJK5FhKsd3xJJ4zmGnJxw35/7msyLNr0NI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gtkCixQ1QurVrB7ApKB3FlZnX12jZM9aVDuqmgYXAb6tDrGKrIf8kuf3S6Kxq2eX4 pMs85kwK70SRyZezqsknfHVFC/YQtkQsmNO6fGKu7V4DqPfcr7eJDf6FwUvmW+uZpS pMvqqURHRuhA1V6uO7U89t/nEZtrahGAKrl5KQzc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Juergen Gross , Stefano Stabellini , Sasha Levin Subject: [PATCH 5.4 086/462] xen/swiotlb: add alignment check for dma buffers Date: Wed, 6 Nov 2024 12:59:39 +0100 Message-ID: <20241106120333.629543320@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120331.497003148@linuxfoundation.org> References: <20241106120331.497003148@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Juergen Gross [ Upstream commit 9f40ec84a7976d95c34e7cc070939deb103652b0 ] When checking a memory buffer to be consecutive in machine memory, the alignment needs to be checked, too. Failing to do so might result in DMA memory not being aligned according to its requested size, leading to error messages like: 4xxx 0000:2b:00.0: enabling device (0140 -> 0142) 4xxx 0000:2b:00.0: Ring address not aligned 4xxx 0000:2b:00.0: Failed to initialise service qat_crypto 4xxx 0000:2b:00.0: Resetting device qat_dev0 4xxx: probe of 0000:2b:00.0 failed with error -14 Fixes: 9435cce87950 ("xen/swiotlb: Add support for 64KB page granularity") Signed-off-by: Juergen Gross Reviewed-by: Stefano Stabellini Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- drivers/xen/swiotlb-xen.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 486d7978ea970..5bd29d0bffa2e 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -89,9 +89,15 @@ static inline int range_straddles_page_boundary(phys_addr_t p, size_t size) { unsigned long next_bfn, xen_pfn = XEN_PFN_DOWN(p); unsigned int i, nr_pages = XEN_PFN_UP(xen_offset_in_page(p) + size); + phys_addr_t algn = 1ULL << (get_order(size) + PAGE_SHIFT); next_bfn = pfn_to_bfn(xen_pfn); + /* If buffer is physically aligned, ensure DMA alignment. */ + if (IS_ALIGNED(p, algn) && + !IS_ALIGNED((phys_addr_t)next_bfn << XEN_PAGE_SHIFT, algn)) + return 1; + for (i = 1; i < nr_pages; i++) if (pfn_to_bfn(++xen_pfn) != ++next_bfn) return 1; -- 2.43.0