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 C57E7C433F5 for ; Mon, 21 Mar 2022 05:19:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232795AbiCUFU2 (ORCPT ); Mon, 21 Mar 2022 01:20:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344382AbiCUFUW (ORCPT ); Mon, 21 Mar 2022 01:20:22 -0400 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8602634666 for ; Sun, 20 Mar 2022 22:18:57 -0700 (PDT) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 22KJYA18000642; Mon, 21 Mar 2022 05:18:54 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-transfer-encoding : content-type : mime-version; s=corp-2021-07-09; bh=n/NAeQlBNhdsJvmFcT5IoxFlZE0vaKRsDz1g5LxFg1U=; b=gQu4yGAVriEMRGxfBHI+frIriBT0lAKsPuqD4sc5CxEdxgwnhV4DqGy82q8drKkBmrAA mgvrziP6RaBi1pyYiRKVDzsBtz3xisGbiUR8UOpq2QDbI0vv4V3iIVBI0IIHtu54p/5u JIrMbCSCO2TmV/kHMRJBZq/w6OKsS80W9fnK2/73UOU8knIPFAmoD5gKw96m9RdfjGBZ GG+0TH3lAhyia/GhyF5Jx3XF3uJWe8SmdkLrnoWFkhPVdkK/naljCNQ1b3TSqVGlFdRJ Yw1EZtyycslHr2h3yfCMImaKJjJKEPTlNFHsH1q59TPFYXfzR25PDGYVCXYsAB0NzlEV Gw== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3ew72aa3js-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Mar 2022 05:18:54 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 22L5FxnO057928; Mon, 21 Mar 2022 05:18:52 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam07lp2047.outbound.protection.outlook.com [104.47.56.47]) by userp3020.oracle.com with ESMTP id 3exawgev4u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 21 Mar 2022 05:18:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZessnVhjXGvAFLu0G/bvQFjPJZ3bMFTE/b7AfLCrgqbqQaEzxd/yGFIIRW/Lc7d1n5s9WkXn7wS6spWiMNRfUFnbWfd2D488OikKiqO6uueQZfgVN3EWqkoG7hK/1Z2nYcktHzmjt/jcaQt+4ekQ4egExBHFtszPturTayJ1FjvcosKjbJhCtofb2keQD5NwdM+kVX0wHNwsKAWWEBnvyPPGpIEhhKssGOo3wo4CLsXvPu6gqUcFvgoHZgeP9JYBev+b8sEE1kRa3P2ret9wVbpEBAGxIXnfcHC1KUQSgPLLGdQnwrUEq6uNUPNU19h9OMKgQaic1a/OsbyifQDB2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=n/NAeQlBNhdsJvmFcT5IoxFlZE0vaKRsDz1g5LxFg1U=; b=awjWp+NDKwiWqgFyry74dUI1oIhvIagesOziIK0qK0N2D1JuNod3YvUsM6VsYkR+fPb3UadD/fWfRhFsmsPmXDNXM7O7UzfJ+talNjb6leMVr65mbcLfWPvpvcGe/Ci+Lm63X+mt2Krp2yIJP1HPyON+jxebKqdLAK4LLXQe73yjXo6a/SSSUPzsyibaJHmrGt+kcWGYMx169UWdjq8gxhcTjaQ63CLJ8bLcbom3CGtH43+AifnaMChdNB7Syw5x/pyVdZsNQbP67WUurW3RReMZxKY2jf3C5GsQGWHHk0erpUefz8AZeNZpaERqNkUCzgDVvuZ7nYls3ZG9diykhw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=n/NAeQlBNhdsJvmFcT5IoxFlZE0vaKRsDz1g5LxFg1U=; b=zypyVo8SedEzjAGFBfP8HsZfiZr+t+mPTt4JfpLS1U9FjJ7S0Y1ZiH63uyf8Kyj7odN0m0Jk+s7GxNFUh82Qx1s4CxP9QhxrDUKBXcYXOVCUeTUrXX/Zh5wxdEhx0TZ0WaODDMTK5zB53XAgdlaDPjefWfXWiTCU+dOoi2kvRbI= Received: from SA2PR10MB4587.namprd10.prod.outlook.com (2603:10b6:806:114::12) by CO6PR10MB5537.namprd10.prod.outlook.com (2603:10b6:303:134::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5081.22; Mon, 21 Mar 2022 05:18:50 +0000 Received: from SA2PR10MB4587.namprd10.prod.outlook.com ([fe80::b0b4:e94f:82df:234f]) by SA2PR10MB4587.namprd10.prod.outlook.com ([fe80::b0b4:e94f:82df:234f%9]) with mapi id 15.20.5081.022; Mon, 21 Mar 2022 05:18:50 +0000 From: Chandan Babu R To: linux-xfs@vger.kernel.org Cc: Chandan Babu R , djwong@kernel.org, david@fromorbit.com Subject: [PATCH V8 18/19] xfs: Enable bulkstat ioctl to support 64-bit per-inode extent counters Date: Mon, 21 Mar 2022 10:47:49 +0530 Message-Id: <20220321051750.400056-19-chandan.babu@oracle.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220321051750.400056-1-chandan.babu@oracle.com> References: <20220321051750.400056-1-chandan.babu@oracle.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: TYCPR01CA0120.jpnprd01.prod.outlook.com (2603:1096:405:4::36) To SA2PR10MB4587.namprd10.prod.outlook.com (2603:10b6:806:114::12) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d63f198f-769b-47e6-4a5c-08da0afa48a0 X-MS-TrafficTypeDiagnostic: CO6PR10MB5537:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zxrZY4e8XANHFdyExUP7HG4vsBc6d/yEAETh5jPMJgJoA51wTNrDHnobMLJxvg8hkVZbO3a+yX/LpPjonav1gpl9sg+dkwOXd7O1mVGduZ3k1Q6DY2pP1kqDORBAu+FroTKJvD0pxoN8qF5CLnxy8Fb54q0CFcZjj4k73TlKhFXp61QZf98hyfJYweV+OiT8deuHhEEQsKDM56z/sILTWwQZH1uF4dmYr4b6OUfUYJuAoOkC0I15PUl26OhL1MDTDutcB4vOBL9qxF+LqvLZjv2+77fM1ljnob6RHngourOxmoCt2sL9MCli8Es5xhbzGKZOGByCLCIsUI2PeE6cw910KyAUk89m8tlYLcmGXO6MC4UUPwEK2zSjwIrk7MZRyRu6H+ReZrF1ebVFvn0RGO69qNy5+tsrcApspXnVTdqg2zFt1PkR/ijTddggq7ZPfQL+wOF3dKOXTIB4az7HPWlFJbDptzDKB4sTL6XYPaI1a20IWuAbrxFU6gifqhiknvXy13cY0GXdL/cjmbcjxUf7xdu+eQU0TqkydzInSkxbRDuXivEQ28NQ3DS0tyKGUgJKnsDZT3plmFclzfOeliukeyRKrHOon5vzH7MbbVz1wBvDLkR/YnNubl4PjLh1dh9i8cWbxkpzTqDyE/vHMcp+wzaEDn5hyXGkl36rgk13ortY0IyWkORelLzXkTlOl2KaFMqtCdxfXf8QWGRk1w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SA2PR10MB4587.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230001)(366004)(38100700002)(38350700002)(2616005)(4326008)(66476007)(66556008)(66946007)(6512007)(6486002)(86362001)(6916009)(8676002)(508600001)(316002)(26005)(36756003)(52116002)(5660300002)(8936002)(186003)(6506007)(83380400001)(2906002)(1076003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o14py5dwQCplRMvV4ywyLhKp3+5CqgOYprg8V6dTnMDjjQ+sakD6+URgUc+I?= =?us-ascii?Q?E5QCYrju+U/4kl05TxaLHkqmUeiriTPMLqd8PjfbWBnJbOSG/YrgLne0rpHY?= =?us-ascii?Q?K8qRXfTc7+1SbaTvTMYB1IOgmvbPq1wKo5xfynxGlUDDH761gHv2rqXC1BQn?= =?us-ascii?Q?Ugn7heiK1QeFeQ1Sn8gazxDO01kkoqhUeDUSFYO+oqdtdyN6AAd4Lg8TkMUS?= =?us-ascii?Q?7GN0AJJduHkEAOHDosIX9VBxlcy0c23fcSGPadDs4cHPaIGyHVtCFFm4qpX4?= =?us-ascii?Q?fEkNf3bbnBnUrxMadlwl7iAV7RZ/BstAJUJ/MDF3cB/4VsqVKywx5xRShU9/?= =?us-ascii?Q?dZR8WoBjrrM5cVQq2nC6ozLgZzcpezXAEk0aiLJRbzSvLFybz1RgJIuc0qTV?= =?us-ascii?Q?xh2ZFBxqmA7uCbSHL6eF22kfLyOaQOukwngXL+ceU1PyinaJZpD0OEpng6RZ?= =?us-ascii?Q?DxQxc942pyB6izbzpTkqJuj4xf6bO6eieH7Y0gEoeUurMeg4Lp89xcR7w8UN?= =?us-ascii?Q?v/B7d4GZpapekqmmhHQ2En+KPAyaPnrDWfyFig8En+Nz3mOYNmydmd6uvfR7?= =?us-ascii?Q?7vTrQVaWGiiQPn+Y6e8M4FYLepjK6VJIZnojRIOre+5ogHE5CxWsteD3b7xF?= =?us-ascii?Q?slZ54/m99ahjqy/qY8/f2I+5HHi5nEnDT0vUPjimedvnm4HYDGHmfEH75EgB?= =?us-ascii?Q?cgyXuRED3jR4b0UxFzWddjJ/SZK5xlxV4TWfDIE6Rv3hEKnco6WR6nfpAiBo?= =?us-ascii?Q?hJbUviAUPMvBR0TFwN6aWLGX5dkyA20Q3GtKlZ7OkTzO/QYEH5NOCTpy4O7i?= =?us-ascii?Q?STlbSmClAmZIVloeEMzyC5AfPyFC8pMtPJ9K+W46cpaL4Hh/TnqZ+yKRUX9/?= =?us-ascii?Q?OmnfNKBZYLJGa5HV6Dzw/H/Jjv/CNxKpt+luo1kmUwQkIsvxGaWUfuwlgQlr?= =?us-ascii?Q?5vejsQRDfX+6ARvesNvAKrfDh+uBznl6W9RyxPsyo9fGMEpzNsbCHBgaqkLK?= =?us-ascii?Q?5HE+LssoNC1Q9cgjQdfOAW6fNjGoKAzfosOXJEViCPB28xyogrIeYgQ/rB2M?= =?us-ascii?Q?BxjRlY+sDKsNUDLQw6svQm7GAzqMKDs6T3fgEIW5H/KRtyl7a+XnDEe9Xwt9?= =?us-ascii?Q?6/fTOqI8HtTAP47FAnaaO5H8O0dibBLAUL4poRSp5/S3jTVzfRMSB0/DyXrm?= =?us-ascii?Q?tpCpb2G4cMEzzT1ARTLY2b785aRecMAfAmOM5xpxJA7BrpNrRKIFI/EUGuVt?= =?us-ascii?Q?EAX9aETbov18LyEFxW6XCmfqb6nwLLd4TCflwv+ghp2IPqhWqoWbBLmBMwe4?= =?us-ascii?Q?TssprvuTVMUBUeR+r0A9Mcqeh04Ghc9N5YTkDh1Ccyzsmjfng9tA8tMPwov0?= =?us-ascii?Q?PdnkQm4TO5REw1Y1INlKdam5UF6FmCqmsSajUOQJWkQ+91TQwRyaCS7AP7Rz?= =?us-ascii?Q?h1c7pfUISQXE7MMxlrQhJztTuPWAdwzKIJ5eKONcdyQ8hv0miafLJg=3D=3D?= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d63f198f-769b-47e6-4a5c-08da0afa48a0 X-MS-Exchange-CrossTenant-AuthSource: SA2PR10MB4587.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Mar 2022 05:18:50.4787 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 1j2VDMu+GUQRL8vNfUrE8AoFb8YkIRIVTKdz0ocmhogQpYD0U5BTnofZyrMVz1PXi9gff0Ptcbh7S4yIT0//6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5537 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10292 signatures=694221 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2202240000 definitions=main-2203210033 X-Proofpoint-GUID: pJrfm1hRcLxjxYYcXdpQI1uZXGcKUCWh X-Proofpoint-ORIG-GUID: pJrfm1hRcLxjxYYcXdpQI1uZXGcKUCWh Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org The following changes are made to enable userspace to obtain 64-bit extent counters, 1. Carve out a new 64-bit field xfs_bulkstat->bs_extents64 from xfs_bulkstat->bs_pad[] to hold 64-bit extent counter. 2. Define the new flag XFS_BULK_IREQ_BULKSTAT for userspace to indicate that it is capable of receiving 64-bit extent counters. Suggested-by: Darrick J. Wong Signed-off-by: Chandan Babu R --- fs/xfs/libxfs/xfs_fs.h | 20 ++++++++++++++++---- fs/xfs/xfs_ioctl.c | 3 +++ fs/xfs/xfs_itable.c | 13 ++++++++++++- fs/xfs/xfs_itable.h | 2 ++ 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/fs/xfs/libxfs/xfs_fs.h b/fs/xfs/libxfs/xfs_fs.h index 1f7238db35cc..2a42bfb85c3b 100644 --- a/fs/xfs/libxfs/xfs_fs.h +++ b/fs/xfs/libxfs/xfs_fs.h @@ -378,7 +378,7 @@ struct xfs_bulkstat { uint32_t bs_extsize_blks; /* extent size hint, blocks */ uint32_t bs_nlink; /* number of links */ - uint32_t bs_extents; /* number of extents */ + uint32_t bs_extents; /* 32-bit data fork extent counter */ uint32_t bs_aextents; /* attribute number of extents */ uint16_t bs_version; /* structure version */ uint16_t bs_forkoff; /* inode fork offset in bytes */ @@ -387,8 +387,9 @@ struct xfs_bulkstat { uint16_t bs_checked; /* checked inode metadata */ uint16_t bs_mode; /* type and mode */ uint16_t bs_pad2; /* zeroed */ + uint64_t bs_extents64; /* 64-bit data fork extent counter */ - uint64_t bs_pad[7]; /* zeroed */ + uint64_t bs_pad[6]; /* zeroed */ }; #define XFS_BULKSTAT_VERSION_V1 (1) @@ -469,8 +470,19 @@ struct xfs_bulk_ireq { */ #define XFS_BULK_IREQ_SPECIAL (1 << 1) -#define XFS_BULK_IREQ_FLAGS_ALL (XFS_BULK_IREQ_AGNO | \ - XFS_BULK_IREQ_SPECIAL) +/* + * Return data fork extent count via xfs_bulkstat->bs_extents64 field and assign + * 0 to xfs_bulkstat->bs_extents when the flag is set. Otherwise, use + * xfs_bulkstat->bs_extents for returning data fork extent count and set + * xfs_bulkstat->bs_extents64 to 0. In the second case, return -EOVERFLOW and + * assign 0 to xfs_bulkstat->bs_extents if data fork extent count is larger than + * XFS_MAX_EXTCNT_DATA_FORK_OLD. + */ +#define XFS_BULK_IREQ_NREXT64 (1 << 2) + +#define XFS_BULK_IREQ_FLAGS_ALL (XFS_BULK_IREQ_AGNO | \ + XFS_BULK_IREQ_SPECIAL | \ + XFS_BULK_IREQ_NREXT64) /* Operate on the root directory inode. */ #define XFS_BULK_IREQ_SPECIAL_ROOT (1) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index 2515fe8299e1..22947c5ffd34 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -813,6 +813,9 @@ xfs_bulk_ireq_setup( if (XFS_INO_TO_AGNO(mp, breq->startino) >= mp->m_sb.sb_agcount) return -ECANCELED; + if (hdr->flags & XFS_BULK_IREQ_NREXT64) + breq->flags |= XFS_IBULK_NREXT64; + return 0; } diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 71ed4905f206..847f03f75a38 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c @@ -64,6 +64,7 @@ xfs_bulkstat_one_int( struct xfs_inode *ip; /* incore inode pointer */ struct inode *inode; struct xfs_bulkstat *buf = bc->buf; + xfs_extnum_t nextents; int error = -EINVAL; if (xfs_internal_inum(mp, ino)) @@ -102,7 +103,17 @@ xfs_bulkstat_one_int( buf->bs_xflags = xfs_ip2xflags(ip); buf->bs_extsize_blks = ip->i_extsize; - buf->bs_extents = xfs_ifork_nextents(&ip->i_df); + + nextents = xfs_ifork_nextents(&ip->i_df); + if (!(bc->breq->flags & XFS_IBULK_NREXT64)) { + if (nextents > XFS_MAX_EXTCNT_DATA_FORK_SMALL) + buf->bs_extents = XFS_MAX_EXTCNT_DATA_FORK_SMALL; + else + buf->bs_extents = nextents; + } else { + buf->bs_extents64 = nextents; + } + xfs_bulkstat_health(ip, buf); buf->bs_aextents = xfs_ifork_nextents(ip->i_afp); buf->bs_forkoff = XFS_IFORK_BOFF(ip); diff --git a/fs/xfs/xfs_itable.h b/fs/xfs/xfs_itable.h index 2cf3872fcd2f..0150fd53d18e 100644 --- a/fs/xfs/xfs_itable.h +++ b/fs/xfs/xfs_itable.h @@ -19,6 +19,8 @@ struct xfs_ibulk { /* Only iterate within the same AG as startino */ #define XFS_IBULK_SAME_AG (1 << 0) +#define XFS_IBULK_NREXT64 (1 << 1) + /* * Advance the user buffer pointer by one record of the given size. If the * buffer is now full, return the appropriate error code. -- 2.30.2