From patchwork Thu Jul 11 08:23:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730186 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 550C01514E3 for ; Thu, 11 Jul 2024 08:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686248; cv=fail; b=SpX30/Ukv+mzX6dojUvyG97DYlx1eHFJRml6Pk8T4X21Ux4e1Rb3pC4MeKQkagHX0/DSIoE5S1RFts5rDX6BHc9PPHmBa+oEI+NvJYEFW37bNYvgO+HPinoN5n/H+jEogT9x0uFAMmPnLyeSP42JIbsOGSboZIFrnqCK+Bp3snM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686248; c=relaxed/simple; bh=ja1qi3Y0t9LYmOjADADtqHqB4whG/93eYpN2gGDayr4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=qz94u/9/c7AU9mc918j9/DqY8BeDBSDKdqbfOVyrjBQLyTBsUhQZ2EMq2TurbtaAn+LnGgnjEXtC+MAiWwoQ3OP5nhREianEQfh3S4PbmhG7/t31Bt3EAEjXoM6e6enbeXxAfeTniaqBBv32MFCC4C8zpfkEfKRX19SYyTgqNHE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=aglE+P18; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=g1ALvMFL; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="aglE+P18"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="g1ALvMFL" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tSJT026752; Thu, 11 Jul 2024 08:23:58 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-2023-11-20; bh=35Ei0gnRI9bn1llt0A+E8EedvnbRXVdYM+a0zGkZonc=; b= aglE+P18aLEvcOIcJpAZi2B5J8zwWVxplD10D8+LJqyF9ejUzpcy7O/vzovMfOod 5unpvHPsrqKYK/owPao9lT0grJm1j3+t5P18DmJdkYSnFcnIjVH3FQGPphYZeCaf I2+07g5qO2FHxMrTF1mgUu5f9noYMTas6Y7VkWvLAsvd426ib9Si71WkXZi676y0 pg+tydsgHZfrWW+KXj3vrAMNTwFn7Ob9hAMOVRQoetKggOZa7j5pA/6A1IqLY+xS ZBs6dw3nM/B+t69x6FbGmaorB5S0j8TreDokXa0BZ/5Szn6ojhZWboKPIRq1dIx/ S0v4jsIITb2lSOUybCd1tg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkns2bg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:23:58 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B77r7o033812; Thu, 11 Jul 2024 08:23:57 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv1wsge-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:23:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=F36hB/fme/CgCZ82RVdHd34QBCfHFBcaoyNxPnN7HZ9tquQFfcGou8A0aKBbe2wweQ7uCGuJrpzjaedYmCCLrNyDHuFAUOuwIKYtTtsqdhwJhGyx1AICHLYgb8fipTTLBxWMofbTUp4XyNj4C3linbvUooVlEsJvyrFn9ZtGOdl/GIncyawvTWCjCU/nh8S1CRlXRghwRB0Al2aO+J4WWzyH6slHSuJvk3c49RyVNKgiCq6u/5f2YgHA4ZQDPi7V1GQZS5s1vIjfvwZgcsW9w9L92Ybp4Teg4969i99JUiAiZ5fgbcV+5AanOKXVksY3LiflcP+JwhpD/Ye5VeRrbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=35Ei0gnRI9bn1llt0A+E8EedvnbRXVdYM+a0zGkZonc=; b=qkxowUrN2oSf7PCLSp8ji/m//rEFKSv8GEX8Qo3v+WDyIrGw8d8dWa2nZvaFovc3jjreeF83/EQY+aH81uO10kAMQ3uJNcjCJGa/Y6uvPWN7weGSZevK7GrUyTg8LPIaQdVdZSovHrKoYzYIP4siumFyuBPudgYTSbGK44PkF0JCFOIjDEn5yfmsOOYtiadVuwCNSbcNLk0y/EUav7GSXfbh9nFaVLPHSS0bQ5x5XfHpCSls+ukaYHFqb731Fd5RC8KFEHWehXD8YiDqaui9u8xLdVsLzlRHQ5qlimSA7RyobnzYEHxBsKh+t788+xjcBeKW2GgCFvlpya90XQbIWw== 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=35Ei0gnRI9bn1llt0A+E8EedvnbRXVdYM+a0zGkZonc=; b=g1ALvMFL2liWK3kgpstG7JdaDe13xdlXwrp+FR2h0ama7fx+6exskLm7t5QnGT2jHYBSXBrLlERACXwa5mN4egx8ZPtJO/u6gBXyw1C5eKUOjvp0tqReN+7J8QN9Wlcie9WI1nnnTKO1VaBmSWWSWDDJbDaFVsepSqMD7h9hl68= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SA3PR10MB6970.namprd10.prod.outlook.com (2603:10b6:806:315::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34; Thu, 11 Jul 2024 08:23:55 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:23:55 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, Chaitanya Kulkarni , Bart Van Assche , Johannes Thumshirn , John Garry Subject: [PATCH v2 01/12] block: remove QUEUE_FLAG_STOPPED Date: Thu, 11 Jul 2024 08:23:28 +0000 Message-Id: <20240711082339.1155658-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR15CA0045.namprd15.prod.outlook.com (2603:10b6:208:237::14) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SA3PR10MB6970:EE_ X-MS-Office365-Filtering-Correlation-Id: eb0778c6-0599-4677-a826-08dca182cdbf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: 6G9O+kuvykN5UeU6W9qT7d9zOYts/yTm5uznzaFckDIRvf5FFvqKKQI01Qq3jB/W1vPxMXoJZwtXMzxM2/o9yCeYIieajWFzkqq0FB+XRPYeQwrC3Irw86C+GB9w5aKahqGogsqp2xgCkTpSF8Ztx1y53hhGiARDFqu0HeD/eR1Sx39w3V8se62VdiP01+tePiXHuMCS6bB8ps+ITdwazAGBBRixzTG29QHBHJWotjeQbmDA2D5xL7Cv0JiKVOsRopKKGtU2QlusWkTKXuYzH4N6ViQSdJXABJSun+ZYouclaof87PM+Z/azbTUg2JBXkbWj5nHQz2ZmYHmKJlCUExSaMJG+99pBIeQclqO04UcdABIGwmtR7XXTtzkvcnt5GbmraooJKeDHbSX5cXI1n8JNVAr0PhnSJkiTkrwsE20KxsAj18FPhGniG+pNbo5IGk3FHDrxoz3C4aLlsbFs8pflDdaXN51LhY3JwcMYZiVv7BMtCDudh3IAXfGd70B8eJYJK0lLiMJ7W3VQz153OpmsO93yDqVSuajIC302fB0fzFmASPxwtDnSaFcW5Y9kE/uOQe1F6/pgCt007/XfHzn2BsaO5SN7/Ub6TZmUCarcSuRa3gFPIn9Te/OXo2hEwi+1ExZ7meRQPuPWEXBozf/IttuyFP5cZhjwsYP7kU0GR7YR+tM8cUmhRED3zBP1H0rGFKFExLR0QcDFn07b8PUUGdu28dvW3mgCOfWRwHgbGT8eZKMNhbACQxzOaAd28UVoZCc2vSLeNrnNQFxX6Wn7r2ey21DCrSD53b/+w92AQXHuE3eTioKCDlTFOpT9EEH4j1giQHnwUvPCOj5+HxaeLakexo2SaLvjCSHQbFuw8WXDKvBeQPLRHUWtQYVjx9mfJor4wLs4h5KlPQ2nfShqa8YOgTedZW9inyQ5xxLlFAW+eKqv2jYPTSLq2oY6CbwUk32MWRY3uGOEsWeO/rKkqcCih1fgpnRI4fq2344YuVaPqxiPhGxmvzaSHKpYN6B7DSqNavAFhf1se7dVOr2GshMRLCaPU2H0yDubypIHSjk+6mH8966/01DUR/3ap+zk9vMIPVmMM9Zni4qhu4urH3gUvKmRVgbwgFjs4il0GujVvWEer+jV7ErKPrxk0ap5G6cI+lLcT1/ZJeoLTwS9RyFaLoKeCf6f+9ml0MLOG80oGhjzuuhZ74TXGgjiTEybHjs5HyEaG+yJ4mHDKeKzGLgt3k6hC5fM5fXSdsp9z1eVNMGm0cnRs8T60ScJvtS4hLOigDT3ty6C03gLVuetDDOyCCLOfo2gCUZR2VQQOSTw36ESMuGJJSEkpMCOFKksAdUY/SUjaFTZl/ftzQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8EPs60pX/7NwPm+2i1G3lf3mt1CzoNScXmZ7jhPbJV7UlUE4Ao1uiSkACNYBCHmMBfNyPmphkGDmBap2znKj5odiXJQz6rP7Q4o6czmV2+xk6goI55+T0myNxn4IfilsNWWBxfFnbSVOU5i4X+ywrfuEUviUYdUlV3h1ZsxrATNMyiPXAicw9nzLbV2lJRo9hMWUgF4axZj9nz/Jx/eJuzCceicMF0VuLSk2+6B+JMljinmOF3BJLBdTPrmBpiU9vQbHJxxwxLKqV89MYiEeV2cIRQoUsUbbw0OYsN6S/6Q4nk80FDL/a/xiJuf12jtdFhtrjZ3GtxIPMyrX7c9PnNICrGuxX+kRC6pu+Nz+H9cIfTyYWDPomMyNdpnrx+IdWWatqKnjpJvl5NQzaQ0dZ4sx6L/1erggvRmnqoOm7JYbLKxqSZBRwhForTEfJAVgsdVuQi8PuPkmX9/rDKdf4GYMwTKrxdQFLGac0f1wn0Aywnk8kBmSbF5hNkjICwM361dt373nTs9yKPpUM3uzDUzlm0I6rW2nPKSA5sNqX/d+jgkKSt5CNSDoLRi0UPz6RZ5NU5q7UGlHxGX6wNCrsXq5ybBA3MguBZDtW3S+fx66g+XrQAUHdgOkwzlyqCJVw20ZwItPN6JP6FvD+S9I/88wKv+itU2v2h8xO7G7CziFz0+0tDqVMxbdHFdowoJfF1bU0CPV86djFaQu8yb8AWo+CxKrAn587cDijvp+riFkEDHv4wsZ58ySvK2fYyVSiFa4HGjp1icc4KLLY/jYIoLfegFVG2sCQ3L2IQSBY9fus5fLUXEGchpeRbu6nrvzScQqrAe59RpEesyhxuaIxUSwnWASPWirlzkywimP0tJadxqBcsCdN40eojjNuZhDGYBxgrwiqslx89YTKuLz5wd1fUCI32UhNFyeEL/g9ssW18rm6VBsfz5dkmYijneNSKoWEnfFpBIOswDmOUG9ItQc6UjlQRM0bBn7ig1NBhVwNcNsZjwFf7wERxNaYhwvgEiCnCsNKH4lod5+lLvklcUGJff01+9nTyXQ7NX3iXAp/0N+ChJrrfilKAcR+YFiyIhBJxT8j77KVusTi8TXnAhb7Hq7NyIXwzK3GDXb/7DzxcFcUHY71gEYfhh3WT+DY3gmwNPU8v5Kxhxz3X2aVJljwcZ4rd+Kxuk2pB5cTPF3f7clygpQRt3puJ0ClII9bSpbggRhqywZoeCfaV62lOl8fsqPhgXWoQqHiIZ7Aqfctdhervssr2bNwQKKknE63FbQ0d+Q6aw8960VaxiQK3pE6S7zhHneFipXTe4iEdPZRSJ7P2PrDpRwIjCPA3jBTPuNyq9L39QlEc66GUayDe0QeIvtXVExwUWLnHDb4E8ghYCynihZrhDgDxbsO9IBK5sLI+Jj7bNYrXWNGUeQbgpQ2rdpcxvnYidOQOg2+yBs6G8hGYQUF3JCkTGlJPT43qdvy9cW3/sVdaRoYKtxCvzmQxxezWJIrX0xQJYUo1CTrLpOPVD9Oalqq3NKiNA9XyFRYNcmZDzvGD0cMFqBPL+LsGaVQ3Hy8Be8ramHkUl2h4nEmJX3+CiSgiZhRpWcfuNDLo5Xr9+iXU9ynWgTnA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: o6+a+uGOM+63ivW9FKl/HCrQ6Co7uDXgrzmnZFSldZXWrvgEa/0HL5nM76U9FvE0mSp29HE7uYa08a23s3AwZ6KQg/eN+N2Q4W+0+e6SzPk63NMXCsGxcSY6oADanHXdDrNFfZpqdsTCq8Bkf6GDIVppBR0xfWzb6yDf2fwC7kWjWK8Ig54evXzEwcjicY05xxW/+dw8e7TmMGyPQBbtaCN/Zowy4et4YtWd5XhOX8Q+TzVbywqJJM2BeMoY8rQONiPpq3IyfRaDS828VLqYAIWjDQYONhTsPbW5WK+fEQhVRy1a+syIv1X1QHmjwuXZnkOQobo2Z/7QYAQjLlHcZ7HcJhvarn1MsfMo4WZjEHCxfQCRaEFNT279/LGkaadRbm3DtfA7sHG4i2sdH1wABmAqDaEx7TScvSBaIBXiYJHJWtYr/4yCDEvN2NWfU+dUCdGGCnp66UTQw5NchOfl6tgAjfTZFtJL/a55VmQwkdmi1FtkgdEDY6Y355EoF9tuogia4H64mFu4+X1/JglzeDbnn+l/RTl2F4h27MKL860LoLYYilIwF/sZs32OzgRzNfikEoBESFaCyTUmvEBQt99Y0dN6VRkN9DMJ1p/dSnQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb0778c6-0599-4677-a826-08dca182cdbf X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:23:55.0503 (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: ielU4ui1kqpZGwvTwiXhYjIL/qnCF9O0FWfUU4Ej6ZHUoOguzilIzYy8Zy4hTG8lxUcS1zrYiDqoJ6NnWGoeeQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB6970 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: m2OTZMtUR-15ZTBN-IJ8EOXgIoQEMCoS X-Proofpoint-ORIG-GUID: m2OTZMtUR-15ZTBN-IJ8EOXgIoQEMCoS From: Christoph Hellwig QUEUE_FLAG_STOPPED is entirely unused. Signed-off-by: Christoph Hellwig Reviewed-by: Chaitanya Kulkarni Reviewed-by: Bart Van Assche Reviewed-by: Johannes Thumshirn Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 1 - include/linux/blkdev.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 344f9e503bdb..03d0409e5018 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -79,7 +79,6 @@ static int queue_pm_only_show(void *data, struct seq_file *m) #define QUEUE_FLAG_NAME(name) [QUEUE_FLAG_##name] = #name static const char *const blk_queue_flag_name[] = { - QUEUE_FLAG_NAME(STOPPED), QUEUE_FLAG_NAME(DYING), QUEUE_FLAG_NAME(NOMERGES), QUEUE_FLAG_NAME(SAME_COMP), diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index dce4a6bf7307..942ad4e0f231 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -588,7 +588,6 @@ struct request_queue { }; /* Keep blk_queue_flag_name[] in sync with the definitions below */ -#define QUEUE_FLAG_STOPPED 0 /* queue is stopped */ #define QUEUE_FLAG_DYING 1 /* queue being torn down */ #define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */ #define QUEUE_FLAG_SAME_COMP 4 /* complete on same CPU-group */ @@ -608,7 +607,6 @@ struct request_queue { void blk_queue_flag_set(unsigned int flag, struct request_queue *q); void blk_queue_flag_clear(unsigned int flag, struct request_queue *q); -#define blk_queue_stopped(q) test_bit(QUEUE_FLAG_STOPPED, &(q)->queue_flags) #define blk_queue_dying(q) test_bit(QUEUE_FLAG_DYING, &(q)->queue_flags) #define blk_queue_init_done(q) test_bit(QUEUE_FLAG_INIT_DONE, &(q)->queue_flags) #define blk_queue_nomerges(q) test_bit(QUEUE_FLAG_NOMERGES, &(q)->queue_flags) From patchwork Thu Jul 11 08:23:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730185 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CB51C84DFF for ; Thu, 11 Jul 2024 08:24:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686245; cv=fail; b=pKK5Rtohy9hROitpe3xjvOx9eVxsrzv2Y017IX2oJRoGgIYUac4xAUMXIymnsPg3jYM8L+eWeXz3Il/WjG0pkpkTKvBVY/sl/Ae9Z47n0dAwOvnrcTxOKFlVx5rob819d+hgwWg4wKxg95CFGil4xuJ19eG3+x4FYkrmOAF1aNc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686245; c=relaxed/simple; bh=9sqXZLekNtaGSOC6zW/egS5HjKkoYFWlyZ684Hze1Xs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=YyJ2iKKHtl0Wkw0ZR/Z5PiZnA2VN8r128mPe2nYUcRuoP2LRxMHMXVgptMHE0IJ3aXjsHU3AcY8UckvNaVZMYH/eeio47tBTXg9KbWMujlRReh3C1nXyKyPC8e84wdpUPOijGNEI1RhFkQGADXLU5bdUuua92yCd/LUT9OTqJnE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=kpsP8+HA; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=f5WT33Ti; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="kpsP8+HA"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="f5WT33Ti" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tU5t016832; Thu, 11 Jul 2024 08:24:00 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-2023-11-20; bh=QwdOqKpvTVnfd1A8EYWwsx43OdRgcMdRLKimplroUXk=; b= kpsP8+HAeLE7hggi2QztIVKm7/ef+Kuf1BxGJhzOTdS9qMx2VqzpleYIw6mi2zAX KUvydUw4wg6N6XggY4fMMIGs7jP8z93Inq75ov+vmHn/dysTQdjSqEylegMVRXfJ N82OxyYebWaqIHTqWtmYzRSWZevcoeBAGZadHoVv4lzp6yppGkg9+gQhkd9sAaCd 9P5sJClbJEBbCY0dFFCX1Qz6f11qjrybPdX9CDYRfO3+7YNQIinXgLKasM93Ee3M vRk1aBvk9w817xjnjWCwZJov8VQHCiFj4HbciAnakXXyH7fWP4MyJ9SgMZpqpLny DQRmDzABZUrx7/Z9VIfefQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wybs4p2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:00 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B6rJ2p008700; Thu, 11 Jul 2024 08:23:59 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv47894-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:23:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cQiBj2OLSOy/HVy93Ks23IiyGkIOD7CreYSqd0p2oU3vjTj+4jc6OTZ5i88shVWDsWlUnejAS8k6MdNOsABlsERsr3jQlQYh/OMAQ8XTVcfJA83VJxeakVhLguvCtmPNVX8OX04bgBTQ+H+hHXzL4j8odZ3aFfYy+nec49+hwQ8tscA6x/ng0Kx1ARFvtFNMJI2A1KC8+l8LAK+2Xl+JiZzDJInBVxpb306nlgRd7RQnKo7x2zy+FaK0ELITJQwimhElpS25EJnnLzpnV3iIeeuVWu4lQi4dcP9A4iSCuE/kZVExs42AjQO52A8TvJxukNZt35q2W7qC/cU6cdmrWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=QwdOqKpvTVnfd1A8EYWwsx43OdRgcMdRLKimplroUXk=; b=riHzIXGo8b7pWsEXFnC2WYZRtDbs12S2/CIqcGRiO2/cbW97b7ncxuN0XYFauCdIBq8HumyH1tj7hQDnwLYwbnAUq44my7NAwReo/DV59obWRZIsq0tXzT24/oUF/A/92frgSG9f9ZUkv3P88m5vITFOQFA0OXmobXTdgGTUKnq7iIwXdEXYfMSuzVOC6semG7mm+eIVHG3CoMSCcc5+4+r/FK+9SMmIx/ZJ/hlo6wPMePgnY7O4VPMCpsQWI0cGm8VwUY1VEcZmiC39Q3WTvmYih4sU5C0kWt+0DqYx9GsqFqawkvWu5aBpFRqXllrdFNbYnkLunaUjbQ7FDEZX+g== 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=QwdOqKpvTVnfd1A8EYWwsx43OdRgcMdRLKimplroUXk=; b=f5WT33Ti5cQ2DCBs3JSB+UoEl0MSlhZHxjSY/6FKzA/I8i/BGDLV5DGxCc1sOxcejlTzoeUayqTcJLgyqiJevB5WU0wNVCF63X/rg6w/bdGwXV9kpTrt3XFqYppHcCfh49c6wOMKB90L3gM3gIf233QIb5tpJLwCehQY8iHWoeo= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by SA3PR10MB6970.namprd10.prod.outlook.com (2603:10b6:806:315::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.34; Thu, 11 Jul 2024 08:23:56 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:23:56 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 02/12] block: Make QUEUE_FLAG_x as an enum Date: Thu, 11 Jul 2024 08:23:29 +0000 Message-Id: <20240711082339.1155658-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR01CA0042.prod.exchangelabs.com (2603:10b6:208:23f::11) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|SA3PR10MB6970:EE_ X-MS-Office365-Filtering-Correlation-Id: ebdeec26-772d-40e3-7009-08dca182ced0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|366016; X-Microsoft-Antispam-Message-Info: zSmir29ywoJvz0+pUTj+zcD3VFY5Tf38nixTQQXUG2u9uUjzliWj9syMhDBBFze0+JPxkfIXfVQM+BPUqQ1A2NU6IRkWxi7nBgKXr16epO2ws1JJKcV3qauGWXcWtpYh+rIpgRcHwIXHyaao5ONS4XhYIOiA5zIngB1O+11DsYWEIJ4MMXN/xkjOej1Ob+MMo5/Dpo8gph65Jsbt0Gmu3CikTaToRAUs3YUqdvce8VAomB170u2NfVeIWYiM7PBRSaEO0ysMwvT+W95xTpi40zgEkjtOJ8fFBICNXRSfURuD8ExIpHdh/c2bCwbFscoollv8SIZee1033ZTKeanCl85WG7Xzn+LjKZavUHMmyx1nxoFr5ouORm4tAgRS2X+naHWuPQhDZUB44YniGVlX7gD2gCGwX4/EVm+ebG8MpLJskKtzjt3DLAKiURYfP9zxwtOe6N1DLoyRp61lBErD9yYIutiEfGK6k5oJRxwpA+7PyCmg83KjoQdcPLfhKza75/edBIEKqI9ANul7MizcBjo+w79vIta37UXFqbdq/FdBmjKVNe/M1Z6V0gaz+C78KpW0thhWK5fFLNE0/mwJT2b0pfg74ImeXX5uFjgXs6HTE7oMDYWHKdr8e8LXCYaJ2+aR0jT6c/X/MwKwaSq9vVFu4CV/ON6jAiBJktf15UUWEY0tm5cfijPmItK7hvCEQVlC+PjoInqYNzaR7Zp8ObHeRWn8E009y2IUYrL6R53oZwejWLSdsVWu/u60FVay4fQsQb4t+6f06CPOoltUhe6MV0be7X2eccsB0p6lrWb4a+H7MkdFTW28DNFedVyHmfwVzobvK8QIiSQ1417fCRSSn2/JJr2TQRJjN6NwE5xWilgHzK91olr5KcJ6XtCc7QM5aKAhbXB72KZeo1I22EC+ognPBZ3Trby7ZuKAmVKu0dmhusZ34lg8JBuyAGiyWkuJRrA+nx+hbf0uvSy+2KBEvrzHdxKTocUxLoNXs8LzMSAqrBSGQaBgAO15wY8jnNf80SMxOIs5qoXFklOekQ13hwgOFrtClr1EOtLR8gJw+Tk0qdFuTMU0krs/eMld4Xw6SO8k49tSJfLHLeeo+W1CXjhSasyXV636+iwE5L5vhaaARRnKs6v/T+lb7EohrMMdUBUJBQkrkco9yylfCZ8ajCjTWF6FW5ktnSM5lPSsMr+zFfEo148sRQdf02908u5DJIsyCC/1S8y1V6qPcJnIuBkojylZpeM1RwUEZm2cZQT6UKtJZeGpT7XvsoC/4tuRQAkXNoWkyJkTHSPByBr01N/80q4AUcL1HteymYhVuX6o7YY5RxtvvMfDtuz4Wg4IM7M1jFKXEQ3NCTa3qg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(376014)(366016);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zpM+ozNn/VbpdqAs+CvFZOhhSJgqHpO+XULMNj92ei3j8uRLSENzJ3Z8yH4MdUHUqvKYlmA+nC9bAf3P2iFgpVyaZfCIrtt6hFRMXo18JMa1nI7snX7YsB/1Vpwp7MpF9wBYj2SB63Hgaksp8dd+mqONqKGL7N9Us2v/+4MXEOdElgnV+DmcJEr+hSvisQhKbGDj2H3LYsvGlGsaFzt4NcJMPHDkVtH7OVfRh+30kFmqwC1kXDAF1q0nV5mGIoVTjugxYsG52zgSrkvm69la8ExzyuuYadBP2+4OBNL2S5juYtEuc+5GrGFrtHy3sLqlv+MXOPJIZgo9XBmiQdFc2BZu9TcNuuNb8d1uHSgeSVxZIdvXSB0KODS0+ne1tRWudUGrSvbbdutyyqxfEZ4OsIN1H7UYw7if/1IcWGGR4DjMBsj1f++nIYZVO1Ln26Bwlcek3HERSUeebWgSoxSFpDynhXzSa4muDagdi26sgGOJ1HyAkMmHgaud9J1sAA1a4PIrAFwI1NJYtpXk5gfIQnJAxQmlpmwDupfPXE6b/ezLc65YdfKOheniGqaKGiNF/ONwaTYQvWdx6zKItu3gQJ4lsp8FCX4UOtG12tyP5ULwIhXj46bWl95JLK7FSlA85kAjI+NEj+h3Q7gz42UMKI0O97SZ2nJjkmuCjBOuDXjuTgwIjMQRaNT0RNu6KzBQPXQdHXShnfnealh+3s6+RxdrEH6ZLxMMaCpKrNcc8C34xSyNmzWjC4MvIsLfv6a1fT1qZU06uImEO0PId3il4miGc/9VJLjzbGPqM4X+GoFtIL4+XnP+pV7kzwaDsUo5p4Z83qZV0jbPzKNTO60sO5Df4zZbRj8+iVFh3NX0eIUyw1Q+/jGLTfBaI/uwwSAt1gJS+mI5RYYb9jZnSzjTXL3ABu/g1h7CZ9xAv7/JHdRaWAnC0LSP9NhSuKpA4JUUdtdBwfhhjyCQTy/C9uNfxHkbMrbGh3NubBIPw2nn3xjy1C/J679QIvQ5RnlQnQaBLvU15uqRBkV74SUftnb/6Tl3ckogn0ZkeZT3RQRfSJdcxl/UdKdR31WRYo8anAnHf2l8xe5yeFcploqUpRpLKU4nS6s4GPLOLgwtcISjixZKPZ0zaMnKUar0RdxQINfTfgZv4pUi+CqDDRRClM2iLpv+nkUvGCW/nwPpDUaiNgDa7t1AdFZW6jDm0SBvTI/e0YnLfhJvJsSdQ6VfevlYGH2vl8ISWyWWcURAjXiDSFQljLjcv2/bd04yoyc/aFwxcu/Kj2ZQw+O9HERLVjdmMwhzRqm5IRkTuKj3o4P3rOvHQUzK/8i3mTQtzOdPstjfkNUK2DbXumsYHeaNlBvDBa8jbqURLF1KyZ606MJl62huhrc+iBQfHs4GLiGD9+FhKTR2/jv4BkuojVhm5deBo+tiAz3qjI/5zA6D6BRTn+m7MYpRh5vAVsnO52ryW9G5e2u2++v3AoI44KIQX3DYlJ5jDN47Z81a2YQXKWtAx1ksgJ7CzU0GUmMOmOm00DX2JNjE7VFK3wVggt6ktWjqY3fZxzJ30PbX6uGqt5rI9Ry8SZj98WE1XQ5cT5n4UMuqwzRLdbptE0dKIo/Fx7gnGw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ado/m1/P3vmwj+SM7kSMUMVavap5OFRrKtapzqwitMNLLkJYC3sdasijiM4WWNneanWavel6kBwRP3ZZNl6l5oCDLbOXxE08fIDAwOo59oYsvsD7+OZREJ/zXOgFbIjW3Kq+rS8HViI5KSaexG/UtgibWGDI3qbczzXO4PQcFHytE7LLukRDB3cjlnUs+uN8lWIQ6JynVY7nGIiM7lC04yeCNc2Nomdh+1B4Q9/DJMU7rs+A50dg9BY6qgitUexxvCsJGiy2s8A9nV8VvBKqeAX/LSEQ0lswx6FUhEyoq+8z2vRFNch1zrov1qSqPCk5nWrkYtvceKN07x1Lbz51hWl1e67lOmYwnK4qbAAPnK5X8fzUmEurBbsDawbEsY/enA4Jn7bdYOs/GuWh1WfwSydJ6AIeQaqS7LgCW8haN4gceb0jN6yNdKRCHndP0Bzr06DEW8xPEVf4m+xn15d2uSDFm1/FiSufM5x0CwP9iIHluS1aw0XNjRlYS5phPuuwYrZFPXYgpIFsQIElB6pBoU8W6VctviKnLwBJ0B3ara8Ovj3y36hRb4QHVEvrQy8lpz5GSaZHooHvk/uyGjvT2FzbC78vcKWn1tRMsjKchr0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebdeec26-772d-40e3-7009-08dca182ced0 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:23:56.8379 (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: W0owSVZuVEqTZZH+W7uILCGYdvLk7x/adumXetpNef/cRWgQJIPKMoaAmgaD9FGRO4jXFETL/QAfAtGQg0sTQQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR10MB6970 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: nXm07fQghecCDdbRBtbvN68ETEXKYLNP X-Proofpoint-ORIG-GUID: nXm07fQghecCDdbRBtbvN68ETEXKYLNP This will allow us better keep in sync with blk_queue_flag_name[]. Signed-off-by: John Garry --- include/linux/blkdev.h | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 942ad4e0f231..bb521745c702 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -588,19 +588,22 @@ struct request_queue { }; /* Keep blk_queue_flag_name[] in sync with the definitions below */ -#define QUEUE_FLAG_DYING 1 /* queue being torn down */ -#define QUEUE_FLAG_NOMERGES 3 /* disable merge attempts */ -#define QUEUE_FLAG_SAME_COMP 4 /* complete on same CPU-group */ -#define QUEUE_FLAG_FAIL_IO 5 /* fake timeout */ -#define QUEUE_FLAG_NOXMERGES 9 /* No extended merges */ -#define QUEUE_FLAG_SAME_FORCE 12 /* force complete on same CPU */ -#define QUEUE_FLAG_INIT_DONE 14 /* queue is initialized */ -#define QUEUE_FLAG_STATS 20 /* track IO start and completion times */ -#define QUEUE_FLAG_REGISTERED 22 /* queue has been registered to a disk */ -#define QUEUE_FLAG_QUIESCED 24 /* queue has been quiesced */ -#define QUEUE_FLAG_RQ_ALLOC_TIME 27 /* record rq->alloc_time_ns */ -#define QUEUE_FLAG_HCTX_ACTIVE 28 /* at least one blk-mq hctx is active */ -#define QUEUE_FLAG_SQ_SCHED 30 /* single queue style io dispatch */ +enum { + QUEUE_FLAG_DYING = 0, /* queue being torn down */ + QUEUE_FLAG_NOMERGES, /* disable merge attempts */ + QUEUE_FLAG_SAME_COMP, /* complete on same CPU-group */ + QUEUE_FLAG_FAIL_IO, /* fake timeout */ + QUEUE_FLAG_NOXMERGES, /* No extended merges */ + QUEUE_FLAG_SAME_FORCE, /* force complete on same CPU */ + QUEUE_FLAG_INIT_DONE, /* queue is initialized */ + QUEUE_FLAG_STATS, /* track IO start and completion times */ + QUEUE_FLAG_REGISTERED, /* queue has been registered to a disk */ + QUEUE_FLAG_QUIESCED, /* queue has been quiesced */ + QUEUE_FLAG_RQ_ALLOC_TIME, /* record rq->alloc_time_ns */ + QUEUE_FLAG_HCTX_ACTIVE, /* at least one blk-mq hctx is active */ + QUEUE_FLAG_SQ_SCHED, /* single queue style io dispatch */ + QUEUE_FLAG_MAX +}; #define QUEUE_FLAG_MQ_DEFAULT (1UL << QUEUE_FLAG_SAME_COMP) From patchwork Thu Jul 11 08:23:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730195 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EDA19BE6F for ; Thu, 11 Jul 2024 08:25:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686306; cv=fail; b=tIoUW6dytR3oUn9DWDQhc83a6mCzYv8vOYGdiEINwBc3RmStLWgE/wLQ2d0p3aBxxoSHbF+C09VT4fJSosR/ffXYstUwa9A2hKto/zkbgZJ1PPjr2RF6FNSoyNroznH4KgPQNuQLztuAdjFpr+a6g/xx/Vx+ewlWLJZZ/leP9Do= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686306; c=relaxed/simple; bh=NVTTzQCfmeMoSpIoG4EKWQRfWmzw2nxXCOS18mxgY3s=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=u+R/1kRFnXyFvVug7VVrvX/6kORVTFOLmPkuYMLihkCNMumX8WnXCdZLZiyz+A/rgvSG53aLZFyFRB18zV9Rg1SdbGh9C5A0kBqLkGM0J29xnwQShNvTj+hVMIIvMwTBpmbK9BlgUyuY6mdiYUM7cboZtDsZ2BaUqRr+GgYgp68= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=KUdx3MnZ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=uRytw9RI; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="KUdx3MnZ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="uRytw9RI" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tSJV026752; Thu, 11 Jul 2024 08:24: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-2023-11-20; bh=XvTCzitd9WiR8/fYTq7NI8wse8gAAjcsWxQZy6bcEPI=; b= KUdx3MnZK/gqBoYub0uhPotIH7B/VpFsWAKqASB/xI7oHRic7YXdxKfpurfVKIGz eRKh8/tt1+hAJEi/WBh3CGjhmexcmz2L/ehsCpvIy4jCJtQ5dWj2VBaKnfHGG81I wagTlWUqOiPT66y1hFs5EnL9UAAcQbeLOoD5XTcCW04eTaZz8Q6tzM+sfZXuaAb2 W3dz4wWICDFkb4JP/uzpjXAKXt2UWoTB0pIbRqqmB17n3keMjytWhgPG2hRXlRMk ujWBaUIujDpYoEVNS/HXdtL7qvPuZMIS6t3UztCvRrl++3Myu8ocNLIhfeEvmqhw qEkN1odaRPZJbMNSDk8EtQ== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkns2bq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:01 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B6gs3f008976; Thu, 11 Jul 2024 08:24:01 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2041.outbound.protection.outlook.com [104.47.70.41]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv4789y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nLMSHrJaqgb58sS6J6pFJKlLC8zvGSVOi2+FLqi+d5KO44M6csOGB/m7/biZJ2+9UiDottBXk1GRP0wLn8Pc3RwWmrhbierAnbuudD/hXW1A31TQPCsRylJBBlqqME+PRwJSCJnQVui4RMjmHwI+YpVenGwXUBZaw5kbJsIT1C8uPI0mbhigXF/TgXi6+N9cOkrjH6CL+ifKhyC1grNuL5tlF8QelmlHZdE3yI4V/t5TMbmxarLU/VYtsTaESr3KTteJz+Sy5CKnTFX0Di72WiuP0xQdlCTid2bdwEBm1XileO0tstjyWoqJN9moOeivSUZ//7hrFYpCytofNAg2xQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=XvTCzitd9WiR8/fYTq7NI8wse8gAAjcsWxQZy6bcEPI=; b=PyXjoCWFAh0vWGblK7Q6VaX8ruiXV4JJGs6eARu2snWjH2Et9jJppoR+hbaU3fUxDiZg+93KdPMTXREq+/OXaF6Bt5cvSAIfdKvK6IikLwu1qnE4rDNLXbViNckH38+NCtOawwNPv5WGHTy0ZltcqdswqUDmgWILXm95Z43QAxvdoAXbINJEDA/8m0+iQO4+kiBF3RINaNW167PMw8XUlUn6+PyncMBHQFofDVtgSdal2MgNsNMkfiTbpTg8nti5Asb4KGRB4rQ8R2KXO5OTlj79TxDZQ9e0zZ4Ypf+QnlSB7sNLMJ44IfdhjD07G18D4EL0OAOhGku/MQgLk+J+4A== 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=XvTCzitd9WiR8/fYTq7NI8wse8gAAjcsWxQZy6bcEPI=; b=uRytw9RIuxY1zdHm5ISVk3zFTTZItQ0FcczgtQnMEfIlPPoWdwAdraZ/XTASQtKT2rOom0JBGehIu+WCGbqq1j32x6/NWKSixhZ0XC9e5Cc3iznbzSRYZIpCFP8yRX6u2VYKPGePiKyQwD4g/yH3Jx7cdGmbgYUPZT7a1BiQ8+A= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by MN2PR10MB4190.namprd10.prod.outlook.com (2603:10b6:208:19a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22; Thu, 11 Jul 2024 08:23:58 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:23:58 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 03/12] block: Add build-time assert for size of blk_queue_flag_name[] Date: Thu, 11 Jul 2024 08:23:30 +0000 Message-Id: <20240711082339.1155658-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR10CA0012.namprd10.prod.outlook.com (2603:10b6:208:120::25) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|MN2PR10MB4190:EE_ X-MS-Office365-Filtering-Correlation-Id: abe2b748-61c3-48da-94e5-08dca182cff1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 5y0+G+ka9Daw16huAoNooiBF9wxyW0YpCoPcylVgIkCuQ/jzDFpvlsVIN8h4Ye6uLNKGUatgqyaK1uXZ3LteNKzr8ioCePOQ3jpk+noGrlIBDjIKR4p6xyynT45Xv/bjHUQzHsq4C866M5j5AtI6IZaw6XM3wonlQgH/zlm7s8+4KmZd/xuMGQ6nFu5TmcwUnQ+cn0keTAaa7mrTPBsqeygYL0PkWF0QsdoQEFMx+dSLmXpGKIAUIc4tdZe6pw1wTr8EuqWJicGkFzV0Sdo1qlHEGQo9cNc6GLqL5K8tzC6K2rwkyZjqYTydoLdsh7ipCWxi+viqy1Thoo9ZH/uoZya/6jbtimSAM3wMMVFeD7/cSh1FrnWz8xMVk/GavGZueWaGPyqDJOfndCbBwGb8HAI6GvkfboF6IhI06rX0TPENJMeUHaES36GmobDDUluHRrDltrJYoEO3MNggC4XMbhrtrfGX0CiQGPZtfDZJm6XnCh82ldj43VuVeEazwz1cVrfu+fxQF6b6uieNAWhoOKGEe+Ud/4UOc6bskE5CJogZ4rbqUqKGi+2zWL80j1ct+oTmzVv0R1WMeqTfsecJ5FWz2dCQ0/6dyN5VbTImWB+B1+wKBdxw15qtH4VzymjHzPx5s54UM6jh78BjecBZg1MCcyCMIt55SBLA0maLzjlqgzbjiKFBBUFy+55YKsKNEjprdtxjRyJo/TLqoQxy0N2UVg6mhEO1Vd8jrFBPt5X+WNWY18/3YpBj6+pBHKZklQOcFO3mbXBl0yVUT+S2euEGx3pmpCkf3QpiwXLTV1DGbAs30IzHtPTbUS9psZLz/zBRfZJitRrb00wEuJ6SNNxludJlKGkVvzSsWIjqPbZdJ0QdiGDgmvScmV9wtfVnJ8ZItBVyJNlwKvOWIlNIxcE/RdMlXpcAfovpWJDW1ABzj++UrXAzg9kBAQrX08Zdhpe5hy25C4Wt2HKY6hLnqdCNMN+CgiCNxRSZU7L+Q6LErONjYtPC1Fklq8YyrCLjqE7+NaxcG7b81MnI8hD1o1EtV36r18ZbFVMd9NbFgAQdwc1d/H9D2u63nRBtruIScxLpAlT5WX/6tP+1OVOK4jC8t+K96A4IEsE5XIhc9fxibHCJQsyPd4/6aE15RR7Lg1mHRzkYYyESBD16N1Erg4vLZJNE8np29bbWZFfJycjpVdHHEf2VDC4eKMenPMnwU9ECSQLvYZErvROhz7VOd2/4/zsyTBw2iZrxGBgoyCqSIA+EzqEs4ylrUtsRC0oe61Y7zH5/c2TYeVNO4zGegfIB7I5T5RZL4NKPl8k/iKqITb3YIWgG9t9RhTYcoT1cE+NWSNJdTSXTb/navE7orQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J+Vie57nAwPPLyoIgtRWk+lpz5t+hVdPBt88sE6lPbmFOy9NzQh/GygKAPCqceDaU5I6sW1Rn3mv2VALCK9NFy1izlFp+5dfZLVCFyWWmQxgA6iLQHjDuBr4shbAEfUL1YAVf916KfCKd+Hz4rd9GYO5tz9mX5sWG7Osw9Vjox7JyXs9Ul7B5Wk/WAk4uHWjxe3ceX/J7UhBx8ly0WMkviFgEOrVpZQCAlZ5W8dTmQEQ9KU8mOkLxdiv1jr+9Kd66ze/PXgOfgv8AaWkSiC74oL36geV37kEylQK2DRdkUYWpWGlziNX51NKpbMJlA5L+Mv6Ljfg3BdJUADSfyVzRAtFXWZeRZZHRc1uY9mRwpymqrb5MY0/ri9E6pWJLkClAny+42Sf3ndm2lEW0ANVGNwddibSw4idUJLmRxZsbBEMzAvtCV6i5+SACv2SqYniZWhaG+8POvItnNjIC+MtFrq6AU6eql0TMswqFCyNLn8W658FF2QZK3z0XUgXotzFgZinuLHcDd1efeG73/6cR5TYO38hcItjVJQuK+AptsIetNzUyHpAKt9ekPDw1+fJRHWD4TK2cpDSek+i79UgqBzlGDAft9Udg6MjhFGiYiCGfXxZUjG7STpnkEu0q996xRm1lSUJ/xwSfdgOcWSVF4urFFH/S4YH1OE7kg/KwUDSFNmefRYJSTmsL1ViHkiZI9M8T6jwFByZj8G6bQotiyn2zzaXIXQpJBlpgHeJiMo6HmhSh6pnK9JhMMzFUziMiPNIIHPiEy0+ZATkoWFKwUUU4w3XLgBznRmcxU8suUN90qakRTPt1j/fuAJRCjQdyGJ3Rh3XLTHFhRmU3viy/MaPqurxPzZEN8If0fjmvrbPNTDVk7CgbIkCSMu3Of/tbexGeVnzIYxEiyWxta1IYhwnv4m3rAC1GoyeZB1wAyjXLQcp9XcIJmUG+e5haktflvd/OUGamnLb+ZFvIjyL6JqcktpaDX/+25xyftp9mkjVNqQCC14zwVwWYvwtSgF8YE44XBvK7HLfivtgl9kj4dCCGmyLSeWDAvv/+Ptxye8+iJps6cw1PqyekmtrqYtxfxov1iTizb14wp4G6qVWYIpF5zgWn3VT9XdGvIo/BRqzuaZLeO8JSt7sjUld9pJd+i39njOAThvWgLsl+gEQu0/D2D5mXa8/2WGBBlrKHcmllwUSw7r0Yj6yjJAMXTNs8lzV/u/Q7u+BvusBD9srTYKYU7GD2QKW+Y/ISidW4TrYf3FPCoEdyPrbpbLrxAVvN0WTCNWeBrjAZ7N12DKLYo+PiwECf9MT72RgjEtDkF9syZUqXr2HL2YrXz78B1Gg2Iuifu6m3skPsPeFEXNCG+4O69hYXfSjUArbLBFrsA/NdNJ02WLGUGcEEupJyr6NqsfTLi7AtsCg45+T27S/lwzgwsvc8sBkAU6TYwUcYW0DBL8chzlceY8+djcNEkxUKQKGecZay3JvN2RtZCRlEs2NbtnAHA9THgzvTTK57v4G69kjzSIXx6AVUpRyjuanx0QDsi3qpoVkEb0ixtVlK7sWwG+VGBmFARLpTCCeA5pwUjNe6QNU7B1xfo3Mqaq0quoHlEPBoNqZIkrK9SdB5g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ws6f4Ic4i4ZFv/mPg2OZMnX1UD4gKzIjUwvcsC6nhfCAR2aEiK6QmCIxcXZR2qOHOHBQPnQe4lkJU37LOECFls4P/u1g/3DA1poaaxBGeMi4NmDrebnF54dQJlWCKUDVXO6uVQ9e/Cn9qK9f35a6fLZvP/VP6zlFYkJ/2xqo06GkgdTXs5b+u8R9M//0+TCHJTzaJUxqNNY83KmOMwXAlLF+QNPlLpcFNmCwLtBMIoCQGO7+qc2NUdVJbQPEJdFi3YMzaKBikEMY6AoGPwOEUWURkDM+NgN2pxXWrW3HVNWwBJ/39uMDNQ+HKSnmDPnW7bW+ARK0zaLi5QB1pZsc3ZS2dX8HXtiUDTAKBj3Xo3a0mqmWt0+bhlm88aevYglEGF7srOgEcYIigMxsU2Rg2RJ3GRnzlfUa4L8Afb1pObfLjjGjiN/XzNHwoP9hlDhnT//GGYL9zs8vjwJBptxomo5DnvQpHLRfa9qrsVqphykp6G/uSDoacKBQZY/nnoy7d5dtUvpJulOD6fJg0L0p/ffbTbSuaZmua1iNQ8dyrLzCFuRJdWTmif3jO2mO1H22FvjraV6ypqrDSi3h7zVK9jH3DgsV5WevdiZKDpzZGVI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: abe2b748-61c3-48da-94e5-08dca182cff1 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:23:58.6850 (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: /IeXyht/f4SHovqSCs4J9WsDXWWPlwxfMcXRvDA7QoNe4vSwZeaya92jSZYqg0qNxw9YoQn9R3X2PVsMeYfD6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4190 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: PDLX3_75iNfvEIqL3w71afCjbfAOgqj0 X-Proofpoint-ORIG-GUID: PDLX3_75iNfvEIqL3w71afCjbfAOgqj0 Assert that we are not missing flag entries in blk_queue_flag_name[]. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 03d0409e5018..9e18ba6b1c4d 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -5,6 +5,7 @@ #include #include +#include #include #include "blk.h" @@ -99,6 +100,7 @@ static int queue_state_show(void *data, struct seq_file *m) { struct request_queue *q = data; + BUILD_BUG_ON(ARRAY_SIZE(blk_queue_flag_name) != QUEUE_FLAG_MAX); blk_flags_show(m, q->queue_flags, blk_queue_flag_name, ARRAY_SIZE(blk_queue_flag_name)); seq_puts(m, "\n"); From patchwork Thu Jul 11 08:23:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730187 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D3E91514C8 for ; Thu, 11 Jul 2024 08:24:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686250; cv=fail; b=qMxwph+uBYnZyvB53KYYpQWI75glN3cVbe7y4OxsckwmxZ5c5GOxcmw7UYDAR8kpN+m9uJieNqPZq9cIy4rXjsJdOZE+ylIiFsti5+x/gdNrloRV9JaxYlmRl9gLaDuhNIh94IKVYP7mWA4xpBaYkoP0nyIoHVFLVHTj6MSOqio= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686250; c=relaxed/simple; bh=s9WYORsqys1R9bg6nBEVAhsqoi4yPt1qeaSszqfjDHI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=MkdarVmipV1bGXzOczf3lEhn+N6ri+WTnPSEe7I5g0Kdm8adCvuKiSDh+0HLyAkJyU0Jn117ioo06YWRpkUL7E1PJAevt27k38gov0+HbINcW2+Ob1jSzeVmOT9rA+j1zBrStTEiUuNVyjBnK4Kkli7Yu4fhSkp+JuilsGxoo98= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=YUIfjJ9Q; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=FJQD4U5l; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="YUIfjJ9Q"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="FJQD4U5l" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tX1d011771; Thu, 11 Jul 2024 08:24: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-2023-11-20; bh=bhfu50rABaNzyXbydtgUtu9fAssH0KemcghAlnC5wfc=; b= YUIfjJ9QhaKl+MsY2ETV9P5EjTO5AVDYd0FOLtDO4lNtYN5SnG/oXIhs4jtYBwKw lTps82j3sVKCBOafMM8U+Rup/+pSy+QaBYhQ84WW57Jcz96IOyEakm8wI21k3nzz CdMNGxFmSRLjd328fSUavyujWFjfcTcVGOvPhyuEr1H6hKFj3rrolM1rKuqweva6 EmYKQJk+fm4p98YX90rrNnGtutI9nvRBPuyFWN+Tsx6SFOnoh2b/UEyMx0y+IrSL a7m7WnUCYeV0kziDL3COxQcBUAoPKDk5TU3zTRsR1llKO7zao5hcpteNTK98fmfD LanQlbiWVNxXq6jcsO7kdw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wt8gywg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:03 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B7Ctfo033754; Thu, 11 Jul 2024 08:24:03 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2040.outbound.protection.outlook.com [104.47.70.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv1wsjr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bX3zL+ANTgldbJQNyGKwnEM3WtNz/h2McIA+Abr7yrtttUAEEfvY25OtF8MeimE9TGiBdzLsCSV0iWLVKp6nANeb2Tz+HDps/Joidv+4n3gxtHhu3x65yUy5d5iYmOmBZPX90OifgcMBphnxMPGd0Dbv1wc7cdD6GmWC8vnRQKHdqOvZph51OSHLx8J5T40gvmRE6BbWvw7vCk6HAkIBuFw5hSiG8jkRaZWiCANlr7EpMXgb9f4bRz+Bg8HF24336DG5AYex+o8HYOsLt5sFhZ2XSjQXEqmr30CPCX9fU+Dyw48vynEvGqszBPrY9alq1j8auu8x2XA9SXVN3tXa+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=bhfu50rABaNzyXbydtgUtu9fAssH0KemcghAlnC5wfc=; b=nVjBby+ezdtXcj4ZUbz3hlKj+3ZsX9RUVaUE/drs4PDGUZOlGGN+nXpgl5ry/XlOucEGZ4TTYIfj6XwBNJYeVxEag4L0LTAYE483b6kAGc1o8hbjCjL6qvrmEXY0T3OLT2u0GwpSusGZoniHiUZKe1RFbzFtk1TN9snebiao28w3dfYfiFhpdGkDlBugH7Hqyz9wIb1k9EtYJ945H+5/H2Rn7GC31JFjIiH9LX43JY59KeD6OWMhuS63j9A/ALmeWxJnzkFcsNtQ0L2MMNBKodd6g2xgdKwbw9UACBrvJZvspgIUPVmtYJDc5MkdvmR/NXQlG+F2BABIXu443lCriw== 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=bhfu50rABaNzyXbydtgUtu9fAssH0KemcghAlnC5wfc=; b=FJQD4U5lAvT+/favlop0nUc8qWYGQWvOpekKZrgCMeZ9EbgX5aQ/sudAzjYzYONcJwpzrGbBoqbt8l9fv7qn46wF2ismZ42/mtviZUq24ATpxGZElV9qBjWQAW74IcmBaYvIO5Qlq+Hyck32pFvSQYWYlEvZz6sgo7GERLEkp54= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by MN2PR10MB4190.namprd10.prod.outlook.com (2603:10b6:208:19a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.22; Thu, 11 Jul 2024 08:24:00 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:00 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 04/12] block: Catch possible entries missing from hctx_state_name[] Date: Thu, 11 Jul 2024 08:23:31 +0000 Message-Id: <20240711082339.1155658-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR15CA0065.namprd15.prod.outlook.com (2603:10b6:208:237::34) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|MN2PR10MB4190:EE_ X-MS-Office365-Filtering-Correlation-Id: 6d780f58-10c0-420d-09d4-08dca182d12f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: o2EbvnByFF7CDlm5FDxi+aew2HFHILmU0xUvx6XdEt5bFh34w3nX7GcAZEVoDfsWsxBx1ZbE9u27yFcC41th0RDn8s853H0X+Mf71oR+ETZTA2xGhDCA//OHJWJNudBB4fTfuGLCW7VePVaqzM4IgCVg2NGUR8ywdVqdP4BUzfgRQabWZa42agswNzFK7+D9P1moR9iqSOzyH8+6uTh6K9hMKPpWrB4m5a1iBoT+srPLFYvg7VNM1NVjV/fXGoYSk5VkEjIrtaxt0dOZHZsbw3O/v4xwmQeMFkSiumXHC1zjTCQe12oer3j+ZjyHP8LprLk/MCCWpEOA3WYNYQuw5FM7REuJ3JYoltpcyOSLiDcs4HCDqo5yYds7Bvon/AG+R4GUolf6VhIjMtmo3XMgVWupJL3EHcoxM7Q9jgCmV32wph1wpMwsSUBP0/0Rr4OLRgTQtW9GhczSgWVPaLAbp1JZQf1L9UlqRdI7oHYizVTjMhTcq6LlcluQDCJuV3Jm3JIPe/OGSsrc8a/TUE+OMWwx+YHNUzbZEjJqb+3G+CbeP8W/QavJtcLBq+UzAYqkEfXRoBZrwfnS+Stnaj52NUrJWZhLrfbWM4JcYrHA8SQYXveD2aApzZ5cRG5d5xYobxCjV9hw2Uta8TZQOi/N9+eGa+4IAC1NfqLMgCnaIb9rz0hKXYuMzcXxA6OWw+ncakRfBxjrAku8W+GelJfE+Ld0AXzcV7V7Keq+ky3VhhcjMPE8nMYX+MQiLVQ+O8EonWr6wdfXAXiuRWLKIoqPnNKF7RujhXToM6Mrjh54HkwjUMKHt30NQrdec/jtXDsHwxf60g94dR+BYEVq/DXVAtftHSdknT93P/arPEPGF0QmUhbcqrvQpTBr7YCYslSxLdnVNB7u0NVWMnwweI5DIOD+M8ndYFyQhAFTJ2+qjDNIrw6jZKkYtX2eomUIaR8rdTZN3JTBaVuqsuGtProNdSnxVWiSXfuOCYGWhJuldEWy2U2CW2SkMqW6tF0qN8ii+wu2C570g8SjKUHHVSZUJf48/UMdhbq90gp9M3+tkgNBdA2Xr5H/fBm+qrykU7g7HF41pivLU0EFnUVm0UbPozEDxmfC5lWRkUvOt/laRhCJEnG17KRD353lv9CBzs2uUqvpJpGVip/esQf8/dMtNn2fmUqLuuLHL5Z5Fea5nvhfMK4uoxVoVw6+S9Zgz5iwlfef/iJI6glpRoIoQCdQ2ckmZVKWHovUF8GgL7v4Lc4S30DssrFKy5XfaQecv/OtEuURXUdSuffI4ZJLf0yGrA2j9dpQOqWXnqZA6v4/LFgsJnKXQIWaklp8IE0rgZHfojpxPYDU8W1koEmylMMbUg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aXqTRXtn1LuSD6D+gic8/xYgEZRHU6a8eN9yj2T/AZlbaGOkbQRnMliWt5wrgAu5qDFE/0EFHpZcrBpeul23FmwtQx9XM7ikO45+Vnh8dd9FERWTPwx+/H4hZCZb0BXlBFv54Ic5wwErjgZdd8V/ZCzY5pLbsXhlZX29VIWcpv/lsL5oKc0NrIljcWC3dkGyu2kFGMFRj5yWhbE46w9RoIESES9v3lONCFxsFKUi08vduRUQ+j58AH2wE+rq2hTYXwh3djy+Bg3z4DAEjM2pdxEceuiYDZmgHEoSwRWpC1KB8sWQrNOn/lqfLl3dUeZgi7RDZV1bxOrp3ukYbmCOzdmRTBrkh75qrTrVeY89CNDIUzGWytjDaBiGzw1bwIgobDos8Ac63ApnupoE2cPMO5ffafhO+985j8Qts0rIBhi5GsngX3Vjfws+tN/zYAaXeuzMzafBjrhBu1PW44ZXNlM/tt4R30QcRTbHNut7lDDm7pU0tY93SpNcE5aKLGRuDlmct6WSU09SJXwMUoH4sxCeHumf7ChB/VzlYEWz7D4vMEyighID0XOECaxOEYJ1DcozrNjuTjXLqX13+7cGhm7gLeCzE8d+gwLbfv94YS4hM8aI6AIaa5YHodY9A2bXgIIsZNLLmItqWqMSlZjXyUweoBCMVbB4IBUCNx3ZllxIjlrRflIUUW4jWp2R71iFOlkgw9kG+qZRrrY3+m4dAjp2ttMs0vdrVQi86YWT+FBZVU7oNtcFIL6ZmrdzCqnsxC1ZXctp/9xnCKKNHklGGF+MWJcrKEM3tPeuRDkvdzi1Y2v+ytjRRECdDmB9/O546raZM5Gn//rhYcDXBfOG0QMl7FHaGHq7KEzScCm1T0rqzBBhZVPN+JCT/IWo5zfX+F5Tm06G0TqeSLXR1KXt4Y4WqDYZsmXe9gkSbKydv3zXWrfv1XUhl5XI6fDxahPEJhYk31nm0QVVnO7a1LwtyZb2f00USAyd9+QV0sK0fl+VTuAkLFY9IRn8O6MhROuS4WW0oZUAAOyVXKFi9ktz9CZmuuFK0nQHhJDzwJCDUgsJwcnSl0wQIceIqEuL2hcqi6G+XbgYLjfsIh9W16ZYardIw2BdrHgOx4lBNf6DOzNHdcvulki8nv/FEGnEtj/734Z9+TUAwdNQ56wm8Z69+cvvghbaZ8B1iZb9+QxRTIidaE4ATGCZxLZbmRmIbV1o8tqHAS5oPqv5bf5PL4gKIhTCJoFiMTq1lXumf51FXycNZsRoSFgDPcXJ/Xy25f5ymc0Wod7gvY/AJx+Ciex6MA9ZgfEQGj7vfuRABU0pRKzVMr9x9+dsFq2hLeA2nCMiumHgFUjVEA+WUNBvhwhiCp+q1JMdclPwZQSjzerR2ZQXbOhnfNvAlkgRmhPMYXudKwPpJe45TCEwBeNnrRIqyki6UB8szeqvie6Ebebae+ndLhjlOYJ6Co/58eBUNg1ljygRKrPCzLjNIHy5RDmAk2qOkOwd+QkltGk0SfpLEiVL8qetqCEN8Oum936FMRTa850Fon9sWbFcDGGX4RL4yEruvTt/jTHj84S1rqObzly5JVd65SQMwHT/FY5AU3eXNsaYZmFTLujm6H3OAV8D+w== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9TvO/46eBmrSoQzlAP1sEH2rIDWvyRBudCVUlMBnLER/tYMpp6GnEktcLm+CILkibSL7uAGA1m2dIzDzhYUH3uKu0ZcPdzdrbkJqDvsD8IBd6D7VlChxD813Gq8X7P/WpFBQnFSGS6QOlnsLnF/ER8KCXlYUGPagbXlRbqGVtacs04fO89rNGXFpTtx5UtknUyuceClpDKRPeK+9r0ptmqnKkJ4liPOBxc1/5xETwCiY2FCT1OQvNzrLnnewNp2ntwd3gCDH8KaYBO/X+uWKpj2np8Yh1HiJLboP0sb84v4bJeg14S2sJlqca1fwMiJW54ajJBPy3bMIuHwb0cibPCg0QzWPIl2zCIXYWMSH1J6Z/iMHIvXFhgrpH5Wz4QLC1cbiBEskqZnLKXQW/TXAi48mjEOtPIJoZlKbCERWBjjANhlyd1AK0z2vgrktLrHtFM8VpcwptZRewugciSYm1h2OdVWzGzt81JhcOZsTrBT1pLR09ix4k6XxwWQ14fBvrGcc6oxEs2TO25rISSghF75DcL3ernM6uzsfd+2OQHQWbltjRAjYhZeEiM/Zbb77XERSJXqOt+fQp9Uo7yqudH228KJCSLqU75+x/Bnv3TY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6d780f58-10c0-420d-09d4-08dca182d12f X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:00.8112 (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: ZZjpn1v5UqesvGw/yC6TJv2YRT5LhuT6QbzI/FixTBeff6p547wWI66FcVWbCMjvtAyDSIcxiB3DtdK82gf+yA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4190 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 suspectscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: C0Hms3Ds5j6SmFls6PmrDXZ4Vs8h1ZxL X-Proofpoint-ORIG-GUID: C0Hms3Ds5j6SmFls6PmrDXZ4Vs8h1ZxL Add a build-time assert that we are not missing entries from hctx_state_name[]. For this, add a "max" entry for BLK_MQ_S_x flags. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 2 ++ 2 files changed, 3 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 9e18ba6b1c4d..fca8b82464b4 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -165,6 +165,7 @@ static int hctx_state_show(void *data, struct seq_file *m) { struct blk_mq_hw_ctx *hctx = data; + BUILD_BUG_ON(ARRAY_SIZE(hctx_state_name) != BLK_MQ_S_MAX); blk_flags_show(m, hctx->state, hctx_state_name, ARRAY_SIZE(hctx_state_name)); seq_puts(m, "\n"); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 89ba6b16fe8b..225e51698470 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -664,12 +664,14 @@ enum { BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, BLK_MQ_F_ALLOC_POLICY_BITS = 1, + /* Keep hctx_state_name[] in sync with the definitions below */ BLK_MQ_S_STOPPED = 0, BLK_MQ_S_TAG_ACTIVE = 1, BLK_MQ_S_SCHED_RESTART = 2, /* hw queue is inactive after all its CPUs become offline */ BLK_MQ_S_INACTIVE = 3, + BLK_MQ_S_MAX, BLK_MQ_MAX_DEPTH = 10240, From patchwork Thu Jul 11 08:23:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730188 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CA641509AE for ; Thu, 11 Jul 2024 08:24:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686252; cv=fail; b=IPx+aAoKUH64g5t8F5lWiFNtrn0yrgOevUgko66DzlNqB4KnLDYeCAnwLtZHYxJy5crgxiGUzI+OgOeoc+W00nGfGSg6ihkJ9eWEqSa9xtrSN78ofdUxQ4MGG0/xj5Xg4DyyJFQMYWnp0q4bxviuVWBTRJj2FJas5tuWp24K9/M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686252; c=relaxed/simple; bh=Aquu7l3Hy94ZtQ9quHFD31h0L7p0RnLMaky4aZ9EAHc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=d7LctZoPGFSTnlFnRcxMsLyGTlTfxUMa5U+Ppp2WyOYofO2OdqPXCpoKvO+0SclYArdOqHhPKCtLH8fVrqRqQ7wNHyAecm7SzV1ZVHE6dp9fFbzcYuLPd/m305mHogk7T2BACkuCuQnqWGmi8voGZn4hYr6L4Uvs48xGKHzsHzk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=JhUiJYM5; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=w/oIac9/; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="JhUiJYM5"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="w/oIac9/" Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tXut026816; Thu, 11 Jul 2024 08:24:07 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-2023-11-20; bh=cAHN189/YfDwmOQB1w75AVuZRKBznp+zHfWm2ncNEaI=; b= JhUiJYM5fIUn8FKPB53ksHemrnIQHy6f2p+6tbWwHdxZFzWLSCG2LWzbSHQ4/RAo Uv2xWZD6L1gq4KhYe7Pf+FytlUr0ieq7w6ntUyCRhG4c8XFUKZO5POpdM7tMA5eW 6Tb7MTlM0/oT/4awI5TJv/xF+aAV25xT6NjsWEfo8eg3UT2uEE61bgxenyvWn+t9 Xvv88pnH5AHWftE55EalBMSj8quajBJ0DNjTTnmP1DdaJ3NmfVNMQrDZWC0vrqFe 3ijBw9hS0n6j8XI8yC8qY2fBvEor8n3r1ccw5XA8H/BDnPfwalXGS9S2L0opqfh/ AD51H58mkfRCYNAlGFHgqw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkns2bt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:06 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B7Gt70022712; Thu, 11 Jul 2024 08:24:06 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2041.outbound.protection.outlook.com [104.47.70.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv25gxa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FMDMMnwFdtQ67QpfS/E2SyyI6/MBYrGG9+DMNXc6n78+rKGt6tZSk3NMFWYjdULnqwJDIfSJemprk5bUVPBpHtu+MnSPLA5cEBBrHg6e/D0KzAeJgTy0t9hvqxGpJtffrZp3N33FRbjEPzzOoG3sxQ/xffcCVMAPjcgpaZeUrAahLuGL/jWNOx1pa6/1nKrFXgq3DIQ96yveOABqTpq+Cp3AoauNWyrzIqYzHiHb+epkCmGJ559PPw3s+b44z5Dy6HklMv9XfwdQ1eocFgp3LqifYAZSroDInpJxG8aqBCmaZZuRJzP6k8+XKA5uvdXU5RkScnDW/JHREqXd7YOiaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=cAHN189/YfDwmOQB1w75AVuZRKBznp+zHfWm2ncNEaI=; b=XMqVIg/gkDxCCelZ5ZtI4Uz+ERMxCpAjexZ+K0DbeaNtCSKaBorSNcu7X/xURxaO1r9Am6LQcrxN0ObiVPiSpUm/P2hYnpFqQHtHt+5WlLnkdZNH489VgSSGGBHKNo59BEgXt+JEZl8rGasFyFzJwPgEoM3Igf3WF6xjR22vrl38idx97/Y79kVa2LJZgof3cgBgOs2QoKxr886y6rFxjmy+cTA6U+GGTP8WVu1YkYvqmMTkIV7PY2Ahi3XrTUdw6S1L3oRiPrOJS3OlrfJq3FZQs+Tir5FTR4e1juv37OqMlPYmu9CZARv2x3s8IYz0h4m8sKNpr1kMruCJsTTWeA== 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=cAHN189/YfDwmOQB1w75AVuZRKBznp+zHfWm2ncNEaI=; b=w/oIac9/H502SL75h+vCLvG9DCsLw5BzKELbwO26ivLf1Y1AcaFk3gn4wK0N2n7QmLX1aaH9HVOfODdglQPLBO31ZbJMXtaR3Ph9it4jR9mCcOCCcBgvK7NModOYVEentdDkz2ph1cN0sxkJ0xYt42v4H4Bh3/mgE63RhYcWYZc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:03 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:02 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 05/12] block: Catch possible entries missing from hctx_flag_name[] Date: Thu, 11 Jul 2024 08:23:32 +0000 Message-Id: <20240711082339.1155658-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR07CA0022.namprd07.prod.outlook.com (2603:10b6:208:1a0::32) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: 781ff115-b0d2-48c1-86c4-08dca182d26e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: 0fX7pYfsVd7yT9hkjORL3bEzBuAatJGeNjWMKphy9bO0aG3EY8fg5ky8+BpIGBtxtecMjPJMTAX3iP4cAbDamQ3F4+FS8Mj1Ejbw236nZPPdPXvNN1yGu8xYin0F5lZ9ruoMpqK5T5o0VK+SeH6XZ+wY2DmYzTdtU++UOwPQ6xlPNhTwMhcRGa2Tqin0FCky2BMWnmnEGrdTfeXuflnApv7yePhZnhlEB2lq1HH1u8xtPOn/P1nHco3qjPIcXa7nUj7d+xDa+gx+TQed7qLhYQ0LxqmelHXcIoDS/NGCKhCow4w2IheZXUeGu9nhyUZJpYWpEe7j2aWvnmR+cQJp0oEgO3QFWG2uSaRzwnvRhi9J8UU9+C7qlBreCg47wk7un92IhSCUo0SSZ9wl8k1SMzINdXsWv/SwVWiTR1L7unYMQ4ZE9CHPPh0woaSEsTQowTTB4s21T1U4G8SoMXdaDL1dj/ZB7UtDf65HUf4crtiLOoTlfs2V25IrwXWRIA5WVEmoGaX/+SoZrtc6Pd7QlBFnLsMVUhNezkQZ9nppau2EuHup37FTGhTqh8hb7cbnmLh+cMPAUR4KMuQrkTxa5jT6cbJK+sFjPTvFq2VqNJhOlVxt011ztJMWoLSHIms8Z7LXaWIfWl1Auh9NzGbxy6rCow/FFOIzmf5QzjRugL1i8Qmh5DbAfAQO7rikokwcibzZRwTK5BR1ItOSgKMvmoFcz7Fuwr8kjl+NfunizLVuT/5Ubuzul7imEC/an4+SYTwxWZoHC1niPgqsmaawIU9VdzBEnvmsuNUEkS/LHtQ2T0g2igDIkef3h2YWrUGpt6342epszZCsYjfjAo7zHs1HX18/6eQkv2LMqaIYjWnoTrMCNwcM38ievPYjC5mwrhImbgsoDSjiB8Mtn1OXdP26FDFL4nbx0fO7ZDJC0rMaBaWd5UWtSTIZuI0s98DoGEeOoNc33xbv7O9fsnpZsaTarf34XAOXwnAchh47z8M7Bwbh+XdtBxAsDjiY7F734q2T6af+9rAE3iLZ8SFtRN6DdMIYdoOyrIQFn7ZJ+zYMgMgxSRmn+3SczBBrCHFnVBRkc+ey23hE79tTaM/eKQsECgvW72Jbl/NvSKnKiBcGxrLJ6nfrlTBlT9bIwuYER9TpyqO9BQEhqT280nBEvuvvDwpAQZ+HrEetAJvhO2XtPRAcCT36w81h47ylyOfEYC04evneLEUtOkQiTifdtR27BR+4fhHC0U+xB3RVsogGtAFyRhADgEb+A6PUKx1HFHBsA8hff0/c7egI3juo1PAArK14n2jUfxzHpq5GcGAXsYFFDdsEFjJTGe2YQe76dOCFsoJ8+EgcD5FvZXh/3A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3VbE1GuOefGBN9fuholdv0wzxES7dcnC3X6MyBQ2Zl2pSRthlzjq1wcutbPmjIJO3fZX4vHoQX69HDJNHwBR0o2KNjLFwJYDVWkJ7Zuu0otM06D2XoubCDjdSfy3brE6I3uxyASKAaN236yMHwrUSIpmJQzv0Tix1jlukTFaGXt0H/AMk7eUBHMAFhbcJwyhvF8V5XtlMi+2CjmQ4qqxpKz4NoZUgPq3rvWcIy3oKYNO/SYpXT7I/mq+3G1TmBBxHPTwh5MV8WIf3HlRw3BzP3lj2QcUb2CIdL/IPWEaJhhnpcMBpHZ1uJCdgZl3FuAPmECLNHFeDZuEVSj8MkST8yoJI5csGO287/ych9FekCHcyM7Y3DYbxE9tTf1hjFFDUYAXfkXx419pBzaex68v1YuG4vvfJNcKfRe+xGGV7ujJt/KjU+kwjme5T23skwcJZIrU608cy2BjrjeVkCshMM9LigFAKGssSs/Uk6NU/TpfZy2rZWkADOdSVBGLxL51/EK9KVtxPr12jak7oiR+5ALcj6pZooMaiyaPJ9xF2KjzLAQ5RvRe4neK8/usDEBVyl6LwJ1gQwU6gwUSkeXrhtE7dynEO9EmWT08IK9WDpkVbCze41KMVPPsiSpFbkeFtDx4/ChfKnF5vcYqfOeB/a2B+pnlHXprJMBwOF81nKhYv0EFU3Z3Obn0BQGwkvXzAGHb1fMNANSeaDGIwW08E8d99KidnzOpuiKF6Fx+a+gK1tUyuzSUv/5dFWHH6YTTJ4gKrQt65ou7MqjSsm4CumRzNWISyDpAfUh1lTyGoNICIEW9/HclWhweMwuv22MTpkZ7pozqQ2UUNtw3V+Qi29Sc8IBGGgxScLci2ccK1zzjuMzTXVfRtDHLT2g9O0w+tROFl50vIrYfjsoJJMJYzH++pDYIcfKzz6V9qrg2cu529cOiczqOqKNnk46MtMWY8iWHFPQ89yYzTbwjgf4tXkjtbryKpgBcly9F2zlVOI1nJruold/FS/+g/E4FeQTnNfkEFFHmxUH2Pb38eOftYInHFDD1/pqAqhUFMuKlhcIGqLsFbAdSraWZKCoYl6C57Pk8oTqtId5jFO6LflrgIfj5O2F0D3PpZf8H5gFT4VzmmB1o7/3bbfpQTn2Swu+2n67dlkeLOWo1a/QkSysCqLHTp5xuygxi2ZMwQnNO7NJRr/jDhiRWdAWmY7vYfOugQjU6/1hq7EhdVcwUQx1w4pTU5RM0/SlGxH2C/JQk7fnbCW6LWkEkOdGdI8zNMFNLvs/gg2ZOXykb+EvN4Q0nxsyYWladYARQ48uQvuqU/ihHBFMg/1KGgQOCw1kzCLUFqNStqH+K6LAN8MtWLXDGLuydxxN5DJa2itl4PDdP7awKFyVlmsgzBR5FZKHN3yaEJwxn+jCqsnIhfjk4qsWtQQ0aQaMXxa1aQLDYoyG8Iqpz3ZYxjY6BMTAxRkNVuQ6uDX9SxPT1sE0u6WwLwPDRu67XrA9M0ru+iycirtQsuYAMAO4NqTQRT0sIFqhCzCbDicVdAYDemNQp0CQZDcW8yREy7lTPDYeBakKNPfhM4w3fW3znh/rWO5lqd11gZLUWrL9goZYEOiGh4I8QMt5Qkw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: TS/Ef7dyJJ9UdFn2ZbNisCt4TvsaN46mPDgYOR2alDLETZVbm04g3zH69Xa+/AwZ366cpX0q/PEneSpqPZIYD5/YaFS05KFihnA2qSmRMxv+p/p1od63zlWc8rlcIKXl0CCdy99P2NWifDQcIh0qsu+NV+KN4IL2V8Jr+qf/RCHu/hS5E5KnFN9IIyhcI3wYsrAE2yIs/JCG4aiIHXEkZqEyDzVD8UYsHVAUaxNxwtxcVFO7g3IKa/M+zu7o2B5UZRtfdj0Kb7rx5DCH8LWB70+81UojD0t9x+9t6BtcLYHY+COzU9hmcWayHvul8pq1/kOskmxjY+I9U2FR11LSf42mSu/yqiCBrnLSOuLSEWopusPmYC/k+bomZj4h0teFvAwgO86t5eNdDLRCMmd5AptRQ4kCqaLJNTN0S5igw24iksbul1Cy2075AM5+FtBBowBwK9x16I3Z49oIFihKFb3nZzIXvCkGXM29jMOJxOvFvFIGzgNAtgPtuueoSl0sy87WcG17j4Xo8zsm2VMIUZN+63hlaUZsyqbh78n+M5BYugi2ddVcpIzYsoPpDZFsg+grGV3vGzGNwgmnHK8xc9c1PcV0aJWAUKkYZ6ZHDUQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 781ff115-b0d2-48c1-86c4-08dca182d26e X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:02.8944 (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: A8j81NQawEY1fSM5Mlb39Wp9q6QtI2NE7qLugHr83RVeB0VpYmZh4yGURr8jMqISX55aBCUgsZYU8F99eW/7Bg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: n1Fjcj_pjSsI1zp2oh2AVj22fFcc7pHt X-Proofpoint-ORIG-GUID: n1Fjcj_pjSsI1zp2oh2AVj22fFcc7pHt Refresh values BLK_MQ_F_x enum, and then re-arrange members in hctx_flag_name[] to match that enum. An entry for NO_SCHED_BY_DEFAULT is missing, so add one. Finally add a BUILD_BUG_ON() call to ensure that we are not missing entries in hctx_flag_name[]. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 8 ++++++-- include/linux/blk-mq.h | 10 ++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index fca8b82464b4..b9bf4b25b267 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -183,10 +183,11 @@ static const char *const alloc_policy_name[] = { static const char *const hctx_flag_name[] = { HCTX_FLAG_NAME(SHOULD_MERGE), HCTX_FLAG_NAME(TAG_QUEUE_SHARED), - HCTX_FLAG_NAME(BLOCKING), - HCTX_FLAG_NAME(NO_SCHED), HCTX_FLAG_NAME(STACKING), HCTX_FLAG_NAME(TAG_HCTX_SHARED), + HCTX_FLAG_NAME(BLOCKING), + HCTX_FLAG_NAME(NO_SCHED), + HCTX_FLAG_NAME(NO_SCHED_BY_DEFAULT), }; #undef HCTX_FLAG_NAME @@ -195,6 +196,9 @@ static int hctx_flags_show(void *data, struct seq_file *m) struct blk_mq_hw_ctx *hctx = data; const int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(hctx->flags); + BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) != + BLK_MQ_F_ALLOC_POLICY_START_BIT); + seq_puts(m, "alloc_policy="); if (alloc_policy < ARRAY_SIZE(alloc_policy_name) && alloc_policy_name[alloc_policy]) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 225e51698470..6a41d5097dd8 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -644,6 +644,7 @@ struct blk_mq_ops { #endif }; +/* Keep hctx_flag_name[] in sync with the definitions below */ enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_TAG_QUEUE_SHARED = 1 << 1, @@ -653,15 +654,16 @@ enum { */ BLK_MQ_F_STACKING = 1 << 2, BLK_MQ_F_TAG_HCTX_SHARED = 1 << 3, - BLK_MQ_F_BLOCKING = 1 << 5, + BLK_MQ_F_BLOCKING = 1 << 4, /* Do not allow an I/O scheduler to be configured. */ - BLK_MQ_F_NO_SCHED = 1 << 6, + BLK_MQ_F_NO_SCHED = 1 << 5, + /* * Select 'none' during queue registration in case of a single hwq * or shared hwqs instead of 'mq-deadline'. */ - BLK_MQ_F_NO_SCHED_BY_DEFAULT = 1 << 7, - BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, + BLK_MQ_F_NO_SCHED_BY_DEFAULT = 1 << 6, + BLK_MQ_F_ALLOC_POLICY_START_BIT = 7, BLK_MQ_F_ALLOC_POLICY_BITS = 1, /* Keep hctx_state_name[] in sync with the definitions below */ From patchwork Thu Jul 11 08:23:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730189 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAE161509B1 for ; Thu, 11 Jul 2024 08:24:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686252; cv=fail; b=W7teI0OeDM2fJYQ5JAVCQwpB4ErB4beh/r7HkJ1VLY6W0a82jWn+cJ3k/2Gbm9iELSibyiYY/DrTAHBoOWwQ3WK/907n83oK+Zbb0HjHRJ/zl2nHLhtWn9OKs/cYy8QgUQ8OhIHErE7agEDPsWeizCRTaGZEGNrIwoIH6p0P9bA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686252; c=relaxed/simple; bh=sN1BcmTptJOeA8gjTlY2SmDyU7YzOXUptqmSpJrd+NQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=TatoxiLA3TVVvlZCBircQWbExIijyrZ+qm9tKIwH4IreD+aGpuzQ5bxd71lFKSECdZjXx6JAL/oy3FEaDwEP8TVYqHNoDAQhUPazEZ1APN6mZeVFxByKsuUkO7pXjklyCNNKtUEZaZUfi9+TztYBHk7lTD51ZZ/O1awnHKHhJI0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=WoSQcBEM; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=N/g8mlDi; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="WoSQcBEM"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="N/g8mlDi" Received: from pps.filterd (m0246630.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7uCAT026543; Thu, 11 Jul 2024 08:24:07 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-2023-11-20; bh=QjvTVPZhQ9oHlDil7LBTxKK6Ut34mfK/rj6EhyOA2rM=; b= WoSQcBEMUtkjZPMaSz9UpfPbnTbYIZEa6WyhUbUkrtDwlb9BznIaRt3IOFSCwKS/ O9h8JjnVxv+bbkjW0dJMvtaT3x48HkvQHLwI0ABoREd7L6zBiF9EWYiUnB0Abea5 UEM8k0XHfrldJRu/zU9hmOt9Pa6Jzg1ifKJYzF1bH1nQHV3T/GHtbGI7EWIghVWV AVs3BkdvDUuhdmfkIp4X6Z1JvuLfvPomfSXzyOvI++nSZ469SfnaNT36KyuShZXu Kml/it1hMXuYLE9k7ybVUrLSTCvRtljFQ0JU0DOrZ5+McDHoEQumiQD5qK/zIqgN 3I0JhmVXUePwDKTgieD0Ug== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 407emt0cf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:07 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B71oAL028764; Thu, 11 Jul 2024 08:24:06 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2044.outbound.protection.outlook.com [104.47.70.44]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 409vv4p3wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HpYDYlRnOus2/Tg/Bmx42a4QKTrddS8Cw3Wk1OJF1wohtune+p3cDiUtjFqrAE59MDKxM5NQHq/e8lleclKEM+cAL7zzuCbeWqUWkAuElni9srknUB2kR4NSdvcmZhEvxjChHyfLCb3naMYEBXeErNqot06nk+Ueo3eP18F9g4lNhFiEty0WG0fp7JCfDbHTFAvuwXC/sYl2QeVfN/o8QoPJdpZujAUvJJ4C3uf9OYi5PdRuOOfLaIOG7Enaoomm30yDdczuCMs+J9BEROOYr07PIM4gLexgNo2znH4DcEJfOzfxYGJ6XK3n9pnQWoOQY+3fQ9csn8K9XVqSLEh6ow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=QjvTVPZhQ9oHlDil7LBTxKK6Ut34mfK/rj6EhyOA2rM=; b=Sb8EY5SUlgRl1zTcW9blKHNKYyXh+StrkYsndhL6Gk0pjEzuNPzKY5IiQsO9TX4q8V6Y+yyt+0dN847IXjO5grWQr66oipndJnDQCxirP/lQNZuEtU5XXX7NVo1zc2KgzKuV9Ydg0EBa8b7ODEPSzyLows3t80ZQjF++rIc7zBLe/sQb5pMUNAJEpgA1eyXXr6RsVHMMp1HPSta5V6CYAUBiUaoI1JhX/WQXt4+4GtdfaYF9jlJ/09NwLskwx6XExTb5p6SgI1lt+oLte7NiWgkLdHvOMvIx+guxmSH3VZBvcl2Aqd1o5ak3xm94QO+HxKTA77sbuGKiuDL7xi037Q== 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=QjvTVPZhQ9oHlDil7LBTxKK6Ut34mfK/rj6EhyOA2rM=; b=N/g8mlDiisxt3XBc9ZFRNs27Vb5kDd6MfaGx0WL5mlxpoEGC8hXoFZnO+MbWOx6qKgQhSrhRImXcZlHAd5tWjcrhtooQmvuqd1cDgLglOcce9T8i4xGgO0QGUjT/BcEK38oqdZsmgtkEEEKoMLtCutGyYWJkXjwWmVADe6bn5XM= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:05 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:05 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 06/12] block: Catch possible entries missing from alloc_policy_name[] Date: Thu, 11 Jul 2024 08:23:33 +0000 Message-Id: <20240711082339.1155658-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR11CA0083.namprd11.prod.outlook.com (2603:10b6:a03:f4::24) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: c1fe7e4c-d441-422f-b1b5-08dca182d3cf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: FtmSSNymzGlbOdL5D+Lg/lFsgrnOXeN/aTsvqyEMK+VxXl0ZepjzEU7c5KIx+JhtTgRnn/YvJmN+4fOTezAQvBYNH3Mywh2GpkMj8jWxVomb8QVQ88edf5IwY7NcybnUsYlwG/+g6kLr+Se5DGldhi745IF7zLpzdZlZ07k+QJJ7rQjOdVRJ/UoyUtq9PcrmtzuIhNBCn/VyxflNxJ6ZK5zfr+g1pFJj8LOMaQOsGM2QrvtjYuQfflad2PCusYcat3p02NkppzoeBhNZiYHVJFWel7+7XRBH0gAgnv69zjvLi4jz6OL7JM5AX0LWV1qQ3H5lytScd12VuZQaOOv2ISEU3Vcxph8HT9fnKMXmHAN0c35R6LY32Af1p2MnBtNjplqUt8FWaCyPF+z8XtPPTfWHc0Jrcon9lAGzIWra610TzfysUgXDc2isbjC8fwPgjX0MrMpuvErWIHyilChUfALGxtZAQ+ezvqnhGzDLGa5loQO1iwbVWc3I6paDWDhcrSW/rJUj3/pMRbLvmlGtJSTzvspckuBMgPV2BEymCDuIDMCmJ37HsMQFygdiZu+fGLBZykrRDMoO8EjH+ewj6biRzKA2zvNnoGjzRihEh8+MqtzxX8SsuFoNAF+H2eWFM3r2fY7TAvogVQOPo1hEIF4oVDBeQeN1S9QylNnALFDC/Tj2OujTDcq00NRnLR+4nUhsJNug8yzsa84BO3W8iq/aszR1SgFtztrTSzH8/CouFGu8ukRnuETeQvKlUro/YaXRzrZO17IJKsI4o3AhhKU/Z40in2IWKSGBU2209WYmu7d/0eDYo2yv+ZPiMw2SDu5SxDoNXh3UDsHCIhMUI1wOyCgMwpZseERE1zkhFcy8Xn7ZHy7WkQKEOE3VFpYShoBLLm4EjVx7DV4OGXgjgfXcmlaREgMFXO1Iv1JjXy6Sgiek/r7q/dgX9iH38ihGubwpziqDtgcwljXkrzLbTyafVszJOamwk864shafaXCODib6st97dGmmtIHbhfxf+gw5RcbYmhWlyxBcBYHvRdBPxgLpVcmy2VJWRsIjCd1cLXFSNjx7hXAfVXqpMOW3Wct2zUdgv24+NklbZXIWmSutyCt9vitoNyzJRpLczkg6jjEaR4I4SL3UOhAs5fTTHR73HJJAFDnK+/hyHLpQwr7h8cSIcwno+YIQySumbLiDmzbBKaxEr9DO8ZTCHxFIfXoqZksqB60r1I2dXUDiPv2rlVjVkSxD4KXeaQ/0ll52SDAcsZZfbeWSU3ysP3SGxpsluymy4n7M4vRcmzJHuDBxeeh+kI1O7NL1mhQE5s4UaE8V/Ad0XUvRkXbLounzw2fEl70elx6VP+zUsW+BQg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2oIDQGOeJidjs4YLjRf+DgeOD8eJV69iC6iYP9s9AumWuPxqxylJ4dRHLLzm0FIUkV+LaudP1q4uXZ4VXPe7/mdDQ8PCo5l9w4/PJsTTIwEjT9HIPMZZVuHNI496e2dXeafR+48Fwtd5dxC6P4DeOrw7sFpjThodQZt+IsoOGpSlTnYR5ETUwiCUm2Ch1MM3ikqJtCTPvW6e/JXwWhS+03FaqFwHMcOHq1FQpc4b3paDHGpky73bi/kXcIVcg844+kxuOEs8+HqN5m9h6L1AjoppmKhiZJr/ueDaeYOKH4t7Hzo0fOipky6Dw8fjwtNKYoS2zhK67+Bjgsj/AdoFB5uueYNbbAlSuq/V959W36ILjmOvS637k2ygZiK4j58QXCLNKVP87Pjhrru54qj73yUcwx72t5x0WwCDTry/2O5iwGSJLR8hktnzPICFptDtb0nmD4uvH2v/6ZsKbZKawyRHB2nQyI8AHe/iTOmsezrkMyNYwqU39FqhNV780oKyoTsYWvs9oykaBj8qiUbso9lF7HVXtNLqbjaov00xYftpHSOaWOIQawRtLtfIzdwmjxWhHjDcWb0bai/sXkXG1kxJZvdsBXLFyW79dY5cy78TAA5lFvv/JYYHW5sqFc7MHfROtKooI+kXPF6sCYLlTxEDKs4b2NRomL2qJ4Pu2kI9QoTEVk1KcW5n/TqNuk40Ym14SXdM/O3AgOCMp/dSCd4+tqJLWIU7cZMK8F+JNQ8DJB+1v42YHk8bFaG184pJ3mtQkWmY5ZeSiMaBx1LI6S74mYXET2GTI/QoQ2cxAgU2/N4gVSkGYBwFZZ+F3oPKcQIb2w0e/rzgXnzRmmevC5vOSz9B+QJ+nNk3YccL8sbqWmqm0/IUd/24NSEyO5e+UXDpdytPsFWqaKkO5FPbrKJDXKtlEc67U4jqfxHoNOlHrVf9bGwUfrIW5B/bChDqLhA79Zz9cQjV8IteaQksY9VKRA+Fqa0dyhMJrfXjG1sIXrFR50a94q1vbsmE6MsaCGnXLjJ42eU77FNGWHqHzB3uLWRcCTAyjROxKf6iUDrZQk/E2RUmCo1FlM3rrn5e7I4c3A0yuD0u7RUFGcpmvOQmiO1OFfkDFm50BWPxt1g7QxN7kssgExloEMHgh9xzVs0c7sT0Gu1Pncvb2tfWOQinaq1418Cl99iwSu3C3BUEgxxxV52yLpUjsVzl1WkTRu4QsgEnr8UES2F0vjZ80w1f6HdOfDhKOSRfMQyj5zXF+3NVvR3LIKWw8la/4S9uViMP17MIePjJpwTjfdDhCjpuLl1iOBcZSimaceqchYlwL9RIudT8JWQM7TduQ6Zr9pY5She+wJtQwSpwDSgQgvD+55XgM0HMcRenIP5piSjHJRa8WeIfYfhgs27NE4Gdfl6y6JyAM6BZ5FnBjGjSn1TXA+YKO97FHCcv1/evgCjE55ZuMqP1AYCaNit5gV34yWC3Zom1zey9lcgn5JQdXJGCfa2K8e4aAwben2+wZuf9t9MmhRM0xhsAoqYzhupldj4tZ+MnG94rLw+QhbN3JttPmQRt5nPj+FpUfoMy/nW6vKybJ5JNAVUcnaRFBqD+D1HUYfk90otYH6gdSoVUVg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2Fu3CncHZu1lPHw87Fdv04FePyrCL5ZWB8TY+FuRzrwWRNTnB0vuejrvbifQhRNGNaMnP79VpfQsaVCnn3YIks4fti6flXFOQrkG7mhgyWFgYS8ivNsqKEv7q2uBprdlmN5b7jAuNTOulL+Rn3PczJmmVN2irNbS3hPq4lQaOvdr3kmL5Q6z+t//FG/QH0MZCA4XWPv2K1a5HS7aVvxYgYKY/Adi69YZjr+HclDIF2zUjgd/kEykzEmLkZEjXc70ETiRV5OzB32jFLXI6OsxQZeOCSzfk/mf+t8ERBW/SW6fsZIqtkWAzLEn3xhvDmu4tfrUsjNej5QabgNjBie/g54VJYhykd7p8g5+y+ZZUHInT1k0vT1joxTD59sZUeUFAF2MGa1XcQCKvsLnHmMKDxXV8YBJK0g66+3h3jx04K5GOVa+MjQTMAKVmYrz1ptynuN6S47581L3vt+0Kq+lnTAgd22ZFIHokD7u3dNJFEpFReSmLlPqv8pSuOqIzs8lInvT3b/iQS1Snd6fSdCuXrm7Trb8N38KcstVuwoDi0JQZOV9lrjR80x1I5cFVWN8BmCxzR+D9lNQzAn0OlM11IC2H1oJKARXdPjK70wMDgg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1fe7e4c-d441-422f-b1b5-08dca182d3cf X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:05.2195 (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: 6lWd2GTwSv/DhEyM9iBQDbHhf38qW9dUsILnnpT4sT1CwaWs6C044wj+2rKNJ8S/SLVV/L/zx1Mzh0kwhVMDjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: Lo4wAkXtJHShO5Zj4oTWUop7NN1IgDEg X-Proofpoint-ORIG-GUID: Lo4wAkXtJHShO5Zj4oTWUop7NN1IgDEg Make BLK_TAG_ALLOC_x an enum and add a "max" entry. Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in hctx_flag_name[]. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index b9bf4b25b267..91396f205f0d 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -198,6 +198,7 @@ static int hctx_flags_show(void *data, struct seq_file *m) BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) != BLK_MQ_F_ALLOC_POLICY_START_BIT); + BUILD_BUG_ON(ARRAY_SIZE(alloc_policy_name) != BLK_TAG_ALLOC_MAX); seq_puts(m, "alloc_policy="); if (alloc_policy < ARRAY_SIZE(alloc_policy_name) && diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 6a41d5097dd8..454008397e64 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -278,8 +278,14 @@ enum blk_eh_timer_return { BLK_EH_RESET_TIMER, }; -#define BLK_TAG_ALLOC_FIFO 0 /* allocate starting from 0 */ -#define BLK_TAG_ALLOC_RR 1 /* allocate starting from last allocated tag */ +/* Keep alloc_policy_name[] in sync with the definitions below */ +enum { + /* allocate starting from 0 */ + BLK_TAG_ALLOC_FIFO = 0, + /* allocate starting from last allocated tag */ + BLK_TAG_ALLOC_RR, + BLK_TAG_ALLOC_MAX +}; /** * struct blk_mq_hw_ctx - State for a hardware queue facing the hardware From patchwork Thu Jul 11 08:23:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730194 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52B44152179 for ; Thu, 11 Jul 2024 08:24:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686270; cv=fail; b=K62jwAKYiKf8f29VBa7nrMxhAzMZiK74b7mO7O8eeN/ZLce8wZH594nnE7+VL8lTj9mnarSGdIKxEfoR/8CaVhCNzxjqAkSzqGt3bysFnLrVYx4IwUXW5rPsVKDKb/QO4yz/NlJIRgnns9WbnkOigNs0uFc2C3xXz9s7VylO+LA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686270; c=relaxed/simple; bh=E+Oq98i7jwgK3g8WDSL+yxHXTbUWzd4N/1ctR8Q7QSE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ivff2cHNVrXb4VaqpTNvlNclTEDb6k1qWkIsjVtw558+5qkdNRgC8V0SckpxdLjivPYOittEM+QEtuFP3rpnavgnyHtnXkVMh4iT6LFueNMXbfE6METMP8/jzXEuHqHE2bSH0Z3BFaCbEj//2CBQhYADu47gB7iWSjsDdeX7gao= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=ebnIC4Au; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=zIuZXybd; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="ebnIC4Au"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="zIuZXybd" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tVU9014042; Thu, 11 Jul 2024 08:24:11 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-2023-11-20; bh=65jJ7WI5WIEGpbRips6GAhApJV1IMjq44LLkllJpyAg=; b= ebnIC4AuTU4t5kpV7yI35cdX02KlWjHjnpB90XATYhvH4F4hpmbV2PGdLI7grtbh gVJBdLf9Ft+kezQX4scWV5vmxdBiQIMROzpG2LlBTY7qaJeDB7Z73FQ/szDF3MhJ 8+QLG14IKtjgJguDAZ8YfD2VkxnWLVIWdzkn23wEMGqJ4rZctvGSlLh1C4zwpJef yo/rpm3E08PX2eZgcv76VyhunODHvk2k0F3eMvfj8Nt0BvoB8zVdVpCaIWph/zgd u6unBbRA4g7gHFAhhntcPcsH9AAgRIp4zmDnBhjLh44ySRNTaiT3H4s3FkOHphwb 1nxIMTYgkXp2aYjFMNT8ZA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkch046-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:10 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B6Yj8o008910; Thu, 11 Jul 2024 08:24:09 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2101.outbound.protection.outlook.com [104.47.58.101]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv478fe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=um/tISSrOXiIln7FVGMjuv6tjhO2nBybVCq0Vl8TJkVFZwwVviA3rXoum88zyW+o0MdNIH1WeYyRYFTY0W1ahaXk8jBI7wltLp2qn5DEWjrRwL+ub0PCjl5vSZKWxIBMIsFPQSQwszq3nRjGb4Iz7dxi2C5UP5AGDMBQHftHHemQip4eP3gTxlhj1p/UECHMjmTEBiSn4TRrMtkWo3u4kBbWt+sP7ogZIOkpbmw+voGsM8l8VObt+R7yGxpJ7b4jI9yrB8HHOWERL4fLnVvm8ctwNBKTXno2anuZWreDC3hKq7OiJdwWZ7VaVD7bQmR2S9rY6BgYKfSDjj9LPzk7vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=65jJ7WI5WIEGpbRips6GAhApJV1IMjq44LLkllJpyAg=; b=JCnZhNCR0X7t+sCVFFZi6JoLY7rBYymRH0tTuQ1bpjmnmUy9A9+At5Hn11biHmDDNo0j96uv/DS/6DtbZ1xxiF3YwgPi9UaH+ztWPQBpGJ9k3Lnc1g3q13VzSln6YPgJEbtOikz2c+DHNIIkrEce5U9aWxoeyBWlywkiUG+oYvbMctYFdUYpeS56JvP7JU/dDOZ18B4BDlKda3OyPvWgfgXO/zmCXdcV09o5YC9gZ7EuFDuKwyI4qmOkjTucPJPVPbvzimcwYEE6QeheVdyUKzbQWsTGLWnldq97Ul6cPoLf/G1b2PHd1xakmbC5d+ZOLbIohHzn2gQJM15hrCn5eQ== 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=65jJ7WI5WIEGpbRips6GAhApJV1IMjq44LLkllJpyAg=; b=zIuZXybdadpsJQQkAZ/W5tHpzk/q7CBGJtPjqjMgA8fVThjzB0R3nN1yrw103Q50LnZpcC0bQW/QCD4ouAjU5jWKCsvHX8Auw91Z1lsANVemFwjPjQN7R6m+RHSGlKaJqS0g0v3Oob79ThQxqddg2TLJRa4y1VU1qjDdnCHvqgE= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:07 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:07 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 07/12] block: Add missing entries from cmd_flag_name[] Date: Thu, 11 Jul 2024 08:23:34 +0000 Message-Id: <20240711082339.1155658-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR11CA0087.namprd11.prod.outlook.com (2603:10b6:a03:f4::28) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: 740a63b8-03df-4cda-0706-08dca182d517 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: DvAGrL2Qkkycx5i6rsvs9nk428TllaUZBWOTTGTaiuVt+6IVu5+hqYHzzRbOIF62sbAQP6TJy95lkiocqiEPwGwN/MB7J+NTcrZ9v1vvGdvzIPq8MeLuP8y3EqmX7KZgLrGwJ2ca9t4oscs3x2m8xRlNEkHT7zNP+46po11tlsZGqS3ZGaVXY3ZeXFEUdsFYLM6imDNvQ+FnQqkANm01hk+eplxG3io/VbZhzkCNWZV1GWw29dsvhKTVyMj1vZ0Ynlg2TLFn6k+oRFEZeJE5tWRPRheuCoyZc6k3nk8hYkTKcKPyOAl6RsgUkDxUE7lELWtWsx56FgNxsTkrEMdwLhK8HQkScup+k8h3La/RxTQJ25bvT2DJvFVlVXJpAvPxWZvbZc9MrMd6Deb3QKW/cIhhOs+1WHfoO7kDZP5gOz6Eg0qB4cCRCQ8vxB2qENOSub3OH/erfXzNwslLCJEpBVcDf5kvzbfXI1FtxLTDDG6LayvSNzfrshogZf3KvK8pseWI63oRMJ0GepUkc896Xxaft+DBBj+9E3MyuCFIbUizhXrB09yTX+rfDXkqu17xDa9ebFrhwsfv828s0tZWT3wq7VYEmnrovb9m7lSYyZD+uj0sSNv8ul2KWWZqlUOXBOoRIkkmERrRiwvt8RHlhaHJct8kzdrwqRTQFTfIMttoqFJUgQ8CKWthot2SiqUOIOGTAWjATwYe3fYvGSxAxhTfFY3QKtPvPufgb2U6pDZIT6a7f9vF20XaWL6LF+25Y5ePmvpR1F0wz97ocVRif8tGCNdCaDDaccCfowLcfOejwmf4DB/ljsEYucfdxwi6Gf/iCb7J6V9gOl2F5KTWrqiBQVQpLIwCHK9bxWYbYHqYtR+J2ffvbyG8WUiJpWa3nS5K7HCmBwPh38PTcckqmU2zEfzbhoMEVUtWSsqh8tKz7wjLyBwaTQrVPs0cPfvbZ+DUbkYGqiMItpxzkg68qVhSyKdXa+jStikcQKJc/WUgHAt3lRKA2ioB0QamOxPQHyCLIduFUskvzeIYR/bd9u3CCAjWc453dsqsWQoKk437CeJCiNRyo/I7GGmdfr3kS+YSZb9nEB/tX+nNlSCYHushHUOMxe28mwjUQzxYvDT83de6ISVDPFiNCaXUdiQaT16f+ITseOEDTr64dBvhqf9IpKPR7yu0bMl0FsReePB1lxnlXTCsjPPbQNcUeFQUhgCx0x5F94wNpqCa2rsLUzffEgJ9KCHC6MX88zViQ3K7God+o7KWL2vk04ejqLp2rdqSBa20TVWNVjOKmW4KlNfq6xhxKbWeuZUmh5B/meogGCkO/77YD3WVa92emyjiEgeKswaSFbkqvYqJjwNvKA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: j4n4O3z1RAQzcdszouApZ+ZmZf+MszFxLhFqgRT99FFVTq+3ZLQaX03LM3dv+XLsxI2IzSoquJYyLbfVcozSeh7Hi1IMNXlNmTRkIyOoO6MzC6hR4V/degHhH5+Z4Sy4VxzzEZWjyR1dx4EFXq78IjOgribNPPe/SNHWVFDGdbRTifVV0Fs0bBEdV3usccgvkvbPQrrmIwT/YnCaEmPwqLqRjG8U1EEKhnEWYAkk4+mcBy9RPySjaRYT+6CKtYcNbBIfVzO2KPVFzFCoiwOcwxEBhgL0JqbqjhXeimpe3Pw1TPnD0fel4teGpHOShxgwQYIN12JXObZB3hHWwDpfG48XqxZUo2yqRVPml+mytTcpH6579ExZ5iErIESkTJ9baTAqMy7+awKpsOaW1xJ1s4jyAsE7DFmCJd6FNN1pzKK2k8yUS//q1rauFvvv0C6QH4duCFLyT2BFOGkTOrrwCXU1/qDdpRC34AtpMYeqcbknpy1vrCiDBnf6KrGZigp1FSw0BPK01mGnF3qmdVYWlHreSJ8yvNOOtnc2NcKSqpxb3NxyAogR2mBubE75C9mBQbdLN2DcuLkhhwKfm3rTT9x29yuHmZ/A054LIge+cdwCCSV2w6weF+LsFJx+sLNcu0DLZbAuv8NTW7TmIrWzxf06ttm7fNCwOhLJlLS7YsPa4ewg/yMjdYusbdLWanAgzfjT8Lbu/k8ued/ctOWbMyzxewK2TPtyZ/LWYhMBoAS+ZkYgVtw2m+xlDU2v5xojlFqmNZE0S/ahVae7eTgQjIAkn2zh52XbV/ufHPaz8gjmkCwPe0auIdteAJXi23Dj6nLjjLbOTa+5jnjuXEfcdA95gkz9iDso6dBz/RkgfrvFttUxem6YvWDTzsIUOcIN5rCFx+M2aTnVeJKJnnqh8Ra2rOXfLPrT95ni1mQ5ipStVJiobwSrLXpbg4AXdRpy7o9Qsb0SVIXcXaVWUjn2Avt3QfmqkwQz/t0CdDKvTfixLMTwPb6tD8pwNqiBsLX3EUVX5Q1AVzoxa4ofO/XOewtVm5JaqpiwHse526pn5Z6c4aAWc2Pa6jAwho23QLepcQDbs/G2REQPiZcYNEHK680Rt8uY9WZD4OTIXzBdOigy1OB5GUlQEF9LsXQ7/Y/O9a3wncqsdAaoFpySQMYrnbJ0XkROLhVH0YNQPV6OMny6Meb6xTijJecwtdnq/7lpDZ1/EZyAQHrnu4+whb7QLhzhYABkX133ht+t31OKkNKmF1JQws3J980yRHy2Hhtr5W8X/zumTPE7T40mqAfH3ATIPSyrx35H6T8H5yXkCne4jjsP3FV1MN0c4DoxocaN0UrhQZuzbAZXi62/nOuCyssLBRXzCvTpLJVILOKUQKg7/mHqO1iXV5vTjm9bZ3zf5obIL+Mlq/GSQRDFiJv9ONIeBE/3PuQN1dWsGtoq/QhaJ+isy4ty1XSL6ucKk5q6Sy3kNQNIdDlG7oI78FVeX54RAq70ZMVEv7dnTM/WWDLp5d24OT2iiZ12g+ly/Nd8q16Y6F2I6wjOgOXj/qqLBf9v8K3uFioN5tjkrTC+fII6r3rCqN3np5rRe8MbQSly2Hin5L04JBYHRlair/rfqw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9+7hozd3mWxJk+6nBPKvPffeYU01Wf7153ExY+u/1FJsSneAHXntafVZZ8tikShHkbb9FpwV1Ns7+xqWLGk8dUH0QCW2fggi3askM/7o+c2eCarhe/S1JfNXh3EqbGfip6MqoAH4iuqzXrMCDJ0KIdF/nwvw1BS793tCGogKmuVxqpIQtbqR6wfXD5u9EwARVGzkmknhxivaeHgZXew7YQvzcSTr7A8gumiIYLY3c4+pdaNIAf56jK6aO6C3ahq+rV/AS40w2QRydbV+ro93NzFqj2GBLlMvHz8PMSjDQ2/P5Xbg+GO245AxunBK/sNFb4S/HTus44l5NK86LvLarkzrgLTj9GdAqCgjKjK7N0hm+5Ro1Y9+scIRae/DtmAtB4Vycf6Z8vhbCPUraqFckZBn4K7Nb3T0TAsiHi2Z/Yq7Apqls+OOqnA+FRwgXkCzTI+ZIn078SbVsmQKBdI3o2s8qoPYwVCMHUN4NDvbdwSNNa3MdSR42mMUlcjwe3Twu+JOLP01mMQio9qSxmV0ZDijLIKQAUa5UcXGfsTrdUuQWJTPlAeG3V3RfhfxjUOf87ynU7tLLp/B2gNNs5zJ4D1xL/urUtcuSg0GMS2Jl1w= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 740a63b8-03df-4cda-0706-08dca182d517 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:07.3321 (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: 4R2yCXtVK/Dj6G3+y71Yf9NqLtPNktDc1TiFC/ObEOO3Y1g604mpRZ9FpgURTWK0ejJO6RDFlsraEa23as+jgg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-ORIG-GUID: 7GVPROUhD3SbAs4x4i927R7qcvGJD5uu X-Proofpoint-GUID: 7GVPROUhD3SbAs4x4i927R7qcvGJD5uu Add missing entries for req_flag_bits. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 91396f205f0d..cb22e78c1070 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -230,8 +230,13 @@ static const char *const cmd_flag_name[] = { CMD_FLAG_NAME(RAHEAD), CMD_FLAG_NAME(BACKGROUND), CMD_FLAG_NAME(NOWAIT), - CMD_FLAG_NAME(NOUNMAP), CMD_FLAG_NAME(POLLED), + CMD_FLAG_NAME(ALLOC_CACHE), + CMD_FLAG_NAME(SWAP), + CMD_FLAG_NAME(DRV), + CMD_FLAG_NAME(FS_PRIVATE), + CMD_FLAG_NAME(ATOMIC), + CMD_FLAG_NAME(NOUNMAP), }; #undef CMD_FLAG_NAME From patchwork Thu Jul 11 08:23:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730196 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 32E1D15279A for ; Thu, 11 Jul 2024 08:25:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686316; cv=fail; b=eQE+hhA85PC8ruVfXo7xVIbVsiB6L7fwdwN1HFZ/ZZvQSZ/thqX3U96ke5nhmERPNrCK/dSAamBYxD3pMK6mchXj9FsjIRYxbEPuzYD4tcu1M4t02HK767ko7F6p/z4NfCBvsOlaEio123Bkkg5WyFjefj5dLhK0BxOgR28+xcE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686316; c=relaxed/simple; bh=ldalz7DlRWURK11PRLZ2oWlNnmNxvFZ8Ztz3+JgqpI8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ilafDRqICbvl/MdKswerD+FHx8enQ62Vh0Ptlj7VaI83SWTgJ8hKwtf6404Imv4C65y+FhLyRWS0mU3yTWzWPxl9Z7f4sW3Kskc2nY4pLA0AxmJCJhMzpL1yYC9e8gHVlV/ATG2ycosH1d8viQlN5agN1SlDuPRBgWlG3Vx88rU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=W2L7Kh8M; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=adplWn7B; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="W2L7Kh8M"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="adplWn7B" Received: from pps.filterd (m0333520.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tUrN016823; Thu, 11 Jul 2024 08:24:12 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-2023-11-20; bh=5on8O/RM1wBkuy7JzTXgb5d6tl7mhfjt+oqDN4y/7y0=; b= W2L7Kh8MfeIB/Bpiq4r5jwCTnycQE962QvWZWC9piW4zjqTNNtPcbUN1Dfj9kCaB nw9zATju2NXruYP7Cb5avuK+3lazfpxHKxjgExGObi3y/NidPOiP6HTT1VF0IYzS 3L80AuLZi0jwG/5kvYZnCtBwSTJZGrEuVxVG4SL489iTGBEGMHnrrgOl8Q4XCWRh gDq0fph+vm84jAmFSs0LimeKN6P+MGS1lWrXIPIIcUIh8OUMWSrCi6kuF7lOl18i my5qfPyrAa/MidyYvBckwTrFcmGMNaoMmmIJ9ROmjhu43P46dWg8r/61A6bEx5/I AFax9WDWrAF5YGICVEZqZw== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wybs4pg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:12 +0000 (GMT) Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B74sCu028750; Thu, 11 Jul 2024 08:24:11 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 409vv4p3yv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ATOmlaCrkFH4wOj7qhvHSD9UJ29Yd7xiCTGBH7q610EFtc61OxIFBr2Wf9Vr2o9jnKR8WJe/Xev0LF1v5tdGp4sZK6tRd78gubAOcYZB37lBDEmvdGbYdLaWdskhNweo45eZjmultmS3ngXt6GFPpZjLMbXMG+LPtoexk6N3TO06L6r94DqD9Pa48KGdsx+8+UsC+KRQcXqsVjbYKmt71cMyHbEELacOTj3916xhX2/jRnStUMZ0a4+yV6nNC4gWpGnMykLqEjEofP9mURhCX2/3aTwfEjaG6Q+4NhqrQ6wFeOyT+JFo4qHV1iCEU3RtH7saMNP6PqaS1aIo96A2LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5on8O/RM1wBkuy7JzTXgb5d6tl7mhfjt+oqDN4y/7y0=; b=abI1UhjTuC7FFYs2VkRPeeDeFf2sxSuv6JGoFlSc9qAh+kt8WM7eBYON8zjaovfCtrNuZUH8oGJLKKCJsrUK3AnO8gynHtl9IW1dP60ArNUYbsVArlr4DEInnAmbOarrjOFvkRaCWMrPOO7Yd2tkT/skcKVQbJJJxMoOniaRyMdOBlCeUYPsLCmuHZUTGC21isGqRzwyVw7JUTRJHRyfmSoUGrI8v0IQuUAPJKY9zPyke6wd/VmNJuQ1P7zKxHR4jfNquMQUjVbhxgJBJ5jU3bA/N9g8h8SXgd+uR92WgAiAnwlfJBk2JeiEErRGPzFKweWQAcRocB6YZxsVBnUrFw== 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=5on8O/RM1wBkuy7JzTXgb5d6tl7mhfjt+oqDN4y/7y0=; b=adplWn7BVhfLvlrK6LPZJVO7c4Xq9hhmyfHa52LIqU4kEJKQDG1XHsCRve/MPoidWD2J0SD903yGf3XZcQCu6gkdni/5iHYQCNO/D/HgysOiTCxOvQpUWTqyFw7mgndGDwS+SSL0lp+BmGdasF6TrWOrAllPGp5T1eCJfsnVMC0= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:09 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:09 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 08/12] block: Catch possible entries missing from cmd_flag_name[] Date: Thu, 11 Jul 2024 08:23:35 +0000 Message-Id: <20240711082339.1155658-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR11CA0097.namprd11.prod.outlook.com (2603:10b6:a03:f4::38) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: 75998924-8ddb-4b0a-c93c-08dca182d64a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: gTpk2hJ/m8hIXSaGI6C3gCJx+O0S3Xm3ZS8cF5mlXJuJNgAnZtq189dFPIKM4yx1/D2GnjBVBo0x9fh+mtJAs24c6Xh1oKgkUUU6pwRCD8LkFPFr1ur4qHfsKOlckMFZ4F1ON5b/r4kpzMFL0SaTWy8LMCr1zD7A3V0Z7GirM6UnMWx3pVZ9mzIAkR2J0CL5Ufix13MBSpDXtAf0TvrmBSdWmRt30WF16MNM5jIfxFErsyU4ZHv8wNYEwzXCmBM4MQCUKn3tjqpzQmubYy9vWrX+9CO4fpzOTxosef6tjemIixjpl1AFwM15/SZ4CTaXLN5eihHytfCK9tzdsLMw9hLX3arISed57EbgpwQi7XyPY9z6PwNQUnwXllFySoImaRnvhy6aok5Q37fG+LAQ8EeUg1nlTHrstL+16+yDGCk15XnTgk7KisM6/1pYNqP0PrIp1jFkrddICnCKFeQqQIXx1fZl98XlauijUPeRG7xnoDgsgMfLcAkRvgNfgV+WTLaSTEGjXhLq8ctPrZ2u4YJy7uezLAO9XtgyeyKxObXTGriXwsg3qm+cNIKKnb5oEU8Q9Rs95DP3eV3m1LnXQSX5UdO0Tgn7VzW0DW8GwrYk7mmJ49ICImOuy6fmT3pSCMbYMNNtNQ26qYPR0gPjCyCVKvn3KUUgjoEW1K5/xQfLvqNbSN3ndRRSkB624V030EfM7s3sSe8NRHWhDBS62Z3Y493zIoEnr5X6/pQe4YgnEaQGDR/Dgr33VTU4t857roEwaak1xG2qGBHOeNd5KJD1Q52ZlYP3HAXzusDx7iS9rVO9Y4v37ZL3rTwgiCADh1GSneQaJmwblfKT78VgNMPSnS3Tqz+A1UNKjM1/deAXqsdDVMpw+z3pRnUcJ2hB0CNZqGkJpLYq/op2r9PkAoZh5xH+gAxYGbaDZu7untpXMExqVvY7VXeW+AYF/NyNCvG5VxVCuCkkcQ2HaPFpDJYpzGgDwLsvbzTsV4BNd8jF63PXOuEzmBZHppgyCicJYiehJTnSLDJ0Yhumq9ZcubCIqJd1m/Er9WbaUdDxLqtnkaAuSDY76vIht71QPNzOw8Ky3IYHCLtObdWRhCiKpjDwt9ZkmyFXvLZlgxddYM6mReBFdaduYBWHofLlc6b7k1AJua1+XNK05Jq1GJkDM/hsoIqvNbvg5GoaFeCnJmJDV8qDebPMM+HJdzLOJt1BtU/A1lgavn/ihhXnNooPJH/VjXOYPD/jCdZX6An1wGQTUe5Bbe2X4ndUyCSAw3/qCWVPM1V30T/5skcc2+1XcQn/ZNxzapfQ/3yXf9SQLCfkFJHhIMnEu0/SXJpwpfYkurKHl3eIbaqCctmLeMDD5A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6TXoPlTy9kOGPbeoz6a4V43i+BZKHLUW3/5g0b24eRVQqbrWxkGYNFMG001IgKO/6osmkAhfowm9lpMNmBkJU515Z3x9P9hAKX2+zUP8tTyZjtTbvt9R+4nfgVa0bIfF4lhrrUygA+tLgQNeFIepjnmwlogBOp7u5L11+8n+QMnPk5QWlH7jHzFgz0KiWYyCF2t8VtlO5x3MVHSpZFUVbOqVbScfMtRDbvzZL/IcUMK8VY4U+QRK2NxcYK/763rGLFIzDrCf5pqs7gObI11fWgoEnxsKrjVE+XUnkNoMfwoddSe0ei5iidZ8UpLuGE73r5iinD2LiajhsbJpvX3eOojm2Z7rKWQjM6fvctSjHh9t9GEgff03TmWaTZ2kQdbpBrbF8pzIoyNALGhLQ6HWKpVp+GzxGIA8Qg83km/MeBaQAK0DIfux8ZrPvusrmp1lrVn7FdoG9NqtOvJaUxoYJj9tiVaIE9yeAnNs9WL/rYmqUXIk+EvU6tMbNtLsNmVlLXrD+800bhp7E0mJWV4M7aGsBNXN/rkwNNNNZOzNHOtXAndOiLhgxz3CjaOnLn4BWuSLPZ4oi1NnYazYKFTMLtm5u1OG7CkvppxGn+8atHwqMZ5xI0FieocL2zhbV2r9zT3iMMF2sEEc2g6Hp9J201muUTnpPbfuggcoCUI9OJR3INXX7v/pOeaHW5Al3tXRSzeAFwjYVmorsd9WYIBpcpoN04Arfklln77jBf8jUqirvQ3TvB97w/CXlUkBcsBAlRCflcQ3qQ9My4oSgenFAQP7KiMxzyCCMoIcP1xNTYVzS/dAevYRTYSbRuoJ8qZbobOOuHxGpRThmv1VGIiLFfxMwSP/9r+YwVPjmgG10a1kWe9C0kppx8v3gmU75md2gE0ewBtxFCImhA/D8jxOEVzSko1rl7F6pOLFZUc1QTbQ3IUTkL2D5G8PYjYwHWeyGLlTKAOaWfAo34qRvjzsTxhWcC47jrVFS6QsLb7LAApWHjluxHqiCIjtZViyYNuVbY43thEL0AzqtvIKrK3EGDp1Fay3APkOzV+uOjMwut0bYbjKgr46Koyh5CxwHbCrmEfjIENQL8rLyft9XrupXge8BjN+mwrzqS1DNmUt6FyD+BsXi29n+nGtbK2xO2enF2TRefKSyB0k/sTjiw4DDWYxkkbJW8ttNOgn3XPkuhTJRJ+y/YAjf40VWs6W+UDbvZtKvX/zo8TMG4WfHw2J/Amcri/oQO/3eRPoWfMMBzzhagpBlciwKbWRxKYlLctNN0HfVfaeNkJY7rp97MZpLbNdg0SEk+a0XOjvuFTpPri/L6VrtKBAPKF2b+NGIGkRny4vTbQgyf7mjJKPEnp9tRgYIjdmh+0UZB4DWzSkU8dJRi7Z4x3bJbMaxpcVKc5NsKO68cFp5fkZL/b9qIxON/1KHzxkAVmvSpvt6uAMSEPEcOOC+1aM1fLNrpLpW8bvX1+3BH9p7Ir2j+b8/erLgu08aC8lA+7Gsi2jICScF7oZ/layUlNfRvdhO5tbmmSgMU+KR3aCLrtsBPfZIMEAA8RInxU8OSfdl8Do3d8i8x3Jr/CssdQqu9Sf8TsPkLxBVaA3edhKL8g2MVOADDubVQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 6DJL++zmwZ1qefdIHoU3jAw53V3PAsWJ2RwMztZNHlCbw0Gem4hs6TdfU9MQooJgQUyFqG7oQBskIJXKd7d6M4dylOJV4j6C02V5/q1RIx1ouC83h0oPg3xCrMKVgTxBwwfoNWo4Vu32l0jxHjmbMQvDt52AX4bSr4QzGesQA8DkNDw3hZ523qdYWW1kV2Vhc8RmxVH0bvWQwwPp0migYgFS66JEkq+2ME2vx8W2fyv0+b2aV0xnXp73FWjgBUb1gbU6vJk058oVi57gEGb8wKQNHaC+BqSd4MMzQ3ZaHgbwwaTizNG3lbQweKbPgZYfiXI1dIdDACTfdtOVAwTJ/PG/jZZOEqBcKsWB/MPwCRu8uFWN5AhmySxY7/oVXKjSjhaCz3VGTvktHIDpWW2SaHUYPZmxem6Dsq9fuAKBtbyLixf65DTA3i3i1V5h/DaUeIBXZgyN5uy/E9A2z3FEtRFD1ddeosPlRe+DVfk4Lawoi1gdvPBtr+zDELefMlpFdpltpa6zNaZPasmAaJ577onaG+1QdN2RH8pZeE4+A4lMkCmUuC2lKleFaIixjkl2FWScPkDsR9SURjajVmBDDkda+Qe0v8SnPb2kCLHNA0E= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75998924-8ddb-4b0a-c93c-08dca182d64a X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:09.3929 (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: rmx/rQ36hjNjA7M5/SsWF7c4OoIb5TCM3w1/Ttw5zhbdNJ/mYSSIm7tm9Vb0BMt8cySW16If5C4PU0A9flPiNA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: wK1OjB0-xNFU_D-9oW5apdCVqkACt6VH X-Proofpoint-ORIG-GUID: wK1OjB0-xNFU_D-9oW5apdCVqkACt6VH Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in cmd_flag_name[]. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 2 ++ include/linux/blk_types.h | 1 + 2 files changed, 3 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index cb22e78c1070..971457b0a441 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -280,6 +280,8 @@ int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq) const enum req_op op = req_op(rq); const char *op_str = blk_op_str(op); + BUILD_BUG_ON(ARRAY_SIZE(cmd_flag_name) != __REQ_NR_BITS); + seq_printf(m, "%p {.op=", rq); if (strcmp(op_str, "UNKNOWN") == 0) seq_printf(m, "%u", op); diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h index 632edd71f8c6..36ed96133217 100644 --- a/include/linux/blk_types.h +++ b/include/linux/blk_types.h @@ -354,6 +354,7 @@ enum req_op { REQ_OP_LAST = (__force blk_opf_t)36, }; +/* Keep cmd_flag_name[] in sync with the definitions below */ enum req_flag_bits { __REQ_FAILFAST_DEV = /* no driver retries of device errors */ REQ_OP_BITS, From patchwork Thu Jul 11 08:23:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730190 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 13015150992 for ; Thu, 11 Jul 2024 08:24:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686261; cv=fail; b=DAcjdhLB7zdwJGMfaR4BCyc2bU9Gduy97e4H/ISW1ps0l3e4higbAZ7chpe3pYqTBdc7asf+6YojJ48eORnlYAABjfoBeefmnzxrmiBbBl2pqJZE1+1/6glQDrUMx1P1dI//+asQ8yE7+Evv2Ype0ld9Gskr8Z2niAYnP4CTJjM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686261; c=relaxed/simple; bh=tRlh2GaW0xmZsR+/NGXxMCdO38vsSONYJnH+PQjIy1c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=FG0z45cuYequSuPc5BN9WiMEu3YCyHJPODMkF+XobxcMOsR0HvgDX1IoPfdrZDkykkOIubUqAJ59TQHBF7IvNTGkk8XCDhGVcg9hojORpzkiX4KTD4hGejsip8Wb8bESEsY6+Jtk2Jf1DNzg3WLSmDy29pvkFNXve2oQivKn4lY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=EP8T0hn0; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WWOWZ/Cu; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="EP8T0hn0"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WWOWZ/Cu" Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tY3M006699; Thu, 11 Jul 2024 08:24:15 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-2023-11-20; bh=5pKuWepva3ECrNRNIFO+HeL54rfBMnwtvr71lcFJzHk=; b= EP8T0hn0JrpC6zyHDwy4rVCaaIpNxFbzF7pmHyWqx6+TkwV8dWsvjnzsOfoLwgj0 /3F3LZE1SGz+au+dR1e9n4RbR+YZ/jcC6RkmSZpkgliXaBvGcOf8m+lxv/WXXNmX 1iJ8uiscwqHQv2Q7VZcOnQ7AnuIwfOXQhLXscg58N0r0ClWjXJ/nymFT29cNwhRp 1MGXKkr4rJhg/cpRSeK1Qb/FhLIeeAM3EUo41ozVnzdVl4sdmutpTYC7pjS7u9CS oc3nAheauIHgAsvaVjAp9C9OsF6So34o0gRHNboFcRLh4HOb67cotdEPGTPTKluf 395r9MFK0Laz7idDWE1Ftw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wgq13r2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:15 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B7OqKx010950; Thu, 11 Jul 2024 08:24:14 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 409vv5e5bb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:13 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OHGOFCw3y+TnduMWeQaPqfz5pQEXHQLv4+BMJypxtWTwd/vYiA1ooL2Izap/StOu3+eorUxB2TIElCMNS86eMxp5+jtK1c64PT66mljdUlTZO7xgIz1AYt6jod6dT7b/RQ0d0e878w7xP6+Iwad5qcVeuimz12WZHdWJKgMFC6EHs0tkhK/jbYuvSju83uzuiaRcf5W+JNwVk4BwkvIg2CBcqipw93iarwMX2T84rjrgJxjpjaoVE1bIDikKZ9xwsmvMAjY8RRiN6As4sFnTxh0Ex7lCJVeTQ6mH1SUScE18IXv08ztOtHWxUr6xfdQ4XOTwdFEGPtJ67YtaPYr6Yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=5pKuWepva3ECrNRNIFO+HeL54rfBMnwtvr71lcFJzHk=; b=hRELAxL2i19vUZO+YfL8d/gSNFW80oNY8djo5IlHrVVcNLVIoUW67VuaCOWH7Wrg59aaSbFh68JETXmcrk/FhGihXmx3aUvWWm6L6DYBjuz5Q7y90j1OUyJAzBG14h4EivFgd6I4EQLtR/5mQTVyJ6Un/8zc9mOUfD+5NlZmGeQmtJ+if5V8XZlQ4CXzAiavbB2Ne+I078RlCd+hWbcfCxMzVa4DvqKXUxsS+ohk9k//UYNORrAkspzbOS3aznUueYctgC1dsax4MZ4fEP9EYH6VWc4kQchiqav6sAyx+9MysjfcZ0rXyKHnueJcDRwH+xRl7Iry5htghjVMVjNS3w== 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=5pKuWepva3ECrNRNIFO+HeL54rfBMnwtvr71lcFJzHk=; b=WWOWZ/CuaLaW2INTOQcKPE8IccVyrQJ0VE0ROeukBnKEzrBw8Xwe95Z1VUnLYZQk4EM/pvemgQdtp6Rj09KQQsMhuNmLvax1nZ0evfmL0/HDZQFp+oc5oJSRzLHGrAN3BipD2uSqVRn5vKbfJqNGxWOV3FuCKCDUUHU9aW/ttKg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:11 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:11 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 09/12] block: Use enum to define RQF_x bit indexes Date: Thu, 11 Jul 2024 08:23:36 +0000 Message-Id: <20240711082339.1155658-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR11CA0042.namprd11.prod.outlook.com (2603:10b6:a03:80::19) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: 3382d89a-df3a-4081-11ae-08dca182d7b2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: 1a4yJBNg9S2K/985n08vp+6bbZTY9HviU1rQn2Nq+/7IUax7Y0QxlO2v9h6lkhycOj+HFWKBZm0856uKqWoaMTFJhMXKlYO+sOmU4tB5ryV/fIEAqV0+lpyOMb0u/XYGusPLUdRWUxnFEbNdlepaYQXE9eIjTIzX9+f8R7loUhX3ak6Dij1Xz63qpzcKIB3zGc9j9nehes8MTVCtlPOiuCAzM0+QJbV0xY1z2Gyiml/cjOGsz2zDDKlhL+5e8MPkqeYzFuEQYgbAfGlt+2FU/BYhEgNEOMX8AsI9oTG8ghgzPFCc2y93iLiKctqjUE0vf7CX2tLl72WcdTCLTB8D/xJsdYsAymg/xtSKXD9U/3xA4ucPsa3y0Ry/LiwIOWItoplMVWj14036XtniWzIZKFq/c3Q0xKXn8zATq0N+O8l6TVWKJM/55gbFF7k3d44IDQZSzbZYO8M8vArMnoEBzigtwueDimp/AaGnvK/koAp96TfDRY599IL5R7vQ3TRLPpcAZbozaRqEUCZHMlBX6XY+sJu9f6kTniPGMMyzMTVhNWvWMtYyEW9om7JPILuXFdW7Cfxzt2pCzqE2573hLCH6FvYV+vxRL0dKhkcOSqVEVk81yqdBUSp8BcAoPi6IAPifVK93bBmTSZIxrGDaOtQkuzKQLjji50gdtfsYJG/cxe1qsDYVvcvDS8NBMJhwEbOH3X/xIZvgyoW1rgQsdveQDrkB5sAQ9g9dbDkEVKJtbhBAd59mf8u6wkA5vcrCgasMcsQBb009C577Xb/M0lVzoUzIRArkFuHxilsQJJcERAWsC3tLh3mK1IFJXcTA4Si7n0h+6OzWDfnqukN1Pf3E6iqPeLH/Nae9MQm19MqUOn2OTp48+MMlsqXXkcmPmJC0Dngf7rjeIeugG6W4wwU05ExvpZyMR1BPDCgqIXdzxhVzuVqygAw+5wXb1+NwbrtJY/n9brwkLRxgIaOVplS2s6ZvjSAOgUow09bnm1MQXiWmAR1IyydHDHKFFnlAW/WSbNkTgXwDOYHGtJBcikR5cpB2igh1U/PI3WsKbqbokvz8eaqCe9vEqFPbgAL9UcA1/ZHwX/+D4gA5vp1520y9Cd/LbJecJ/6FJLA3ZTqC7jswD58O4EDxAefRtyUpN5pjRwsy6YUslcWdYUIctDsvtK9CcrN3txPLNZZ+LggL6Bl7iW0GKQ85+cHfeqOz5z35HqNNu8CG7fh41JzZfVvdsOnZddvx5AjETt34yxbRmwcC0gkI2kQYl776Y+wsZpOeJhteLeqHQuXDl4dkix1GyyZ6FxB29k/9ha6MBqHxTNSOvgncwStgMxjz8cDKZntBJGY/R06q5F8Uc0/wzg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: J/B72VqQY6OfjJ5bFi1q7FY4lz32plGHq2ISSkL8ZtR8VziHinhAXVtJosKbxdDITmsg+LY0DEtN2va1spoaaTZ/2Gy8xd/9QyMU600acvvaJwBS462LBl1+B0872Qxq8JHKoWvjI5g79JVh5MErXnKioY7/IDthlpuBkUsYaYVq22HRldNsa5VWrHwUvlGGucgl7HkN4BgpZkyUtcuKMGmvirsUDuIiPrxGxm6YQiA0xJxdxWe4yQzMyoT5CueDt4FX9NyfnKCqz9fKFOzf9Z+if1L5JM+9hdq8ooz6Q0UkuFcJTIx6DT94gUy5RoyaSyB7xeERAGGL9HD93IHma5kZX7bdJb0twH7/0g1c4pqfXbHOhDZpBq8tRmXjYPls1+i7+YvEvNerAI95NL3Xz1z4+0/nzJkE9aPBjbihVOxlkgnZ2kyHZZUn4BTJI0ov7WtKC631Bn0L/THffqKaWY8zciCVZbfM9I+Fr9BSGuZR1+6GeaeHDZBo+EntwBZDNfvkV0kJuiRV9F030QcTJ6P1HOtPtOr/AYyjJ6QooVviBGLoDMVReUudAhg2JkEYEdChqZzVTfzBbwtVMCNhs5jb/sD9j6RgCdNy1Ww7K5lgpSopopa/P+wLeKuLZd8J+ZbPMueh07S0DjulVtQOYTq07WgTjFF57kq4tVR0WoL6BjnQRwYRnnaJKw00lMdgR3lOpKI2A9eTm8lHR8uvVhCnfTNJrjz+SO3JyhaMYS12MoKB1nDiIyt46Vzeg0leZJOwmSHeaSXMeoG9jqQONdne+FD8QCXmHzieBzr2lM+CTbl02xD5CtZlKVcugj2qh+bGsxKn3ks1W9lIDrO3VrQiWLF0IlC7wEfCMtdjsy1n0A/G2zcXXRq3XYx6+Zc3jDrzdvDL11XBBrwD94ATY0r9hF4xLC3aCHAZyXID4deq+Dgs8cOwn1KoRESgCvoNRNbss8/I84+0lSiO5UutNey3H4EKQMB5ZDVKhWe+De9WEeC/su9WxaB9hkNxWO5tFxACyDvakCFdjWEPeMV9tlSOb+l7oD/LyUydaNO84YAHUXdvtCPs8+0ce1l1k5rt7Z/VKnVO8RDJaJSX705LCY+agtaPaGMJwUaMmx9fuj6IfX2EvQXgRXr1YEXw2pi7hkpjlSdViVZ/UonX6C+rbw/RI1ng6/NfCWyHmMkeS91PnQJuHjqbAzZbwhcmzQHVZRm69IdCf7zLAId5v773z+HV3NJDrHD2Vv7l4BaS3EYC6pU5cn6DtikAjJqczlf9G7WGvNJsW3jeT+opmAa8AOutfIJCveS6NfJBNvuscyVgOaOoNEuxWq4a7oLGwznRNeycH1UxKZK1iCYh1PM24yGVJvFDLKTkbyzQeRFvpbeOkiuevslD1WDsSlc4auXZmThlJf+fdwp7PUO5By9Smhaq3ot+NrldxDkmagetchOn5xYX40mjSmeI82NgvAAhSuZ0cD2gsNElFz5OqtTgudmBlzore1RH2HkDPc3xdULa08jvWSHptgnTw7Q2OqCRMno30nGEpXgFr+DoWj/hjoYXemTIg97n7PVJ0n56kBjjBLYd8vYtEdmAhgJiqotJFxPxVpc69XCQ3z3CclGmbA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: jPAb4aYuRfkUr05Oq+/s7E24vDeOEZKR6dbTf+cQK4Ga7wvxstTcIgpVMmQkM55YEGSKnD2CKkq+aNqK7eZT7F+Phe1oP5TyOtThPbU4tody76jjl9y+2TkGRIOVlsRU+wPkLMkGFDaG+yC6290DdgHQeHJKvJttwV1/Q3zYrxOH0erO6k2dcW17lfMnFKwApxzRsKlvQBhUR6o1lzFgP09WV0Ie/YdC/oOwn8q1HvCAUf9NGTz3nMBGkYlQzmMZU5gXltwcQgnJsGRGjEgUZk6nVMnwssaeCZW0qLNBi1gz0kFnyehb0I+xEb8uu7RhqQ5t8dyeNdd3FcmiGNRokupFiOd8CVQnDGUU5f1WRxR3EDQ6t0kYQmq4OOllPYvwO1AWaKG1nfN/wtJckqs0dwjC7R12lrDzHgaUuoK0hWG2ujGIkfK5Hif2hxj/ntNDR6EL1TeIDuySDTT52WF8XgT+J8nGi5ayXA1/pX2FM8MMhS7Xf1AnsI0fNqYjYcQ4TNbsg0C7MxkPCNeR4hdp9rFNUNBJfcH+BVsJR74hVXWtbaFxISdTLAmJDSgUXt/0jSLkeZ2yL/Xn0AiQJvWGJ9ZVgvy+6Yz8gty6ISq2qnk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3382d89a-df3a-4081-11ae-08dca182d7b2 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:11.7421 (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: zkONXjfJsoq+cU95aerP5d/ueawQZyrg1d5mzuglUU+xEo8N+oQ1K11eSWR1K1Hqsph0/9VUR9zm9zwQ5eiUrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 phishscore=0 spamscore=0 mlxscore=0 suspectscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-ORIG-GUID: oKjVTsY053HLBKVQV9ROphqDaH211zRg X-Proofpoint-GUID: oKjVTsY053HLBKVQV9ROphqDaH211zRg Similar to what we do for enum req_flag_bits, divide the definition of RQF_x flags into an enum to declare the bits and an actual flag. Tweak some comments to not spill onto new lines. Signed-off-by: John Garry --- include/linux/blk-mq.h | 86 ++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 32 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 454008397e64..4b300f902d8f 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -27,38 +27,60 @@ typedef enum rq_end_io_ret (rq_end_io_fn)(struct request *, blk_status_t); * request flags */ typedef __u32 __bitwise req_flags_t; -/* drive already may have started this one */ -#define RQF_STARTED ((__force req_flags_t)(1 << 1)) -/* request for flush sequence */ -#define RQF_FLUSH_SEQ ((__force req_flags_t)(1 << 4)) -/* merge of different types, fail separately */ -#define RQF_MIXED_MERGE ((__force req_flags_t)(1 << 5)) -/* don't call prep for this one */ -#define RQF_DONTPREP ((__force req_flags_t)(1 << 7)) -/* use hctx->sched_tags */ -#define RQF_SCHED_TAGS ((__force req_flags_t)(1 << 8)) -/* use an I/O scheduler for this request */ -#define RQF_USE_SCHED ((__force req_flags_t)(1 << 9)) -/* vaguely specified driver internal error. Ignored by the block layer */ -#define RQF_FAILED ((__force req_flags_t)(1 << 10)) -/* don't warn about errors */ -#define RQF_QUIET ((__force req_flags_t)(1 << 11)) -/* account into disk and partition IO statistics */ -#define RQF_IO_STAT ((__force req_flags_t)(1 << 13)) -/* runtime pm request */ -#define RQF_PM ((__force req_flags_t)(1 << 15)) -/* on IO scheduler merge hash */ -#define RQF_HASHED ((__force req_flags_t)(1 << 16)) -/* track IO completion time */ -#define RQF_STATS ((__force req_flags_t)(1 << 17)) -/* Look at ->special_vec for the actual data payload instead of the - bio chain. */ -#define RQF_SPECIAL_PAYLOAD ((__force req_flags_t)(1 << 18)) -/* The request completion needs to be signaled to zone write pluging. */ -#define RQF_ZONE_WRITE_PLUGGING ((__force req_flags_t)(1 << 20)) -/* ->timeout has been called, don't expire again */ -#define RQF_TIMED_OUT ((__force req_flags_t)(1 << 21)) -#define RQF_RESV ((__force req_flags_t)(1 << 23)) +enum { + /* drive already may have started this one */ + __RQF_STARTED = 0, + /* request for flush sequence */ + __RQF_FLUSH_SEQ, + /* merge of different types, fail separately */ + __RQF_MIXED_MERGE, + /* don't call prep for this one */ + __RQF_DONTPREP, + /* use hctx->sched_tags */ + __RQF_SCHED_TAGS, + /* use an I/O scheduler for this request */ + __RQF_USE_SCHED, + /* vaguely specified driver internal error. Ignored by block layer */ + __RQF_FAILED, + /* don't warn about errors */ + __RQF_QUIET, + /* account into disk and partition IO statistics */ + __RQF_IO_STAT, + /* runtime pm request */ + __RQF_PM, + /* on IO scheduler merge hash */ + __RQF_HASHED, + /* track IO completion time */ + __RQF_STATS, + /* Look at ->special_vec for the actual data payload instead of the + bio chain. */ + __RQF_SPECIAL_PAYLOAD, + /* request completion needs to be signaled to zone write plugging. */ + __RQF_ZONE_WRITE_PLUGGING, + /* ->timeout has been called, don't expire again */ + __RQF_TIMED_OUT, + __RQF_RESV, + __RQF_BITS +}; + +#define RQF_STARTED ((__force req_flags_t)(1 << __RQF_STARTED)) +#define RQF_FLUSH_SEQ ((__force req_flags_t)(1 << __RQF_FLUSH_SEQ)) +#define RQF_MIXED_MERGE ((__force req_flags_t)(1 << __RQF_MIXED_MERGE)) +#define RQF_DONTPREP ((__force req_flags_t)(1 << __RQF_DONTPREP)) +#define RQF_SCHED_TAGS ((__force req_flags_t)(1 << __RQF_SCHED_TAGS)) +#define RQF_USE_SCHED ((__force req_flags_t)(1 << __RQF_USE_SCHED)) +#define RQF_FAILED ((__force req_flags_t)(1 << __RQF_FAILED)) +#define RQF_QUIET ((__force req_flags_t)(1 << __RQF_QUIET)) +#define RQF_IO_STAT ((__force req_flags_t)(1 << __RQF_IO_STAT)) +#define RQF_PM ((__force req_flags_t)(1 << __RQF_PM)) +#define RQF_HASHED ((__force req_flags_t)(1 << __RQF_HASHED)) +#define RQF_STATS ((__force req_flags_t)(1 << __RQF_STATS)) +#define RQF_SPECIAL_PAYLOAD \ + ((__force req_flags_t)(1 << __RQF_SPECIAL_PAYLOAD)) +#define RQF_ZONE_WRITE_PLUGGING \ + ((__force req_flags_t)(1 << __RQF_ZONE_WRITE_PLUGGING)) +#define RQF_TIMED_OUT ((__force req_flags_t)(1 << __RQF_TIMED_OUT)) +#define RQF_RESV ((__force req_flags_t)(1 << __RQF_RESV)) /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \ From patchwork Thu Jul 11 08:23:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730191 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65E971509A4 for ; Thu, 11 Jul 2024 08:24:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686262; cv=fail; b=MlXFhjepitx8BmbdvpyUwH2BtpNyUzmRs4QpmXyEBzGLyxgE3sFzIxXjBkQ7Cil+6IPpLnCOixHiVsQq9HZm/rVZCq41iCZ5Yc0FJgM5Yov8lY0g3Jucsv7gwIn7f+2SEbJnS5+x2MrLbQyeiSh3cfNQpAWXxarKSe7d4yrwCPU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686262; c=relaxed/simple; bh=7xN0J1N011/SBSZ7WxYAndjmE19sLpghLPwX9EZuUlc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=uo3ICT7PXHLyDWW5d2plRQbrYOFxg7Hd11QAWM0UYWC6YABrt46igE+aTh7T8A1wVlQSmn9pEF0YvyuZSeJOOjR97IN+YIuyveUyXqbfIo7y6NvmvwQLrlrjcsc7rkXGeRRCbnXUgk0x1QjDmrJrwwlXOOWVH3wuH8BA9dWYYFE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=akvnwjOu; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=pM0MPQiy; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="akvnwjOu"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="pM0MPQiy" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tbBX011828; Thu, 11 Jul 2024 08:24:17 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-2023-11-20; bh=1/ZBh9ktrUFojjs/C8PKS9yzavqM7GRmvkh0+neoAyw=; b= akvnwjOuSvsfdxvttRjg0+ClQECwMrcw/yJS82cSPsC2mpJUGyzG3MFksumAgHVj PO65o9W7sWM3CSOzkkZlc92Dar1vo67097XQI+k51rS7gyMjmh73PCSuwZ3Uzrww FBYvd5YLi4FkeCaNPHQYreJNddcjzlf7AmJ+sQy61VPjkEfrzRjqF050ZUMQuAqZ 9l0hGPo+6RBshibzbfnTUs8LC9ZDRTTmgUgjlp2Ufz/tNYQ560yrCPnPIQPV75ZV 0ikMJbaDiW/2eFQP8wz8Ggq86Or4ads5cwj0tp9O0ZZKIQtAhRtKpkYaM+cJCywI RPmz8Zf6podnLFTFsmCMsA== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wt8gyww-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:17 +0000 (GMT) Received: from pps.filterd (phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B6WBFD008720; Thu, 11 Jul 2024 08:24:16 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2044.outbound.protection.outlook.com [104.47.70.44]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv478k9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:16 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gtA3DL1aIUEoSgpB+n8ozBKtBXD9XjOYjuTFl+ll4fiFYOtGu1dn+VNCSKx/1do3i42USi9WjCiN3IM/fCaf7fY0P0WABBtcXKe0s1IdTHQJtBZXn0Aov4OtISDIP3xEDouDcxTLISPalbP/GIpeEofRMHt/EY3J2Mh5Nn0lUX5X1FE/4yz5v2eN0ImZ0x57u4YW+vXOFb1f5vgQEQilHexTwqW391/jQQfT880sIGn0P6KgCTiAO/pszh7y/2D1xbtsiKHeUI70u0gaxIbS7a242/2Kt4QZOKvilk8sY91Lm5XReEH/ZWgiQVE6Dzxh2JjfZ+OksP1CZB/Y+Wacbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=1/ZBh9ktrUFojjs/C8PKS9yzavqM7GRmvkh0+neoAyw=; b=mNlcCdBdQBdCcncKXHiawhH1/zDMFDLqtYiMJRPmI+EJP8obYf228Qs6wITN5Do5lLf18R2jiakboDG46bv0pIyD7D1EG3vHkz0hDGMzMVNRiXXg39gzeKHJJOXQAdN572eLZ5SWMxzh6j5NIf8jh1e7VwS2tsDzWrJgpGgqIsxNr6/OSDwq9ovTrVs0RhjePtlgabsYcHpOLkqIC/aequEAVW3sgkryTmUHVPlFkcoM8anfQx216lJEco9CSZmOXCPsitN4ULhfrw/WeRvl1p8LT+kwLVJhvKHjSrLYGK48kvkZFdwZ/kvYbkfgCV1WXKPsxH62w5/fdODarL6MOQ== 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=1/ZBh9ktrUFojjs/C8PKS9yzavqM7GRmvkh0+neoAyw=; b=pM0MPQiy9+pUc669g2D2LRPhOaG0iaN9b7gP4bi92Fa10d9NiY4HWfVO8sDCGNtHYUPBc6wrxTlqmW9zaMSmDek4WjRHRpQbEkT5sPmOvMuMZ/6K1wdd0b/nQWFwxmqHa4TAd13+xmFmCa224qPQxEGIS2n3pafaTGARZTj4A58= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:14 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:14 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 10/12] block: Simplify definition of RQF_NAME() Date: Thu, 11 Jul 2024 08:23:37 +0000 Message-Id: <20240711082339.1155658-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR13CA0151.namprd13.prod.outlook.com (2603:10b6:a03:2c7::6) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: a5f602af-c327-471e-0ea7-08dca182d93c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: L/qqnRa6nPtamJTI83YG9bzNwQoRgrkmwk9d+aKHDrjT2l3JUdy8LqETBwxpGoHYMWkM8kKGIhcK6wFKMqGt8ejYKBlKIeRMxu2H+AQlHAB1IoQ+rJRJy+8CiwwV7CFcTkZH2gjurZHVcoJC9oLXwnR/VPyLTGjCaRvwLHILljcHuzJax7SL/dxHA0FvlnE3fTPuqyBDIY6qyjFp1RWfZf8yGfArPCrK4fhUHD8t7lpnQ9/8ggOdn9ltmtf3b75CHZkqL3RNAfNYqMTIiyWokhhzWDe+tQtQYC99mw8IKZli4ylc7Dg36YfoD9ZyLiGsX03LIoOwZ0hGvsZcf1H4UmyxEqEKMXac8HoNew9/X+VMJEDKd7gtSD+VYpc8mEhoxpdZ04fK6UlP5TB3iDtQxnmG0PwdOFUDviLuRJzO7t0SnG11m+ogzLdtIzQwW53MPhvqYLdnhBWd76ftAprdAQg+yoXohycYMJtObcXDPL3sndxWZq0+hxMv8xVVjGEus3hv/ICuGrm4aYPnaGqnVzP3m80EH2pf/IYmEpGYA3oRpQtuX9pVMn9kLj0vH/PVmzGJYVaWvOq1v2K+iljh7ePjLZHcY7le+FSciUy9qbcJdfP02Bq8oNm61r5eGjZY2hYN4k2+5yJLoDsxObtS8OT25bSJN06M/OlotJm5AZPNY5QMUo+hR3PmZuu7RtWvH4Ki65RHPgyw50OOF+ArIPtLAbXwJlAnnF01lKlRIQ26wJ+diGx6RNf9sVCWUj9SS2p29T2U7rvKCRl/mxBE7GStygfyOLUb10WK0FAPFmjpzOYmDYgP7PXsSfjGWo2ht44c/AeZbfz1eP6oM02DxBPdsAmX6XMDKze9cSOzv7mTv10LTJ8xOmA610u1OOrU9PImSL36vdEqMhnvg43IEXpgUf0bjXMIYj2quhR/GC+OsSWVNjkQQnIHKJ+mG/gmDsGOQZfd5X8lK1958Cj6lvEjI1lzNCV6WGiFTn6su4OKqi1SDeqqBjQ9JiWqCEUfTG8ABSVEECbn5K4wgBAXqD2UwM5+QXETKVSL3iPYEQPsaDM5VIhqnxJq949iHVoKuirEFc0yWbIvMLw/hhhzPPFbNOr/VdftwMuNKUbYNftNpfk8qR/pp0p2XLq/nYUeXjmso0LIe4TJmJInNYXPDkXclcrRkCkI4Twn4lXyH23narnzMza1vE1pi+gor6QSFyyQhT7Z0rJ7HbVuBj8MVYFj8hWg0IKbInOr2lA1Z9bxGRoUdZqAEqJBQdYVBNrK13n1prHYPrdhZlviDWIP9ppUXL8t+jbfhxp7IWt1bxKf2Q01z2qcY0tjm4SgRbd2rv5u5a1QAa2ebhWZJcXL1g== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kG1oAMcHcRwGOjbliKy9PzlFqFhb4/3CIKriZCA9rHvm3Gm9EStHWA5rHutLJmrFMAy7Ab88bVJJjL1ccC9cX2u/ugWF4EbbchrJE+p2q4ROgoGGt+F3E22drZAqnwZ6RQeLfVCpDnCH5BV3+hRgtpawCksXILA+3GzMWGm6s6qiTZfrNgp35kiJHrLI2+G0nAzfGcJ2Hh/TD4ac4GQhJ4xKBDujVw93VLoEK4QUAet0WAI8OZz1hJPIGUhEYMPWP7yR2JpfF7/NYuH/NysS0XxFutdfQVSHM6gMJgLVbPHSLUChL3X7B5earQY0ui0++V4WyeduIbTnQzwUY2ANbNtpTaOsFJVreTRPFCKXL9Ro9FZ6nWx6WgarZi4dKKhOS8cRsCe1YO7iODMXoqR/Jz7rlDgogA+i71LUUFuSk24PgL9eO5qlqh72SgvUTuzx+y/chYd3FtI17nrdxwawH4dr+p+odWBNBchWZVi/vPcIA1S/Mllnn3NNEUW7ot/AOjQNMyY9wIQQuZGI0YFcgrcbt2l1I5wb89jMUPJrDHiX+ZKMnT937g5SqtkF5VCubk4YZX7urVphHqXqNppF8lVd0yH2v0dAbDXBpihC70q9JHuBKmNIbBYdIZAC1EsG033z4d7ZfrCmboiNGEW+vdbVc+EAfxgaOylwvMYjqqHpqVQuaHcrWFePvW7fj29kqwHuDjDsrv6G4wc4U60/1VPdiOFzezN4XqkEpZvyoyB11DGkkOe46Rtqcru0L234DQbKedUYGgYSjUoxJFe2SnLTNJV0rh5oSAz8Q8Jbsdtg5heC7jwId34wRTo5SPYdS925JXT4MbF5duIjjyTNCJmyEuwsxnKlRuQ2sQYdjOLaWR+Dz+Ls4Bll6qgmhc7yOoC31oDhy2Fy3g9ZeVP6p2yVhlFuh5MhgonY98lMdUvUJWpbRf+93ph07Q3FBtqaCmTqBR5e9HWbdz6yrA1o+G7Wa0lSBg3QulT09V3j9B7XRuWpmzsfXlPiKW4mv9UczPoSmyIQHKl37YiHeDaQCwaQsbcAXp+9AsqFkrXiUO0yf6D0BMEcwBe5OV2qqrBFTCoerllymUDkLA8nQDOct2aumYHnE7UIg2YOBlGgccyplKhTN1VCOpNuiS2w3pQgS24W7t6Vq7rzCvcQ3SZ7BgIbTKKffsr/b+d9KD+42nCVHqC5DXFue8k+pnIZYGHULBTXHa85Si+Qm19WNRhLKAOVTuDZ5gWLlfI+R3QkKIGgI2aXdJmHMDpp+kpG9yEyQaAKk0qmnNcytQocWwE0cM/yE7hJx5xl8kLP3tkqdtM2NW5zY5UJqV1nYyRiZwKyoZhZibovrnv1vwCtdoOHL/g51QGpqla4l9XqPwsbDGIsPpn5ng/+m9uFDU+r2Epam/adgIjQAlt62VfB8UGni2WY4FkhjeZhaJBCeOSnKOGplFHQl1Q6HFz5U7s3pks9xzoiCWlcgAHnJCb2ylY7Ngft41Ju75kK5ALNUa0WO18K2f/f5Oi05l9jWFQYxE/L53xcI3Ps8NlnYGrKf4YaXND06RUNvxvvtifCrTtH0HQQwXC6F+jilNo8SdjE2NCMIssuzS/hS8nTyf3BVVciLA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 2GD8/wSI6lY4YGG9AMJFf/ph0iZap/hmhIiAd0ooFdPs16gWIWBYNwXetZ/X4mSMXFaGHTby/3XxBDqNW7MkUyCFmvB5a4ReRhisOvOHZTULKSv3SXuQ10P1OQoRBDOGN/B5XWjdq1/x93p9zgcROPAzPoUuDpEmTuiYaiqINNIm3a7fgqv1qiDYbxu5GdfSQQBBCDK+IlktuIE7SILwzojL8bV7xEDs3t6pnr6UuJRPk+vhThx/6zRLolsJuhgXkX7rnhacQ+Mx3LWwk7qXy86wPPXhEZIQRfe5MZHNoivBE5zcXSMTEWjdemwC4y3vmxUwds64Dn+5AeA06jc0MxIy34IguEDP9ehTy7PH94nQ89OcfUE5X5Cdb5rJMJH9ukVh9TzLqxolQMjf8zcSOpVppDR3avmjX5n2puQm3lNcouOX8AxppELdJnS/9x3T9CVZRkqKtClw0EzxvuziEsJ5bPB56c5WHfnKhpXjVop8xqOheiASxIipKcNWM3rBgqvXm2YmwS/GishtLY6U4eSJ8mAYHP1gVRkQfauhljJW7CwCuZzxjmMHb8zNDknxpz9kL1OXIZe5z/9jSVhnY409FL4CN3MaCs1/6vnD/PQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5f602af-c327-471e-0ea7-08dca182d93c X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:14.2672 (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: vPftbdOg2evbeq/RXBqCswA003Mxmk/D4ffaEPSfUV1XLU1yxVgV13Z2JLE10mylL+zUI/3aI7nfH/5saMRLQw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: pZ57wiQg8vOVx-HfS2T5OsPwALOKugCr X-Proofpoint-ORIG-GUID: pZ57wiQg8vOVx-HfS2T5OsPwALOKugCr Now that we have a bit index for RQF_x in __RQF_x, use __RQF_x to simplify the definition of RQF_NAME() by not using ilog2((__force u32()). Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 971457b0a441..305c53459fb5 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -240,7 +240,7 @@ static const char *const cmd_flag_name[] = { }; #undef CMD_FLAG_NAME -#define RQF_NAME(name) [ilog2((__force u32)RQF_##name)] = #name +#define RQF_NAME(name) [__RQF_##name] = #name static const char *const rqf_name[] = { RQF_NAME(STARTED), RQF_NAME(FLUSH_SEQ), From patchwork Thu Jul 11 08:23:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730192 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D2DF91514DA for ; Thu, 11 Jul 2024 08:24:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686265; cv=fail; b=PC8v3lmNtWwVXCgBcokxhkSSWuqDM/ZtsxqZbrqltfbFyN1YTQFoX3rR4chs4ZdHJSzVKuvfpbHmOafGolfTocjt1SFqhNTWyK7q8qT51BUmS8c+uEzgiQ4z0wKKYV9Su37SzrVYYZIcF+zIa15B/37T5t7Io8SzG3aCuMefUBI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686265; c=relaxed/simple; bh=25RgP1Y9/ubHNpkq6I/nizU56Wcx2uEAc7XMuL5otbc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=MTFo96q6knyvfhHhhQyutufJm23tq3bfLa2ecgcjKLHPoMQ5IVsg3B3jKz1YG1GSIw0/fwo+Nq+AEfA38sUYaB1hbYg2Kmz4Y/QnkueqZJikZESeCClpLAx/jBHZiGX0O+ukuI4e+Nly3EgqXixJ2YFmkeP3nqQlUEGDaE1eNFg= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=f6cf1BHU; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=gG/fvrDY; arc=fail smtp.client-ip=205.220.177.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="f6cf1BHU"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="gG/fvrDY" Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tVxs014064; Thu, 11 Jul 2024 08:24:20 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-2023-11-20; bh=Av6KlY5/H+ZO/s2QZAPEiQ9Ze3hf77mbCHwlrwKLJTo=; b= f6cf1BHURfi9neaJjUxvQvJHeRcIfFFhQMIdVRYZBzqOXCyh0ShlOfARTbHgLjJR 6i5L8tP1/k7YUMDTZFbZC4AqGh9DET4OwFrO4BbRjk1bJAzDqtlXTBfVh2gC0Wm1 8sGNoEHnIcsswWv1/rmhA3CDC5eOG3yN9FCzVL2fEwIB5zJjHwfSQL2+RGLFBrt0 x07z10MkFlAl3K1EaTfojHKoWYNT7Fh3YToBo3iw6OEqIPB+l7BzzA6gznQ/ubPp WPYbglDCUOrbR8KFbnOUWmvkIYPRvPOChdxQyBdp+kS/iAqEunKQM7Ywr3s8v9GX BwHgbPa0SpYpOmNhDN6KbQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkch04d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:20 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B7I6nU022701; Thu, 11 Jul 2024 08:24:19 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2040.outbound.protection.outlook.com [104.47.51.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv25h4q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xVSkvJAFej7dvVFtjoOSB+PBAe4Aq5ceWXkw0sMDoxlg5GoYufM15b07KTpGc6vqql8FsX6UwX3rLAO/6MA04S/c0JwPxm0ZpFj+DujeZdaqxTnBnslBbWUfM0C0qCm0PEw07DsagFjY33BN8eeEO/ktBKjYI4wD00oqhvsxpdaen8DB8czeogKFx5qJYDfADogfqxBe/Fal6eiWztdN9peKLit7RM9jv69U6TSvMwsGW9S+ikYi6kCw0qlMx9Tg7WQSoXfc7Y4gebvVMGy1JqKn+I/+hoU6GFmXqpQbaiBwigDhg4RZ+WBdnYykWCqBV+9A+AiJfab44uuB/c5etg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=Av6KlY5/H+ZO/s2QZAPEiQ9Ze3hf77mbCHwlrwKLJTo=; b=dyMmOYoCU8X3cAQcqRdr2rr7n93/2++RlI7kSHplCr5cHCOnDYelCc1uqOddqpA1q9Blvm8raI2sZsZs/UEE4IC5m0rEfZFx4Rcf+fruJHCmYxFimDaHdthoW3Cs11oxgLcrkDTYwQaRg5HoOW1ZVgf/12id2FFMqp9dvy1f20ZOb50b10Xfhwwaw+c1nwF31G8LXCmR0mZSNCT+zouTtPbSdacoliHHTrxDgORP3+083B+necUj2ZU1AMbUrLHzc8n3s3nJoWHFywDnhYB4A0KtXhWXP53cbIJKPvn+Ix3LTRsTmqZQglQodGGglmGzzvdm1A1Vvg7dQraq18Ubtg== 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=Av6KlY5/H+ZO/s2QZAPEiQ9Ze3hf77mbCHwlrwKLJTo=; b=gG/fvrDY17Ys65CzSYNMeIURoJZc2LFcLVOD+7ACfly/UzsdOV4acFJlCwmAzq0Yh5dlXMo6+eX88tmBWEvBwvdvyZ3OYroxaVMlxJdUkfmez7GgfMmcVfx5i8IPqxiXIbPnhKJRxbxTujRi3BGdQ+fgXcw0mV0X5JIStrCuMD4= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:16 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:16 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 11/12] block: Add zone write plugging entry to rqf_name[] Date: Thu, 11 Jul 2024 08:23:38 +0000 Message-Id: <20240711082339.1155658-12-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR03CA0057.namprd03.prod.outlook.com (2603:10b6:a03:33e::32) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: f0a7232e-5aaa-4d84-e8ae-08dca182da89 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: w+DjhbwmWBbkOS7/6Qo5/9RoA7N0Qu4/ThwObkhlQHkwiuFq1aVdtXM6uVRIbCEUmnuQHjk78Cnpb5dGJlysJlJYUsf3/bt28qZFwJPfHSWUoKJGe7BkwWrJXFhPBxk/fmhE15tQzuFMByMqIe0ZWDD3d0CyO60pM1TEtw4N/j3j4DPtB2RmklgMjirngJsddTwZsIg9vHGbvU2S68weSgi/BFoa4Mfv18z6CWiexDYAZXLvjNC2zGUuEMG1QmkzCHxlHXU9ltfO9gmhbmg5ckCv6EafbjDVgt5ir5lwMdWNeP7BrN2DhRe0W1My9OCmCk+Pu4lMN66dZWGYsPfNszt+dOwRNQj7mVPyxVmVkaawSbzISk0zvPjqrwncoGPHOK/sakbX2Q/p+v7l42mx4Xu7+B2x2o09xIaM/099HyBJnflPXVDqMVLHbasllyHWquy2wy40td2w+6C4jAXxbrJcyqxp5hRDXqxdu5PXyX0p1lSpFvCRHeAd9s0j8dhWsf3IyOWiOlpFNgadSd3XK8Xg9ZnAf43X8BceMAmGYJKui2LQvJHUeWRjsn7VjzliG4IdPWqb7QAVdyX9Fjljzr4JGbPS3FHUOV84NU4roijj5HDpw/bJujHPyN2FaJLcGBvTp3Oo/JO5s0cVTZsGwjUDGXm+GDKH4HbJJGOgYDGd7koD/dDAKljyd0LcuqZGUwxYgAw9PwsjNfT3PMHm9nuTRTfj6VAqs/DFRtR9cYaexJ8qHBqOSFVd9Bwqt2BBAk+bc+tycKDykuYmo8dtdTOyj3XwT48i3cBzeG32JraOHcPpSvg6WRIIX3TIcd9xNdVcNcRuPGKRnJ0psngMpoURwEZEkvgPH1L9Gx53ItvHLx2CHV5NHRHUqLO5JXzUtnvC9HnwKbTM9roOZ80lp/8uWTrXGnCAth+kGGwgKmTywkMwK5rXxOZCYXMFeTtR9vJ3V22ytdjsXjK0pLwZ9dRl8FMasaMG+u/y14mYsNvMV7UiSRMdmx2otnVosX/VreRe2fVRnv19LjtHS9Jo1IHDeP3/EdNsdhhnhG4ElZhTqllRrYS1HkzANgP8jq7YRXVl5HlKRLTgu5fQ0Tq7z3hlX8GW8CLrQRzc9BR56moF6OZevvXZ8VsbbyChQelvWXkyTRVnNyFilmJEtP/WjTn6GuIJjNzA6VwtU7UD11G9End1VW5n7d/nG6hARXn4k+/FQXD5FH6eiSMpIvrDUlNCiIhwIe8Mpo4dgYvHncfl/TkDt7sWjn6GzKoNnM7lZ2n5HbxkQZAUZQuHg2Gqmt85c1cmrmxE6TnOlnCTa51As5Xjp6OmgyOjZ+5ox3Xt93IlLviitn5qeDbnwMDkBQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yA7d7FHx5npld5MmLITSTKa7KhJTqdTfyS/XdkAdQmH3RQ4hKp5m4419bogXBN2C46i1ndfU05SCJHo5CbWm9MXjA/erb1Cq01AdCtenIX9kwgzt4MMRMaj0vXwiy8yWmvdBwHWxL93kDYu9S8yWHbdt5udUgmstFclKtz+VE76QNq/p5wlYzRG2wzG9bzOttM0VncuxXLTOgJIlhCyHxKOHx6YU6DVWiB5jel7Hb5BHC+araFfD80ZZJ8tAq7xumBkghO8JgHg2dAfOYEdCZpEwXtwPAgB8x/BfMFWUXZAMXLqAmfx6OQalPy+IAroJOWmIf3Ev91osWI7VP838nN0oPWfWCoS2S11FsCupywJynxPIIh5SYVJ4oVDyEeRTz68L7ugMcS1RLIfKmwUOUgrzFe9W7f7d2CJyvK7XBeN1Qypukp/dOC2fJTWzKsDk4hTJCBbi7l7V99NJY2SWmYLmiCKSdcWZrCMjR0MfULpQfqXTSwaJWjJidh5RQqC/mKhfvi3KUQAhomauS3DhXA+OUVxIbSGlFwG8Opt+pFMZCkP0xlGWvON65TXRRJjswQNooMDlZ53DZlc/5UpZDEttF/BCwbh3IPgvCYhzk8OJv9cQdnMakSUwdBOjjjH81LIwq2TDHwTM/LU9seh0apvacUl5hzl97XVwRm88jpa1nNp1QcTIKvZe5XEfs/u/fl1/0OoNerLWXkispAHeZ5qTXaetc6L37krVxHb6SyVsrzi2ywzpmse9RUWodZm3Ku+QP3rD3zj5NU45VWvnb8eX5JgIxD97eXtV7cUa1OfQKib67rBZ79JHJzZLItfTMO5O/vkk3BuB5TBww8KHq6TTmRzY2Xq8OtXsuhBQ94hl0q1e5uTWdCnKd1x2iFV8ATcLA3mk3/YPGyInzyGObIg3fJ1tzx9SS1MFIwkk+AFQXriaMR4JfGRqyDsAIQal4y12mAK6rYJtBDpZk/1elHZs1eRnzW/lx/8aJtr/0oFyrH4krQQyO2+gfNmwMW3yd1U/FoIxt65qRVwKquQosoaEW/+1jqV1vFaJZrDv+tiOSa1748+dsWf94Qeaz8FNcgrpTXtI3SYtlkeATeisYODtP6K6lXl8hpqH89mVnBUVs5qrrIW2VnUXUaZi2KDEcqZl9XSqJsPPX2A50tYS7NphYOMl3DcXVS8wdDYq3NhWiK5vhS8P7eqsV7WCQDm6UDTyu8OQdQkxcBUWUYrJYYWQ97U6ga4XBFaQAqJoi54aqhAbsquibGHHKrlhPITi5WCr+lr+yWDDAuEdH1qWWzYWn/KFE7M7EPZ0+kC4z7L+pN0BlwaVwbYUQ/0efI0Lmzqo5/orFv+NAQv2vhc0k8gnZfj53TqXDCXvbSkiofuYHsKShZqxtwq/kvnq3JxHg5niX3pOv0Q8Fx2R9wiIC4pqjiE62TMKO1JbvGDh8hgAhwFOFfGuZTYtv5Bia5wdlhg9y5F/itXEYTxInwpSqQk3VkZWPt5jomF63jHOW50zs/iuiILiABv9d/2jWKn6ThmU/C2CRhORfIgGKKWstSwkLWjB4MtGdmlUUZQJEpmnhVy4OUAXTcH87gvzYGCyYZcS92eHS0Cmul7W2EsjoQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: B+3Y2RQjao4pn4AUQv+Af0I/cUWibolzoW7bMji03vZ6tD5Q9Ezyyyl5d73opzDvjhFPT/O4NR2r6A1iz1LoPGVNJEvkrR5xJ5rfOBZVz1z+pNelapIrp5AjuGTOAPQpmiH8rwOabd70K+c2WjSOlnR1+OnuxNIZq2KKAYJfSocQhUL/anPc9DDh0abdZdTL4yKeS0UG91btUGBRoggLmZP06TgPytlj9aW1v4U9uRodCT46IaPXVwbnU0LjxaPEiGguvM/dqz0u1VnGkNWW5EUA6zCB5e14ED5qTSVTSOtxXYrObX7uxMg4BWtifTccxtnI0H4b91FiRuolWQLu6O3+BxMeWS3BfqQ6uOzjlRrPtTCGw9ZpFz1gRDHTNHX2EWmju7o3jt2VbXo1SrAytO0WIQopEdoFO8HQsRN2vjykF09VSHfwGljwAxaLS5AExbhab6DSh04kfLz8NmN+IvW/g1uQjaJSzjBvRVsmBVzKodxkM1J3qgTDQhXPe5YncG1dpp6qX1VeLo6sqVf2nfznrhl072XibKyeB49chAR4pCXp9N5nwqePgPPmp+OP++nLg4Pz2ThVuUWgoXgNhgRCMSiekwtKaCqNw3Jp+rY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0a7232e-5aaa-4d84-e8ae-08dca182da89 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:16.4726 (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: izSguVqBTghTfYcp2grHxckgvTJUQ4uroSad78FbVJk9OhnADgSz2dsd1+EAidg9Szgtx90VZsjapD94WDQGoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-ORIG-GUID: RkUXA5lZ499EZDskdK4QPbvy_wwt3aeX X-Proofpoint-GUID: RkUXA5lZ499EZDskdK4QPbvy_wwt3aeX Add missing entry. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 305c53459fb5..34ed099c3429 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -255,6 +255,7 @@ static const char *const rqf_name[] = { RQF_NAME(HASHED), RQF_NAME(STATS), RQF_NAME(SPECIAL_PAYLOAD), + RQF_NAME(ZONE_WRITE_PLUGGING), RQF_NAME(TIMED_OUT), RQF_NAME(RESV), }; From patchwork Thu Jul 11 08:23:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13730193 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD26D84DFF for ; Thu, 11 Jul 2024 08:24:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.165.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686268; cv=fail; b=qGN4MmJIxEHOutnqYHd5GcixxKHROb9Hoo3lQRhwVk5rC4RNphIOy+5fvTu8wvMpIHim8s/CtDV4fv0G+TvUC3MqTqZAag3BAWR8bV3SV1Wt7aZS3sESPlQ2rI1VScDhr6Uo/tNGGw92SgWxucdzVI6j1s66U0ICNulapHksPNA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720686268; c=relaxed/simple; bh=EiRfnCksxBZT5+m9tZdT04XU4Qbzy2TfNON8pHhEYMU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=FF4Ra+PDNdiZYaot1zzK0RJha5FnG8eU/9PhSDte2Ja6/1KhW054gr67MKKJi7Yx45QutEqMbmzQy4A8i8mReHfIZyX3KspgyKqkWQChw3LIvtQ1z0sYBkVw8jiMX/p3rJlFEzieUUiu2yq4zlwwOAGCbfcKtvaMsdIRRzs0kIA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com; spf=pass smtp.mailfrom=oracle.com; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b=UXsM6GgL; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=OUw3WdgX; arc=fail smtp.client-ip=205.220.165.32 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oracle.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oracle.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="UXsM6GgL"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="OUw3WdgX" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46B7tXeh011761; Thu, 11 Jul 2024 08:24:22 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-2023-11-20; bh=ijYhQDfRanAxe8prvryKh65lkQzn46fymflIoyNnsnQ=; b= UXsM6GgLlt0EDpvKp2eCMpsNS7VuoLWs/HWSGk4t49pFB/7lSYEapW9NSVZyojIk jM9UIx4aKfKE4pP67RfTR6pSeY4VHfVjeUUmdQprgb3lNnGstaKNnCWDliv/kgLw 4sev4WtHvRO6ZQ60tEAavO010CqHLyLHwrjy/QCRlAL5mBr0YXzjw7QaesWlR4rZ rmAbvgGGvtZk62tIxG5Fgp33fe/RtWOuAs6H62RDN3jANl6Ki7TfsbDiyNVX9/4c Y6/2ZFXcNFeQ3jVyfmeBHkUdGwazmP4kIkrIDmHxzOFZKljFayfMHQOp/LxQ34Td xCEvw+bP4Jzr8M/KF1YaVw== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wt8gyx2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:22 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46B7UjAO022924; Thu, 11 Jul 2024 08:24:21 GMT Received: from nam02-bn1-obe.outbound.protection.outlook.com (mail-bn1nam02lp2048.outbound.protection.outlook.com [104.47.51.48]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 409vv25h5t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 11 Jul 2024 08:24:21 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rD3F+lYJS/JpNKC8zokrgh2EtvENzIQPzjLKIniFJucOdCFZDjA1LQ9mzXAFGIQv6ZeuXh21Rny9B3QaMtDOvFZR4tLbJyIU6NkS7ofAqSvIz8fyJn4H1tnwye2/zF44sfMs+FWLl2UZVyk0XRYVazzEYhNrdPPF9sHUw8y7stXAPdvus4jmCy5FLQTonX6PwnnNuDcBoG0lRm8Cu7N4INDcsVaYiiYidd9SVhhskikyVuwDFkSFwaqsCz6dq8CjfjU+aYkl+Qvp/1E1TkV24VjpqRdxiWIgrX4SBQqhGvsQz2VwDiFg4Hj5++lxf8hlJpfIRE4IpHYOVaTING9FfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ijYhQDfRanAxe8prvryKh65lkQzn46fymflIoyNnsnQ=; b=CdSJ/XnRlkNFMmnaVx6DoyB5r6vV4ry1jvF5v77Y4XJFLIP8EUpvxoG+P1yC+4/q0adsCuV/nV5lk8cFm1BLHB1HL0qvv3RL8fVIa2SDojJ7IE8EOoqZztphD4My2y/dRX/mesvK6lHbNDkU7uQrN6W8Ed74OGFpjV9ZM6cZEyAsnuBpch7I59Yy7g85O3RFNflcZcFLio+iVjObC1lHAEp2UoU+QFKZdfHlhIgMMGELY1vE8hHXg01ErV9C7jueNqG4I64Y3j96+FHI/olwzK3cVHIXBS2fWLXx2XR02kky4tpq0jsVajouQB/X+nKuF3dEdf0enrkRoIYZTdV7LA== 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=ijYhQDfRanAxe8prvryKh65lkQzn46fymflIoyNnsnQ=; b=OUw3WdgXrR5bCOfJ/4jybpcem8zyofdKB1caZJg6dywPxz+hqb4AWvcI2dAl9NoHTJQoYnw13GMQuQD8QYRH8ZvCZM6I3W8SJMi183p5b7ev/XEq6s3BoRWnTrEfFR5C3Um8XKt2XhCfDtRI4YE5S0XnKlRqCkVGU44Asoyc84E= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH8PR10MB6672.namprd10.prod.outlook.com (2603:10b6:510:216::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.35; Thu, 11 Jul 2024 08:24:18 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.016; Thu, 11 Jul 2024 08:24:18 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH v2 12/12] block: Catch possible entries missing from rqf_name[] Date: Thu, 11 Jul 2024 08:23:39 +0000 Message-Id: <20240711082339.1155658-13-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240711082339.1155658-1-john.g.garry@oracle.com> References: <20240711082339.1155658-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR03CA0044.namprd03.prod.outlook.com (2603:10b6:a03:33e::19) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|PH8PR10MB6672:EE_ X-MS-Office365-Filtering-Correlation-Id: b7701d22-2c2d-4a0e-49a9-08dca182dbe1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014; X-Microsoft-Antispam-Message-Info: ZmUhGKvAm8qSIDAe+WNjfqc0njH+PU+eO0f00ARLM866ukJLR1mxgxyqJB4eagWZ9uF0BsHwfGxUGc9S+Dxlxi9FXruTlnbzqHL3bQ/ynm6w01cFkX/D1Ax03C47n47WRrhP2Jpl8Xqfo2xIYTlpu//AJLC9oo1mOjVdzEbxK+7q1bCA5vrMEeJoYVNw6c/XUETMQR8fvfg4zedYaOc9DCAkl7+x/EhUNb+h5d6F8YA+5TsHhBTgnJScDq+sZWcoKRDZPcFARRjuVwoV3f53GMgBjmPfJgERx+7MAmZl6IOvP2S+adbS27ILQffbSxqsVdNl7JWHurTHh62skvNqBeX1E/RaQhFLxt9beWI4hh8A7PSGHb/9u+b3RmJJRaoA5sjWEVvy/lDXWf2VWkt4hA5SPxaHGkh6021uICNjcqjPFxw9ed8/mOEOXHyWQf0H3DoSfr9XBHRW1h+hji3lIYAvzWmys/tq1WQcudNZsKKuUFswBG4rru4T8WstDBDWGXAnhPBRlG7HhPKogZqXXq22CBswvlJoRONSFKC4kCBCij60Vogmpq1j6Ys7La5GSNGBVPX0nhV5UsQI+Vt6+S8pBOv8peVUO4vDERsVkXaIlkoc9e1yDZ7g8XEPOr9yvUj4R2QScuvjR9bhCbVOEM1RltwLrtMdddQMikZQC7aFlAR66E3xsjxGjCzQIE+9ILurPNcsunlSwjt/FJGkS+99Isq8DgcQGWTgC0at0zWk6YLmvj4QAMirN9TINOqMEZoa0gJdCqTjnp5ehRQKSfA1vMYyQJVj94ipJ3gyNdya5qeKiDLTGHcROxCXQrWRRqu8MGldnn+R923D+E+bhg0Q0bjfOR5JGVuEdw1BcM/TouH7mOmKOrUgTZ3yZIjLJGXCu++++tWlibr6TXcNHxOPppRLv1K7mFVsDl8VAPNHpCEkQlwFkuhWJuyI8kMOKoi32JyIfnzK4sL16zBSom5aFXT8FouakS7LMJbJt0vZVgcY7bScpUH6YXK3KvgAPsS2/ez4NVZ4MxE67B7GEZfyxS/cakCwFW0THujYwqDYfxi9puliHTPvfUXgrQLYyLmxNJbgePR/F+1vofxzSo+AXXvQUt1WpVvm2uwum/Epe32lej6iXhHU55NBfmx/XkFCZb/Df10A6ypg5b+VdIUGrrnrpiEz2ZepU7NvxW3MGxOZhRVaZWMT2kb9x0P9jqPgfqmiMOV3zfl6HWZSuVHut47YIkoEIayLpplWHbaHK4nCg9qUAf8SGICAU1tiMOMoUEHklnCJYq+rZ/1+8AaYqVwUKQFONljpz4hv2wLWZBSgWvvlCMhQJK0s0WXaUazj89Ku1tIvVBOkFleTjQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lAFZlR3plU1sshPfroQykGfXYu4AXG5IH70INPvLME/xtlKBIMZVQ81hRzMkJfvCSBos9o9oOC1EdrHevoCb6TS1t+92Epmf920uqwGks71y0OThlcB633O3/ZEom8oI/UMD//iJ3s0ZS/je8wT3IgsRzG1iBmD2OwPjV9vw8+DHbQOP5RJ9bbc+t6BS7tk7V9ePoiLVFBx3w8wHNiTbwvcex+H4oGFITw6ZV7MZ4SEdd0pU0BuVpWCdg5vsDM3FNnUQyLrhTTwJlCsAcoOFVWAkBQ5UDSZAN99q2MXypGsCtLXv3M6acEgFvJ4TKlRgjKDyZwAmIHXpdfxE9C+RMbUP8SzNLyPQffZXPsUoTCG9+m40VyvTF2TCP+/0cP54kmJVREfHAouHkMkCwpcgi0OzRF6Ss4yZjAB2nXoHI+nCaZtad65ccIVVaFLR53HBbMRRokSdeynjgyn5VDZ97eCbcKGI9XUyOw4WleJ3/kwn4Qtu5YG58sODlYvRdRLEKMQT8lpfEZkzhLvfe9KKmZIOpZBgftr32BUBSrCUv7RKeXUN3RWS8t4lmoY0Y33RvH904DP4vADL2mZDU+dcH2lMr1GadcxNsSTNJJhzzOR5ekJfpPGV2F3R3NOtLUMJQO97Tzk9bVhusKzi38tLs8Umf0UkKqHXXPJ0/0pvbBCkAtyqFDhuZ68meHYP7oxc4DBnMbJ+zXyxbQUWG31/CPFOVzeXAnuXVKz48Z9nADg++yBgQDVmpexy+E4xcQIFj/+cYtjZt+K/bIj1KUkwE1ms0gukYlIchy465SxOOJhSgInHlcahZtVIwnDo9ijJl7ykmewDhflpF9RsrLBaSSSWaGFVSuucgACUL8dk/qo83p+4q5wRpeGvJNbe4ARXBdBb99hSC/9v3GtgCLsT8KlLa2UIRo6r0Ujc8+eRb9Q5ItRnTQjC4Wd97m3taCU+8hX+V5Crt/TJ14H2XCyoOHSTHLD4qlArG2xXtgRi6m9OUvA8CDHO7QffFPHAv3fUc8d/8GdCj6P91BxhxQER3vD6CYSz2LbxZW/7hPSCe8kFUUCvm/FWN2LxYbQdrBkfY4VeYaXu2dENL/yAw7CyzbZNYZx6hzl1yqf2jFs/Ik3utPKKHqcIsDwoue7pmnoGGmTYYXHfrPv2kwog+cK91nWSz7X+Aj2s8DjFOLUap9xDHGq/c3n3k4JXYb8Ll9VG4/FVAInxQ5OKx37WqarPHSYHSSGUF2DCQsLeSl0qmj39XbBvuwBB2nLj76FX4tLub6/XwEPc9Ky/2qbD351VHn7r/6ziF+y+ROxxdJrpd+SqJ5vP6sMLdqxtpaOQvxTYE7f8WSguxED4nXSseDcd2Xuj9XgW7oOFkaxwtYUVESwnJqRRKdJ3mSXr8AftUdSh3HtdX8+VvpMr5Rrata07WW3WZckrLc8aRZwgY0pO3nTrG6yFuh9TLr66cMp0SOwxTf2R1W151q2dVoZaqnwOfoqGSM+WqsCxyTTdsexUP/E/Ryi8ZqZ9GL4jCLg3C2vEWlOovQy6XE2u6+Z1kurONMm3lL83Li/eSaDLHSoYATW8dAUrflMZgsTy2G1NXq4CtCTTwvBoFfBSXxGnWnOCrA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: LdPbF4FOzMws/sHR9v4MPoxMo8fDltuVJEMN7987zigrgwn2lXmKGTQ52oLGrENWwJ6lYyalI2SBCNiBtHdc3D71gno7TmMHH6l67vOHxZ0YkGD3zgHGbTenjMVTBiT1kfs/DmqWhcNGcL1rv5/czeSP3MxT+fkXiXWKOHBliKkNR2eLApnEhZIgjj/62H/3xR26FSsBMkIMTCE3GVtuL2BbvhEf5gtSLBYUv9IKEaXBR2IKT6J2rbjL6yqdZX/cEdc94Hh9iY/VY3jnuyDOK60bg3VJV/jk3dCamgWLrRtaQcS3xjzUKOMaJbG3k3JFuXeFT/yskmE8RasUpeJmNJBYQuTVvUwlTgKCLcuAubWAjVqepPZYMLb5kO/i8P7FWpWTHnZ5j1HIKdNRXq1VWrSODBEZp09xVoVIn0U5bOiganAzdrncFWuCgpP5LI3zaQtQRvGZqxfYNdQZdcaMmumUn9/gFyTFtaqPz8eriLzQ87Y5xI7wnYA24PBLGPZTDeRTbNNVjUGsP35HBx/THxaa2XJ3tu+WB0c7b0H4D0KrsB4b+qio4gR363eUniM3bHBNufKkk443kyHjn2hFuF2imolc0vKsxfpqOM2lKwQ= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7701d22-2c2d-4a0e-49a9-08dca182dbe1 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2024 08:24:18.7197 (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: h6qS6XnChPoW41d++OEpLWd55Ga16JC6bcymiKNFlOOKxnWwCmjHjKAFl6pZhMPzRGW2IJ6SlbmT3JfQxvdkNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR10MB6672 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-07-11_04,2024-07-10_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 phishscore=0 mlxscore=0 mlxlogscore=999 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407110058 X-Proofpoint-GUID: VavoY8h7FB59zMg3V7pBg0jk59vf-7NA X-Proofpoint-ORIG-GUID: VavoY8h7FB59zMg3V7pBg0jk59vf-7NA Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in rqf_name[]. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 1 + 2 files changed, 2 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 34ed099c3429..5463697a8442 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -282,6 +282,7 @@ int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq) const char *op_str = blk_op_str(op); BUILD_BUG_ON(ARRAY_SIZE(cmd_flag_name) != __REQ_NR_BITS); + BUILD_BUG_ON(ARRAY_SIZE(rqf_name) != __RQF_BITS); seq_printf(m, "%p {.op=", rq); if (strcmp(op_str, "UNKNOWN") == 0) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 4b300f902d8f..023e5b9f6758 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -27,6 +27,7 @@ typedef enum rq_end_io_ret (rq_end_io_fn)(struct request *, blk_status_t); * request flags */ typedef __u32 __bitwise req_flags_t; +/* Keep rqf_name[] in sync with the definitions below */ enum { /* drive already may have started this one */ __RQF_STARTED = 0,