Received: by 2002:ac0:950c:0:0:0:0:0 with SMTP id f12csp3243552imc; Wed, 13 Mar 2019 12:32:53 -0700 (PDT) X-Google-Smtp-Source: APXvYqyLAkgXo6KXwsalbv+BCSEO/S0M7Z6VPcq75wJmd3bqnKQOnXrZg4lNg5Gudelc5mRm2yQ6 X-Received: by 2002:a63:5349:: with SMTP id t9mr17414168pgl.262.1552505573590; Wed, 13 Mar 2019 12:32:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552505573; cv=none; d=google.com; s=arc-20160816; b=ymWg4eAk8t67IGURVSoOHssmhHWjeqx6IUZXrNAHxGnIUKTKiphB+kP8uIMqRcWXMs nT3i6n0tzEeNlrQMSFlqM6XjJCi2bn8cAD+tirx0Pzggu4T1ird4WE//l3d6EwxDcA3P xrDxC85Suk1vQO2ioCv0vwiFCjmR6LC93IGiC+7iqHTbP8NIFv8Iv1xLX2LTQLmUcP9a /Cb7GsUI+bmCDTeDXGsCK87i1ayWn3alRDEsjG7CC0YoQ49+i/3gssK6sYStG93+/t9h abBUnJsvOERLvCtQfQ5/9deczCRMf9SE1UzG9DuPreXKRlHp8EsQFPDslBBFr06MNK82 yBFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pPIycjxVsX3Ze4vTm38GWRDVORu3ZQrzKvzouG/Fgt0=; b=rH6PN2qQnixeIyIilHU92gGdGdJxqscO8bgt2NIFSmLHfzdQbSTf7wlPq/p2wMsV7y GRHBFCaPTzzvWhMKUySnzuD/pCsdfZQWs+MLqM1MZ8n4lnx3C9syTjl2Kt+rxU+F4J3w 67hDeCWR08yq4WhyzyIzHnyjHtr/YJIvPeqkyo7N4/7PhQwRjt5G67iNzKX3vkepuP7y bxks/oO9bDGXul/aWubIHs711A/xj0/oWs6EhdclEOTLpOgaoB5dKVP5ISw0ncZFsAsp ytOuKfZWKxbrEfy2PjoYoy37pqwv1eJC7+BkXf4PgHRJU7HmYB4y1Mkwu6tt7loyyHOC 31kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="wNnlPQ/w"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w3si11652160plq.169.2019.03.13.12.32.37; Wed, 13 Mar 2019 12:32:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="wNnlPQ/w"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727560AbfCMTLq (ORCPT + 99 others); Wed, 13 Mar 2019 15:11:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:42374 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726628AbfCMTLo (ORCPT ); Wed, 13 Mar 2019 15:11:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 20AB9213A2; Wed, 13 Mar 2019 19:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1552504303; bh=/uP16jNlmCtvaeiTKwrjdK+zw3IfqialZn0qnVCqR9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wNnlPQ/wjJnsMM5pJPfKBIRyGgiKOF867/IQpbcFpJKyO2+RUXDRViHHlPQIDtn2H aFP55Eog2AP47I+aSi7tAoC/Bx91NxpL+lVi0L0lXK1oo9/mn7mbFPbvYWVo6X4zma PrbrLEF02TEYsEgN9oYoi19SyBPIGhqfPjXCYaOg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Hugh Dickins , Andrew Morton , Linus Torvalds , Sasha Levin , linux-mm@kvack.org Subject: [PATCH AUTOSEL 4.20 37/60] tmpfs: fix link accounting when a tmpfile is linked in Date: Wed, 13 Mar 2019 15:09:58 -0400 Message-Id: <20190313191021.158171-37-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190313191021.158171-1-sashal@kernel.org> References: <20190313191021.158171-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Darrick J. Wong" [ Upstream commit 1062af920c07f5b54cf5060fde3339da6df0cf6b ] tmpfs has a peculiarity of accounting hard links as if they were separate inodes: so that when the number of inodes is limited, as it is by default, a user cannot soak up an unlimited amount of unreclaimable dcache memory just by repeatedly linking a file. But when v3.11 added O_TMPFILE, and the ability to use linkat() on the fd, we missed accommodating this new case in tmpfs: "df -i" shows that an extra "inode" remains accounted after the file is unlinked and the fd closed and the actual inode evicted. If a user repeatedly links tmpfiles into a tmpfs, the limit will be hit (ENOSPC) even after they are deleted. Just skip the extra reservation from shmem_link() in this case: there's a sense in which this first link of a tmpfile is then cheaper than a hard link of another file, but the accounting works out, and there's still good limiting, so no need to do anything more complicated. Link: http://lkml.kernel.org/r/alpine.LSU.2.11.1902182134370.7035@eggly.anvils Fixes: f4e0c30c191 ("allow the temp files created by open() to be linked to") Signed-off-by: Darrick J. Wong Signed-off-by: Hugh Dickins Reported-by: Matej Kupljen Acked-by: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- mm/shmem.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 5d07e0b1352f..7872e3b75e57 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2852,10 +2852,14 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr * No ordinary (disk based) filesystem counts links as inodes; * but each new link needs a new dentry, pinning lowmem, and * tmpfs dentries cannot be pruned until they are unlinked. + * But if an O_TMPFILE file is linked into the tmpfs, the + * first link must skip that, to get the accounting right. */ - ret = shmem_reserve_inode(inode->i_sb); - if (ret) - goto out; + if (inode->i_nlink) { + ret = shmem_reserve_inode(inode->i_sb); + if (ret) + goto out; + } dir->i_size += BOGO_DIRENT_SIZE; inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode); -- 2.19.1