From patchwork Fri Nov 12 08:04:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12616291 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20E0CC433F5 for ; Fri, 12 Nov 2021 08:05:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ECCCE60FE3 for ; Fri, 12 Nov 2021 08:05:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232841AbhKLIHw (ORCPT ); Fri, 12 Nov 2021 03:07:52 -0500 Received: from mx0b-00069f02.pphosted.com ([205.220.177.32]:26924 "EHLO mx0b-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232346AbhKLIHv (ORCPT ); Fri, 12 Nov 2021 03:07:51 -0500 Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AC5gG3J002573; Fri, 12 Nov 2021 08:04:59 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=gJlLx6aBJ2HO1hsn2ueVLwZDm6sVW2FWg9Hq1JremYg=; b=1AIn0Mr5Dlh10fb4YiQ4hYZ4/xE/GuMjGs7DtVwHR6u1+YNZPMPMUpxUsMAHQsq0XHfV W3uYLt7hy5cilxJmMjVqcl9BbFS3O+EZZkEdcRmLxD3Urupy+8Zyio/eZgCw1OwBVc+6 JdACetqtFxEH+pfx/DDJDAuqMuV0pF0sej12cDwbNvmuOXpm30YdFQoeeOLIwprlKBkn 95i5A0w838DB2uIBe8MygwMqMwkFyxLc9OopL/x3bO5w0yKB1j4URwmwgPOr8sGDMB3V f3MlnshRwu6HIQeQgN9pEMp9Y15Hj0Blvs7q7pKsNwIdk1ig4XKbPhYIXux5/unxhjQN 3w== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3c880s5h5f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:04:58 +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 1AC7ummO053105; Fri, 12 Nov 2021 08:04:57 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2175.outbound.protection.outlook.com [104.47.55.175]) by userp3020.oracle.com with ESMTP id 3c63fx89fh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:04:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mnMmar8HMaHwxsE571/6X9UUIO4Osb1kRWMJx7Iuo3WyyY8iTBcO1NE6NS7r3l7SYS6VFx8mQyLvxt6A+g/BzjKuX5VrjGmYALg3C+BrCsCFlRSn7B1TFJRyOrAJMAwrDXK4UFQ55oHMDk9WB7bzdEbdRmragGf+0iKa+QJoh7AmT8CtkLJsEvccfydtX0HiVixe5FWKANHkwEzLOEq6u1bcDiOrjES3mmJVUhWzF/8w2apIj0cacQ3aiyWnJcWNGH8tZpxpFV78zpltMxMQ+Qcs1HNUS5O16ew/W6XBNdAdxE2cTO0fPgoaCghbtuNLUVVF8mDZGGtEvFp8ZbEDsg== 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=gJlLx6aBJ2HO1hsn2ueVLwZDm6sVW2FWg9Hq1JremYg=; b=N2jGhFu9/hNzqEACXnrusTqs1nyIk/TiP3iDpjn3NOAxH3oFBjrq5a/WhMPO/3JhfbwHjD+LdakfeFtsK9IfXM72Z2lhupbTUL0QzjDst94dqyMvXRD2ecH7ZQoFTc721x1WfqJ6RGyWmYTxQVDWAZmPreJnUlXgTVQM2tIt9KztmZZWzOtk5zn8WDfqViNlvPLcBXrvJtRSMF4WRRoKHGpVnhUrmlTcYsP2IRCaXmNbr8B2/NqJMLT5Afst+USZM9NEKYdvXCL0oFu7zEKQ5o6Y3j7LX5Av6hiqU5RoQ6vk16CVc4Kt+s5/wFZIHjJsy/gnK7I+0RE5Tep4HBLNPw== 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=gJlLx6aBJ2HO1hsn2ueVLwZDm6sVW2FWg9Hq1JremYg=; b=BwYKt1Qct3qi2zla39zGSXM0noil5Ma4CSOH03bZMgID2N8MDB/vvhEcwEq8EB+oB9ZZnmWmh+Gbz565AYV7ZJstl8p4s+9qmgcfMBDwL2EcEVjpFDNqATQQimn2AH2T+25A8J0Pta/PV2321Cm3+TYipaL4gbk2+nXXvnbVzd0= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BLAPR10MB4980.namprd10.prod.outlook.com (2603:10b6:208:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.17; Fri, 12 Nov 2021 08:04:55 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038%5]) with mapi id 15.20.4690.020; Fri, 12 Nov 2021 08:04:55 +0000 From: Anand Jain To: josef@toxicpanda.com Cc: dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] fsperf: add a few helper functions Date: Fri, 12 Nov 2021 16:04:37 +0800 Message-Id: X-Mailer: git-send-email 2.30.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 Received: from localhost.localdomain (39.109.140.76) by SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.18 via Frontend Transport; Fri, 12 Nov 2021 08:04:53 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fdedbd7c-019c-4d58-9741-08d9a5b31cda X-MS-TrafficTypeDiagnostic: BLAPR10MB4980: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:546; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S9OMcrksLZrSKri+p33XnqR6ndjB8FqaEa9k6RQ/FxXjfJBiVcNz4fyjwAQ+/+Jug59q7yzVD7dByL1hrHEWCTzhilB/wIWs8W+oSE+p8LEay7sV0LGBDUhmrEioqaxiGFm8X0Zgmoh7g4kIeVlZeBi/QGWWHeJPHnStzgdHkzfrBb098k+9X/TeExX0M76dM3lEF/gdh1uEORa90SomycXW/VEbqG04FPuOY1Gmdia9EdFGYwFUo3FbxA6DEPHpm95Zxo+EWiAmGtw9sNuJ5yUjSc8Ko7SpaIAPNxzlYfiMgpfzF58Z2FDPhig4f3z/LV6GfnXXyzx8/zSvuZkFcFTbHCcayponqpiFzRraZ8PjKfm/JxcDLtuVoKicZDPpdgX8NJ85qI4EgVdFslardg7UW4RdTnA+3J5IvsHFqNJynFcXQIE+X6f2qmwMjOre/wSQAlk5PAFi3VM1pDTYGZJaVZdN19c3n8gL2v7+Y6u2NXNeyqW2bQC5bmjXoaNB+A7c8Qb9+XOjuTx2rKoLNdyqYJS5ng+omAUaiS6czgRLosysLYYv3lu6ZkitM4geD4mjqZnbuliIDXZtKhrj74aO1KLDIuv3KnlmmFRndyYHv8IWd6EYUsh6MvbE4UOGZrmaznXInSDsun98bCUWuWF+niPZQ1Pfo5w7BIXlI5Vigs9vRwk3qq1yxMU4QR2U3RsVDM+wsrfwujeFSLY6HA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(36756003)(6506007)(83380400001)(44832011)(66946007)(52116002)(2906002)(4326008)(6486002)(508600001)(6666004)(38100700002)(316002)(8936002)(38350700002)(66556008)(66476007)(6916009)(26005)(2616005)(5660300002)(956004)(6512007)(186003)(8676002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NPFDy4exjchb5VKcvJdJ20RI1niD1LP3Hv8vFZusxL+uqhq+zsxOqAaJyq5M5OCUpHGkiAI8i/zi5zb4l1YFdqF7rptIwoaQ5lBA8NXMW0wkgmcdu2NXn/VfpcJp0sVlwtxyw10OeWH6KC9Gq6mMct2PZVeR5eqdqqSr3ac+3dOLXM4UmmbNMUAasmuJ1NsO0oCDLpiCLGNg4ho1oBBwQOo9kLDkw5/ZLuNpeL9oTjBy2X1HMNUsQUeOotQp7rnjl8HyCxm46IPUqlX3Mn2Cjfmup6GRH+rO4ANsqkA8WORe0CgHAZ4esZf9H637W3tqZpgbpTm7wqUDq++j2IqFLXKdrjyc2+wy1Obm9vBYUbGA58wGRPUHhCQZEO+bJ3CvmJQ2zc6qAj8Y2RKrXYsiUmOT26qMRWZDz0nzk9piGAD0jkIQ0LnQRiKDNiJQv68/ZJraaTiMw7PVSCTpjr3blGcwq7nrmkQdRX+XPoMiLxF7OGh6t3iuSVVgyJboDDaDCciTuCgsEalqJpX+p875VmhIA0ZnjkFBhOxgkLu15fuchzQXdI3e29t6RhQyF2nCSDc+Pb5ffcKjamDN6JDSmaKt2ytp0aUsll4qcAcYCZpJAnhE8lAh3IUvDHlG/0jpPCFfqKiOZQJfD/Nvd9MTKW+sKa9timbJ10jrPNt98bjiptGl28XZSZDd7bveVo3qJW1gkdKrGc33Gyf9aRRoRafzOWj6fkKFUB+4GnHLR634/2/0QEJZUo0JwKknE7G4OFFR0iK0ihB0dlqE/0FalEIUN7j5JHy/C8VNOfnbHcbuFZmxWOzLiLBpcalbYtIDwPpUsbGfBRgeqXjrifZ1JeSXGsg9iZgcm2GDNAjB/cSJOuIxAM00VclNhohJwbtV7zf/lTMJuNfIX6P6e1OFnXURL3zhTREEVjGJcrznSwhx6EKRvn0yp8jhC/Aa9zPEs8MEhQgvZpyDcmHAQpTxrnY8B4UPiEd/E6gKdxRn1NlourR2O1IuiYXhS/voHNfjaQmL7s3tdbq5IUxdkU/zDi9rEzjrHTJF6ESCiDKdgUjGnsZQ0uHmoAzow3YaIimY89bkVl30smwcVqP79VMhU+KPRLl5J2ubG6LtDe1OczuTDGgaUC9ZLIg62X/E5v4RmhbhRpnJBJoN4tbr+cHEDIi58nwtHyyc25pR1FypCj+Q1tyCwbqRlBurSvUIVZ6kdxzLLT3cB1kcujT9n0Jtr49YttJhvmWuiyQZWzltUgJpkSUE1BkgrF3N51WBa02fTw41icDs8q/HsIiUh6dVNFKUuC8cyHeE/S1M+XqR2YQsp8zve9O2dnhtP0clZ6MiIQzFQno42U65zeWwW4+T3teNsLCpD+XA+ZC9pFeE/jdETMZH+rR9NjLW3pmTFu3xmXLLRa0ON2sraHZmcOpCctc6scqRf145dENB8aDeDeh2Wx3iVdgIXJCaxXznCWl+d60tVG9OvwjMTw1siBtWjQSrjAco9uK1gLsePnB51uBUllgMvvFgyNBSlJzgOY71WssY7LiHHiLSHAKp+mFlwcZcWFONyrW9rkWDpai1gI1vovIOgpZDYmlyJWQqDXurzMBA/WY+eVE25kiKQFQRunNGm8HInNv1XrdIlqm+JYo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdedbd7c-019c-4d58-9741-08d9a5b31cda X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 08:04:55.6032 (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: UwI1cCQ1IErEHAt88zK0dpdVe+ftomCuNcBzTiMqhASlEyqO5h4PktHCihk+aXz5JRPpILvmcMI7IekiUVdmTg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4980 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111120043 X-Proofpoint-GUID: pZ2p4vyi8uVOZIoLChb-_gQonAPIAdXJ X-Proofpoint-ORIG-GUID: pZ2p4vyi8uVOZIoLChb-_gQonAPIAdXJ Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org This is in preparation to add read policy benchmarking add the following helpes get_fstype get_fsid get_readpolicies get_active_readpolicy set_readpolicy Signed-off-by: Anand Jain --- src/utils.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/src/utils.py b/src/utils.py index 5629894ce1fb..a7f0f1baf448 100644 --- a/src/utils.py +++ b/src/utils.py @@ -8,6 +8,8 @@ import itertools import numbers import datetime import statistics +import subprocess +import re LOWER_IS_BETTER = 0 HIGHER_IS_BETTER = 1 @@ -230,3 +232,46 @@ def print_comparison_table(baseline, results): table_rows.append(cur) table.add_rows(table_rows) print(table.draw()) + +def get_fstype(device): + fstype = subprocess.check_output("blkid -s TYPE -o value "+device, shell=True) + # strip the output b'btrfs\n' + return (str(fstype).removesuffix("\\n'")).removeprefix("b'") + +def get_fsid(device): + fsid = subprocess.check_output("blkid -s UUID -o value "+device, shell=True) + # Raw output is something like this + # b'abcf123f-7e95-40cd-8322-0d32773cb4ec\n' + # strip off extra characters. + return str(fsid)[2:38] + +def get_readpolicies(device): + fsid = get_fsid(device) + sysfs = open("/sys/fs/btrfs/"+fsid+"/read_policy", "r") + # Strip '[ ]' around the active policy + policies = (((sysfs.read()).strip()).strip("[")).strip("]") + sysfs.close() + return policies + +def get_active_readpolicy(device): + fsid = get_fsid(device) + sysfs = open("/sys/fs/btrfs/"+fsid+"/read_policy", "r") + policies = (sysfs.read()).strip() + # Output is as below, pick the policy within '[ ]' + # device [pid] latency + active = re.search(r"\[([A-Za-z0-9_]+)\]", policies) + sysfs.close() + return active.group(1) + +def set_readpolicy(device, policy="pid"): + if not policy in get_readpolicies(device): + print("Policy '{}' is invalid".format(policy)) + sys.exit(1) + return + fsid = get_fsid(device) + # Ran out of ideas why run_command fails. + # command = "echo "+policy+" > /sys/fs/btrfs/"+fsid+"/read_policy" + # run_command(command) + sysfs = open("/sys/fs/btrfs/"+fsid+"/read_policy", "w") + ret = sysfs.write(policy) + sysfs.close() From patchwork Fri Nov 12 08:04:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12616293 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB46C433EF for ; Fri, 12 Nov 2021 08:05:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F85660C4A for ; Fri, 12 Nov 2021 08:05:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233191AbhKLIH5 (ORCPT ); Fri, 12 Nov 2021 03:07:57 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:10016 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232346AbhKLIH4 (ORCPT ); Fri, 12 Nov 2021 03:07:56 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AC5xjs6024107; Fri, 12 Nov 2021 08:05:02 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=wZNGfOvLbeiLFJZUm+N6O+a33RyPr5XAIWdnMdq/r9s=; b=qfYcsU+Tzgom8s5Z68Vy/KH9HxERBX0ZXBHqgoWUlGrNVjxXwDd9OmfNeIk6g5em6db8 U/irV6mGl/UehVE8IyltLiEMI04gA9Fl/U6BZnMCj8YPoif/HCDjTeAZoMV3wt4IC0RW uLhv4F1W6yMBiI0AwOLwI55A0qtYJXon17lIcserSivAt9Auj+Fr59uRyNAKDV2kaYUI lRnQKL+ifUcHAFvJOrx6yrkglaBEJCm/leFtAXkE8Zi7/KS0mZvq6Ik7piSzStbsvC6j mBp67PiSWvvglkUpvrjx5kg8niABuuhB8SYtGQJawOdEXpJSHK1Qyod/VmB9V/lU1JYW 4A== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3c85nsp8td-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:05:01 +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 1AC7umQO053068; Fri, 12 Nov 2021 08:05:00 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2171.outbound.protection.outlook.com [104.47.55.171]) by userp3020.oracle.com with ESMTP id 3c63fx89j6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:05:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K/5ZLvpSBM4Rz8jwwIdJJDkJrxfZPTzMSXYwQf1ip807SiA0HkncybTpJ4Nu4L9NcLCsXPdbo9ejC8KTKg9eAJ07HzboCO99AcuG9ijI1O1vxWCBGSaVK/kJmXbEzX/HiN/BAgyDPFenBKWo5VYrW8SiOyBQLP03eBz1LA0nhiUHgnq1UgSj2HSK3zedy8MdcXMJ1SxRCf7RtOmQmKU36RUpogK1N3JkD1Edg0cR11y6N12Gvk0Z2Y7Hr4cWOH5dS2dcsovqFVJ7A8xL5Y8z2wCJoNdIsKcqlY14pu6JZdIHalMxJ1I9o0AQ+XNrbpJ5crYrRLpbaIl8kVB9xRdGxw== 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=wZNGfOvLbeiLFJZUm+N6O+a33RyPr5XAIWdnMdq/r9s=; b=b4oUSelJyxFEPj9ogHpVnoD11di9LejCs13PvYkW3IxHW4vsgbVS0mX/zE2oJuYCUO6Q1Bdy1f4MVmqDywWqkQsxSpiQWT9okIkfuz1VGUIkkaAYYCwDgZGFs+DCJ86cuMeieiz4m88RMG+iHWj+yDRm12676/C2rgxGW8chXRRhNqEKaNhAJ1l7wngV8uOYMaqiVpVPSDsPl1h+Dx9zp61D5Y3k3G85l1uDfZWYBNNMBqjCwK+dF6ru+bveLU1T3NS3uwGxsH8J2aRR8k6SkM3DgWojCJTmmUjOuE+n9hCzo1ltIEmj6+xLDeMRHJyIa+RcoC7O+3hbdLxnv1ENzQ== 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=wZNGfOvLbeiLFJZUm+N6O+a33RyPr5XAIWdnMdq/r9s=; b=dotLlWqx1cNaTHdTNJ40HIoUQDpGziwAWWqHKOK20w6KKYrhggZtwva1fjwDvaKsUlIKQcwtggZPErJo9G92q1TWPfQwmk1w07JKTWRcm4ekygq92G04Qsqme84g4VXJFOltbTSTIqkTqlBGS7Ti6AysQHGT0YpGM71XKK9AVmE= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BLAPR10MB4980.namprd10.prod.outlook.com (2603:10b6:208:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.17; Fri, 12 Nov 2021 08:04:58 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038%5]) with mapi id 15.20.4690.020; Fri, 12 Nov 2021 08:04:58 +0000 From: Anand Jain To: josef@toxicpanda.com Cc: dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 2/3] fsperf: get the running section in the setup Date: Fri, 12 Nov 2021 16:04:38 +0800 Message-Id: <2aa6fbb5e415251faeca9eaa01526a6f7333517e.1636678798.git.anand.jain@oracle.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 Received: from localhost.localdomain (39.109.140.76) by SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.18 via Frontend Transport; Fri, 12 Nov 2021 08:04:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: de02e75d-6ae5-4e30-ca3b-08d9a5b31e61 X-MS-TrafficTypeDiagnostic: BLAPR10MB4980: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OaPhHtCXGmnJmHzRKAjnAcxZS/Im1/am5fLvIZ3WIF/mhOewm+I3Zr72u2Uy0x7dthtQFmifRjoWBIhQDMr/3TPEREGgd44tqNPSJ5Yha4uOEwsNSSJ2qstQmtt50CF7sBOKJbsA9fJ9Ogzo7C7f1j6h3bIe09Fxh1KKdle8RdMtdbuHLCKQQCivEv77zFeUMPMIgjruWwDGm+fmFGh+gEkrN7/7cvUGU+dERUmJuDcN0t2S3yY5LUJghlQ8KW9RhjhdcOy0GTApX0JGR+JVeigBlMzGWDrL5oTIARIDksim2TdL4rzyUyRo7TS1FFg6YduQpEalFwIL2pVVpt+I+NFNi6BnjdDUfTrS9iBDDOZDD1ZTFOqCuqGXCvlDpBu1BOn8BWpeNkJvLrpKE+HaRoT4KKltxiZlJdv0WOXYhETrTLkQtNqkaIus/tA2hTEAJ5wwEpDSvfbfqE5Jx7AqmEYCMRHhaEQLDQgbsTs5zU1pXIrP/zKdV469xhs3kKKM3p5FeLpNDdkSxp8tveunvhRl/3B+ZTCuN32KY61e6HveXusinjnxdvg+0shxK9es8AcZWtZgg/0RptgiyxjfDedcS5MpCXhZazTk5Nga7t5TW3TP/INbFbXy7Ihs+xwIeZdHrbR4tg+4SZank347JJMhAH2UVejQFhetcXgX2ucrL3aeTS5Ud7LHOeNeHv1XZADFpsHzMxRrPYEa1T7gkuQID8zOef4E2gJmBa32dHpRoSEsXjRSFrMb2bpukk3K9F0YiJRqmwhTGCP1+QPogZrwkruY22Ra4KrX20FPaambmP3BlG/W2wxBoL5suc/k X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(36756003)(6506007)(83380400001)(44832011)(66946007)(966005)(52116002)(2906002)(4326008)(6486002)(508600001)(6666004)(38100700002)(316002)(8936002)(38350700002)(66556008)(66476007)(6916009)(26005)(2616005)(5660300002)(956004)(6512007)(186003)(8676002)(86362001)(15583001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: N1xm0USBanax57k3KKY9BtCTHyMKo7Npypbc4bAsBf8/+l1M6ZKnyM0OczGrlEmhJYgykWvnFlT5+6vhJUQFxWmVrR8z6RGx5wuVwyA+7EGvTry+SR8EKdD31YVKkMlMEGMe7IHwsGxUPnRq1ic87Lh4Fg7ZRB+eZwhDUEuCpIwXTdyNcPqTIw3FH1d1wj8/UoszeoOdrA5+/OJcpxL0+VAWMQ1ftGqU1LIsx3OtwnGpOjXuVJQqZ22l2PZQHoeBBt7sxiIhC8yOFXsvwpoC4d2Lgrq6Mj9OB0Hz1Wvu8WwlBuFYh4hC5FsviN0/cPXaipLZtoYySFEi/tl6sgExrdbr82CnZSx8y4sN1UuKwWdUUUKbZGnM7KiSjky1uuZ98ENVlPv7j+j0nSYUAkWqRfbei/ykVW//NhM/lxU/ae0Hs0bu+Ru9W1ehZO3FakdY7n1y9uQS6Z6S7WFlLOSAdFq+LeB5+sinV3indND9BiDI6O5Zp+9PhnBi8Bvfz15plWRWn58dAm5IyCTQcy3ay6kGNjVk/8ucru2wCysy4Ad1FbbkRGXSs4xylgn/52gkhhhdCbQSy2NAAn7K24WRNVeaJab1aqvep3e4wg1ibXAJALm/z9Gm/j9UDlgGdSD3sW6tVcn2+D1FsaPszyTOtieVZ0QyICSBPauRSAOzFzlkrMwqjSAcSxVqqgLey+lhYJXFpn7w+Y9Wms416Y1E2xHgLVUbgJf409fU/SP7eFHSTVuLsMCq0fbbO4A9AigFHzV7MZJEU/kYLW2VjpldaInqZ+hjOmqnmd4iSPQ9EB+BVCMrgqON6n1ImR859GVc+11hVUL0aExjTUStyFqWGyejwzvYueF7cEnaX5WPG4Gld4xttXhZv+UGYjJGyFAT6t/z7dkUT1h/dGhW4KmBcxOoiyaRVTYR2bws3TyVUfvwT/d3XGtJYI4xT0MjTjP3UKp0GYQdt0b8D2Op07aeF2pXcwqTWkA4wnN+IgGh833USXi51Gd/aLGLeBvbSkgCOgeUCb1PDlxNS04t357tAwiNcASYh7eOefaxHyN8TR1fKxevkVLpcqoC4iIlwU+FsLDv/96zF3Fxg5KsC0nh4xFd/UUo0TRS4ZEho0pwJ4h6FA64ffs+kF2zY8q9IlaVsXLo6izqfPcVz21YcPp1U4ihKeUvQVrAEdqlZNO9W7LaLamSp0hEBdVnoIssx01NktgWfdfrnMK8UVZMZzCat2ded0hsD28KgBQvru+Mp7ODxNNBpT54LcaySeNNyOcMFOKaHajKMcjCbDgiE8XUEEnp/cm1LHXsBTTH2KvirQpaD+vQyR7r+dIi4lHFaHNK9qQ9/sGemzyG0YsXL0YP518eo4K08TXv7YkOdATptId9X2OA+GONvsn6R3cn+JkaLCHOljs+hCX5wBkF3lWh0g1NjwwDv7eWjqB9P63KvHiJPKHlfdcKv+wKowAHtSd6mjov/hgtNOl+Q8zVnXtSlM6fVXYmpzAP21imfVuUdp9yv+YXUsprlvZEVpiXgQybNfCaahGkANYV0bV76VfkgJQqq7nBMoMkrXCLaDtjq0H/cPbtA68uVdBRN/ZH3m2+4SYOuUWLc1rS0274+Js+SFojfv5BzmVYM3tV0Z4CbPU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: de02e75d-6ae5-4e30-ca3b-08d9a5b31e61 X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 08:04:58.1002 (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: WsSrKeWFaxtvzU+Q+QPzMewOmsd3hS7SGFPXTKOToo1nGCfqGl0UdlNu+zq+guqHxVKSKsuuzCx42e0vz/z0Fg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4980 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 bulkscore=0 phishscore=0 suspectscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111120043 X-Proofpoint-GUID: 2rA9VNGSpn46wCh-RoanhYKHC7E9fiFM X-Proofpoint-ORIG-GUID: 2rA9VNGSpn46wCh-RoanhYKHC7E9fiFM Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org In preparation to support readpolicy in the config file, get the section as an argument in the function setup(). It helps to verify the given readpolicy. Signed-off-by: Anand Jain --- src/PerfTest.py | 2 +- src/fsperf.py | 2 +- tests/randwrite-2xram.py | 2 +- tests/untar-firefox.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/PerfTest.py b/src/PerfTest.py index a47dd4985c3d..f084a92121e3 100644 --- a/src/PerfTest.py +++ b/src/PerfTest.py @@ -9,7 +9,7 @@ class PerfTest(): command = "" need_remount_after_setup = False - def setup(self, config): + def setup(self, config, section): pass def test(self, run, config, results): pass diff --git a/src/fsperf.py b/src/fsperf.py index 99d8e9e0e43f..a26d95b8b5f4 100644 --- a/src/fsperf.py +++ b/src/fsperf.py @@ -20,7 +20,7 @@ def run_test(args, session, config, section, test): mkfs(config, section) mount(config, section) try: - test.setup(config) + test.setup(config, section) if (test.need_remount_after_setup and config.has_option(section, 'mount')): run_command("umount {}".format(config.get('main', 'directory'))) diff --git a/tests/randwrite-2xram.py b/tests/randwrite-2xram.py index 25fc94e51dde..dfaa97236727 100644 --- a/tests/randwrite-2xram.py +++ b/tests/randwrite-2xram.py @@ -9,6 +9,6 @@ class Randwrite2xRam(FioTest): "--size=SIZE --numjobs=4 --bs=4k --fsync_on_close=0 " "--end_fsync=0") - def setup(self, config): + def setup(self, config, section): mem = psutil.virtual_memory() self.command = self.command.replace('SIZE', str(mem.total*2)) diff --git a/tests/untar-firefox.py b/tests/untar-firefox.py index 5bc1923db72e..b5dd7ab8ecb5 100644 --- a/tests/untar-firefox.py +++ b/tests/untar-firefox.py @@ -5,5 +5,5 @@ class UntarFirefox(TimeTest): name = "untarfirefox" command = "tar -xf firefox-87.0b5.source.tar.xz -C DIRECTORY" - def setup(self, config): + def setup(self, config, section): utils.run_command("wget -nc https://archive.mozilla.org/pub/firefox/releases/87.0b5/source/firefox-87.0b5.source.tar.xz") From patchwork Fri Nov 12 08:04:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 12616295 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 73686C433F5 for ; Fri, 12 Nov 2021 08:05:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5612760C4A for ; Fri, 12 Nov 2021 08:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232346AbhKLIH6 (ORCPT ); Fri, 12 Nov 2021 03:07:58 -0500 Received: from mx0a-00069f02.pphosted.com ([205.220.165.32]:11332 "EHLO mx0a-00069f02.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233189AbhKLIH5 (ORCPT ); Fri, 12 Nov 2021 03:07:57 -0500 Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1AC5n9mu024095; Fri, 12 Nov 2021 08:05:03 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=UvwyQMRusv+o34X2OvJZY7Y6EhyNifM819wzUq98AsE=; b=CkgUZW2r8HS+bPIBPr8wOcc+8nuSeS6JTYKFidhSXE4rFK1xR5OefJPm7xPVZyY5CReH dkE3KP9TU665dWIY/cRvap6KwTWuBP+HDn9E1nKlBWNzArIWezp07iPFfw/QmZPvCia1 jGnpIVJ+GKUnT93hdFf5uAVeU+jNvvbs6ZX85hFGDQ+kRzqFPLN/BtjqCIiUrB10MYkB s/39Qs6zx2MWewl1H/CCjQRMuCAYdwPj2HvY8FKJFdElDXHSgFzwfssXJyAIkQOoo1a7 dB1kS0CfPaWkvhhPC0LzIiJg0mQN7WobyKOCIMDvV0W08zXXfegCtfks5PZdf2/MYBZ8 JQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3c85nsp8tn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:05:03 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1AC7uPjk135522; Fri, 12 Nov 2021 08:05:02 GMT Received: from nam12-bn8-obe.outbound.protection.outlook.com (mail-bn8nam12lp2171.outbound.protection.outlook.com [104.47.55.171]) by aserp3020.oracle.com with ESMTP id 3c5hh7se94-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 12 Nov 2021 08:05:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hjn+RwxpHQMbJl+bWAJewqTfFmcs8pdo5LIODod0l9zQ8wOiA8nG6cXaBL83ZjxnYaTx84VXJ7bEVdnONVirpVbWsjEt7rlr+NV2Eox+ZEud4vHb+vWZolmNQUYd2ca5xDEYfMJIcL/gGiPBZiv0gu/RlyWgmt6jXYIMzimsZJdR+eMFAKskWbrtZdHzi9EpZpl1AiIRuDz4pqI6QKThH6VHezw98W7smrXx7mZQZL5xjBMR8shwJkTsupqZ1ilR6QvVdue+H4Uy+NeoJHsQNfxlysFzgjO8aFNiyWYLmsMR7++0ljjOCau/u4rC3xyGmgYSdXG9q/O83kUPcW08Fg== 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=UvwyQMRusv+o34X2OvJZY7Y6EhyNifM819wzUq98AsE=; b=ChJJItvcG2+2RiiF1owZ5CfcDQatioZcuODSE+hPg7EHqXBTH+nVQHzcI0ImFiiiHRqQNahSq9/J1x394Iy2ecLOxNfcnqFH/L9F3wKNc8gKmhlgTHBnFjgHbSdxPBBfCr2A7HnBj7PMgs9Y9K09pJbpbUNphA4yuzqK235i60yNn+gkx3ptwPQJZrcAQzvyDQPRlgLJ3qJZ5EhTiY2JCnUPv3NX+oSc7IuSLkT13Ti/QxsMxuj6JTzK+7dmh370TLUuJEKGcUVmuIJn2nyWDXkSwl5DAG7uBzSJzEX1bQBZSLYZtxQli5W/sjdQbykEs6wC4JLMaZ9PdacQq68r+A== 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=UvwyQMRusv+o34X2OvJZY7Y6EhyNifM819wzUq98AsE=; b=YWpJtvw2MufEvddpArmXwStyynBUgidb1bUrbR3KsU+1x/yC7dbUaEinUru7cMalN3XGPVWUd1U/m6PyV5wjJMbUm02LyR12f2V48FybQNVWbvpjrN1hEvlHRw1s2q7B779rj4oiu0szHW8w9mYXVhuAj5Z/5i4SwJUKE8qjuCo= Received: from MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) by BLAPR10MB4980.namprd10.prod.outlook.com (2603:10b6:208:334::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.17; Fri, 12 Nov 2021 08:05:00 +0000 Received: from MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038]) by MN2PR10MB4128.namprd10.prod.outlook.com ([fe80::31a8:a8e7:1ccd:6038%5]) with mapi id 15.20.4690.020; Fri, 12 Nov 2021 08:05:00 +0000 From: Anand Jain To: josef@toxicpanda.com Cc: dsterba@suse.com, linux-btrfs@vger.kernel.org Subject: [PATCH 3/3] fsperf: add a new test case diorandread Date: Fri, 12 Nov 2021 16:04:39 +0800 Message-Id: X-Mailer: git-send-email 2.30.0 In-Reply-To: References: X-ClientProxiedBy: SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) To MN2PR10MB4128.namprd10.prod.outlook.com (2603:10b6:208:1d2::24) MIME-Version: 1.0 Received: from localhost.localdomain (39.109.140.76) by SG3P274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.18 via Frontend Transport; Fri, 12 Nov 2021 08:04:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1066eef1-ece2-4dcb-eab2-08d9a5b31fab X-MS-TrafficTypeDiagnostic: BLAPR10MB4980: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5dl4UZDs9Lk8EKJCyxgUi00kxk5GcXilweO8r8k3qzb2429rClY7CyWhvbZCy8V+imFf8AS0LoXEnWXYzRi8rgAendpgHf0VjLQu5jtiaK9TqheWF1RVUiIWGT+Rf/dWXXccKRCbt1KPkYclrGdvVpZlC6nIEg0axSEe6STC2+GrvEXByj5tIa/ORmPedILQBrJkWbbbz7oAKvtipHA9s3jT9iXdUY/y3G48wBD6Xyy7RxlK2ucKBuk7/tVdHcdwuhTvkRaidAqGSr6lCQH850yaYxdrk/Ekzaekk0LHkQhq29TOd9VgxBGY1pZU2Zt92VkYbk9F9dCYXT8lIgbUQUAyDJgd7LlGZ66HfERhlJD33X8sMC0IVnftOX6VeASli74KXd31FlvnCluVkj8DReUmN6U55JbFsRxAB3zvB/yQUsOa/Huq/BZ5Kqd52bHD8M8vBXQPUwM9mtjxSOcxtmjmttw6FABQvF+bHjfbx0QTotX/uA3jtV1tJ71wmvpIkkgNk6BUA9IZMUmFzf70szx4FiBHppyOd1xn3LLNQKTO6iXknmhqwWAqDbo2BQgs22CFuy/IArcZTKRE8IX0t61PL8ncxsqtfucfNSMD/XFEEUZUCwgi/xwyhupUahxzM2C97wiN94c2iUGTFiG1o8mMfLOMEob+YSyo6fAaImZqAdVszvVCA82bB4EKFkMl5MSn4r8AOcf+5aOhwtBFLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MN2PR10MB4128.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(36756003)(6506007)(83380400001)(44832011)(66946007)(52116002)(2906002)(4326008)(6486002)(508600001)(6666004)(38100700002)(316002)(8936002)(38350700002)(66556008)(66476007)(6916009)(26005)(2616005)(5660300002)(956004)(6512007)(186003)(8676002)(86362001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x/z/HNsm4b7J+V5cHb4LhVS34352hZTmQspCSKxcrx4BJCoo9xVNZ3WYhvN5bDYC8EaCizeMqST0pl1TNO+Wl+iAc5eBmJZnqEVRVu12la6CqkKjowFgNbYQj6hRL5lgrBdsqhcKP0dmuze9fpJ/NZZflaCJq0SbNIiSuaD/pERVwNJTeWkIPZByc22t6xPSguwJ55j0oospb+KeUAzPZTKte9hkMr4ZFKlpuBuE5wkVqm9r8vvMkCXn0f2MBJ5/ykBHsrNLH3rxwbU4yNwR8XD2uZLcqYB1ahDtN9dGgkKeIF1IodE2662ZgXl1aVnZpOw9GhC39+KUD+/oXnIh2QxwUIOrefSWeFPYQ0pmW1XPgLg/9FDJACVd8HQtGUu+4gN4ORe0Gjmr7vnA0623wlqN57vkTWikDo3cyPTyp1V6MWHF1/GUUpL3+jD0d+466u6XrVavQD3uPY4b+5fcqlcALwZuuIW4EfS2DN734VpqClkmseDU1APSxsItCX8ANktKskMjsj3Qpp6kRR+r4W5t7qsRWUs6DP2mB+9KKfJcCAikGNpxepBzwpDcyFnOG4gxZszL9IUjF1TQnbAxlGqg1sCkfFTVyXqmjD7wKtxhZHSa0EerYdctnDJLnXoORAXNB1bG2PbRKCqtoHprPr2mscVjyAUe1BP1S8ekLyTiaj9k8NXY2Jltb4IPv65Z/NPtGYxKx7rHwwsFK9rliLrmkMGQxl9iLUUom01Y01MRAHdd9ODVEn12q1c8qskBdTh8xz4DjrLRq4mmP5Dygqq0sRxXpL+mD3AhPZI6W9Rp5k6fIDprlqJFQ+ekLZN5W3QasIV7qu1d/VufDRFW9v7/DuJF1h5RHXsR6z1HTzASkY3WBlSfs1WJiCkikWyZGE04UnaC/zOQBtlHbUfXQCCiNS3YS1nSvQl74NlKOi8amUWyV690Ujz5X21OYmx88R5U0awR2rkCgxsSTDSF8jl+n4Ep8rCrrrChwIiQyTHFqR0gV9MH40lfY1To9pioYz2UJcYVqCJsrd+t1YPUejl+7HF/npUv966wOY+tsHAXgVrtKjGW8n1csTPMZ3gWclQ5cCQSC+FvrNoK1r3SjcRURiO8AydFCVj7TXF2fbGO5oliqt/xqa65Q7lK0w8lT3+jmWft59UIeLHNlQxr30j+9lPqMHOnvs31se/RrggvYW/SDbzCuv+A17Tb75g46k+j3MlcnyM82m+uFdIZ2AI0Z9DO+2AiugiLaco/7D8GVZ20ylnL6yhltnNtdY5lQf2uh34qPzQjhlBplc9WCy6Zs5UAfkjRuvPoxpFwjJ6LVttd3JbZVA8qQGyybFeFx4ZbGBDuEG+SGTTTHkFpuGibGPu681ZMqdZ9lIfr2qYajeiMyEE3byhDb3TtE6xa1nq2TJt5Ph/mZ/eqTZfpkFRUObnPvEG2jDLURPMwmEO6egCoQfmGbXkbzgsLCPBRExFIB0WJsK5j7WYDUh/kBBiqmG0cpHhBMJ0SrZmZ+4dD3R4/yKVqX6ijOkDXLbS7O9Va4zquMgIkoqejfzDM2UR8Qa2RfWbGkk7l4ocwUHNEcgUkDbpjfKRGVOOAeySAJnZPrfGSVLtQuAidhPay1qZVsyRoBwswrM5uFWckO6c= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1066eef1-ece2-4dcb-eab2-08d9a5b31fab X-MS-Exchange-CrossTenant-AuthSource: MN2PR10MB4128.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Nov 2021 08:05:00.2857 (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: r+8pEY9O+tgFXSW1GAZBWXGgnnO3YLZp/nzBMeacv2PP3uDyumWzaiC0sqIq+t4zYrG5/YAvob+6hG8azvCMOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLAPR10MB4980 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10165 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 bulkscore=0 mlxscore=0 malwarescore=0 spamscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2111120043 X-Proofpoint-GUID: fGvEr0pku_4GXwdxvpwtsEencpPhY_oG X-Proofpoint-ORIG-GUID: fGvEr0pku_4GXwdxvpwtsEencpPhY_oG Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org The test case 'diorandread' is a readonly direct io test case using fio. The primary aim of this test case is to benchmark read policies. An optional read policy parameter can be specified in the local.cfg file as shown below readpolicy=pid When the readpolicy specified in the local.cfg file, the setup() in the test case using it shall validate if the fstype is btrfs. To compare the readpolicies the developer can run './fsperf diorandread' with the supported read policies under a section. As shown below. For example: $ cat local.fg :: [btrfs-pid] device=/dev/vg/scratch0 mkfs=mkfs.btrfs -f -draid1 -mraid1 /dev/vg/scratch1 mount=mount -o noatime readpolicy=pid [btrfs-latency] device=/dev/vg/scratch0 mkfs=mkfs.btrfs -f -draid1 -mraid1 /dev/vg/scratch1 mount=mount -o noatime readpolicy=latency $ ./fsperf -c btrfs-pid diorandread $ ./fsperf -c btrfs-latency -t -C btrfs-pid diorandread Signed-off-by: Anand Jain --- local-cfg-example | 6 ++++++ tests/dio-randread.py | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 tests/dio-randread.py diff --git a/local-cfg-example b/local-cfg-example index a9034f98fbee..4b7fd0703feb 100644 --- a/local-cfg-example +++ b/local-cfg-example @@ -6,6 +6,12 @@ device=/dev/nvme0n1 mkfs=mkfs.btrfs -f mount=mount -o noatime +[btrfs-raid1] +device=/dev/vg/scratch0 +mkfs=mkfs.btrfs -f -draid1 -mraid1 /dev/vg/scratch1 +mount=mount -o noatime +readpolicy=pid + [xfs] device=/dev/nvme0n1 iosched=none diff --git a/tests/dio-randread.py b/tests/dio-randread.py new file mode 100644 index 000000000000..05ced875bb6d --- /dev/null +++ b/tests/dio-randread.py @@ -0,0 +1,22 @@ +from PerfTest import FioTest +from utils import get_fstype +from utils import set_readpolicy +from utils import get_active_readpolicy + +class DioRandread(FioTest): + name = "diorandread" + command = ("--name diorandread --direct=1 --size=1g --rw=randread " + "--runtime=60 --iodepth=1024 --nrfiles=16 " + "--numjobs=16 --group_reporting") + + def setup(self, config, section): + fstype = get_fstype(config.get(section, 'device')) + + if not fstype == "btrfs": + return + + if config.has_option(section, 'readpolicy'): + policy = config.get(section, 'readpolicy') + set_readpolicy(config.get(section, 'device'), policy) + policy = get_active_readpolicy(config.get(section, 'device')) + print("\tReadpolicy is set to '{}'".format(policy))