From patchwork Wed Nov 20 11:20:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 13881060 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7D9611A00FA; Wed, 20 Nov 2024 11:20:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101652; cv=none; b=QLb9LVJl99Iwcg01/9LLjVMwLRNeXA4FzSk/eA3PTAFQgfUH2gQwrXpMgL7MvFjIorUP2X2lY0IjshHmdhP5A1K5MorLZf1Uucqk/KqTyqfYy1mZmYLycSO2MzlVuSHNr97Oc9djiJvtSfDrb5n9GX9XZBEnoUfQoyriXRGt8Xg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101652; c=relaxed/simple; bh=oY4G8rXKvXk/RMESA/pAWGVas5Id2NmoLa0YqTfcAV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hW62lrZCphVFYnIoUEzmY2bXtVw/eG33L4IRPZzpC7W0y3+SjOhu07nSFUSyId/6+rpNqURc2bpVFWJUI3fJTdiGQxfh+rvesIsc9ksJXIa2Ove/NAzwmlazrxCNuxNcYmPGER7/gi4U8fHjw5Di9Cxu9Wo+ROWRgNGtkkOTCAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=UH0kTMWl; arc=none smtp.client-ip=209.85.208.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="UH0kTMWl" Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-5cedf5fe237so5233215a12.3; Wed, 20 Nov 2024 03:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732101649; x=1732706449; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=vUaKEruejfDCGRJdpj1eBL3gJs8S2bH9vNecg7yvIhA=; b=UH0kTMWl04zmjomg2SbUfqjYmKgjs5K8M7U9Quby0r12nDO6+G2Y6UUCxepRrJ/X+3 hhHcXeBx9OqhnTBeCkFvLwwjy6B4yurAV0wTpk2aGaCuG0IvrBh66h7SlgH+2Mk9ZuTm nvaisgxh4G/ZkhMuvUaVeYQeMPaiwf8M69zGB2gp9g9r0cJrbD4vZxB0i9GoqMVWeSl9 cGRIAOouNcOEaTpmKWsyHSgwBBjzIKi7T5vy2vVX0ijO+uk1X6Hscwyl97mpXXQP/n9d v8U84bYpyd+sOonYW5qwumMNivYU0XicCb7q/BLQgSQlfp2BH5DDCb76s9g3cI1NCwmT FQlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732101649; x=1732706449; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vUaKEruejfDCGRJdpj1eBL3gJs8S2bH9vNecg7yvIhA=; b=WZzVgu6eDCcXq/lede2RJ1UX9sM4PKdDcevqmvs89fKcI0+G87/W+k/bR6jZq1v9sp WEtVBP4/Q+XyGuG6yKugmwqLKofL6MrJDR77GjmOnok6Konc9GfHLDPi1ZD0wwoD72w0 GUvDCGzPO9A48amvP+clbEXNzDFofn6v9sYRDeKGlzIPGf4QyYFAeFD4QLD9E9S0A3K7 IazviE6AqbmPywxqef9PE7gwNvPoBAaXN1coI11/uQ7lQK/SANCwvxJz55MdhNlLYNZA aStiU5u2dvAxZvlrEl7HFbPdFjCFHsxjp7+qxMAMg6BT5Oq9OoT9Uc3hqcadOTh3zyNE eESg== X-Forwarded-Encrypted: i=1; AJvYcCUTWZBXYQVWVMTQFzGlWMtoNtQh+x0WTuTYWEntXGFwHlW6syUHz5g0G2TcOo9ppYuHEb+ah1eSrD0sy8F9aA==@vger.kernel.org, AJvYcCUxqCWZqu953v+eTwZv38ep+ZM1GRtWjTAWhCLPifNdOQ5C5wNAWM7OjD1P+0w9zKPSp17UfDiwovp7@vger.kernel.org, AJvYcCW1F0WFQCh3lxi5XxyFnmeZKX2XqvG8OTzhHScNtkMGu+9aHx3LjejcohUl+aKG2I2t7Tu3q0/NxZfT1M7n@vger.kernel.org X-Gm-Message-State: AOJu0Yy3JyKcUe2HaP9XY/rLNi7i39Pzk1ImkRP25Z0aNGPeNFCouG5h PAohA5pvH8LIEqqsGkJW+m2k81mtqHUUV6jTTCgtJftI6wCJKogQ X-Google-Smtp-Source: AGHT+IF/eB9UNR6VnoZKt3nFhYHrh56urFiBKWBZ6vnCYzDyugb1WbUzdkpcnja3XeP3jZyhS9PA3Q== X-Received: by 2002:a17:907:c1f:b0:a9d:e1d6:42a1 with SMTP id a640c23a62f3a-aa4dd57c0ecmr210229766b.30.1732101648787; Wed, 20 Nov 2024 03:20:48 -0800 (PST) Received: from f.. (cst-prg-93-87.cust.vodafone.cz. [46.135.93.87]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa20df5690csm758559566b.75.2024.11.20.03.20.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 03:20:48 -0800 (PST) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, hughd@google.com, linux-ext4@vger.kernel.org, tytso@mit.edu, linux-mm@kvack.org, Mateusz Guzik Subject: [PATCH v3 1/3] vfs: support caching symlink lengths in inodes Date: Wed, 20 Nov 2024 12:20:34 +0100 Message-ID: <20241120112037.822078-2-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120112037.822078-1-mjguzik@gmail.com> References: <20241120112037.822078-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When utilized it dodges strlen() in vfs_readlink(), giving about 1.5% speed up when issuing readlink on /initrd.img on ext4. Filesystems opt in by calling inode_set_cached_link() when creating an inode. The size is stored in a new union utilizing the same space as i_devices, thus avoiding growing the struct or taking up any more space. Churn-wise the current readlink_copy() helper is patched to accept the size instead of calculating it. Signed-off-by: Mateusz Guzik --- fs/namei.c | 34 +++++++++++++++++++--------------- fs/proc/namespaces.c | 2 +- include/linux/fs.h | 15 +++++++++++++-- security/apparmor/apparmorfs.c | 2 +- 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index 9d30c7aa9aa6..e56c29a22d26 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -5272,19 +5272,16 @@ SYSCALL_DEFINE2(rename, const char __user *, oldname, const char __user *, newna getname(newname), 0); } -int readlink_copy(char __user *buffer, int buflen, const char *link) +int readlink_copy(char __user *buffer, int buflen, const char *link, int linklen) { - int len = PTR_ERR(link); - if (IS_ERR(link)) - goto out; + int copylen; - len = strlen(link); - if (len > (unsigned) buflen) - len = buflen; - if (copy_to_user(buffer, link, len)) - len = -EFAULT; -out: - return len; + copylen = linklen; + if (unlikely(copylen > (unsigned) buflen)) + copylen = buflen; + if (copy_to_user(buffer, link, copylen)) + copylen = -EFAULT; + return copylen; } /** @@ -5304,6 +5301,9 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen) const char *link; int res; + if (inode->i_opflags & IOP_CACHED_LINK) + return readlink_copy(buffer, buflen, inode->i_link, inode->i_linklen); + if (unlikely(!(inode->i_opflags & IOP_DEFAULT_READLINK))) { if (unlikely(inode->i_op->readlink)) return inode->i_op->readlink(dentry, buffer, buflen); @@ -5322,7 +5322,7 @@ int vfs_readlink(struct dentry *dentry, char __user *buffer, int buflen) if (IS_ERR(link)) return PTR_ERR(link); } - res = readlink_copy(buffer, buflen, link); + res = readlink_copy(buffer, buflen, link, strlen(link)); do_delayed_call(&done); return res; } @@ -5391,10 +5391,14 @@ EXPORT_SYMBOL(page_put_link); int page_readlink(struct dentry *dentry, char __user *buffer, int buflen) { + const char *link; + int res; + DEFINE_DELAYED_CALL(done); - int res = readlink_copy(buffer, buflen, - page_get_link(dentry, d_inode(dentry), - &done)); + link = page_get_link(dentry, d_inode(dentry), &done); + res = PTR_ERR(link); + if (!IS_ERR(link)) + res = readlink_copy(buffer, buflen, link, strlen(link)); do_delayed_call(&done); return res; } diff --git a/fs/proc/namespaces.c b/fs/proc/namespaces.c index 8e159fc78c0a..c610224faf10 100644 --- a/fs/proc/namespaces.c +++ b/fs/proc/namespaces.c @@ -83,7 +83,7 @@ static int proc_ns_readlink(struct dentry *dentry, char __user *buffer, int bufl if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) { res = ns_get_name(name, sizeof(name), task, ns_ops); if (res >= 0) - res = readlink_copy(buffer, buflen, name); + res = readlink_copy(buffer, buflen, name, strlen(name)); } put_task_struct(task); return res; diff --git a/include/linux/fs.h b/include/linux/fs.h index 7e29433c5ecc..2cc98de5af43 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -626,6 +626,7 @@ is_uncached_acl(struct posix_acl *acl) #define IOP_XATTR 0x0008 #define IOP_DEFAULT_READLINK 0x0010 #define IOP_MGTIME 0x0020 +#define IOP_CACHED_LINK 0x0040 /* * Keep mostly read-only and often accessed (especially for @@ -723,7 +724,10 @@ struct inode { }; struct file_lock_context *i_flctx; struct address_space i_data; - struct list_head i_devices; + union { + struct list_head i_devices; + int i_linklen; + }; union { struct pipe_inode_info *i_pipe; struct cdev *i_cdev; @@ -749,6 +753,13 @@ struct inode { void *i_private; /* fs or device private pointer */ } __randomize_layout; +static inline void inode_set_cached_link(struct inode *inode, char *link, int linklen) +{ + inode->i_link = link; + inode->i_linklen = linklen; + inode->i_opflags |= IOP_CACHED_LINK; +} + /* * Get bit address from inode->i_state to use with wait_var_event() * infrastructre. @@ -3351,7 +3362,7 @@ extern const struct file_operations generic_ro_fops; #define special_file(m) (S_ISCHR(m)||S_ISBLK(m)||S_ISFIFO(m)||S_ISSOCK(m)) -extern int readlink_copy(char __user *, int, const char *); +extern int readlink_copy(char __user *, int, const char *, int); extern int page_readlink(struct dentry *, char __user *, int); extern const char *page_get_link(struct dentry *, struct inode *, struct delayed_call *); diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 01b923d97a44..60959cfba672 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c @@ -2611,7 +2611,7 @@ static int policy_readlink(struct dentry *dentry, char __user *buffer, res = snprintf(name, sizeof(name), "%s:[%lu]", AAFS_NAME, d_inode(dentry)->i_ino); if (res > 0 && res < sizeof(name)) - res = readlink_copy(buffer, buflen, name); + res = readlink_copy(buffer, buflen, name, strlen(name)); else res = -ENOENT; From patchwork Wed Nov 20 11:20:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 13881061 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DAC41A2544; Wed, 20 Nov 2024 11:20:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101656; cv=none; b=T7mYo9TmKQ/hr/Q5U/52G8obW9y30pzxz5X8aM6zIMqqwRWtuxbMQud5eIXZbhOO0KGTXMYYMOTsS+bZKchthPVYWNkO0qjJbABJZZbV3PR5czH6gY6vvSjBzBdkzMqpPub3ch0b0DtTvUe4LB5SnCVKEexuYltw2hXw6HKiKd0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101656; c=relaxed/simple; bh=xtTZUjsWZVXj5yW5dnZUqVQ8rBguXuqM28VC+lUH3wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X7XUTwFcU4RiYB73EbjgxgQQnpyuN+h8Y24tit6xVU/79F4TX6raQNOpRl2iz2mHwU/aY2vGmz97655VouBzvZPEeMWq639Ksi0m9lAae+42cNALkUoBJH0eYW28m1g0/1oz0e+X+JMZRby6iLthqk6kze7EiJGv4ttCTZmiJ5Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Etsm7+z8; arc=none smtp.client-ip=209.85.218.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Etsm7+z8" Received: by mail-ej1-f41.google.com with SMTP id a640c23a62f3a-a9ed7d8d4e0so653844566b.1; Wed, 20 Nov 2024 03:20:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732101652; x=1732706452; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YMDpr51HGMdjTn/zZt2QmbhLNhc4xxoRwRH832sAaPM=; b=Etsm7+z8RhZ+El8Cq8B4d90xuRHGDdAc+mJnKhDmNO78DNBX8Lge1evFtG4yOcNLgx 2zb2toy8iT5IqGoloiHDKsJhY1gi1R+vxN7hs2/L2fghXqk/8vU/pN9bzu6oa3Rn7a7M gub6IBCpNZRd3EjzoQCQITEwmnuBavv/WA7L5j0Sq5+lRPiJrjbzOXYw2cNmhiuriCzA Nms8Smlj0RBD6aI/Bo/AV0MD9RjnW94kvO/tAIl05KIv2kVuzO9BA6tz3d+cwVc22hzQ ugt+jOtejtlwp3XwaJJWjZvWxQlGxYzusJiY3Zm3AScKeGFRD2PdnCwQcOE6UHA+Rv6c utsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732101652; x=1732706452; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YMDpr51HGMdjTn/zZt2QmbhLNhc4xxoRwRH832sAaPM=; b=C/RbiBKfgHmosFg5Y9W90gHzC49KiqNYqCBIrcOJRr4PRcpNyHXltD5Rr21N/RWwLD vms2A0d8orj3PTO+6Tf3dmimcFaW69P71YLcjogcfkEKRKQGsUp54bAngDrZH0AIPPOA AfgVh/B+pA9a4PDJFS9tnwntRnp3ctpbPDbI75O/WbWIYvSaY5ZYIadciMnDBTEbj72A R9fk0tVAJoaormjW2z+jc8ziT7+Ad7AYgfcr94qt3T9bcsIvP7wxijFcq2eintWPwV9R h9NDBQ418+xYiiUUejBRzwHz3FpqcI9ajeYTEMMNBlzGBWfEEj3gyD9yVrgKw2jw6zG/ HwWg== X-Forwarded-Encrypted: i=1; AJvYcCUol2MvKvULJ7ftE9yB0TxpKsHtgjythBSadv0jOeWPwWQBn6UYkZP2Y2H4vw7lvkIb9x0LqpTmozsBggafuw==@vger.kernel.org, AJvYcCV3AR8JudyKxtJ7yjwsKo8mxwMkIK0MJMXImyufIOPVmaC9DQ3ShjJuJQ1Bf37ZpiPzTP4jfBIKOYWz@vger.kernel.org, AJvYcCVoE/7/J8Cev4ZYiwKm2X/sJlMf/vfkGKRsGM5ooxb3oJ85EQWSTO1/NCrR16kYjqMA8D+I+lA+zLnQg/6F@vger.kernel.org X-Gm-Message-State: AOJu0YwOtyrl7r/lwgPL2Zlicxsvw9SMnDavCVX5VA42PpLsUIy35DBZ Dqv1x9+brW+8M5bwjQNJQJDJl1ghT/pKpIKwJNdd3m9DVBc5LGeB X-Google-Smtp-Source: AGHT+IGME9zrR7PEmCppueSU0EVvlvlY9LrKb85f85FZGjKra7l7vMMQegldnpEbAzUI5fVhjh2VUg== X-Received: by 2002:a17:906:c102:b0:aa4:7905:b823 with SMTP id a640c23a62f3a-aa4dd6b0c82mr252771066b.32.1732101651378; Wed, 20 Nov 2024 03:20:51 -0800 (PST) Received: from f.. (cst-prg-93-87.cust.vodafone.cz. [46.135.93.87]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa20df5690csm758559566b.75.2024.11.20.03.20.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 03:20:50 -0800 (PST) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, hughd@google.com, linux-ext4@vger.kernel.org, tytso@mit.edu, linux-mm@kvack.org, Mateusz Guzik Subject: [PATCH v3 2/3] ext4: use inode_set_cached_link() Date: Wed, 20 Nov 2024 12:20:35 +0100 Message-ID: <20241120112037.822078-3-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120112037.822078-1-mjguzik@gmail.com> References: <20241120112037.822078-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Mateusz Guzik Reviewed-by: Jan Kara --- fs/ext4/inode.c | 3 ++- fs/ext4/namei.c | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 89aade6f45f6..7c54ae5fcbd4 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -5006,10 +5006,11 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, if (IS_ENCRYPTED(inode)) { inode->i_op = &ext4_encrypted_symlink_inode_operations; } else if (ext4_inode_is_fast_symlink(inode)) { - inode->i_link = (char *)ei->i_data; inode->i_op = &ext4_fast_symlink_inode_operations; nd_terminate_link(ei->i_data, inode->i_size, sizeof(ei->i_data) - 1); + inode_set_cached_link(inode, (char *)ei->i_data, + inode->i_size); } else { inode->i_op = &ext4_symlink_inode_operations; } diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index bcf2737078b8..536d56d15072 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -3418,7 +3418,6 @@ static int ext4_symlink(struct mnt_idmap *idmap, struct inode *dir, inode->i_op = &ext4_symlink_inode_operations; } else { inode->i_op = &ext4_fast_symlink_inode_operations; - inode->i_link = (char *)&EXT4_I(inode)->i_data; } } @@ -3434,6 +3433,9 @@ static int ext4_symlink(struct mnt_idmap *idmap, struct inode *dir, disk_link.len); inode->i_size = disk_link.len - 1; EXT4_I(inode)->i_disksize = inode->i_size; + if (!IS_ENCRYPTED(inode)) + inode_set_cached_link(inode, (char *)&EXT4_I(inode)->i_data, + inode->i_size); } err = ext4_add_nondir(handle, dentry, &inode); if (handle) From patchwork Wed Nov 20 11:20:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mateusz Guzik X-Patchwork-Id: 13881062 Received: from mail-ed1-f54.google.com (mail-ed1-f54.google.com [209.85.208.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B32951A265D; Wed, 20 Nov 2024 11:20:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101659; cv=none; b=AaPmTkVpV8kdRxZc29AUirzxKtqAg7T0zesnSppoIFpOPUvcCfbngniGLWqq0O3RBgCyyr8KYtA3cRHag6b5IHCnDYNRqsiz1OhODIHTGI7qxAeMMj7qXP5E3dU5CHWSgMEeGNn2WYxwhlhSf7eU+RG4rMjQeJoiK89ewBIyO7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732101659; c=relaxed/simple; bh=qsgrmeV4Yho3nXdO/d4sbWEH2Emf8JjJL73+zX9kfF4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HJXLbS2JiUaOhDtS3ZEAjQFzZdGOU2oM5xkeRkoavVDu9EX2ibvHIBVgEp2tkwymVXQ/dVv1nWcyYQlrhkW6Zh1GmKuI0+TG9we2xjikoRAoYf2zcIDvTO4U5sk2U6jQ4lUc0eNPamrje08FnJBArB68tjlLAKlTSZ6Z5qlMkp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OuxapYRL; arc=none smtp.client-ip=209.85.208.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OuxapYRL" Received: by mail-ed1-f54.google.com with SMTP id 4fb4d7f45d1cf-5cece886771so1480681a12.0; Wed, 20 Nov 2024 03:20:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1732101656; x=1732706456; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kLyrUQbJ7DreZ+2eCL0QXJjGPutHdXgYXLv04PixPtY=; b=OuxapYRLmv14Kgw/ANAObmnGQH7cSmBx5wpbJQcJToXjSnxuROfy64DKgsNuEcY3IR dWAYPKCcoTjWR0bS0+XQq1lDPkOvQMRPuquYAwstrZ+lLPNbRby3yj+Q7qfCGjmlq+0q liTJrUTvG4iRpbldBQpKvwXLUQ1iM/7vIJTY7J4uhU0HUsqbzyB4AqjGyTGADboyTjhc vB7A8FXYetWOCix/QNJbw0ZLFhI2+su5QSI5CYjvn+LgJbB5hquNkmcUWqqzRZ4rVPoD MjBNHGPT0LoraEwIn4BUK4CepDI3SRuCjU388VM3VawhomLmE5ejcNBNFMBfXlCIeX7D B7Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732101656; x=1732706456; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kLyrUQbJ7DreZ+2eCL0QXJjGPutHdXgYXLv04PixPtY=; b=Wwc4qfXhlI+ynskTSn4okKZ8tOzi5KDkXRF7H9U0ClS3aIKuxfI3KE3brwOAEJJiMw Wg6PvO+J96D+mWK7bddm+YcPeVRmm1kwIhJu+tmZDtdxMw06YKG2L7+wiws3ByaATJck 6ey051YQ75hASsDitGvCMvAV+jZQtFCcWppFhiVeN8gnvfA/lnzMhbDqs4xmik8V3LL/ cko5wNB4Gb3F55uDWy8yFqbJBsuOJqjx+sMLuyr0IUZmKtiN17ZL+30TAzH6Qjhg3Gmr z4X6YAd41dvCKDdJhiNOXhEGk7n8oU0CBtj24HwlKXmUvHCxLj2AzKwaNrPattHomATQ Ypig== X-Forwarded-Encrypted: i=1; AJvYcCUEV974YIHjfbf/JHA+PZeue7xmsshhS6qculM/8Vrhnnr7dEqa5VU7JbD/P+HZDOc3qzY3KxgxwesC51aYUg==@vger.kernel.org, AJvYcCVS1a6TQl3BjDe970sAAOo5ShSWitpX+SRJehF+j0HN6t8PQxuVLPSvuySqOIMccXzAwiJRIqef7Tkn@vger.kernel.org, AJvYcCXfocLeHbqK0d+tPNICDioXXoy3T+5fiZVephoIAsyNrVeFdRAKIpK2rJRyAuL8xKtOnDxuCilzFkYFXrft@vger.kernel.org X-Gm-Message-State: AOJu0YzUsiMNc+OkBkN9RGhb51pM2bWulG5efSgsJDYghqELbwzgzojX CGCAqTygWikH57exCOY4ltdPkeyUPjy67AAJf3e/VABsEkJN8hx1 X-Google-Smtp-Source: AGHT+IG7pW3Dxr7KS89kSKjBWsHbI31GbaM1tb6J62zSZ1xqBnHqjvWaYalwKIjlxD/g6vIF9K38rA== X-Received: by 2002:a05:6402:320c:b0:5cf:e218:9b08 with SMTP id 4fb4d7f45d1cf-5cfe218aad9mr5811934a12.15.1732101655755; Wed, 20 Nov 2024 03:20:55 -0800 (PST) Received: from f.. (cst-prg-93-87.cust.vodafone.cz. [46.135.93.87]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aa20df5690csm758559566b.75.2024.11.20.03.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2024 03:20:55 -0800 (PST) From: Mateusz Guzik To: brauner@kernel.org Cc: viro@zeniv.linux.org.uk, jack@suse.cz, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, hughd@google.com, linux-ext4@vger.kernel.org, tytso@mit.edu, linux-mm@kvack.org, Mateusz Guzik Subject: [PATCH v3 3/3] tmpfs: use inode_set_cached_link() Date: Wed, 20 Nov 2024 12:20:36 +0100 Message-ID: <20241120112037.822078-4-mjguzik@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241120112037.822078-1-mjguzik@gmail.com> References: <20241120112037.822078-1-mjguzik@gmail.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Signed-off-by: Mateusz Guzik Reviewed-by: Jan Kara --- mm/shmem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index c7881e16f4be..135f38eb2ff1 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -3868,6 +3868,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, int len; struct inode *inode; struct folio *folio; + char *link; len = strlen(symname) + 1; if (len > PAGE_SIZE) @@ -3889,12 +3890,13 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, inode->i_size = len-1; if (len <= SHORT_SYMLINK_LEN) { - inode->i_link = kmemdup(symname, len, GFP_KERNEL); - if (!inode->i_link) { + link = kmemdup(symname, len, GFP_KERNEL); + if (!link) { error = -ENOMEM; goto out_remove_offset; } inode->i_op = &shmem_short_symlink_operations; + inode_set_cached_link(inode, link, len - 1); } else { inode_nohighmem(inode); inode->i_mapping->a_ops = &shmem_aops;