From patchwork Thu Jan 26 21:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 48918 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp505962wrn; Thu, 26 Jan 2023 13:55:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXvW4wB7fKen46IQxx3BffqpFNCfJ8F/D3FLywCb/duXT7saitkT0r9LRAIleXwBIxK/ugRN X-Received: by 2002:a05:6402:2499:b0:499:1ed2:645d with SMTP id q25-20020a056402249900b004991ed2645dmr41680575eda.17.1674770141290; Thu, 26 Jan 2023 13:55:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674770141; cv=none; d=google.com; s=arc-20160816; b=OPwIsGqCFFsjz/7iN+JboPNpQFViA8UXQnaynNFkE+Kg8C3OXuQUssESWLWSYxtD3I A9dAprqhdNbUJ/aFvWXfsoggpvl2EXTHXTYV1uHsXelLrOhLP1cyv/i2Cn7gks+bazZS xL0vCUQszXa9pxAZ4iHj89B6CWAgIYvdvqQJpAt20Tutst+scMcpe8+lFEfXMU5kF1bA h/jDJEd08Khg5vFezlfLInlfmsIfEop6xp60OJ3RRnwPbQIohpMtpLiyvk48qRxGRrIF DP+KsN4qUjimsOODqbwb8gsp2Y4hvbGa+/GfKtK0CUWE+r3MN6Z0ziUySqanOVD1c5SN le9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GssxkqRHzywk5Sc3h7qaypNsDK+tSAkz3BBhF75F+wE=; b=JMJMJTossKjLqu10OpasSuFZO1aEDxpPdsC0jqbieicYhAz1RS7lBOsk1tROTT0hxD Ga68D/0nHxYor0eb9kIUF8pPnEvzNdXX4DNZWXp0fqYFlE2gW4jiqb9fdKIdzdnUmN61 F/suuP5aU7MVgHETZ/6eDMLzhDoTGeW4bN0FyOfRJFLzlK9z/wWZPZKoR5vfCj2n1opm 3ZVa0ESKq6N2ZWXm4m4gKnU1mmNpmc2Fdm//AE2dxdXtFYJCC0Q+i65hOqEZ3rq3HWrR RZT8OOWnHixq71kD43qTbW3rdW5loPNyMnpzHBh6gqqoD//ttJubX68d7naOb6VIZKx+ 6dWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=EW66EzzZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a056402150700b004a0912d723dsi2952848edw.264.2023.01.26.13.55.16; Thu, 26 Jan 2023 13:55:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=EW66EzzZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=meta.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232339AbjAZVy0 (ORCPT + 99 others); Thu, 26 Jan 2023 16:54:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229530AbjAZVyY (ORCPT ); Thu, 26 Jan 2023 16:54:24 -0500 Received: from mx0a-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16EF30D1 for ; Thu, 26 Jan 2023 13:54:23 -0800 (PST) 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 30QLpQYG012189 for ; Thu, 26 Jan 2023 13:54: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=GssxkqRHzywk5Sc3h7qaypNsDK+tSAkz3BBhF75F+wE=; b=EW66EzzZTYxhxkLjG2nAjPndtIL8LgcOKBBHD/sSSDMd31TgPu0CZWKSeSNRB/D6mSNa dt8c+/70JMd1fhW8sMd/GQB2mQ6ijYChIbRbJkEnPu5A3lVTMiT+K5SXTBS7IBZooSgl /6Q5fi9ryDlra82ARf9bFswTsfAilHAwZv6cK5HYODvGn0/iGaYxhPGYWjwGEJhMzPyg o3eCENiy864rN1NDEddVjj2fQ++ENMLr7FwVH5byL0Zl58Piuhf0mCxzaKG1ldF3hIsz cLuGoG7fMBu8A1TwmCZ4NWzF1qpnle/lWci29BDJ4Mts+COFT4eBwAaLIvgHiZQWRQAz pQ== Received: from mail.thefacebook.com ([163.114.132.120]) by m0089730.ppops.net (PPS) with ESMTPS id 3nbw49tujt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 26 Jan 2023 13:54:22 -0800 Received: from twshared24547.08.ash9.facebook.com (2620:10d:c085:208::11) 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.2507.17; Thu, 26 Jan 2023 13:54:21 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 3DA2DFE80A9C; Thu, 26 Jan 2023 13:51:26 -0800 (PST) From: Keith Busch To: , , , , , CC: , Keith Busch Subject: [PATCHv4 07/12] dmapool: rearrange page alloc failure handling Date: Thu, 26 Jan 2023 13:51:20 -0800 Message-ID: <20230126215125.4069751-8-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230126215125.4069751-1-kbusch@meta.com> References: <20230126215125.4069751-1-kbusch@meta.com> MIME-Version: 1.0 X-FB-Internal: Safe X-Proofpoint-ORIG-GUID: nVICH2WN4RRxlrWXGNPzgcFglWzOIOop X-Proofpoint-GUID: nVICH2WN4RRxlrWXGNPzgcFglWzOIOop X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-01-26_09,2023-01-26_01,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756123775897570277?= X-GMAIL-MSGID: =?utf-8?q?1756123775897570277?= 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 | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/mm/dmapool.c b/mm/dmapool.c index 30b069e999968..900f2afa363a9 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -292,17 +292,19 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags) page = kmalloc(sizeof(*page), mem_flags); if (!page) return NULL; + page->vaddr = dma_alloc_coherent(pool->dev, pool->allocation, &page->dma, mem_flags); - if (page->vaddr) { - pool_init_page(pool, page); - pool_initialise_page(pool, page); - page->in_use = 0; - page->offset = 0; - } else { + if (!page->vaddr) { kfree(page); - page = NULL; + return NULL; } + + pool_init_page(pool, page); + pool_initialise_page(pool, page); + page->in_use = 0; + page->offset = 0; + return page; }