From patchwork Mon Aug 5 03:25:44 2024
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: Huan Yang
X-Patchwork-Id: 13753093
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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.lore.kernel.org (Postfix) with ESMTPS id 9BFCFC3DA64
for ; Mon, 5 Aug 2024 03:26:20 +0000 (UTC)
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
by gabe.freedesktop.org (Postfix) with ESMTP id 0354E10E114;
Mon, 5 Aug 2024 03:26:20 +0000 (UTC)
Authentication-Results: gabe.freedesktop.org;
dkim=pass (2048-bit key;
unprotected) header.d=vivo.com header.i=@vivo.com header.b="nLQtw5nE";
dkim-atps=neutral
Received: from APC01-SG2-obe.outbound.protection.outlook.com
(mail-sgaapc01on2045.outbound.protection.outlook.com [40.107.215.45])
by gabe.freedesktop.org (Postfix) with ESMTPS id 8D4EE10E111
for ; Mon, 5 Aug 2024 03:26:18 +0000 (UTC)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=xAHzvs0zhAAxkvwni4WuadJsl43EkEXt4294iLXKxTm3Y0rAL8OzYuxYlVU6LNpxErHBz5mfv/NXlSRkzDbdGn1VAw1Trz+KCdqanwxdPSmvoJ7PyYAzeXWe7JSLeTYdsMfT0XIGLlHAZScFuF99B7UquPRnEZEVcbwuj7GK3mY8DbNPjzcedcdi8vd/134vEpzz8wmnWeAnOtjcGwkdFuVos2wsdIxscnifHQs8Vu8SaGiadgnZBdTEvjr6tVr5gSsgq1OHdgFqQAHZLwQonG01rPaUIDtaiJBWKZ3FaTBg3SQTYgj/z2KTUKurZkUCl+AWvsITsgsOpFZ7dvutXQ==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=tsHH4X5CdxMLGJRzF8Qxk8XqsOUiC6aUr+MRuw1SGcU=;
b=CSDEKNsZgKiAUD5dKC9TRFW1P/YoNMcUoqLh81EGp+Bqo1gyKQuxIztnwNBve0oZCxnrmjLHhWwtU/YP/eQ4V0265kpAGhC3QQbL86VVY6qnJ/U5XKayOISqAT7VRRAxIWfg0N7T1wU73zeiniS7zMyWHJKgSmOAOxcwnHmRL69GDUaeCdDhPHhnoy3xkiEymoiuXzr/Kxo0h/jd8tdLIVTUs2i7qvwSII1p6wePhXMiMEuarlQ0kQu1ubL5mHLqWxi6QEVC8LRAzfxgJAJLG/J7e598McEeLHrmSNIpH1LCoy+SyC8vNgXVvHHb4VZwDYXsInPCQ0o7iUmkuLjSRQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass
smtp.mailfrom=vivo.com; dmarc=pass action=none header.from=vivo.com;
dkim=pass header.d=vivo.com; arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vivo.com; s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=tsHH4X5CdxMLGJRzF8Qxk8XqsOUiC6aUr+MRuw1SGcU=;
b=nLQtw5nEjr6NORcz+HemiqGEyLFIkoPO2DkSdXG8NeGAGyPUq+Tr8+8YBaTVsOj04p+Di68uj+i6D43XSatd139HMjYZHeaCdLepLCRcjLdLE++xShGyj9RnFXCZJsgoyPJLrChs7vrmQRyRqS8FixsoYZuNEn3uE2ZLXl0JN7vEDdugHvtOP1PzvTjwtr01wLG+P6AmgP9OLPOGXcfwJItXPscsC0YOv6uvjSaUEFmo4eiN28xHQ8NqiCj8XLFSYTgzlUfGT3K64WWfsOozAXDYveytnolQAyxuO7xbU+x1VF0zUFm+y/6Q+XGuCekQi8Va/AclkpgQn6qrluICKA==
Authentication-Results: dkim=none (message not signed)
header.d=none;dmarc=none action=none header.from=vivo.com;
Received: from PUZPR06MB5676.apcprd06.prod.outlook.com (2603:1096:301:f8::10)
by KL1PR06MB6988.apcprd06.prod.outlook.com (2603:1096:820:11b::13)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.26; Mon, 5 Aug
2024 03:26:10 +0000
Received: from PUZPR06MB5676.apcprd06.prod.outlook.com
([fe80::a00b:f422:ac44:636f]) by PUZPR06MB5676.apcprd06.prod.outlook.com
([fe80::a00b:f422:ac44:636f%4]) with mapi id 15.20.7828.023; Mon, 5 Aug 2024
03:26:10 +0000
From: Huan Yang
To: Gerd Hoffmann , Sumit Semwal ,
=?utf-8?q?Christian_K=C3=B6nig?= ,
dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org, linux-kernel@vger.kernel.org
Cc: opensource.kernel@vivo.com,
Huan Yang
Subject: [PATCH v2 2/4] udmabuf: change folios array from kmalloc to kvmalloc
Date: Mon, 5 Aug 2024 11:25:44 +0800
Message-ID: <20240805032550.3912454-3-link@vivo.com>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240805032550.3912454-1-link@vivo.com>
References: <20240805032550.3912454-1-link@vivo.com>
X-ClientProxiedBy: SI2P153CA0025.APCP153.PROD.OUTLOOK.COM
(2603:1096:4:190::12) To PUZPR06MB5676.apcprd06.prod.outlook.com
(2603:1096:301:f8::10)
MIME-Version: 1.0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: PUZPR06MB5676:EE_|KL1PR06MB6988:EE_
X-MS-Office365-Filtering-Correlation-Id: 4e9b9454-d87f-48c1-5537-08dcb4fe59e8
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|52116014|376014|1800799024|366016|38350700014;
X-Microsoft-Antispam-Message-Info: =?utf-8?q?MU1pYJMgdOP2yKYOLatHFFXaAhWAc5k?=
=?utf-8?q?clvHdvbKn62Gg40p3HUoV9BnKfo7PzSKQNM+t00CgunPs+KnzVGxxXiXMeV8AO7Ch?=
=?utf-8?q?jNRBN9oX18CS/hRiuQbqGTnA4YD9HccHVz/6PDA0AMPb5NXPOKh424QNzhCeEaiyS?=
=?utf-8?q?wZgRIHrLoYGquob2iIDscc3ImpR+lREBhEsMYtNN03Q3kcyne9gF+Ms++lyQaprLh?=
=?utf-8?q?XoIC665FY8DrinfiL9wzYFwUjSTNnkltGWSbAojGj74p6L0JPMzRG1gUnR0VowuoI?=
=?utf-8?q?CFbUvWyfTjqfkch2G9ap5IiG6aNpjU+QivOyEEn83U7m4CRn0slWf9IRp75KtvF9L?=
=?utf-8?q?W8jh0IAYdorXASLrrgXJDxJcj0jzBgloIvc+Nmh6JFSBkMgOCJME7myq9lRuBQRCt?=
=?utf-8?q?FSOiUza4nQX/+/FbhVjn2TSbZWLb/YMG0/7NtaRVHS0qjjct6NWcRdO5n0A47bgsI?=
=?utf-8?q?x/0mED/B3kcDeoezYw8UXstflkKSV0T6h8RXSYMxX0LH/QRmY+sJSohWY+j+N2Opp?=
=?utf-8?q?q2JzltcI7CDeRSm7CyrZYHsjshko6x8ru9XMWb7jRh5zDy1vRqd/DYvY0/bnbXmZG?=
=?utf-8?q?WvkxGSYm6svfkZKK9dXsfpyuMqehhgyDXfnYR4SA05mXV04pBBzE3Hu0QS7G3P+tm?=
=?utf-8?q?26dKlTuiTSmEorxBk9e7ZGvtsekDW1wMYrU7Z9RC4fdfGVg5JnbFIA5F3U55RN68s?=
=?utf-8?q?mihQ8rsPVDcmmJWgLWvORnDc27gW82FRYaz0vyNyjwfmjlbT1uF0r9wTftXV6ljHf?=
=?utf-8?q?tgulvl5aciiUUVlDu7mpe6vuamd/2KatBcySj8I4ykfWImWrckN9JQ0o/qH1tU29F?=
=?utf-8?q?oWG7ihaOFWjVfrL84ce7ICDH+OpQuYiH3iZpKI7zrQp/ZkXdhBo2Q/N++L7CzYPb0?=
=?utf-8?q?n82d8z6WdB2mmZP/JOVLL4WOrXT2C/gkUNry9m8EtahMbZgHpR4XGnhNo913VvePE?=
=?utf-8?q?NHGaTXcCIfsknwXR7YUsC4cE+n7iBRvrVpeJCjGsTnIgsafs6PIQco7IWKM3i+ynr?=
=?utf-8?q?5kQTA3+zEjplBVmZlevHREU2rLKHi8a2gDn8ZFewDgKDzxwT+6/+gexLqDHGj+Tyq?=
=?utf-8?q?rd7zzuSM/NHH07+s2elLoAW/NRLldcHBe14L2GiCzCmKxxToTWbFi0y0024yCdW6r?=
=?utf-8?q?DWhVbYNKxw36m7hftpJ5DVcXsgRqQE7ewrlbWVrFwEG1+snf6sDpyxw0lkydFgYpY?=
=?utf-8?q?PeMINHJhRrd0+KPoW19ZNV3LEBBr81ES9jE6SKyhc0IypPvtNYdJVGIeAhso9DBdf?=
=?utf-8?q?gFvMAFJ3sdwDsYkTd60dLrWNOkdYzpbymLPVhcuSs1WnbB2KW+Ul6/Kfj1C/lq7am?=
=?utf-8?q?njL4/1loXtTsR3rK5hOFy3Xj9mQzJWcCyw=3D=3D?=
X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:PUZPR06MB5676.apcprd06.prod.outlook.com; PTR:; CAT:NONE;
SFS:(13230040)(52116014)(376014)(1800799024)(366016)(38350700014); DIR:OUT;
SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?v8qKAB2LgjkdjKZO2V+Su5c+gBlO?=
=?utf-8?q?saonjejxY/YP98BYwxX9pA4UD1xm5RdLXwPlHCCAF/i61FQCODLh58xcHD0z+9uEs?=
=?utf-8?q?ZHqypeeuIvLlM3DBDbmLZXRa3j+TEoW8ezisILdd7NS+2SYoz78FyWLBA9D9sh0yD?=
=?utf-8?q?ilZ3LXedrROXXuLrqDeAI0gWSLhbXuJ/cQKmctYj3mBSDm/uJKwxINUNWZNSM4A7e?=
=?utf-8?q?X4cYYnMtWolCUidUZ/D2NOQczHgfZTI1VTSmMtAD0RQZ/mnln+1UuMWjiBthW3vf9?=
=?utf-8?q?tVk6IHLfqJplmqKxpoesajRL8fsnGoEwF2IfFk0c3ijB4kEKA18jqNEApV1pIo4Fg?=
=?utf-8?q?Eb3ABbDUB+qKxN59215GfAAZbypr75anJQcdWH2hk2HOXnNUhTjwuhJpUpS1NsSwb?=
=?utf-8?q?l/ZLpAGdcX0BRTLT5iJveMNRUfm/ZobPHfDGgF9qnTBXhHe9hU82LENH54HxgZ+Rh?=
=?utf-8?q?idlmgKuNjwAyykCZILUq/jJMS4eqMCH4rhjlPAR/3lGrQIRtsXOz3f4SmRH0cUH73?=
=?utf-8?q?AkpM7XlewfyT4Mzsk16CpyJJsJNe57OgQZhO66Ms+KZ/Mz0klrB8V2FMKtx8bcJxs?=
=?utf-8?q?mIsiAXq7CCE/36kPBE0raZZTD82g2cDiJK41yoFxEwuwA67qCYSQIHC1hHyePon9i?=
=?utf-8?q?R4tUYW6axOmEEa5hADIlDDPAoN/UHiyrIaB74WhnXJ5cilyjCIXtGtsKEVOHw3dAY?=
=?utf-8?q?Zyr1PnW3c0MP8i5ZoKBM8eSa8awROPCaa9I+yv3BgqRDBSfq+SPklA9ZEkiNn8SyF?=
=?utf-8?q?b0KaDFzv5ozqA2QuDphSBLsyzL8hG8bDg2V/8c2cWZ0e1O2w5dQpsB1WW4/L+A6wX?=
=?utf-8?q?6PcEO5nPiKaIs6SZTNvYPYTyxIUJN3bu878jPZB8/fAlGilAajEYTChkcBO+doqzq?=
=?utf-8?q?irN2vuh4B/fVB+PN1GVLkboYZtbgF9I7TCdrcWUZ/NCBW09Sjz/Sk+N4nmFMAxYpD?=
=?utf-8?q?m/RLMwlfS2tHjE5CMfg/hQb259JmfjMFSvVvXZ00Ex7zwlKGA34JhRFE254uCTxWs?=
=?utf-8?q?vX9uOT0nRK1TdUE8D1AIEdfM7A12JtktffWTJJZrMjfLJVbalsfuuumwa8l6aBHCd?=
=?utf-8?q?AeEKBGoQ1cGoFwvP5cPUYYC9ENXdbPRP7OjE7c/LwtXIYRob/a94X21gT9o+D0Mof?=
=?utf-8?q?tOYmXuaRgcTtxhMCHWm2+WJf18k0CiqbsfklZFSAGfr9vhZjFqH/hh5I0kmm+TlZg?=
=?utf-8?q?aaKQpW0I/jE6pyhj+sUE+yPnOhruIiGWQsFhpB/akttS5FFFWFK13eHqQPy5II+vG?=
=?utf-8?q?hQnLaTPLJgEiXOo4ZO6klBczMgNeWswBUZ3hue0vPs+7VXT3O7Z7eVDHrZSwNza/s?=
=?utf-8?q?TfTuGsFKePslKuPuKpZ4fdOXlQ+sn3ViU4GYLvjovdt3uuFq8PlkIIdY/OAiFmj8T?=
=?utf-8?q?ZRZG/LJzavBNhPvKGPPc+Rc0Vb+C1wkoDX/3s402k0MOjivkYxvNkcw55ZSm0+4S3?=
=?utf-8?q?llNd90A1BAnQy/b1VdlSqAuTfzXxTn1w9CvCk830l7YvSpZmIQbjbqy/Dr1EbkJ8N?=
=?utf-8?q?yYDpR7E6vZW2?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id:
4e9b9454-d87f-48c1-5537-08dcb4fe59e8
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5676.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2024 03:26:10.5236 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName:
ddhW1yfnWIcNHiLjML+fhV/EqjdlpvMj3Qf0A8A68SOskCSBnUpOstVsFMF0+nzbE/A8k+Q4ZHdFzM2cwAhzNw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB6988
X-BeenThere: dri-devel@lists.freedesktop.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Direct Rendering Infrastructure - Development
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Errors-To: dri-devel-bounces@lists.freedesktop.org
Sender: "dri-devel"
When PAGE_SIZE 4096, MAX_PAGE_ORDER 10, 64bit machine,
page_alloc only support 4MB.
If above this, trigger this warn and return NULL.
udmabuf can change size limit, if change it to 3072(3GB), and then alloc
3GB udmabuf, will fail create.
[ 4080.876581] ------------[ cut here ]------------
[ 4080.876843] WARNING: CPU: 3 PID: 2015 at mm/page_alloc.c:4556 __alloc_pages+0x2c8/0x350
[ 4080.878839] RIP: 0010:__alloc_pages+0x2c8/0x350
[ 4080.879470] Call Trace:
[ 4080.879473]
[ 4080.879473] ? __alloc_pages+0x2c8/0x350
[ 4080.879475] ? __warn.cold+0x8e/0xe8
[ 4080.880647] ? __alloc_pages+0x2c8/0x350
[ 4080.880909] ? report_bug+0xff/0x140
[ 4080.881175] ? handle_bug+0x3c/0x80
[ 4080.881556] ? exc_invalid_op+0x17/0x70
[ 4080.881559] ? asm_exc_invalid_op+0x1a/0x20
[ 4080.882077] ? udmabuf_create+0x131/0x400
Because MAX_PAGE_ORDER, kmalloc can max alloc 4096 * (1 << 10), 4MB
memory, each array entry is pointer(8byte), so can save 524288 pages(2GB).
Further more, costly order(order 3) may not be guaranteed that it can be
applied for, due to fragmentation.
This patch change udmabuf array use kvmalloc_array, this can fallback
alloc into vmalloc, which can guarantee allocation for any size and does
not affect the performance of kmalloc allocations.
Signed-off-by: Huan Yang
Acked-by: Christian König
Acked-by: Vivek Kasireddy
---
drivers/dma-buf/udmabuf.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c
index 475268d4ebb1..af2391cea0bf 100644
--- a/drivers/dma-buf/udmabuf.c
+++ b/drivers/dma-buf/udmabuf.c
@@ -73,7 +73,7 @@ static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map)
dma_resv_assert_held(buf->resv);
- pages = kmalloc_array(ubuf->pagecount, sizeof(*pages), GFP_KERNEL);
+ pages = kvmalloc_array(ubuf->pagecount, sizeof(*pages), GFP_KERNEL);
if (!pages)
return -ENOMEM;
@@ -81,7 +81,7 @@ static int vmap_udmabuf(struct dma_buf *buf, struct iosys_map *map)
pages[pg] = &ubuf->folios[pg]->page;
vaddr = vm_map_ram(pages, ubuf->pagecount, -1);
- kfree(pages);
+ kvfree(pages);
if (!vaddr)
return -EINVAL;
@@ -189,8 +189,8 @@ static void release_udmabuf(struct dma_buf *buf)
put_sg_table(dev, ubuf->sg, DMA_BIDIRECTIONAL);
unpin_all_folios(&ubuf->unpin_list);
- kfree(ubuf->offsets);
- kfree(ubuf->folios);
+ kvfree(ubuf->offsets);
+ kvfree(ubuf->folios);
kfree(ubuf);
}
@@ -315,14 +315,14 @@ static long udmabuf_create(struct miscdevice *device,
if (!ubuf->pagecount)
goto err;
- ubuf->folios = kmalloc_array(ubuf->pagecount, sizeof(*ubuf->folios),
- GFP_KERNEL);
+ ubuf->folios = kvmalloc_array(ubuf->pagecount, sizeof(*ubuf->folios),
+ GFP_KERNEL);
if (!ubuf->folios) {
ret = -ENOMEM;
goto err;
}
- ubuf->offsets = kcalloc(ubuf->pagecount, sizeof(*ubuf->offsets),
- GFP_KERNEL);
+ ubuf->offsets =
+ kvcalloc(ubuf->pagecount, sizeof(*ubuf->offsets), GFP_KERNEL);
if (!ubuf->offsets) {
ret = -ENOMEM;
goto err;
@@ -336,7 +336,7 @@ static long udmabuf_create(struct miscdevice *device,
goto err;
pgcnt = list[i].size >> PAGE_SHIFT;
- folios = kmalloc_array(pgcnt, sizeof(*folios), GFP_KERNEL);
+ folios = kvmalloc_array(pgcnt, sizeof(*folios), GFP_KERNEL);
if (!folios) {
ret = -ENOMEM;
goto err;
@@ -346,7 +346,7 @@ static long udmabuf_create(struct miscdevice *device,
ret = memfd_pin_folios(memfd, list[i].offset, end,
folios, pgcnt, &pgoff);
if (ret <= 0) {
- kfree(folios);
+ kvfree(folios);
if (!ret)
ret = -EINVAL;
goto err;
@@ -375,7 +375,7 @@ static long udmabuf_create(struct miscdevice *device,
}
}
- kfree(folios);
+ kvfree(folios);
fput(memfd);
memfd = NULL;
}
@@ -391,8 +391,8 @@ static long udmabuf_create(struct miscdevice *device,
if (memfd)
fput(memfd);
unpin_all_folios(&ubuf->unpin_list);
- kfree(ubuf->offsets);
- kfree(ubuf->folios);
+ kvfree(ubuf->offsets);
+ kvfree(ubuf->folios);
kfree(ubuf);
return ret;
}