Message ID | 20230103191551.3254778-8-kbusch@meta.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 60673C54EBC for <linux-mm@archiver.kernel.org>; Tue, 3 Jan 2023 19:16:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2EE6D8E0010; Tue, 3 Jan 2023 14:16:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 26A338E0001; Tue, 3 Jan 2023 14:16:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 093DD8E0010; Tue, 3 Jan 2023 14:16:27 -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 E5FBB8E0001 for <linux-mm@kvack.org>; Tue, 3 Jan 2023 14:16:27 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9D6FBC0B6F for <linux-mm@kvack.org>; Tue, 3 Jan 2023 19:16:27 +0000 (UTC) X-FDA: 80314444014.27.E4A4079 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf20.hostedemail.com (Postfix) with ESMTP id BDB321C0003 for <linux-mm@kvack.org>; Tue, 3 Jan 2023 19:16:25 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=nFBgo9iE; spf=pass (imf20.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=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=1672773385; 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:in-reply-to:references:references:dkim-signature; bh=Sev9Qmp+4jQyHwYNBzNbVt7THFKHOWH3teTqQDlQVTc=; b=HfR24S6Qg3YxHWZmQhZ5VzcAoLVN2x/8JSaD4yqTfqOEw77rGN5sPNYgLbYYh/QDqQ7wX1 cbWQj6ZqP1g1AcO20g6lKn7qS9IU104baV41I4xeCkw+eEmWMf7wC9ZiAC9MgVYgr5p6/z 5TUKb6e4o+HjqwOdYrWvFTR0EgPiLO4= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=nFBgo9iE; spf=pass (imf20.hostedemail.com: domain of "prvs=4367607b20=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=4367607b20=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1672773385; a=rsa-sha256; cv=none; b=7X1mwR1kKOM5xgtTlFJMWTunJ0wRnzRMDwV6+nAgvh32xBYCWsZVZlEh1ZjDklj+GMTPWF KmhVJm9/iz/+lNHD3/V1EydN+9NXwFRcbJVEgNKCGIvArjGI2Zy2xHWYUJeHSOXTgztm9M j3tdL9P9T+ZguMOdimIF/EFef/0dE7k= Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 303IGIJs001055 for <linux-mm@kvack.org>; Tue, 3 Jan 2023 11:16:25 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=meta.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=s2048-2021-q4; bh=Sev9Qmp+4jQyHwYNBzNbVt7THFKHOWH3teTqQDlQVTc=; b=nFBgo9iEBcEUKjljPW5nEZ14CiRvj6+EAlj8eYVJfKFjxcjOzOO5kfBPIjJeu3Op/PMV Lym5wKYgrqU01OC7P77SmVGDa00n330+KLyeFVDRA6GrANYpODSDVWXrGqSPXNLAyPIm wnTPLShE87ei5CPgzWuiTuk0TfYVR+Cr9EWoniPWp0CpsmHZpkOhJhBxinZWpyCtmugH Hgg+52SnTIV/d/jHazVbzT3ZeT88RDGXNSuSUVdSCNy753xSmLk5pWhFGJWDo3nPAptD rWVd1wntRowl4NkmS0SItKEqaiGJgK565c+Lmb34oj8mQrp3JRlRtGF4Uwn4t+BmKIdb 3A== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mtkt0sxf9-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for <linux-mm@kvack.org>; Tue, 03 Jan 2023 11:16:24 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:208::f) by mail.thefacebook.com (2620:10d:c085:21d::4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Tue, 3 Jan 2023 11:16:21 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 428A4E1F5E16; Tue, 3 Jan 2023 11:15:55 -0800 (PST) From: Keith Busch <kbusch@meta.com> To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>, Matthew Wilcox <willy@infradead.org>, Christoph Hellwig <hch@lst.de> CC: Tony Battersby <tonyb@cybernetics.com>, Kernel Team <kernel-team@meta.com>, Keith Busch <kbusch@kernel.org> Subject: [PATCHv3 07/12] dmapool: rearrange page alloc failure handling Date: Tue, 3 Jan 2023 11:15:46 -0800 Message-ID: <20230103191551.3254778-8-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230103191551.3254778-1-kbusch@meta.com> References: <20230103191551.3254778-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-ORIG-GUID: cg_PJM0P_adpB0bSFQ8EXnAUdPf6rq7J X-Proofpoint-GUID: cg_PJM0P_adpB0bSFQ8EXnAUdPf6rq7J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.923,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2023-01-03_07,2023-01-03_02,2022-06-22_01 X-Rspamd-Queue-Id: BDB321C0003 X-Stat-Signature: 9bpkbbkk73x6yxmezo7jreb43m8iuqfi X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1672773385-31382 X-HE-Meta: U2FsdGVkX1+F9iO5HoXilN4YP9IRmS+4ZWUrbnCuO6R47Ixt8wzWAQ4+L3IL0E88uzJ9bRXoozIL6HBxoNgPaIRuy48vsCkYjdASQI4jxGBL9a1y00d0R5vlzK9Kmh58rJ2zTvaAm8Eipram/QIyATng+JIXfv2wGFsho6TbeQsCIwn03q0NO5RALTQE01J4a7azDZ2SEKv1pAnQ/nNCAaFUXSx9a5iVMBYsGzv2/DDlYm0+1Vgn8IYTvHSaRjcqeW2EhIDnha13JAI8C1Su8c+uAxo7dr1jkMEqpnyHfXv2TWStTaW2AStwts7Zix2Y+r4fAbTq886sAqXvuqfoV9/5JYGXhDINZy1liDzM7EQ2evWotL+SixD/iL/bdSyHSx6fmi/FYTRkgrFY8VApNWRTbVuopeXK87BImGiBVlbN6IfuCx16I4lNJ7MzRVZhD5A/YceL2jjyFu7agNQqDfnAlxZVgnAAB8hUfyQsbDgxPtn4LWYc5vII3SUw2R8DjKsPXG7LpQdAMxbdF3CL7pUaCO33kcvUkjwmDkW0kW+/GsbE3iUUyvgHL1HVSVK8mCoVGU4475et4NkBHqKmF5Fzu/WXqiRJ8IrsC1D++YbDOkqCN4delnL/oAJmXm+I7OVcykNh+Li+1jvUZ2IqxFS4NTzLgiDW0pvkhY2t+5IE6DRRSJJ/QEN42KdPAQmkmC10cXILAbuwQmWDw2VCA0nLAA7invbRaZ9Qngh/Gb11UYK7ndPVYXlkb1hgirs9xOrNENMIuzJ2aKyK4TVis35erHTQ9zsbPRThC57uXMbjp2BUp1mfY9xmzJdms6dJAsHE6NtbRXrYu931rHhS9Vn1Y4HANA7Bc8tc0LSUjG5NNRVKpd5Fap/Gq0SlREPGixInaE8nhWm+cD6wnkqsNiihNOyz2ka8yNa7dzufHxN/J46oO0G0s7yRHWpTIBbimM57gYGn83/grEf73Ty QYKbMKxV Obtv1DDCq27d7DR4/8GmkJKqH8lt/WxEEAS1SW56gkNk4tdjIPx4wl4yK9Q1FX/YzvkKxrVrt/pWQ1zsEfcYRHEULxtsKLaGfRSE7Ugy7PgANrtU= 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: <linux-mm.kvack.org> |
Series |
dmapool enhancements
|
expand
|
diff --git a/mm/dmapool.c b/mm/dmapool.c index 7bd8990e1913d..0a443c8120f62 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -222,17 +222,17 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) return NULL; page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, &page->dma, mem_flags); - if (page->vaddr) { -#ifdef DMAPOOL_DEBUG - memset(page->vaddr, POOL_POISON_FREED, pool->allocation); -#endif - pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - } else { + if (!page->vaddr) { kfree(page); - page = NULL; + return NULL; } +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + pool_initialise_page(pool, page); + page->in_use = 0; + page->offset = 0; + return page; }