From mboxrd@z Thu Jan 1 00:00:00 1970 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 D8A5EC4167B for ; Fri, 16 Dec 2022 20:17:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 710C98E0001; Fri, 16 Dec 2022 15:17:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 64BF8900002; Fri, 16 Dec 2022 15:17:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 427B78E0009; Fri, 16 Dec 2022 15:17:25 -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 3447D8E0001 for ; Fri, 16 Dec 2022 15:17:25 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id DB7E0121201 for ; Fri, 16 Dec 2022 20:17:24 +0000 (UTC) X-FDA: 80249279208.01.4602CA7 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf26.hostedemail.com (Postfix) with ESMTP id 1243A140007 for ; Fri, 16 Dec 2022 20:17:22 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=STzCkNPe; spf=pass (imf26.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=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=1671221843; 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=ADvvFQUdwkTabb+mgOJxdznef25hLYACuBWcCNuRK/M=; b=ogxN9P0kKbWP+c5NfPdr5hUzURDRVJqPP5qGm4ix1zVXJCJW2OGa0LMYhuc9+Q8WiuWn1R vvORrIHS6q36ZKH9722ny8pO65lhqWSd1gQ6KJpp9oOCvfHwuEzP9K5R75n2zHSSqUbMG/ lPrx7yydPsxChslmhd8ditc06TXGYqI= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=STzCkNPe; spf=pass (imf26.hostedemail.com: domain of "prvs=33494f0754=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=33494f0754=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671221843; a=rsa-sha256; cv=none; b=awYKcjzJ7gupoGOF3GLGcWdpxSZvEvAltDXzV9mn1OiVBCEZ1WRZ2UX6QDEnd7+oi4YWWr fFE1D/MJg5QxpqDoCILIHgkB36V5J5QbVnnGNGzkRtnWjaqYmS++DYABYNbZhntpD3V3gI 3+5Uv29RBmK6dP+hZZ+ZnMVqI+9GBKc= Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.17.1.19/8.17.1.19) with ESMTP id 2BGJx3KZ022884 for ; Fri, 16 Dec 2022 12:17:22 -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=ADvvFQUdwkTabb+mgOJxdznef25hLYACuBWcCNuRK/M=; b=STzCkNPeqfgrpppDPw5oSsN3vOKMm72rvWYfooQHmAohLWtRhPDzTrjukAr2+N4WppCo 4xtpDJWyYTkk3xoTbuVy/4pguJ5xy15tVj9S7KISqhZwQAx3iTegSd8mQeUl/u/y+rF0 XZXBOPIJKhpC/kwbwy8yu914EOgGhsLmuhgiTDhSz8agnvMAcnzD6UdgHs5N+y3xIdvt epoTvXQQEUwlW3RTfwNffUzxoTGfVYqDLWap3Neo+O5cuzgnnW8oY4Enx6FQBXxK5iYN EicOxa1Rl8qJk11jKwYXIlWB4z/Ugl3M8JHl7nIV/FtkKqoO3JDMrmsru82aItyBzHMr vA== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3mgsfdacgw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:22 -0800 Received: from twshared21680.02.ash8.facebook.com (2620:10d:c085:108::8) by mail.thefacebook.com (2620:10d:c085:21d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Fri, 16 Dec 2022 12:17:20 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 45158D042ABE; Fri, 16 Dec 2022 12:17:10 -0800 (PST) From: Keith Busch To: , , Matthew Wilcox CC: Tony Battersby , Kernel Team , Keith Busch Subject: [PATCHv2 07/11] dmapool: rearrange page alloc failure handling Date: Fri, 16 Dec 2022 12:16:21 -0800 Message-ID: <20221216201625.2362737-8-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216201625.2362737-1-kbusch@meta.com> References: <20221216201625.2362737-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: qvW2ePhFfx4Qjy9665TvVax8fcRpcVIT X-Proofpoint-ORIG-GUID: qvW2ePhFfx4Qjy9665TvVax8fcRpcVIT 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=2022-12-16_14,2022-12-15_02,2022-06-22_01 X-Rspamd-Queue-Id: 1243A140007 X-Stat-Signature: ndkigzfeo57g58kwo5csawjsfroimfua X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671221842-930829 X-HE-Meta: U2FsdGVkX1+j5SOHyd4y1ZVnxLWC8/7eiG/p0RgxBGH5nZhDhsRQ7JuRmA6uQZrHbO97THVdWx5M5yF8MzCdz+xDtWmxPI8fiPEGyk+GC4oRDUAUDJjkJB7g4X0fOrciMMZvagfqmom/yqPja6weFL4qhupPTcH73X3/rAVfxSYtxY1EylK9Rj1VAVmnS0zJVc82Xj1XqoBkX+/rAwkOM7oSlY4/2hQXyj6hAzkkd7lUlvYqixH7t59gDWSQoWC6Cbt5vwlzgBbWW8zs+lbmhT7wAGycoyzflVVC5SFqEJ13KTRMygQwPMEx84N01XW0fQUjCzp/1Mau6/5oNIJYeNM6qnMa4voltrfQufVuznT1On5zalW2Lq4u/TFKYXTHBqBOUDM4XJFo0QDD5M/Yi8MHkJoL7O9qoJKToTWAwGY+pXOcgtHKfVceyZw+sF96UGku+6XPlRMi4Ynzf6cNqn73lMOZkYjwHObe4ih2HwPEElu9AoFZHI21l3mMgysoMbYIu9dBXDUOsPtTil5WO1OrBz0ZiY8SqAhLVq8xi0+WWFLLhwqYbb/NRmPX+k6VzIEfVtMdpmzvs6OjjbRtezZCGiwTWX89L+Za03AgcD3+mVdMT6bmXD4ZWULJ3qrhgltJDEV5k/w8r/1Sh6Kv/qWDz3HQVCFqmiHVOYXzHDBfq4QiiGKTOtSv0ygdsKanJZDPlk6OfQFX4lEQ4krE7npOtG6KYeTjOzV1Xad+2yivNOc6EsGPj95pPXn3fGxX5l2Qrc9VU/xL2oGpXwQkTzjQ29irXNcEUPbYMEaCQZpfJruJmByYCyM5IDvQUnCDLJK5N929b4i0Q3XSOz/UQ/vOblgkEM3VrgovwbBI4DD9c662A6f0xD7uSkx2buXke3q6CrhDKwr1hwuYiDzI5xuBCvD3d9e2fQt26EexiRwkGVrTrQ12dfz1t1Yypr+hJ5C6+pizDC5omm7RyM0 bn9qj80h VwCokPrcxo0Gk7VCkC7bC0nq/ISkvB/9FfSJZ2bvnQ2n/oOlF2NdD1s+rdhFYg7iwvysUe7PMqzM1d174oRoM68z3ic8BbojFkepzDHYkTf+O7FU= 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 Handle the error in a condition so the good path can be in the normal flow. Signed-off-by: Keith Busch --- mm/dmapool.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 8a7aa19e650a1..f77e2af4941de 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 =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