From patchwork Tue Nov 19 20:55:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Johannesmeyer X-Patchwork-Id: 13880539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74435D6C299 for ; Tue, 19 Nov 2024 20:55:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7EEFF6B0083; Tue, 19 Nov 2024 15:55:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 77A426B0089; Tue, 19 Nov 2024 15:55:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F0BE6B008A; Tue, 19 Nov 2024 15:55:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 33BFD6B0083 for ; Tue, 19 Nov 2024 15:55:38 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id E286DADBBC for ; Tue, 19 Nov 2024 20:55:37 +0000 (UTC) X-FDA: 82804048446.19.3BBE8A5 Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by imf16.hostedemail.com (Postfix) with ESMTP id 960F1180006 for ; Tue, 19 Nov 2024 20:54:45 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IP4JQgAp; spf=pass (imf16.hostedemail.com: domain of bjohannesmeyer@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=bjohannesmeyer@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732049534; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=ZbuVcaxj8JodWMRgXnQSRz0XnZKwpGSc0YmAvvgqPOo=; b=BCK7Ek/j4M7OaRpjVjgMRwZ2NVLQWDG1jhyWoT9f4jMTC9kJjx0wZN8BzqiY2tWYInPYey VFoGRJpIdPhca9kBfDwP6Qgu211XQ/mK6EHwndnZULXgqBT5ggeBaTXeQHcR+Ar1HN/orS Hd/s/rENb+lHM75tc83DhZB7c8ng3co= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=IP4JQgAp; spf=pass (imf16.hostedemail.com: domain of bjohannesmeyer@gmail.com designates 209.85.218.47 as permitted sender) smtp.mailfrom=bjohannesmeyer@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732049534; a=rsa-sha256; cv=none; b=x4K70kFh2sLEwPveWetxJlZhVDsyomx3zAWylH5hXJU29fdQE0XzSaSVfV6VbKa3iMpeoO u8pkRtuikMJRoeIAS/HC90qtxn2cUvhL2fjnFbnDMmwTlpRf0M3lenhMHUnsdpc131yZla zaUCnoS8jOGUf1+wb6IEaN4cdkgSHrw= Received: by mail-ej1-f47.google.com with SMTP id a640c23a62f3a-a9a6b4ca29bso704556366b.3 for ; Tue, 19 Nov 2024 12:55:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732049734; x=1732654534; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZbuVcaxj8JodWMRgXnQSRz0XnZKwpGSc0YmAvvgqPOo=; b=IP4JQgApsjyJXC6RZGmJ2AVwLMTUwd1YLIYokzo62KAsPPi0JDbLpObL7IgaGyzZP2 DXMd66lMnLRdscQ/8ZsPlpLi141MQULlYY3sS1GfJIGUCwonILOCIQRETYif1kFlzMzL gK1VEL85EUc8AmtcGTrLeG3LWIs8vrTXaXL1wQ1V4lt9qH3wOfZ1nXTRWvUt5b5OQ/te MqTamWcyWXAGUoRFOUVJiwV9a5oQ6wmERS/0+8D1dw55/vg/DPcRBUBZfok2CLBg8Xoq KYtucT5FStUNM9FlcBQNbhZ1qTypMy6gdmC8a5h6c1ox+6aiKpVOk/zngkdlC2nq9D+o FXkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732049734; x=1732654534; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZbuVcaxj8JodWMRgXnQSRz0XnZKwpGSc0YmAvvgqPOo=; b=BxDvl2tHlnJ4+5zN9qf8NpC+xtAwtNWLQCWXh0+YJPCGpKzVz6bTUIaMLxFNSYF4x+ UiL0bsXwsiE2woNev/TQbgB80BZQsR10uM9vggYstC/M9+l39IwzXVcl4pv4XK3/Cx2k Nq4lyMfGB/id4+baHXr7whwL4aThLwba3LCl825PrXFx/GRgzKWpMWPy0TM290QPqvfN SqbjYHKb37T8xjdKOVCTK2Fc7SEZo+i2AK/Oc3cpYTRF0woz6eY/Y3oVioBxEJkVxQdV MKHaznWs6K9AiYIceOp6XzPa8/A5H4ouAiSqiDys24O3InrM0opBhC4E+P7qFbyR6Q5n 6TkA== X-Forwarded-Encrypted: i=1; AJvYcCXu8P31zhnvKaSpUdXiyizrPd0eBF7RA6oZulVFNsA6V8dxCxcqM3ByzIT4HBzXrhTzq/zykW84QQ==@kvack.org X-Gm-Message-State: AOJu0YySlVwyWjeDiOjQWtc2Mg8wOpV0PkVx7ylM3j+3Ef6Sctp9bNiH ZdimRYA1WzHKSn4KCLKXY68C1bgGk9sy281fNnXXLEDHDFvSKnVk0Xy8+gvID70= X-Google-Smtp-Source: AGHT+IHgTN9tdFjMSKVLOD9Fb39fDLgUkoJ3LRgFT1/To2hszKOZjZVwYj26pYowqN58Ud0woVF63Q== X-Received: by 2002:a17:907:9726:b0:a9e:b281:a55d with SMTP id a640c23a62f3a-aa4dd7518dbmr29120966b.56.1732049734460; Tue, 19 Nov 2024 12:55:34 -0800 (PST) Received: from rex.hwlab.vusec.net (lab-4.lab.cs.vu.nl. [192.33.36.4]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa20dfffc00sm694709266b.101.2024.11.19.12.55.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Nov 2024 12:55:34 -0800 (PST) From: Brian Johannesmeyer To: Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Cc: Brian Johannesmeyer , Raphael Isemann , Cristiano Giuffrida , Herbert Bos , Greg KH Subject: [RFC v2 2/2] dmapool: Use pool_find_block() in pool_block_err() Date: Tue, 19 Nov 2024 21:55:29 +0100 Message-Id: <20241119205529.3871048-3-bjohannesmeyer@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241119205529.3871048-1-bjohannesmeyer@gmail.com> References: <20241119205529.3871048-1-bjohannesmeyer@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 960F1180006 X-Stat-Signature: rtyregus8qn658i8q6h6ebn7ph165umo X-Rspam-User: X-HE-Tag: 1732049685-860620 X-HE-Meta: U2FsdGVkX1/uzlIXssymHv5UbZNXXCynh4MjWDX6Kv3tPa5HoUJNj+csa1Q3aCoVoOvVys0XDeem1VbLMGJILawLeT0dnBz4zogWGB+fTKAWjQxOa0dzSKoCaE582VcmrlAllBf6X+KkOb0kx9qLamCyQrQDz6BmCGeZBFMw3OCsHqThrZmB398TRVpMMmMpmo/0NhVUhwzdZoQYWzKXCR1lbdMv7n9dwLYgNQf9ks3tPBS7fsLsEF0XgAWStEwVHAoxZ5sdqzIouk8ynjRbODUdh7z9cNkXegtHuPOvbqH7uOtJSanFg5V2nnmJ5lvFBpxO8pSAiaQ/Uq7y5rdpDMQebafIuz9DaIZXqM/huoc8bw6amYn2m6k5RQ6B5W17teHw1Co98pUYD2kDjDB1VuWVdQblFbuC6Mh7rjD1hA3gBtHX2XMeDyjJNgnI1Etkb3WW37wZFlZbv3eKsFBRy+CGu5cE6jZrf4ZQo30qlvASd+mIqhZoC7/NmJZEIfT/xnD7QfUhXUEkKN3uFnFJhP73WpnCA+1fP3SsgtFBGGn2CIQe6XX+1R1OsXz2+pfYCgExkkzVxBpmWq7kwCAR04VptE4h5OWYH1vaTtxzkUzoazvCGPV3jceE6ocjGpng0WOHg3WglQIMjcIEyamAUe+LkWykHaHlCKlzofK1j1tWoUR8GNfkuN510VYHVV8//x5cmALrJkHLy3LeYbzkcvMOQNtaNrOBEWnV5m7/wPQFogulp9Ug+mgHZE8hxbRmJFuRDftWJtTA0U6ymH99uDKogJ1pls5UcFSStZdzeoYXGxAegMbfgVBIEay6uwFSUqJzpv3C/XlGys3x1Og3sOBFud09V3QomFdtQKzQBp/u06t4YAgZMFtAzwiTeIpscUU7metO40bSUNbWhhGOaK7a/y7oIWBbniYTFYlqcrmhzc7tkQXwhvCJdFTuFg6XSYNVcLYndLMeHOxf4dF LpvN7b/7 yEOSAp5oe7e46AXyOhBKioBidubVGkVIhCx6tK0XRQ3WM8xqE/94l5YbrVhku2NypEISIK7nMjZstkBUysDOdjups0OLu8ePZA1szYoWwuRKjOv27SXbfdL63G8w55j2ie37ruQ5Zm5C9YtWbL7J+JrLmkYZHW+jLpi1WdnapaVucBwu5tSGBnDw12QKbNgFQu281+ASnMLSPe4Vm9FhMg9bdjomwmzcWIX/ObJGQsAAUAum+e1C+Y4uoeNNXWrEpFVgt8pQDXI8r++EXbO1DLcO9VQ66EsJq10ENTNp67/LcgMr3fJ7OKuGyq0NqwMLPPlXYVQLSRLxn4S1e5GjBtCknflUFL+ZNQkbO/MoVAjWypit/W1VL3jnyROFglG4ja+g88R7mi0aEyQ3PdxEDnSz8gpsheMmOYsU0qzyQNH2ubjVqHT7CN9UYWjSlbUkeUcRSsY1+gr/v4a4= X-Bogosity: Ham, tests=bogofilter, spamicity=0.116376, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In the previous patch, the `pool_find_block()` function was added to translate a virtual address into the corresponding `struct dma_block`. The existing `pool_find_page()` function performs a similar role by translating a DMA address into the `struct dma_page` containing it. To reduce redundant code and improve consistency, remove the `pool_find_page()` function and update `pool_block_err()` to use `pool_find_block()` instead. Doing so eliminates duplicate functionality and consolidates the block lookup process. Co-developed-by: Raphael Isemann Signed-off-by: Raphael Isemann Signed-off-by: Brian Johannesmeyer --- mm/dmapool.c | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 25005a9fc201..267fe13347bd 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -141,39 +141,25 @@ static void pool_check_block(struct dma_pool *pool, struct dma_block *block, memset(block->vaddr, POOL_POISON_ALLOCATED, pool->size); } -static struct dma_page *pool_find_page(struct dma_pool *pool, dma_addr_t dma) -{ - struct dma_page *page; - - list_for_each_entry(page, &pool->page_list, page_list) { - if (dma < page->dma) - continue; - if ((dma - page->dma) < pool->allocation) - return page; - } - return NULL; -} - static bool pool_block_err(struct dma_pool *pool, void *vaddr, dma_addr_t dma) { - struct dma_block *block = pool->next_block; - struct dma_page *page; + struct dma_block *block = pool_find_block(pool, vaddr); - page = pool_find_page(pool, dma); - if (!page) { - dev_err(pool->dev, "%s %s, %p/%pad (bad dma)\n", - __func__, pool->name, vaddr, &dma); + if (!block) { + dev_err(pool->dev, "%s %s, invalid block %p\n", + __func__, pool->name, vaddr); return true; } - while (block) { - if (block->vaddr != vaddr) { - block = block->next_block; - continue; + struct dma_block *iter = pool->next_block; + + while (iter) { + if (iter == block) { + dev_err(pool->dev, "%s %s, dma %pad already free\n", + __func__, pool->name, &dma); + return true; } - dev_err(pool->dev, "%s %s, dma %pad already free\n", - __func__, pool->name, &dma); - return true; + iter = iter->next_block; } memset(vaddr, POOL_POISON_FREED, pool->size);