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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B49EC4332F for ; Thu, 31 Mar 2022 15:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239017AbiCaPgo (ORCPT ); Thu, 31 Mar 2022 11:36:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238753AbiCaPfr (ORCPT ); Thu, 31 Mar 2022 11:35:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EB29C2274D6; Thu, 31 Mar 2022 08:32:06 -0700 (PDT) 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 CB24D61A82; Thu, 31 Mar 2022 15:32:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9394BC3410F; Thu, 31 Mar 2022 15:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648740726; bh=+4d1+CXq+9ZDinb1ZWpVB2RADQjE1XweuloJYwAgNNI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=K53ECP+R6Jnu0hROF0Y108m2Kp1x7VBVqhmRjmKhs2ow9hnKyag4y7s8G9XuBbDE9 E/FI3BO21ynnBIn/FQy68tIGt5T/QDgY2voLk+0rTH+GvMgzINUFyvpmxMgzF9UY67 uVvEQFUhqsApDoxyDq3Gt3hQ9g2mprMfrBFHdOlvkyAKv6hoxKyLxfQRpx4V/He+aF soN7qScxAZJ6JxE+hQ5UU8NlL7Rs4AghbxurNLgycTVgec1E8RNuA+nsWW6QluOBrV XDIHideRFdPXkC+ZVhTXmsUlEDRVSEV1hPWXqhuPA4gSd/NHvyiF338/h+P2mtKXpN Tcmr9MN/CueWw== From: Jeff Layton To: ceph-devel@vger.kernel.org Cc: xiubli@redhat.com, idryomov@gmail.com, lhenriques@suse.de, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v12 37/54] ceph: get file size from fscrypt_file when present in inode traces Date: Thu, 31 Mar 2022 11:31:13 -0400 Message-Id: <20220331153130.41287-38-jlayton@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220331153130.41287-1-jlayton@kernel.org> References: <20220331153130.41287-1-jlayton@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When we get an inode trace from the MDS, grab the fscrypt_file field if the inode is encrypted, and use it to populate the i_size field instead of the regular inode size field. Signed-off-by: Jeff Layton --- fs/ceph/inode.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c index d53f771128ed..20eed306895f 100644 --- a/fs/ceph/inode.c +++ b/fs/ceph/inode.c @@ -1023,6 +1023,7 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, if (new_version || (new_issued & (CEPH_CAP_ANY_FILE_RD | CEPH_CAP_ANY_FILE_WR))) { + u64 size = le64_to_cpu(info->size); s64 old_pool = ci->i_layout.pool_id; struct ceph_string *old_ns; @@ -1036,10 +1037,21 @@ int ceph_fill_inode(struct inode *inode, struct page *locked_page, pool_ns = old_ns; + if (IS_ENCRYPTED(inode) && size && (iinfo->fscrypt_file_len == sizeof(__le64))) { + u64 fsize = __le64_to_cpu(*(__le64 *)iinfo->fscrypt_file); + + if (size == round_up(fsize, CEPH_FSCRYPT_BLOCK_SIZE)) { + size = fsize; + } else { + pr_warn("fscrypt size mismatch: size=%llu fscrypt_file=%llu, discarding fscrypt_file size.\n", + info->size, size); + } + } + queue_trunc = ceph_fill_file_size(inode, issued, - le32_to_cpu(info->truncate_seq), - le64_to_cpu(info->truncate_size), - le64_to_cpu(info->size)); + le32_to_cpu(info->truncate_seq), + le64_to_cpu(info->truncate_size), + size); /* only update max_size on auth cap */ if ((info->cap.flags & CEPH_CAP_FLAG_AUTH) && ci->i_max_size != le64_to_cpu(info->max_size)) { -- 2.35.1