From patchwork Fri Dec 16 20:16:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 34075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1176374wrn; Fri, 16 Dec 2022 12:18:27 -0800 (PST) X-Google-Smtp-Source: AA0mqf5JuH8CnxqTp9oOCaKpCww4CiwBGebIMdsW2XYqeLb8rEcIFdJgngCnm/Du1x4/plYjaFLC X-Received: by 2002:a17:903:2408:b0:185:441e:2d77 with SMTP id e8-20020a170903240800b00185441e2d77mr39343693plo.14.1671221906747; Fri, 16 Dec 2022 12:18:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671221906; cv=none; d=google.com; s=arc-20160816; b=CiQe7F6ZnZs8fMQgiJ4CqP4OycV8gudPXhEYfLy9i1p5bMQYnsFYvaBBwJooovDisx cyWCgWke3H6HPMKBCsWJUoB+XL9wPNxSkoSTpq9UDSF9OI8Sz/vufXY2R5Dy6xS8kTPR cAvwRZAEcBheCK2QQSpmvUkp5SbrpslUkR1mBUYQ0h8U4zzI/ltYFXweTi3p2K9vIIrH 52H0w2dl/H8Hd2PIq2KuCBftjfQ5JD6smXBuaWTOljmfSxKBQz/yUxDIkyDVEoGpqRJS 54PzRyNfSKh3N+hXladtR5INKSFBL5vL/31t0bgeyRpTAWjN0kzBiGt5LTF5yV5sXREA TNzQ== 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=ADvvFQUdwkTabb+mgOJxdznef25hLYACuBWcCNuRK/M=; b=imyDuJMntvBWkRTRo55Ojt4Nwr7cPDJUMgxBVWqDbApE0ESva2DbEQWaZ4+sVUKuC3 E1Sqq7bXO2efMN6UEXwbGPl+uJNnQMj6+8XapIsnJiRO0zfpyy77gb8ew5sfKVde8VdX r18vqbrZ8kbztEL85eJpHZujVe60lneOZVJdCU8CE7mUWC7uehNM8tYTfNXTyNkMTtAW gPXnMPVfb0gSflO7I4C996PvO5mveGkI+I8DIAmKI5h3sZxdqR9C06JR0HiegVrdJAbC 0sH/xFkVD90s82/RmvAVzTn4j+2nCoEy0xaTbVttGwArgLSuvtU4mp3yeaAg+IRWGVG6 kFyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=STzCkNPe; 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 e5-20020a170902784500b00176b7b8cf2esi2979289pln.586.2022.12.16.12.18.14; Fri, 16 Dec 2022 12:18:26 -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=STzCkNPe; 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 S231991AbiLPURl (ORCPT + 99 others); Fri, 16 Dec 2022 15:17:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58934 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231971AbiLPURX (ORCPT ); Fri, 16 Dec 2022 15:17:23 -0500 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A2FF7260D for ; Fri, 16 Dec 2022 12:17:21 -0800 (PST) Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2BGJxCtI024587 for ; Fri, 16 Dec 2022 12:17:21 -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 mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3mgwvu0uu8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 16 Dec 2022 12:17:21 -0800 Received: from twshared21680.02.ash8.facebook.com (2620:10d:c085:208::11) by mail.thefacebook.com (2620:10d:c085:11d::4) 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 X-FB-Internal: Safe X-Proofpoint-GUID: 1yp9UXgPFRP2qgbBLE18nxXddd1am-SZ X-Proofpoint-ORIG-GUID: 1yp9UXgPFRP2qgbBLE18nxXddd1am-SZ 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-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?1752403181991384372?= X-GMAIL-MSGID: =?utf-8?q?1752403181991384372?= 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 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 = 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; }