Message ID | 20221205145937.54367-8-kbusch@meta.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 D1E46C47088 for <linux-mm@archiver.kernel.org>; Mon, 5 Dec 2022 15:19:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F1E98E0006; Mon, 5 Dec 2022 10:19:36 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A4318E0001; Mon, 5 Dec 2022 10:19:36 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E5D878E0006; Mon, 5 Dec 2022 10:19:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id D05838E0001 for <linux-mm@kvack.org>; Mon, 5 Dec 2022 10:19:35 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9430640B6D for <linux-mm@kvack.org>; Mon, 5 Dec 2022 15:19:35 +0000 (UTC) X-FDA: 80208611910.09.3102D46 Received: from mx0b-00082601.pphosted.com (mx0b-00082601.pphosted.com [67.231.153.30]) by imf14.hostedemail.com (Postfix) with ESMTP id 26EB610000F for <linux-mm@kvack.org>; Mon, 5 Dec 2022 15:19:34 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=ELaivGWd; spf=pass (imf14.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=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=1670253575; 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=Y54XyLeTi8Os0BxM3Y4aH019Gz8c3PMJa+9bPVED8T5DoNbsWD3CwvzjocEkFa63reE1h3 PVIhFcNFK83Yh6MmS+FYfGjIiFdwCCSxEKt2BLQl9J3b0Smo+8FzMYHZ8IE+k3Eb6ZuNaV MZe+udzsSZFS7pYSX4kFZIc2N2B6hbo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=meta.com header.s=s2048-2021-q4 header.b=ELaivGWd; spf=pass (imf14.hostedemail.com: domain of "prvs=3338591533=kbusch@meta.com" designates 67.231.153.30 as permitted sender) smtp.mailfrom="prvs=3338591533=kbusch@meta.com"; dmarc=pass (policy=reject) header.from=meta.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1670253575; a=rsa-sha256; cv=none; b=DADkaMgB7fJL9j1/hUGn9LrKVypAAJBYzqlMyPclfGJMVlqdW/3U/OpgIYRWE2maezEpvq hnoqOYt/NxMSabyYUblpDqV46EkCuUK99DaHo9ZXtsFNuDctKkQhtFXSWE05DQ/vW+0gF/ Ebcn4JknjXXFgIl+FCt/xhN906ebP+A= Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 2B5CVba7012959 for <linux-mm@kvack.org>; Mon, 5 Dec 2022 07:19:34 -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=ELaivGWdKmR+7P/NGl0TQf7pvFbhWJmnbb62RC3z369pUeY6UlSZuwWKDKnOMSokdVJs Arw3dzuIgZEFFiZKh7MI7upKp3GquRl9YtAp/b9OeNH9VpE3fc6BuIEppTY6lc31y+FK LaHIinB+i7JmHxo6VpvquK9mcBDYlPHu/VKMFVu0hGibcaFJHo9ZodKMSPrw5DipBopS uGmULh1f9rX4DcZCFpIYeeDEGjI873/8R0AuQD5HMA8ykYMx3wM2CDemmSaePK0SWjpn j4fDvG28OUbNt9QR1pEaZAc+xeP4vszHywKECkkB0CfBOhvspsI4pCJ29Qp/DKwpnGas FA== Received: from mail.thefacebook.com ([163.114.132.120]) by mx0a-00082601.pphosted.com (PPS) with ESMTPS id 3m9gqj9gct-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for <linux-mm@kvack.org>; Mon, 05 Dec 2022 07:19:34 -0800 Received: from snc-exhub201.TheFacebook.com (2620:10d:c085:21d::7) by snc-exhub103.TheFacebook.com (2620:10d:c085:11d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 07:19:30 -0800 Received: from twshared16963.27.frc3.facebook.com (2620:10d:c085:108::4) by mail.thefacebook.com (2620:10d:c085:21d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 07:19:29 -0800 Received: by devbig007.nao1.facebook.com (Postfix, from userid 544533) id 6E86FC615703; Mon, 5 Dec 2022 07:00:11 -0800 (PST) From: Keith Busch <kbusch@meta.com> To: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>, Matthew Wilcox <willy@infradead.org> CC: Tony Battersby <tonyb@cybernetics.com>, Keith Busch <kbusch@kernel.org> Subject: [PATCH 07/11] dmapool: rearrange page alloc failure handling Date: Mon, 5 Dec 2022 06:59:33 -0800 Message-ID: <20221205145937.54367-8-kbusch@meta.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221205145937.54367-1-kbusch@meta.com> References: <20221205145937.54367-1-kbusch@meta.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-GUID: lUCBPGrbfZlTL9GIjU-YHb0XG2036_ZX X-Proofpoint-ORIG-GUID: lUCBPGrbfZlTL9GIjU-YHb0XG2036_ZX 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-05_01,2022-12-05_01,2022-06-22_01 X-Rspamd-Queue-Id: 26EB610000F X-Stat-Signature: naohyj4jop1nn1wrb8wbt3qaeampbnfo X-Rspam-User: X-Spamd-Result: default: False [-0.63 / 9.00]; BAYES_HAM(-3.23)[92.56%]; R_MISSING_CHARSET(2.50)[]; MID_CONTAINS_FROM(1.00)[]; DMARC_POLICY_ALLOW(-0.50)[meta.com,reject]; R_DKIM_ALLOW(-0.20)[meta.com:s=s2048-2021-q4]; R_SPF_ALLOW(-0.20)[+ip4:67.231.153.30]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; DKIM_TRACE(0.00)[meta.com:+]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FORGED_SENDER_VERP_SRS(0.00)[]; FROM_NEQ_ENVFROM(0.00)[kbusch@meta.com,prvs=3338591533=kbusch@meta.com]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_FIVE(0.00)[6]; RCPT_COUNT_FIVE(0.00)[5]; TO_DN_SOME(0.00)[]; ARC_SIGNED(0.00)[hostedemail.com:s=arc-20220608:i=1]; PREVIOUSLY_DELIVERED(0.00)[linux-mm@kvack.org]; ARC_NA(0.00)[] X-Rspamd-Server: rspam08 X-HE-Tag: 1670253574-80609 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: <linux-mm.kvack.org> |
Series |
dmapool enhancements
|
expand
|
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; }