From patchwork Tue Feb 21 16:54:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 13148216 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 B353FC636D7 for ; Tue, 21 Feb 2023 16:54:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F8A86B0073; Tue, 21 Feb 2023 11:54:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A8BA6B0074; Tue, 21 Feb 2023 11:54:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 370446B0078; Tue, 21 Feb 2023 11:54:17 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 294086B0073 for ; Tue, 21 Feb 2023 11:54:17 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id D1F71A9472 for ; Tue, 21 Feb 2023 16:54:16 +0000 (UTC) X-FDA: 80491896912.11.3794405 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf05.hostedemail.com (Postfix) with ESMTP id E469510000B for ; Tue, 21 Feb 2023 16:54:13 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=P0Ku8hmc; spf=pass (imf05.hostedemail.com: domain of "prvs=54169a0d01=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=54169a0d01=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676998454; 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-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references:dkim-signature; bh=Lv9wtK+Nznn45ETj9R3Fhuj6gPKzD5SadJcUnBYgOLQ=; b=bh80lQr0+HqJzQXZgi7SN7fCvY5ts1gTAZks7M9DEJm1+IffNXcGasRN0GQuROyt6HSSny 5MJR0LiL8PiVskdxieXj9rwwrSX8WO7AE7z+TQWDtoHkSh0iF4NH48vU5zuTQrteNiDB0k t3nEWV8Mz4FnDk7M7Uyw0G8ntjDlRQ8= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=P0Ku8hmc; spf=pass (imf05.hostedemail.com: domain of "prvs=54169a0d01=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=54169a0d01=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676998454; a=rsa-sha256; cv=none; b=JYYoRVOBBX3PUfi7JnwOI7XmHQFmZIauJEBG9SNgkYie51KiPyLkmqKvMkSk8GAnAIBNLd NRzbHJkHnI3Pbq4+gIpiNTlXeKiz5c8SWNhuNm6nRXsbagPJY4YDF+aiIbr5w59yws/Db6 htsFrL8JoQgZ4yvchta3vh5wuHnlm4E= Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31LDjqJC007138 for ; Tue, 21 Feb 2023 08:54:13 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=Lv9wtK+Nznn45ETj9R3Fhuj6gPKzD5SadJcUnBYgOLQ=; b=P0Ku8hmcIFQ1Qij/mJfUcp0QRf/3OcOzbXplOI8L34/kr6qJP8UQBK42btsF1JeovfM1 9UmSK1s6/sLzNce0o4/Ue3SDIbwfXh3zVEPPgq+FUzb2xePVm4Ol0NGkkJnO7bP8E81b kRlWlTnOcUZ+sARg9Nq2X9kJOSjg9/M0sbwxgMsyICxrhfsyZDp725XPqiuG56iGUA6Q 3IUBTnK1jrtnkqHr+UaAReODuNPfeXWWcG74ShAkvPnIQE4QkurJU/ae2isakwUeoOiC rw1XFmRAlZArLhRzs2mgecTepCIwdg+H3CUysNPwNHVRIIBbtVyFlqhJX5E+pyKywrGG cA== Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3nuf8xwnht-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 21 Feb 2023 08:54:12 -0800 Received: from twshared15216.17.frc2.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:82::f) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.17; Tue, 21 Feb 2023 08:54:11 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id D5EF011DFBF75; Tue, 21 Feb 2023 08:54:00 -0800 (PST) From: Keith Busch To: Andrew Morton , , CC: Keith Busch , Bryan O'Donoghue Subject: [PATCH] dmapool: push new blocks in ascending order Date: Tue, 21 Feb 2023 08:54:00 -0800 Message-ID: <20230221165400.1595247-1-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-GUID: bJ5Df_I9FF6yr0VrHQkcWGXVCJGu61tR X-Proofpoint-ORIG-GUID: bJ5Df_I9FF6yr0VrHQkcWGXVCJGu61tR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-21_09,2023-02-20_02,2023-02-09_01 X-Stat-Signature: ux34wyyj4dxron1oyc8pks7g3n1k9cs7 X-Rspam-User: X-Rspamd-Queue-Id: E469510000B X-Rspamd-Server: rspam06 X-HE-Tag: 1676998453-166483 X-HE-Meta: U2FsdGVkX1/S6PzYGAQcDheZ2/VBCaILx3EIaKecQ1iEWjvwcRBR4jvysi8iM599QXmEeD848cR0l2Q34x/jswAD0Ow+Zru+3X5mzvvkey42JDiQkBBg0TSZoKbKn2jsqBXHnLwQ9gfVZY5Gz6FGv8fYwVaXNFpOu8DnjDfB4k43Ha+n+k6BQRg6KKGLpuJGJXhs+UkoRHBuJu/6g4dtWN8ig/z1zGlI/GT1E8u2jTtpGQUOi1++/03TH8ZhmiDMfs2Pr5CARYowVff0JkhFSMKuNQBH1lf0MZSLt8DLYlYaAutn0GVuedMKQue66borUZrPo7xNmJpBSatlp4AZRT6AYS4C5ZXdcsTQDrnQALsSxGjCkZrkuR8VQhayRmxGO3YOUqNNX1T4DZyEb5vrcVSs2YvU436WLQORpffgppLMJ7F9g3c5Nh9niL+MsTOjvTta1+hTxdHhLD/GWtvSyQdtYQmT5JszldeMT5XqU6CJRBr+ICfAMR56TMdYMty56j2haROcs1rjKNpH2HSfzosY6x3XJIvkbm1OIo0jXoG28xLBRsOFcAixbjtpSvFOv03GvOtLp/bd/lufmkkpI9migy5ykQZ0SS9OjpvHaQJHHCcG7PEqIVmsoIeDYaeictPKp7Kxs8WZUvY9A3oyZ6KF6XyIKz0qBFGfyqeqT1ITzvSzwCzvkIbb5srmJj1XxQyfpdqnAxXImNjrNaSTZR838sS6cuc0e4OkXJTwl1sw+Kzg9FpN33XzStblvObm+FPXRx0XQOvspjmAg94UCRXfnb4F+lgKbPx26HD56CAqg9es6owkA9pzqebZgvdghExPaXvA1VMakwyCJcZFA7E7S0heZsEhCZZCpOACY/TJtBpsdyfc05blmQg8aao8W3JsRGn9B8MBsE+UkezaawPbxvb5n+4seuQ9uXeq0UTLBn7RUMFiOQOhfg2hGkRivdOnMxV7CPWIxy2RbjH XQMYSY7h IpRJyvLiWf4ZLs2pWye6CYgVbDgkYi+CRIUbVeeU0KdvALrnZ3AY25aV1WWueRU6u94Mw25s7q2gNQmQ5IL7OWUonaKkhYudNsH4DWeuc3qk5Vpi/ai4wRfCq9A9QM02DTQz18NyJt162yuHb5bzPjnP1XUE271Ev7NZ5FkLFvUH4Ie+AzD89HvdgX4QdR/AGGlzLu7RMxZXPn1IbHOKl3DshMxl7ibEbqWFJ1YGuYvLQ7H4oF0Uae14fyxBfNyRSkxRohXzROpQdG+GFutgIyeTT5Uiz4nmEcmAvv8yul6J7P33v71Z0rJm/+U7Oplgm6SvLLvkyOQLyyVmPkxflRCPHLaJ9w/08YE/fQZrP7oOwUt28ZgiASyz+9YgMs25bw9zmGbtk3VXqv7cu3koHe4JalU9GqhbEQhdI/I2xwyEhNWHFH0dl4EusJIykaP8gihsu X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Keith Busch Some users of the dmapool need their allocations to happen in ascending order. The recent optimizations pushed the blocks in reverse order, so restore the previous behavior by linking the next available block from low-to-high. Fixes: ced6d06a81fb69 ("dmapool: link blocks across pages") Reported-by: Bryan O'Donoghue Signed-off-by: Keith Busch Tested-by: Bryan O'Donoghue Tested-by: Guenter Roeck --- mm/dmapool.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 1920890ff8d3d..a151a21e571b7 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -300,7 +300,7 @@ EXPORT_SYMBOL(dma_pool_create); static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) { unsigned int next_boundary = pool->boundary, offset = 0; - struct dma_block *block; + struct dma_block *block, *first = NULL, *last = NULL; pool_init_page(pool, page); while (offset + pool->size <= pool->allocation) { @@ -311,11 +311,22 @@ static void pool_initialise_page(struct dma_pool *pool, struct dma_page *page) } block = page->vaddr + offset; - pool_block_push(pool, block, page->dma + offset); + block->dma = page->dma + offset; + block->next_block = NULL; + + if (last) + last->next_block = block; + else + first = block; + last = block; + offset += pool->size; pool->nr_blocks++; } + last->next_block = pool->next_block; + pool->next_block = first; + list_add(&page->page_list, &pool->page_list); pool->nr_pages++; }