From patchwork Fri Jan 26 13:28:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13532571 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 AE62BC47422 for ; Fri, 26 Jan 2024 13:29:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 49BF36B0088; Fri, 26 Jan 2024 08:29:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 44C8C6B0089; Fri, 26 Jan 2024 08:29:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2ED596B008A; Fri, 26 Jan 2024 08:29:40 -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 206F96B0088 for ; Fri, 26 Jan 2024 08:29:40 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id BC966C073E for ; Fri, 26 Jan 2024 13:29:39 +0000 (UTC) X-FDA: 81721544478.17.09473D1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf24.hostedemail.com (Postfix) with ESMTP id 48837180021 for ; Fri, 26 Jan 2024 13:29:38 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=elCIyzGp; spf=none (imf24.hostedemail.com: domain of BATV+8230b42af99c397292d7+7460+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+8230b42af99c397292d7+7460+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706275778; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pWiZ+uq6s6Jb8DG5zpX+nOBm/9LHv3+s4Lx1umDyLlU=; b=b6ZR5FISSPnQAzGTc0NKBvzWo0zCy1lSeBq/8VXmHdRSnmhAwlDbYkwMwAZx3aqFB6tgzl 4GEThFVtuFsKNtcZF8cPL7n4gjyRzJKBMWL4vdblmJIhdefH9dYiOugjkWD7tGTZY3ZRs9 t9BVQAVQAwipAGaRm+3L8Ic8qo0Tnmo= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=elCIyzGp; spf=none (imf24.hostedemail.com: domain of BATV+8230b42af99c397292d7+7460+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+8230b42af99c397292d7+7460+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706275778; a=rsa-sha256; cv=none; b=7FjRXJKV5sXHCKtPC4UaLVfblnx8jnpJNvj6EANkNuYTQ1sy8905rhl5JkAkCVVFq1YOsr Nyix8eNeHPkKsVWHUBIHgZSj047Fnn0TMeSgMdO4WXZDU8B+TdbtSTBsapeLlEPUwt+KEM S3yeBN055YKXFNOBMFfQEUzqW57yzQo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=pWiZ+uq6s6Jb8DG5zpX+nOBm/9LHv3+s4Lx1umDyLlU=; b=elCIyzGp+nOt85GXW3Sjqc+xJt ucreJIe1XnRuOAMm4wAmDLK32DRnCCwxdZdzl8+68mTreQydzaKPkvpHeyhcC6Jg7zBmdxsAZmq4C RkxEBe13mMR/9QkLVqz5U213MvVBz1XiYHym9tYSjxNB60HfbnAmZ3AxSsoyrA/lPNSyQfgV4BLUW KIx4L1lf+pJKA9m66sV86qp7/4PFANibdgoodUowdEGA6kIk+gqmwFp5e8ISz6ZsEr2qKojOW1R51 qThmAht9NvoXRb6A7z3IS7ywtMFaHstSfjUbbi0T/UMhN+jE+C6X2B8EEn8+7Zj8p4MrLKUAuZOIb l6ENxlFw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rTMH1-00000004CjK-2Uad; Fri, 26 Jan 2024 13:29:36 +0000 From: Christoph Hellwig To: Chandan Babu R , "Darrick J. Wong" , Hugh Dickins , Andrew Morton Cc: linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 08/21] xfs: remove xfile_stat Date: Fri, 26 Jan 2024 14:28:50 +0100 Message-Id: <20240126132903.2700077-9-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240126132903.2700077-1-hch@lst.de> References: <20240126132903.2700077-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: 48837180021 X-Rspam-User: X-Stat-Signature: hb4j1fg54ziteix78nr998ihcz3n7td3 X-Rspamd-Server: rspam01 X-HE-Tag: 1706275778-10867 X-HE-Meta: U2FsdGVkX18BwjQNbed6jS/O3a7SZkPccIwlu3/QXKn75BZofXySh7vQowz/mcq9LPH8jJeQJJ9akX2nNg7IQb4BpWne6TfBLwmJZr6VPT9o25F9hBelUMAPvBMRLg0O4wLkNNTToiPVnsUBNf1jizlMLdb7QTOHGLL3H6i44tukRG1w/tzz2Gd4NadHbSO3YBwuvvrq45+ueM9RC6GAL5KHwJNYpp2XJERHaio28ZxCLJDUcSSqhh3xm7GMl68Bg+EquYLKU6BkudV2QVjDUohpqdvpXdwap5seftBZqYMJDLFO4k2YfHnw7ujv4pIBP+aDAwy/IkAcug6cgjBd+cUzGIK6tCRwt81n+gFu3XXG/I8UK3ViUBY3mno7xNQY7Nxh0AB/5q6roVch2dBoL+ngq4fdr8eJxbgkZiKaiv2npt0LUZLkKSNaTt7kOumXKp5Un7rUt4gg2krr9dBrje9y1fMsbxHUzqDlWsc5Sk6TxBlzmrWhI1YsyBB9JjXv8V30AD5So1m6hciSVfVaADjDoqaVhRGt7lMnpwRNSrEu7uA7+Q+Q6qLaLZ+UcCmzfWHx5+v5nWqGLEbX5twNRD9HvLfKrJIqy2DW9jnoLIn0zrYIzfue4o6RgPWBGvafP/OUloAGozfVB4w4UUMlMpYT8AmAR78sttzORLY+8oNDhzLLYEDlpuLPGjRsvP3yAgEl+KH7UoYajroV5kQwVMr9yRruFjP8IdeJHxzzBKOBEnZaE4lWLqhw8Pj3erAxkabUuuXiLc05BjLEXzaxFdpgFc9BBHj8EZuPPHhys+NW1f7BLTdOOQOE0B7LZV5EEH11sbenoXUTF6jPn3L5gvJE6XYVOWIWsFWndK7dQg4KCRDU+CY9q2/vZrSAl6OOP3X7MRnqVq3tdUF96GF0EBHbDst5VPG2ljx6YP9h/8veGqou8TVLLbQsRUfGMuC/cIwaCkhQnrDjv3b+kIj ZmkYr9zQ QmQyyV1kx1nJrHSqk8G9gVMmYxQD4LAIehi3AR/lwUxMpgmtfySAe4sDbVKDSxZrhbDTgTYyXZ2NCuJFdNwGFEmeBZIkQcFmf/WWfaQS0Ug+pw4c9WZi1DbJs8GVoJK66yLWf7QPX+xJFyld3ukWZ9vcpLeIVOL17vB6GiF+fYcwL47FT4MfXQ+0SpwtgPxVYIZ9bkkqsyRDWv9zx8vg8UV2VNg== 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: vfs_getattr is needed to query inode attributes for unknown underlying file systems. But shmemfs is well known for users of shmem_file_setup and shmem_read_mapping_page_gfp that rely on it not needing specific inode revalidation and having a normal mapping. Remove the detour through the getattr method and an extra wrapper, and just read the inode size and i_bytes directly in the scrub tracing code. Signed-off-by: Christoph Hellwig Reviewed-by: Darrick J. Wong --- fs/xfs/scrub/trace.h | 34 ++++++++++------------------------ fs/xfs/scrub/xfile.c | 19 ------------------- fs/xfs/scrub/xfile.h | 7 ------- 3 files changed, 10 insertions(+), 50 deletions(-) diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h index 6bbb4e8639dca6..260b8fe0a80296 100644 --- a/fs/xfs/scrub/trace.h +++ b/fs/xfs/scrub/trace.h @@ -861,18 +861,11 @@ TRACE_EVENT(xfile_destroy, __field(loff_t, size) ), TP_fast_assign( - struct xfile_stat statbuf; - int ret; - - ret = xfile_stat(xf, &statbuf); - if (!ret) { - __entry->bytes = statbuf.bytes; - __entry->size = statbuf.size; - } else { - __entry->bytes = -1; - __entry->size = -1; - } - __entry->ino = file_inode(xf->file)->i_ino; + struct inode *inode = file_inode(xf->file); + + __entry->ino = inode->i_ino; + __entry->bytes = inode->i_blocks << SECTOR_SHIFT; + __entry->size = i_size_read(inode); ), TP_printk("xfino 0x%lx mem_bytes 0x%llx isize 0x%llx", __entry->ino, @@ -891,19 +884,12 @@ DECLARE_EVENT_CLASS(xfile_class, __field(unsigned long long, bytecount) ), TP_fast_assign( - struct xfile_stat statbuf; - int ret; - - ret = xfile_stat(xf, &statbuf); - if (!ret) { - __entry->bytes_used = statbuf.bytes; - __entry->size = statbuf.size; - } else { - __entry->bytes_used = -1; - __entry->size = -1; - } - __entry->ino = file_inode(xf->file)->i_ino; + struct inode *inode = file_inode(xf->file); + + __entry->ino = inode->i_ino; + __entry->bytes_used = inode->i_blocks << SECTOR_SHIFT; __entry->pos = pos; + __entry->size = i_size_read(inode); __entry->bytecount = bytecount; ), TP_printk("xfino 0x%lx mem_bytes 0x%llx pos 0x%llx bytecount 0x%llx isize 0x%llx", diff --git a/fs/xfs/scrub/xfile.c b/fs/xfs/scrub/xfile.c index 090c3ead43fdf1..87654cdd5ac6f9 100644 --- a/fs/xfs/scrub/xfile.c +++ b/fs/xfs/scrub/xfile.c @@ -291,25 +291,6 @@ xfile_seek_data( return ret; } -/* Query stat information for an xfile. */ -int -xfile_stat( - struct xfile *xf, - struct xfile_stat *statbuf) -{ - struct kstat ks; - int error; - - error = vfs_getattr_nosec(&xf->file->f_path, &ks, - STATX_SIZE | STATX_BLOCKS, AT_STATX_DONT_SYNC); - if (error) - return error; - - statbuf->size = ks.size; - statbuf->bytes = ks.blocks << SECTOR_SHIFT; - return 0; -} - /* * Grab the (locked) page for a memory object. The object cannot span a page * boundary. Returns 0 (and a locked page) if successful, -ENOTBLK if we diff --git a/fs/xfs/scrub/xfile.h b/fs/xfs/scrub/xfile.h index d56643b0f429e1..c602d11560d8ee 100644 --- a/fs/xfs/scrub/xfile.h +++ b/fs/xfs/scrub/xfile.h @@ -63,13 +63,6 @@ xfile_obj_store(struct xfile *xf, const void *buf, size_t count, loff_t pos) loff_t xfile_seek_data(struct xfile *xf, loff_t pos); -struct xfile_stat { - loff_t size; - unsigned long long bytes; -}; - -int xfile_stat(struct xfile *xf, struct xfile_stat *statbuf); - int xfile_get_page(struct xfile *xf, loff_t offset, unsigned int len, struct xfile_page *xbuf); int xfile_put_page(struct xfile *xf, struct xfile_page *xbuf);