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 B2BF3C77B7F for ; Sat, 6 May 2023 19:04:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 174436B007E; Sat, 6 May 2023 15:04:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 125456B0080; Sat, 6 May 2023 15:04:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F2EC26B0081; Sat, 6 May 2023 15:04:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id DF6816B007E for ; Sat, 6 May 2023 15:04:15 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A6092ADABD for ; Sat, 6 May 2023 19:04:15 +0000 (UTC) X-FDA: 80760755670.02.6A0179A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf24.hostedemail.com (Postfix) with ESMTP id DDEF4180005 for ; Sat, 6 May 2023 19:04:13 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=rA1bKG2h; spf=pass (imf24.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1683399854; 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=veu0EKu0zAq5EUTZINXbjpvpIBhJFJBhqmD7Qjykouo=; b=fScfQYZ0Y7/IzH992GRtloiqDHhyXDwsvwH3M66Vncgu/aGunI9jq/3GflCQn1zGkFLpaD wcrRC/P0baZDJQ6H67BaYU0MOQQ0Z3V3l0mnSyuAwbFoYoxr92YdkoNROmXd/p5HGFxfIe CHIGGFnmCAyil9z0tV0hsgBeE6Ew9Hs= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1683399854; a=rsa-sha256; cv=none; b=2MzBu5k5G3cGGzRlwfop5YDwKuBhebp9n/3t/9kea4S8RP9Z0Jd8cH9xH5dihszzU2uRgv oKjR46yD0SlObhPvolVhNlmh8vdV8MlDZwXVlbsPVqWs5ifm7pYb1E3Sq04GzakYb3nsoW /J90xGyM8jR3NTUQ7kKiQlRVY7lS3T4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=rA1bKG2h; spf=pass (imf24.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB83260E99; Sat, 6 May 2023 19:04:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BACEC433EF; Sat, 6 May 2023 19:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1683399852; bh=s5rAmNl7PRvWvOwuownC2bCo8Ucqs7SYfDCXJJHVOBI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rA1bKG2h8MT+6DHFW8Neba7nVFgRp1TyA8jvJyZFjfdJ5knoHo4+h3fvDvrL+u5ij Mn2729tiHOUeJMWNrY7eI7OwodqFg2lWivqc8gjbR0H0jBAiY173CwJaUrS8s0Pgzg aaTAKRPvh/4tpMmunYlFQN2yqT7mtrKTJVAS2w+0= Date: Sat, 6 May 2023 12:04:11 -0700 From: Andrew Morton To: Linus Torvalds Cc: mm-commits@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Keith Busch Subject: Re: [GIT PULL] dmapool updates for 6.4-rc1 Message-Id: <20230506120411.588729735420b57c1e0ce9b5@linux-foundation.org> In-Reply-To: References: <20230506105054.0155139b3d3a7f249ead37be@linux-foundation.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: DDEF4180005 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: ubfftdig958ix3a9kt3rnik88rj15coo X-HE-Tag: 1683399853-207934 X-HE-Meta: U2FsdGVkX1/P3jPpQupw19TBMqaql3vRUQIbrwYmhUhbNjTpn3FkH8MUjoyExL73Xwl3QwVjqVWR60G/qxbUZyYVFIEtU6s53E2mVrfpjfOnknfDPVP0ZCEeJqC8vpoVCF50rCVY12GAJ3N6D4V2lK4kU+p1nK+cd+ZXrweD9KcdtBiIi/FnOE/PLdVpC3GmBLL/+WKjggshT+dndK5u8dD87MwzbcgMWRJNzIegOrwwOXKkCP5ArFwkDolURgBsp4UvuwKJkXAVhUeLpzShl/64exxLGYIlJzs6O6nDciMsZpvMmwUWc3T2ODwbJXWNpBS+JSff71FVbXDXZblI2qeLMN2EJ5FnfQYZyoIvMgcjYRi3LPbjVwc7qFv+8wV7HPdgd1sgGoMws2oDixHsPE5Lun6IN+A69NS76FApZIoCCYMia48pD8arn4NF/HMKZdIH/8c6UQawkN1OSNtV/Q4JsEPePR3q2egNsVUWOO8DOF/WTljasJGKiC+E/S2UAoQcjl5mRrLM+cpzYpLkV0fFZhmFVVnP5/N5yUmYBRi/DKmQ3sZQKzlrKVOyj0Zc9hCpNLxT5mltMCn3feThWvJAXV39TSFaTWZqOq1sfXjhMSHS1FyGJzkLh3Bed4Tq8EtsvzF3/WMkCPoYf/V1T4DEK5H2HeJDASvO0H7NotGIlnpbLFiwXRSeWEeSOu0Ul3t9u/OlaLC6BYPwW5I2bgnmcPGcicAoYyyEbcD3XKeM8/QkbpREIPEJpxMsOLEyQitalOq7+Ua0PXLLA5h6ELbPIDeNMvB8ODUVU7m+vQOjBUtVuzE15INBiuDVZ7Iayi+afRD4KpUoeotSgBZ1nCRwnfvmEZSIe6VsZ3/xOwJymf+VjqOyuYPGPTyzBtirdOYaqQt1eslMiB3EVvIGEpqF2hF3lHi+oMHN2y13OfcWWQ6BmTYb20t0fdpeRzN9i6PqLGS8uAdwiain8bL FikOVaWy L6gbuZex2qrHNJdz2tqrbU8VsqethpPcFCLxfvNqPOQBhZM96FX6eTnyoF33dEhUkHzFnYqgID6hwSG+QnpuZple45KhAA3nquz7lEslyiwGiIQreLlQXgvTxxcaGdMiPcwr8zAArPOe15CGFpln1zQtca/9X9k9Hhein91VcueMYeNVWB8e92V7Jp8XhLbRDh6dWdLM8FdfsjhqeJm6YaPWnY4MTOQeHnSK54XKq1JUqDcq8XVI7uEx7gOJ5JbNzPATPBVsx/2WWnl7oDbB+uLmWTfFSRd4h3WwoPvMC4TjokpZAjmvyFuEwmmnR41YhrD9gvjfjrj1Q1kQU6m/ulHT8z7dMF0jTVR55PfxkxgM6DXuPzpa0z1PLukFBVc/oLtqf9d6LtYsYGn7tBI2GWudT8c35nxSUdh5URPWzhXLWz9g0bTl+l9A2Z6IrrD/PPwk7w6LAm2JXtNYw1k+igW3oShkittaW9OfYXwlcWAj3+q76Zx9S5Dd2+hd3mAWbZKr85C6BzZuK9F7RKMTiEwAhzlKhC/TYI8ggTGgtEX+/8RH0V2JlNHdmXsef8Gyqug8Nwvn3E1XM7jgAAA1G2nGqxhkTMx93PaAz9cUNMwPif501QWTUi+mcDw== 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: On Sat, 6 May 2023 11:53:16 -0700 Linus Torvalds wrote: > On Sat, May 6, 2023 at 10:50 AM Andrew Morton wrote: > > > > Reinstate the dmapool changes which were accidentally removed by > > 2d55c16c0c54 ("dmapool: create/destroy cleanup"). > > Hmm. So this series is exactly the same as def8574308ed..2d55c16c0c54, > except for not having that last broken one. > > Which is fine, but I'm a bit surprised. Why? > > Because it's also missing the _real_ "dmapool: create/destroy cleanup" > patch, ie this one: > > https://lore.kernel.org/linux-mm/20230126215125.4069751-13-kbusch@meta.com/ > > and I realize you somehow corrupted it last time, but I did expect it > to show up (perhaps folded into another patch, but in _some_ form). > > Anyway, I've pulled this, but I think the end result of all this > confusion was still a tad broken. > Yes, it's just a little cleanup so I figured I'd restore the non-messed-up patches that make functional changes and hold this one off for the next merge window. From: Keith Busch Subject: dmapool: create/destroy cleanup Date: Thu, 26 Jan 2023 13:51:25 -0800 Set the 'empty' bool directly from the result of the function that determines its value instead of adding additional logic. Link: https://lkml.kernel.org/r/20230126215125.4069751-13-kbusch@meta.com Fixes: 2d55c16c0c54 ("dmapool: create/destroy cleanup") Signed-off-by: Keith Busch Reviewed-by: Christoph Hellwig Cc: Matthew Wilcox Cc: Tony Battersby Signed-off-by: Andrew Morton --- mm/dmapool.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) --- a/mm/dmapool.c~dmapool-create-destroy-cleanup +++ a/mm/dmapool.c @@ -226,7 +226,7 @@ struct dma_pool *dma_pool_create(const c { struct dma_pool *retval; size_t allocation; - bool empty = false; + bool empty; if (!dev) return NULL; @@ -276,8 +276,7 @@ struct dma_pool *dma_pool_create(const c */ mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); - if (list_empty(&dev->dma_pools)) - empty = true; + empty = list_empty(&dev->dma_pools); list_add(&retval->pools, &dev->dma_pools); mutex_unlock(&pools_lock); if (empty) { @@ -361,7 +360,7 @@ static struct dma_page *pool_alloc_page( void dma_pool_destroy(struct dma_pool *pool) { struct dma_page *page, *tmp; - bool empty = false, busy = false; + bool empty, busy = false; if (unlikely(!pool)) return; @@ -369,8 +368,7 @@ void dma_pool_destroy(struct dma_pool *p mutex_lock(&pools_reg_lock); mutex_lock(&pools_lock); list_del(&pool->pools); - if (list_empty(&pool->dev->dma_pools)) - empty = true; + empty = list_empty(&pool->dev->dma_pools); mutex_unlock(&pools_lock); if (empty) device_remove_file(pool->dev, &dev_attr_pools); _