From nobody Tue Sep 16 14:33:01 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F59EC3DA7D for ; Tue, 3 Jan 2023 19:20:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239067AbjACTT6 (ORCPT ); Tue, 3 Jan 2023 14:19:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47344 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238582AbjACTTC (ORCPT ); Tue, 3 Jan 2023 14:19:02 -0500 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3853315FD4 for ; Tue, 3 Jan 2023 11:16:25 -0800 (PST) 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 303IGIJr001055 for ; Tue, 3 Jan 2023 11:16:24 -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-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Tue, 03 Jan 2023 11:16:24 -0800 Received: from twshared7043.05.ash9.facebook.com (2620:10d:c085:208::11) 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:22 -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 To: , , Matthew Wilcox , Christoph Hellwig CC: Tony Battersby , Kernel Team , Keith Busch 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 X-Proofpoint-ORIG-GUID: nv_ckmGyQhR0hRpNuDEwPGmKo4gdlqjW X-Proofpoint-GUID: nv_ckmGyQhR0hRpNuDEwPGmKo4gdlqjW 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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Keith Busch Handle the error in a condition so the good path can be in the normal flow. Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig --- mm/dmapool.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) 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_po= ol *pool, gfp_t mem_flags) return NULL; page->vaddr =3D 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 =3D 0; - page->offset =3D 0; - } else { + if (!page->vaddr) { kfree(page); - page =3D NULL; + return NULL; } +#ifdef DMAPOOL_DEBUG + memset(page->vaddr, POOL_POISON_FREED, pool->allocation); +#endif + pool_initialise_page(pool, page); + page->in_use =3D 0; + page->offset =3D 0; + return page; } =20 --=20 2.30.2