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 EBF61C3DA6E for ; Wed, 3 Jan 2024 23:32:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 535936B0368; Wed, 3 Jan 2024 18:32:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4E4FB6B036B; Wed, 3 Jan 2024 18:32:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 386206B036E; Wed, 3 Jan 2024 18:32:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 1E4466B0368 for ; Wed, 3 Jan 2024 18:32:46 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EBDEC1C0B30 for ; Wed, 3 Jan 2024 23:32:45 +0000 (UTC) X-FDA: 81639601890.20.FDE0E09 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf02.hostedemail.com (Postfix) with ESMTP id DA0978001A for ; Wed, 3 Jan 2024 23:32:43 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PgVVFAhH; spf=pass (imf02.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704324764; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5pf5N5B/9IMhryuWB3kRkWYBpgGCstZCTKTxl3eV/ZU=; b=HO3jM293xg+BkCrYmS31uVBMTZXh9AzE76cBjjDCSlHV40taIFjMRVRJpLW9CTU/qDntN0 W9JmH9fpB9HvXyhm7KcBpXJuQ/zxhziYweL96CcN4t1fTspW5PR1vRSo+nwRca1YSR0PdO SrwdK59bPlPv1GEZCCjYw8eslc9kG8Y= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=PgVVFAhH; spf=pass (imf02.hostedemail.com: domain of djwong@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=djwong@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704324764; a=rsa-sha256; cv=none; b=4cBdJSu+nQjjMA5H3NeBtM/UprKk/niPVtabHI909W2VlcBF50UOqnXZnA5wvOaBjklP/I g7y/XNE+7oOKHF35fnrgumjuRUyarmyqNrAz1L0UnugUvZSQGSnscvyxoFkE6UqhtqNrG2 qnIwoH0boWRMKd9mac5W2Q0GRbhPPzc= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 44BC0CE1411; Wed, 3 Jan 2024 23:32:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DBD2C433C7; Wed, 3 Jan 2024 23:32:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1704324758; bh=+5o/V3NHEhBC28Q/AGRGKxOFWI4+5MHUYEGWMTi0chY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=PgVVFAhHl5JMUKNiKjmFIkqIjrGVUcgWRsy6tbQ55SEFxuoLeYjR5j/R0cZFwRhf/ 0LUZNfIPXHdNLvJhZT2BqYC7xVPGd3/E1nDeNbu3nIoFrecfutBDvWB2taXLN6aCwo XYICA4gIN1fg8K9hntpNtshe0MWayWKv6uE0vUvsXPQOsvfXyg3cVRkvpYeh5ipbfI HlI1I9O5qK1SSiI/yvESHZ4gg+RBx8F4USLq6/Ge9lQNXm1cyx26WrVoAZsSufp8Bi vl9IkxVvxxHK8bs7k3t1iA/NcqtpjdXvTY3TzJQniaBsw/464B2vmm4NH6YnK8NR8i gb5uZdjwMmwuw== Date: Wed, 3 Jan 2024 15:32:37 -0800 From: "Darrick J. Wong" To: Christoph Hellwig Cc: Chandan Babu R , Hugh Dickins , Andrew Morton , linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH 01/15] shmem: move the shmem_mapping assert into shmem_get_folio_gfp Message-ID: <20240103233237.GV361584@frogsfrogsfrogs> References: <20240103084126.513354-1-hch@lst.de> <20240103084126.513354-2-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240103084126.513354-2-hch@lst.de> X-Rspamd-Queue-Id: DA0978001A X-Rspam-User: X-Stat-Signature: wcgwm6zg8qjuqguusmxa9o4kn77g7tmp X-Rspamd-Server: rspam01 X-HE-Tag: 1704324763-63284 X-HE-Meta: U2FsdGVkX18KpKYh0ir6Zd+jhSFD2IAabB/HdoaTJrEbsP/3PsdJgy+u9H0+ybFUPQfyRHvOI4N1COlHaYyFNRIJlwjQdMIaAKT2qOoKXeH1vth/FWvTnC0++uQJC8sIvy7lbXwZ79aEsc09mSIyYA/qb/zcunv1JFNsp1kWkkKx/dARz4eVTKONmmC9NFaixoS3CbvjCEeCnSRid31/7JHqFhIjce+ariIi1Jj73AmhtIAiINcD4uADlmYaXACCtWT37p35a1RSBBdVlogxQkwp3MsJHrkYBiJ7haVPi47NYYqH8u1QLHPgCdM944+JmATKfND85x9g2aonhZevmvMBpbbdRw8S8eczWjQ8cc53TiGpv79N7HAWT5r5Qwdf65SWid2i9ka+VXB4+LOWRwyaCI8IlwLglNg9KfJKlEL0R21coE9QGlDs2FpGv/Vpy1I2Dsoh7B9oQJPHsKtf2VkFhhMUZQExnAN8FvXfe3AR0SZVofGzvRQ1RYYn3D4xReyqmgpaPRlYqbg3CIy52UFvDD9bFDtTuTzivokPK2m90zAcj/XmZHA0KJHCk8gSg77wb1eBYYWT1z5NlSqaZcfk6aNHOwAJLjyRFKV7YpAX5fIoEIgtssl849xeqUb5xZRgVi4Zu49Eh4ilTEsJCFGnEyuRGt6iEKW7jDJvgAX3SMV9h6wibwyDRYQUCi/0O5nMTlUNuFa+qH5O/awNTJVHRjH5P3a8HlDxMWNTSsM6MkY47PTsDS2erX2rIcnLpRtfBMpu1MrJY2oz3+rYOWfqB9721SUaNe2wIC4mvOCGsJ9AjRySrW5xRcJlN2E39mYIKa0eP7IGqYD4T3hfYeX3k8RQHx0uuGCWplkTYJqIAWBG+hF/nk4J/D9YJLQRMNfluhXejUlvQ59xV5NzfYiOgq+R9y+hPHk0glim3G0inheqHwVUItQVXuzVe5L4ZF+7MHqNY58Tv4ZYLlN B0CLLLuM LXb+q3TZCjDz7eiuMiTEbgPrrIX+vnCtpPfAPWo0C00oIPSlJKg9X1rQVqPoF6seKUfgz2+iNS5BM7EqWan0ptfAO7P/vx1n66QNkcaMN8qg1gTqBJtJBEclScbneyNLHGtC77VfIbPRlaRu9rLSoH//aI4p/hOTjrcv//lIf6LTMsrdFIri8lJxC+d12qC5+TAH6xGsgqqvLhNtf3sjEz6TWyK85EMV2aWO7FK9+LzmQIG/K+q1syE243vSc8iVaeZEqxoEUN0qPZXhJqZICXRw8/7DoDm/lbNDE 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: List-Subscribe: List-Unsubscribe: On Wed, Jan 03, 2024 at 08:41:12AM +0000, Christoph Hellwig wrote: > Move the check that the inode really is a shmemfs one from > shmem_read_folio_gfp to shmem_get_folio_gfp given that shmem_get_folio > can also be called from outside of shmem.c. Also turn it into a > WARN_ON_ONCE and error return instead of BUG_ON to be less severe. > > Signed-off-by: Christoph Hellwig No complaints from me about converting a BUGON to an error return... Reviewed-by: Darrick J. Wong --D > --- > mm/shmem.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 91e2620148b2f6..3349df6d4e0360 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -1951,6 +1951,9 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, > int error; > bool alloced; > > + if (WARN_ON_ONCE(!shmem_mapping(inode->i_mapping))) > + return -EINVAL; > + > if (index > (MAX_LFS_FILESIZE >> PAGE_SHIFT)) > return -EFBIG; > repeat: > @@ -4895,7 +4898,6 @@ struct folio *shmem_read_folio_gfp(struct address_space *mapping, > struct folio *folio; > int error; > > - BUG_ON(!shmem_mapping(mapping)); > error = shmem_get_folio_gfp(inode, index, &folio, SGP_CACHE, > gfp, NULL, NULL); > if (error) > -- > 2.39.2 > >