From patchwork Mon Feb 5 19:01:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 196993 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1080236dyb; Mon, 5 Feb 2024 11:03:27 -0800 (PST) X-Google-Smtp-Source: AGHT+IF4FyisV8LaEcrL9nugiLfAalrXDPqcD04Eflbm4PSMveBQj4DwZV7ZOcwRJJqRwXUW8xAf X-Received: by 2002:a05:6808:6046:b0:3be:9ae8:16be with SMTP id dd6-20020a056808604600b003be9ae816bemr554449oib.38.1707159807376; Mon, 05 Feb 2024 11:03:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707159807; cv=pass; d=google.com; s=arc-20160816; b=L9u9s8LBc9+bpz+WnFFuUJm+CyB7Vcq8NZd6Q+HxUxEFwyaPK5giUE7WrXOTU48PBQ mIr3Le6C1nKT0QDzSQbjxj7Xoswos6y2LrKGHV7qE7TLEerWQAozllZcCNQe+NW9nGLf XaiaIgnHn63PlGR00V7Qdcxs0rjptAz/6Nq/w/O1E51svkU8tyLWxFE+mGQdlH+B5opm Ad1E3i1+/QymdRFCg+E6U0swTFgxmJEGR+u24kvzbnLeB4ZrC/L5cvkYjdwhkB2ekTj8 xA0PfHhY5IE+rWdJvq6T+luuF0G1Px2N64SSCX/YbHPY3DWPY0DCEIgy+3vQCruiHhcb T2UQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=TYWd+25EZKHgv9DFcU1CxEQiMmgf4I9Lf1cAo66RCbk=; fh=VBKWtEpegNagfzBVKRKp9InbQv1zE2Y+aCYZMN7SllQ=; b=N2cVUR9J5+PjFLHNMXcVcNuhV8JZlEVkJ5w0GJdrgWEpRkZ0VFrJyex/itYCI/rTNf Okew7QouRwIPlereTRVluol6MM8EFSgIWJw/3cfPlCzWp9MA0DjlMj0YIOagXpbfpL1d yFap8zDapOMlaZxCtwAwEW78T9OglZ03I4lQylkDq6C8DKvT8rG4itHzuY9VUb0O1jSq JMjxgYs2hFUEJczSCZnmD6SQvfgvndp3gp6YrX9G8CfiHyjQpfFuKu29Xh3oxwnxB1of fk5pZ43DmEPeSJ8cIkTWmmGkbHXnWk3wdaxtr57V0BeTDtnlNdUiuGb2EZvrI5E/bJC2 fUuA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lmoQR25l; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-53276-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-53276-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=1; AJvYcCWy2XnsfDG+TV1Zk39QFXgRRf5C7kSFJ/4q0wjEEyuDR51oOoJEuVzzzZ68Bn2JUrW1h4nD8YARcVNJTheV1Eu/L5Btug== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id w18-20020a05622a135200b0042a53b932b4si488058qtk.9.2024.02.05.11.03.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 11:03:27 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-53276-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=lmoQR25l; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-53276-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-53276-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EF6961C245F0 for ; Mon, 5 Feb 2024 19:03:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 724564EB46; Mon, 5 Feb 2024 19:01:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="lmoQR25l" 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 BFE5B4D5A2; Mon, 5 Feb 2024 19:01:43 +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=1707159703; cv=none; b=TEStmv/W4HEh2xs4ZnHa0gMW9L6OKfT5dd/ZnZrdYylJca7xzWOugSZFR1MzqAbnkTqyYOGJ9E9jhPdnrI/X9Wx8jActuSQ2WMcASEbf9Jp82yoz/FOn4CinjUhVinFdQj6fDaF+NAf1DQmDhhp88/PAZIDesDPc49zS/53SdWY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707159703; c=relaxed/simple; bh=hQZUe3sC6qvAlN4FEOPtkqPiMEdJZuABY+olfP99JFc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=onhezXw0PNdLALIc2dmdLq9lhso9r6kdxNd6q45rbosFwGI5wClEpu6DyIYCXyLYeHlNgIEALwSMeglPE1Lpp+DZSzj/6BUvHlO70B0CHDp2BIEt5eqZVNHmSaYNde6pyt+JTG6CTTcmjGA53lKajO3xserM8g9Q2ztUSz4mrA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lmoQR25l; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8FB3AC433F1; Mon, 5 Feb 2024 19:01:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707159703; bh=hQZUe3sC6qvAlN4FEOPtkqPiMEdJZuABY+olfP99JFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lmoQR25ludhgwq7pg6I1EhIk/p8uQEqt8nLNz7TzzLBOX2wlnQlMhVmrCVOaVrDmI oGP61dg+FoZ3JflOYRYPQgaDLxt6gMLeGUImiWBiwoQi3A+DFrUxQWBbvpgteIh7Nf RoNzLKYE075wvJp57XGu+9niQCouMmcWRsD/PyMTjOekbdS4ajwjOj4Y8yNQFANaT6 caBhmNO0eWy25b0h8FlrrDvpIze5J1cKCt2I8dfPMPV0j0PkszJ/02+LMdXZgYQQWn BUra+IidX2GQ5qUJH3X0XnOHipUoBWgrjTEas1zkICOsnv7QJwUUWmJ53edEGpT7qN FI3PM05JbV7fA== From: Will Deacon To: linux-kernel@vger.kernel.org Cc: kernel-team@android.com, Will Deacon , iommu@lists.linux.dev, Christoph Hellwig , Marek Szyprowski , Robin Murphy , Petr Tesarik , Dexuan Cui Subject: [PATCH v3 3/3] swiotlb: Honour dma_alloc_coherent() alignment in swiotlb_alloc() Date: Mon, 5 Feb 2024 19:01:27 +0000 Message-Id: <20240205190127.20685-4-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240205190127.20685-1-will@kernel.org> References: <20240205190127.20685-1-will@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790086802188144430 X-GMAIL-MSGID: 1790086802188144430 core-api/dma-api-howto.rst states the following properties of dma_alloc_coherent(): | 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. 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, Calculate the mask corresponding to the page order suitable for holding the allocation and pass that to swiotlb_find_slots(). Cc: Christoph Hellwig Cc: Marek Szyprowski Cc: Robin Murphy Cc: Petr Tesarik Cc: Dexuan Cui Fixes: e81e99bacc9f ("swiotlb: Support aligned swiotlb buffers") Signed-off-by: Will Deacon Reviewed-by: Petr Tesarik --- kernel/dma/swiotlb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c index adbb3143238b..283eea33dd22 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 = dev->dma_io_tlb_mem; struct io_tlb_pool *pool; phys_addr_t tlb_addr; + unsigned int align; int index; if (!mem) return NULL; - index = swiotlb_find_slots(dev, 0, size, 0, &pool); + align = (1 << (get_order(size) + PAGE_SHIFT)) - 1; + index = swiotlb_find_slots(dev, 0, size, align, &pool); if (index == -1) return NULL;