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 58E251CF5FB; Wed, 2 Oct 2024 14:33:22 +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=1727879602; cv=none; b=cQ+WkU1vIj+E7wxyBvKdqR7wOMQXuQNRxwp9V+Jp2toqdUAnznLPKYD+FHPKIZmqJ9zaBXIArlJLD9mgqP+3eSOAhwhuAh5cmnPonx7GWZC5fiwWIvlqIiKHx3gZGfY24xxr3Tk9oMbXXBYx8qOnJghzrumsXLV1ABku+Xf29JM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727879602; c=relaxed/simple; bh=CA53wqkXDHHi4j490I+zrqPunO/XAOIWlqjHQ4M9Gh8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Di9EQ3DcC48OdOuRyYLJsQsTsmi18QFHvXDWWOU6UTQ1LEUKffcf6PtlDahmWs2jev6Li1iZMENP6xSzcZAujIc/1B7PiH+EDEo9Z0taDgjWBTeV0ssPSyOB7bFGa70USR08qSaLsQ0nDyc56EAdC56K/HG2TzZTujQnR98TXfE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=UrDB0T70; 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="UrDB0T70" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5E61C4CECE; Wed, 2 Oct 2024 14:33:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727879602; bh=CA53wqkXDHHi4j490I+zrqPunO/XAOIWlqjHQ4M9Gh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UrDB0T70mTX22vBlRFQAJQddJ+X0ix7fT6mHXpmQe9SfmQi5NmBFfbksEp3Q9Xq0K HcBJOCZtR3Xoc1WSBEL9JZp2MWMFeJbj1WtnRAKbZ5vy7/G5fJ0oIUg8g5KbZ+KKMk 6XsPHJi6AGiPX0LXgJ7ftxxkXoXZ+EIuBXw/HohE= 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 6.6 176/538] xen/swiotlb: add alignment check for dma buffers Date: Wed, 2 Oct 2024 14:56:55 +0200 Message-ID: <20241002125759.203469347@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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 0e6c6c25d154f..892f87300e2cd 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -78,9 +78,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