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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E28BAC433DF for ; Mon, 18 May 2020 18:07:09 +0000 (UTC) Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE81720853; Mon, 18 May 2020 18:07:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sourceforge.net header.i=@sourceforge.net header.b="MIGaGPJq"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sf.net header.i=@sf.net header.b="K/tm1bNJ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="u+0P1hiu" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE81720853 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linux-f2fs-devel-bounces@lists.sourceforge.net Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1jakAP-0003K1-94; Mon, 18 May 2020 18:07:09 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jakAM-0003Jn-E7 for linux-f2fs-devel@lists.sourceforge.net; Mon, 18 May 2020 18:07:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=6PV4Q75UmjfrhJZ+TtwYe5kK00mLvf2ecVMb5FWCwK4=; b=MIGaGPJqtCkcOUdFc/OyrmE9j0 3uGkjYeZJ+HvfPJYdP7tsS7zwcb+DaURr3V3WGOeifclujdUG0cg+juGPz3/KhkkCib7H5aP1jlsM DOzqk9+tczCGYURuLB8rMU8PzA1FfFUTCHMuCjp9k298rl7IC9QaGSturXSStz0hckqQ=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=6PV4Q75UmjfrhJZ+TtwYe5kK00mLvf2ecVMb5FWCwK4=; b=K/tm1bNJBUWX99UfPmOGMYK27A 2Z2ts8KS8j45ip+BJ3A+suAB99eD3Fd0BPx0WjJNfH18v77T1iByXTyKTY5ObwpHRyMviV1aDslc3 qE1g/XZO/hBEU4mugZ6QAHQfKMjbGeexuzLdgHklTajoXRt6u21uu/5amOMLXr2tW8JI=; Received: from mail.kernel.org ([198.145.29.99]) by sfi-mx-4.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1jakAK-00HH5r-EZ for linux-f2fs-devel@lists.sourceforge.net; Mon, 18 May 2020 18:07:06 +0000 Received: from localhost (unknown [104.132.1.66]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 730E5207D3; Mon, 18 May 2020 18:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589825208; bh=0t5XyQefUUL24DWESK2XXYLe5nHTuuT/8UE4UguAhGU=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=u+0P1hiutz1sSwKd64TfnPFMZ47grouIIUAo8hrS4c22W/zrTew0w0nwdj9QOs1gP uLM3MOMiFZd68ET8k/jyWIY1HWr6DFwg03devChbJwIJBXzzJ/2z5W4JMqYIkfuUot ZTU1STC1QbI0GIRTmViQIRkgE2g0+CB9lFB/h03w= Date: Mon, 18 May 2020 11:06:48 -0700 From: Jaegeuk Kim To: Eric Biggers Message-ID: <20200518180648.GB218254@google.com> References: <20200505204823.211214-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200505204823.211214-1-ebiggers@kernel.org> X-Headers-End: 1jakAK-00HH5r-EZ Subject: Re: [f2fs-dev] [PATCH] f2fs: don't return vmalloc() memory from f2fs_kmalloc() X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net On 05/05, Eric Biggers wrote: > From: Eric Biggers > > kmalloc() returns kmalloc'ed memory, and kvmalloc() returns either > kmalloc'ed or vmalloc'ed memory. But the f2fs wrappers, f2fs_kmalloc() > and f2fs_kvmalloc(), both return both kinds of memory. > > It's redundant to have two functions that do the same thing, and also > breaking the standard naming convention is causing bugs since people > assume it's safe to kfree() memory allocated by f2fs_kmalloc(). See > e.g. the various allocations in fs/f2fs/compress.c. > > Fix this by making f2fs_kmalloc() just use kmalloc(). And to avoid > re-introducing the allocation failures that the vmalloc fallback was > intended to fix, convert the largest allocations to use f2fs_kvmalloc(). > > Signed-off-by: Eric Biggers > --- > fs/f2fs/checkpoint.c | 4 ++-- > fs/f2fs/f2fs.h | 8 +------- > fs/f2fs/node.c | 8 ++++---- > 3 files changed, 7 insertions(+), 13 deletions(-) > > diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c > index 97b6378554b406..ac5b47f15f5e77 100644 > --- a/fs/f2fs/checkpoint.c > +++ b/fs/f2fs/checkpoint.c > @@ -895,8 +895,8 @@ int f2fs_get_valid_checkpoint(struct f2fs_sb_info *sbi) > int i; > int err; > > - sbi->ckpt = f2fs_kzalloc(sbi, array_size(blk_size, cp_blks), > - GFP_KERNEL); > + sbi->ckpt = f2fs_kvzalloc(sbi, array_size(blk_size, cp_blks), > + GFP_KERNEL); > if (!sbi->ckpt) > return -ENOMEM; > /* > diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h > index d036a31a97e84e..bc4c5b9b1bf14c 100644 > --- a/fs/f2fs/f2fs.h > +++ b/fs/f2fs/f2fs.h > @@ -2953,18 +2953,12 @@ static inline bool f2fs_may_extent_tree(struct inode *inode) > static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi, > size_t size, gfp_t flags) > { > - void *ret; > - > if (time_to_inject(sbi, FAULT_KMALLOC)) { > f2fs_show_injection_info(sbi, FAULT_KMALLOC); > return NULL; > } > > - ret = kmalloc(size, flags); > - if (ret) > - return ret; > - > - return kvmalloc(size, flags); > + return kmalloc(size, flags); IIRC, sometimes, we suffered from ENOMEM from kmalloc, as some structures depended on the disk capacity. I can't remember exactly which structure tho. > } > > static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi, > diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c > index 4da0d8713df5cb..e660af55565c61 100644 > --- a/fs/f2fs/node.c > +++ b/fs/f2fs/node.c > @@ -2934,7 +2934,7 @@ static int __get_nat_bitmaps(struct f2fs_sb_info *sbi) > return 0; > > nm_i->nat_bits_blocks = F2FS_BLK_ALIGN((nat_bits_bytes << 1) + 8); > - nm_i->nat_bits = f2fs_kzalloc(sbi, > + nm_i->nat_bits = f2fs_kvzalloc(sbi, > nm_i->nat_bits_blocks << F2FS_BLKSIZE_BITS, GFP_KERNEL); > if (!nm_i->nat_bits) > return -ENOMEM; > @@ -3067,9 +3067,9 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi) > int i; > > nm_i->free_nid_bitmap = > - f2fs_kzalloc(sbi, array_size(sizeof(unsigned char *), > - nm_i->nat_blocks), > - GFP_KERNEL); > + f2fs_kvzalloc(sbi, array_size(sizeof(unsigned char *), > + nm_i->nat_blocks), > + GFP_KERNEL); > if (!nm_i->free_nid_bitmap) > return -ENOMEM; > > -- > 2.26.2 > > > > _______________________________________________ > Linux-f2fs-devel mailing list > Linux-f2fs-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel