From patchwork Tue Jan 3 19:15:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keith Busch X-Patchwork-Id: 38636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4781725wrt; Tue, 3 Jan 2023 11:27:37 -0800 (PST) X-Google-Smtp-Source: AMrXdXuJEqAgZTD5KFDh0elqCjkkogKWHaDB322eaJb5q1THBbH+LgvDL5Wla4C7mGQxVtUNE9oK X-Received: by 2002:a17:907:a481:b0:7c0:c1cc:c68 with SMTP id vp1-20020a170907a48100b007c0c1cc0c68mr38189322ejc.6.1672774057058; Tue, 03 Jan 2023 11:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672774057; cv=none; d=google.com; s=arc-20160816; b=Oagj7cQ5fkdRrJBxU7co827NR6I7DorbvM8c5wGxKCGROR8b2MycNZfgf9UoTISyz3 +ZImNqfQQFBFrNbqmmhLZuflVQMULvVssPLMk5uxVCk5egz+lEo3wnS5VAvEx56ND4rW aHEj2/G9cwIG99H9xpDRZlUy5SD9BOaIOU19WIcnRmmfX1xydEY/xIdtGlRu4ADR+taZ XPYuhZzsAjMZG+e0l1n4BiltJ6cTUaLDZ0AEEV6XE9Xg+gxBZoB07+WGZq5ZJaPodwau DIAWe6ByyZq3IpPMsHBYYQvSyOO5V/opGOdOqRtst6TGoUtkz3JsnQqEf0LS/ycAPcd6 7EUg== 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=Sev9Qmp+4jQyHwYNBzNbVt7THFKHOWH3teTqQDlQVTc=; b=x+ODrz8Vq2bU1U0ucJu3paFR/GJn9rROg3kgJSev4Stf5O0iynw1eWuaYNYeuUzVFf JL6+5KBu+4mcnEN/DnL+M7t9+JMTIJGyjA+eYftaZ4Kr1lZv7c2AD9zMqV3ZjGjHIDvL 0j5F+zRXemRqQaku+EJk2nI29OOXE5FpohWMHejgo5Sx+rFGzAyCAFA4ImhS4AjSF17C 7M4srBADbQypoajXWKcBnWUpBr/6KNZLHv3MX/uSYnIytdc0p7X64Ep13UxpGi3lVhm5 HUFXT5+P5LI8Kt2CPUUK0dVRk7JtBGhDARO9sjyqUwCA1fD7aqQT3l9hDSKTiW+lia9t olnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@meta.com header.s=s2048-2021-q4 header.b=nFBgo9iE; 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 xi10-20020a170906daca00b0084ce73e3b2csi1969443ejb.760.2023.01.03.11.27.13; Tue, 03 Jan 2023 11:27:37 -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=nFBgo9iE; 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 S239065AbjACTT5 (ORCPT + 99 others); Tue, 3 Jan 2023 14:19:57 -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 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 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?1754030729831551906?= X-GMAIL-MSGID: =?utf-8?q?1754030729831551906?= 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_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; }