From patchwork Tue Jul 9 11:05: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: 13727670 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 9E473157A4F for ; Tue, 9 Jul 2024 11:06:00 +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=1720523162; cv=fail; b=MSB9FIaW4kL+p3wIRTZsthaYmyPp1EAvVUFupJPIbPFjgJ0dp/xRRCOG4jPHIs91ArRVU1SeJSeTkimJZ7G2X11uRm/1K+sRbrbo2v6bfRBhJAuKkuMFXnO3tiSh/n1RqjqlkvFOQ6ji6Vk4DIHFaGI5bvo/LrDmwS6xgd/H+Wg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523162; c=relaxed/simple; bh=7XX7i/IlTiadXSQrf1cafaYl+X5c+Pvm11CsfpZTFAE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=sAoM6CJ3ne3q45w7glYZ8jNbXVcDn3rc4XBaMI4FWSMiuAdOh1O3NFFK1UYiZtrL9VIbVMZmNC1fg5zQpCflkETzfmjoynM/ZTnWuR7gBpQD7XjJFyJ6b7/rlsK4M1eDQitz2zJKgdqK3yFPLfd7teU06mubLmMCJQagHP94zmU= 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=MboEgpsF; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ysRNVNxG; 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="MboEgpsF"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ysRNVNxG" 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 4697tSEP009537; Tue, 9 Jul 2024 11:05:51 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=zHD3qcGc0eilHzm9XgRWLUraA98zyIxJrUdh4R8Gn1k=; b= MboEgpsFsAKFKyT/CEnHONsKfnA9hjBPpILpCqpXuyfYx+hLdXDqj+kYZlDVHq7s VtPYOIWVEbRxQ9Pj9smTSJmAH9anRPnSEpX5DGO95pxdAsPuCM2M/jbbFlueIkIz i57SjD2hADwySFmvarg79Mfx2d46lNv1nQxkn3Gx4KG/wAZIwsz7F5HafX+/vQzB HA5JNpOYv3ghBSYEnoJA/EQ/2nTAAa111sx0/4vpPpjqUWB6Tr2fWoAzsbuPVmhN KFBk6qQmmmcohbBDhq7bUU+qI4CIyRTX4qcTh/4SQBrLnpzKDOK0tKa54atAEuXM Hvem/z1BrR1sh/iQ6jzp8A== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wknmnu2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:51 +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 469AUcQe013665; Tue, 9 Jul 2024 11:05:51 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2040.outbound.protection.outlook.com [104.47.70.40]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407txgs9dm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K0fbMupfkvmzofT6uDToCbzFC+BE0/vH1AufHnTaFGHmwH9eUxolfHl8An7H2dy3GRNeVDeAxBOQuNm/H9IPv4orjDU+Srmf/Kp6FdGaocIzIMjBKsHDthLF6dQ0bcdYgY5KTOqJgBXZQTJqRldiD0eepQ2TYduC9BpMsfe2RlgvrixCVedFUBylCdSDa/984v8GNwhC5dTpLg/JIcRPTWgzxKNMInoH0ucz8be4u3OgSnTKZZUrg3hNA5NVRM6XIVC5j8hb0VYMWJO/PnhX3wQQ7azJqmho72zx2PW1mfPO8glpzks+FHZQjyfBlU9dnhAozr8GXThQT/9QKMU+vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zHD3qcGc0eilHzm9XgRWLUraA98zyIxJrUdh4R8Gn1k=; b=BiqKU8u+JsidMY2Zc6xvzJwUh8fr9Y7KJToE+HAdIn1W3lEDTJS5ik/NEtF9HsTIbHke3osmXJ3s/ZWe6g0wxqoHB5fjtxucWtAYiT3M2U0gaLfeiG/UM1vTvEPwun2gTra9/19eSKIDKaEdVsZ5IPjzwXqkudvEW9uF97GSkL8HNRNpWSldjsT7pGsmoGmOVP4r8Kzqmh4UeZv9RRJt5MQrHIZKYIY2KiT5NNidA2a5+b31SG68/bKp6BvHhioiIg98h4AR0suWJjKzA02IqntU/xXeI9+rKKEtWdaxt+Auu+WJ7BXLAOOIuT4KJq5rL+/3wuUxMm4HR6iSPC9qlA== 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=zHD3qcGc0eilHzm9XgRWLUraA98zyIxJrUdh4R8Gn1k=; b=ysRNVNxGZL2d5x2NLPxcPcfCeysd75FreVGlWXnfbr0+XiAbVkKnuocieaM6DEDHrbZoZsbuuTcmAEz0X2HWpiO0Ys3DJgsOdIqXFP9RzP4eAYCKRbZ5NetBVn91gJREFmoQ+UbVShjPqPbLUuoM4TRHTeNZJizdAC2MHhW+ROk= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:49 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:49 +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 01/11] block: remove QUEUE_FLAG_STOPPED Date: Tue, 9 Jul 2024 11:05:28 +0000 Message-Id: <20240709110538.532896-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR12CA0001.namprd12.prod.outlook.com (2603:10b6:208:a8::14) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 8870741e-6dc8-4e09-c59c-08dca007172f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: jwqgYqJBO3epMdkyGpZLVNZGfqMuaYSKV7wamhIC3e1UGpoI3reBh6NJSrd5emElv85/ZLWEcHcM9wPEhn4sgfgCP61JbHD7vFR/hXLKsJIVbAuV3oAVXuGfj05JaTokbnQBUXxp3dbUXnn3t8InSCZwCKXBBfLINVAk1D9bvl5hcO8Dyu3cj5t12ltKCTPDtgFg5LHASw5R+/YeR597j1+ini+ZyLTm2zkn6L+g2oKMRk7G8ZSvDgxRzyAwiU+gZoJWm0EDn/LCw+4Yc6c7PXG8+X7qjVmHA8IKcYaayNgw61fqpVWJTmz0zvKVuEYlh2FXqSc1dU+T+3/MSOZilYPvY+DR8k+k9HJIKOzGIBtVBsOfFgZ1oU9dp+OVeLmAV6vDvXhLYdiNhmzdubBwf6wLRNylSTnqFwe9Ljcp1+NKQSWqfekJTO5c1bEGbEFunes2Y8gAmlLXDXXCvV6f2AjvJoKMtteMXNKNPZiHfQmvkSSef2/WQ5sCqADqs93MTovJpKI/dF8kA4uH0gzGZ6aeYeqEOOcO5hMTqnFTTQ0PsyfqR/DF72X6VH4JJTNW5rsaRyxmRjsnWBgGYJTgR942XaSfj9VaF1DB+3X0ViDxNQpTMCOeeEMpN2GOobtbTA82+/Wewt9L6gl0uE4zFKMOWCohHUm9tUs3H51xBGuPpoBOBL1rSoSYEJbwaz7YdFIQBKc2IKT3rTiulJP/H8iYasXy32ucdCJ2sVXpD6lbmXull+3DQtsSXum3NmUNH+P17ue/vrBnkBY2iCYjEGq+2CwT+Uq1TL8mZ9Dm1c34xwzA07T3+hcFqPEOxqPi7fy4PuEWSwlmFN5+IgXUoHFHNxQWunLKkofHOBq1lW9fVFQSgw9t9/eg7uWj1mdjmVD7MFGfnZoKSouGLRNsjS2L7uzrbEghqZR9VRV7J6wqYB3Bt/UMYXAFc7J3puUnSsbeGPUkTHlvUkhRv3SvO+84vNjL8hRz5S0Zl9lapM414+v24kPLgDCXSi1rJ4uCecDN+MHqFcr/DsmTRiCyyCGaSEl+9nr8HEfxBfptBj/6IvLkiJNhaAX+BEQNGBnBiamtg+/kpK07VF1xHRaIfIaywY8Y9N+F/aPIqD9FaiW56YW6mu+dFDYz4WttYKiCJSPsETgiKUDifG6GfsQbf0WYvDN9CGCp90/mldPu/1NT6IgFb+6iQGNmtvE0xdRyN6/00qbDKeszuVSpaIPqfxb575JSB3qyLeXaIY3BL08bpL7GXMp5FhKf95oe7kjhbcmI6pTeH+9yIsA7mh+5ygVuKP5z0Ad7hulL1cRX0qdkUMfzvWizKAi3vNSm5Y0laa/dxFfM0f9WCAQAcIDRww== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tJonIkkS6Xf7iQ2fG5bVuVC6IBpAl7hxIcIIIhcVZA5bC6bfpPvh6Ty1zuFyz2JadGEU35sJT7CWKMz8Se7uzmGOIh/BfA3fmt/kk/rxiQDTx0NAO1GIJmwfterpW5/8RdNHW7XbDuubjbHBwTf/7APiaCmcPViZXpB9/9NKk1kx90yLWY2rZaAn2VZsnW/5mwK8WXAYEcjQRTjw13ICiAq26G1DdH2L9Xf8HBOjwD9GanzDjdj1E/oTzmGRMl7rdvD0xvSnjHpbmtnVjvef6mvNYbBeYIexjv6BHIH92MlQLn+iRajJ078PUD6ZJ3HRbIr8oEVPHCxgU67J5udd4jPBZeNcwkNiWxpCBouvDcvn5wtWNzQpSAVLSNIfx+X7WNNfQRbJDRUFOANQpSLmmQMsz0WNuZ9JyhhxnyFqI0aSCNRR8PhdXqu+0EFHcjEf532/EpY7XiPEFpp4xJk/QxoLsUO45ayptNhhvqldLbTA9Q0SNl9Lblw4z3+eGNUSgZF5bp5v+gIq5XvkVSthxJdHQJnckfm4kDjeMyd3uDb6RPFB/ND7O8BxUPZdxOeIYkVfpv95lUgxNCKLlMXNOzP9FUgBZp/RNhC0g+O+tX86a6sZH0DnjOxLMSFOHx+KQ7acQNsizp791ep2PjPKil0SHy0dkZ89JfazDzr4+Ancn8ZVU80n6xWV7g6yRMEBjNmjV5hIW/vOzuOlAueaEgdszNXCYztLC0UygLb/ruZHGqxp2Y9QQQdiUBWySQhix+taX/gLIjDsx076ahSbn5bxo5o8TaQRDd/2H3wknt0pVPOrYQbe9+CZoCMzT7u0Dme9pzJ/Xlw0GbQPT/+i09xj4i1+L1hPZtAcnyacZNClrd6AOmmysL8q72eAvH9Kut9KwCJ6NL+wVe3KcEm3YPW0EByJKBadDhO1HK67K0X3Xs7o3zbDzGPwuOYJNHhkK0ogjBNpvAutQl0g0y9uEQZcTHvOlrUZJ8z3DBTFL3qHCr7t8kHNbPHt/lMxa1sL3CNUvgE9uXYfXniDhB0zDBxDhDgmv/n8ja6eLF8fJhJO4LrkEpd1Pb642WOHz3rcwBpbv/9JvhPeb3YivSKNYi081Db+d44ukx6dJJa1tgw3USHoqwosJWGW722eip5gi0ho4e4Qi6a0c1x0311VfdN0IYDuR2e48aZJOOMn1tH7q8ULJ+59Qx5B0Ns9ccjbeUmmWwVWg0ceihFDv3403XluGR743Iel2BUnFJqKxO36OyiK3RjGHY9yM8cdy3yNjjVbH9gU0uLcoNRqmFinn5fkTVlMUERncx8MDAbMWSxihWUTclTsI7fx1jz30Mf8VZoVJZXH10sJXifp1I4kIajC2dDDGdsmqtW28l2HYg+uQGY8Sz1yiopUAdkzIehiQjXd+FzrPngcmz9G3SRgfKStYOXSnLrapV0IIVzeqY0Lxhjs9U+kv17emES1s+wsYmBD+uTD7AVo63yGxBYIKljsYls9pBAoQlXwOmr/AOPzqelq/iREWZxNCD74WSfzBHeW7lwc0lyUGsYHIxdMgiG3luU9+IICoaCZJnql5IKpdWi3uRUcTce4lN7h6E2rGrusFQXJcZo0TWiqwIzxKA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: h09HSZ0Fl8kDYemd41X2kzIoTNGZs4iMaMTVogcnnbEtGBiXrUpmrZoPpa5ZXbHP5YlF+UJW8vNFv9N8iNWMs3KyHP4z/fL90fEnp5ewk1fclNKDAitEd9KTjVwcIEiNOkS1/REuQJYZ5AsxoFW5dW94Mg+gnH3MHSbVwyxgj4hAbH3d7XzQ7KazfRwq4+ht2QOt82+tRFfUdLq5pW2naHPNLO821R/8oGOFW1jYR2ENkgo0RBUkAE/Y38W25v4Yq+tMtYQrd5u1QMqPNk+QANrKOTTBC00/Di/32c8CwgFz59gqVaXRacWFKK+rbkRRJ/Vb7TTmxnl/0lpL58XvPfYrMPWUJ0LbW3UGkmNXpt573jiVu+9/8VLCdVIkbl5B1urCs+aaSnrn5QW7HhFzse6ybCQU9CvCEQFydIEsxXLinKtWfyDBeA86/8k/bV31mEdnlUh7ULshtT3irfAZcUfX5kfuuQBBSc3kCTkTidVT3+YEHeODnqhvNk7UycaXXQ2VeJdlS7zYoKLB+D7tvx9VrWZAflwF70XonCBaB+tQG2iRvXFk1slEKl4Dd8tOK8l2ctVQGxvkXS0Yo95hj7lmB5fUNHEdXV66PTYHqKU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8870741e-6dc8-4e09-c59c-08dca007172f X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:49.5748 (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: nZPblzZgaPjvC3jtVT1qrzYckGdItI0adR5sEuPvjA31NJXuryb2B+n2xFY79+n0S4fldNP6I+FBg/25bD0KoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-GUID: nv2Q63OdLVOnggPJljDmtVAkVJLj9cgu X-Proofpoint-ORIG-GUID: nv2Q63OdLVOnggPJljDmtVAkVJLj9cgu 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 Tue Jul 9 11:05: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: 13727672 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 C6D47157A4F for ; Tue, 9 Jul 2024 11:06:05 +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=1720523168; cv=fail; b=llxoIvVrfoh8UVbH1wEiXQ6l6+i3ESlAHxMjHN8Rm+x1MnSK7y0qkOrcVl1eWgh5lB+qvXn9JZZc1tLQD9OQq0OxroY4iGlJxyuhsvTq/zDoslQzgNIL3oDQuG2eh7svQ4XEd5ojjjLHU+r3XgCRrUo/4/UmBlGjKSeWhdX2mag= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523168; c=relaxed/simple; bh=9sqXZLekNtaGSOC6zW/egS5HjKkoYFWlyZ684Hze1Xs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=u/X4T9+xxxSJ7otIlM8yR1+ggF/+GbZyuSVt2OXzcaGj9QWf0z4whkNpK2fn7ikd8faKXMcRGYtGj9Ua7zRl70OIbvcexyNqTpyU1AzpU3q2vJpCp7BNf7ZBfPUfaO/0TZzWIazPEOVQu38yguegKfQsVAIlWjeRRSc7dtavmCI= 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=U+RXbKh9; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=X6PZWELU; 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="U+RXbKh9"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="X6PZWELU" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4697tYEa024726; Tue, 9 Jul 2024 11:05:55 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= U+RXbKh9bFkiVq6sC1PcTABZPkRqKH7NBRZ+Kxb63TaEmFobqdO8ElBIlLbfUhzh VuyZJakpDdNDNXzwQX6zjzGYzlZIdT47MO1upg89P8q1OiFzksWZka039TJhjPHa hIhO1xumfptbCV1fsqp9DG/seDC0sDLnqgs6gyvSIM40p+CpjZSdjjnVr3S7SPEZ YBxJH2YhEONQ6EE8TZxWKZ2aybx8tCE/whWtYT6MZOmpp2lF0Ui52FYOBUn0XKms rQKiDkmmnDPMGnP89I/7t+5uiV9SMJkd23HBqIOKY8Yjl7+aXomU39XUguxSw6ax 5eUkSfhzPGSsNAvb3yQx4A== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wky4prs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:54 +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 469AJfbt007496; Tue, 9 Jul 2024 11:05:53 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tu31m0p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:53 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GwinIjfkjyKSwN4jMLNBJPSqQSVjTrrdyPFanTnm7h9aAN8oeFML1+3IT1EA41MZyiJ4l9Xy9tHTXLnbbn6qqJ6vjMuW6hjTgr5EQqcXdGHxyX00o3t0nrvowIPCEWS4GI1tHq8FktxA+SbNRh1/mRZWG793w3HjZWf9Jy/ZfviAd1G1z5C3VTw6OdzQGODYpF0SZeLgMYy0XOOM0V6WszVO3i8jOERm97gOQ4GdfHcA/OZ92qYst017l3edJ1+i3FxsK0NXK/dZrjHw8mCs1dYqxX7gde7VAMSsZfTMIBwnXKPirVJXZAV9uaoG1hTUEBVC3nQLtWZhhBeJm6Td0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QwdOqKpvTVnfd1A8EYWwsx43OdRgcMdRLKimplroUXk=; b=MQ3Y3LtKzNNChF8YAptVA+FVmCR4uekJ2E8j7s2KPie4dpaif0/7LEMvopUoMIBI5gLocoewS8jqm+yajimsD8PjIG/aTWODlUn7VyE0IBtK0wiSp7RgDusxUcJ/KWAlhBWUWhG1daYa/ThOeRpKb/dyQHpjDRWHL+8NsAPPv6fYdF1WKEoFtdlc31UBdKxR4eMa2uzX3/xls4yMQw6nJpg5sni7+TAwGdtxYVkFb4j5fkxNVVoJOaWqqXeKYh/K23kn5b6juI5aSi1WJrG0BnA9z9oQsP5JoOAxJK2C+q/uVtqHO8/YIHTwsPvkii8KlrF7GqKyhNAUjdTh17HDRw== 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=X6PZWELUq9vz2zQrlj9P142S3c7T8qx79kCHGxER9ZnwusL9YxHLwk1ADVyxivelijiAbNiasKH3ZjJYVoaY8gewQmDw48u74urMIglmnfLez0A/3ktvQjujzx+cX+eftcv2KY1wi1kE/JHiRDT0PTYPikg1kRJI24Z7NK3sSos= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:51 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:51 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 02/11] block: Make QUEUE_FLAG_x as an enum Date: Tue, 9 Jul 2024 11:05:29 +0000 Message-Id: <20240709110538.532896-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BL1P223CA0016.NAMP223.PROD.OUTLOOK.COM (2603:10b6:208:2c4::21) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: aea3a16b-beed-4a78-28a0-08dca0071877 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: 0fTSfdXuMc4DgF8ms8846UjWjsoC2JRaZ4NccdzWzs/w1nNqydz4mPpz2JBbu0Z5gmpUuhiNIxy3yr09AxuRQ7ut7UZGjdRDVNBp5Vh7WhAeKuJZTb7D1gNRvnQ4VzE74bIhOcJOn6yO0+hNgv9S66AZC5oDtDBAc97lEIRQmIUR0mSnREtYia3beXmUP4WgBTKTmrfx8KBC2gvr5gteCkME46lWuP0YLpvvcOMaMa8xqNoWVFwFKTN6yJRm9E/vgyN4sMEScbg0UsgdegxsXT6wByR6cekMZYKRhRQJzFqkxqByZrboUz9MpJ2etGkQYSrxQ2KIqNRsY5iOJ0rQdmxW9H0SxKMKkzRxSOQ3gfwXu6149E7dKVbt5/D+Ep5KWKxfTRLT9VH/HFJ954yOgSviV9ONwvJLJlKyFcmiW/x4LlrDfiCwhgyUKtbvNo4sprgFBZQsAlXl5aO98L94siS78o5r1YoytUqDoFKvTI+2iNEMrRFZHpbl69EjJ4+9SrwkyAwbe/RK4Z9clpkq/oaybejwgb8i0qaW6VKU28wcfK5tJpm21fN3mP1mj7G5n11GSTHBczFfDMzLnhB2S4ar0j9g0IHIIsKknwwq+r78cq46Z12u9ywLL4FwgYuBBv4KsUkSuSM0EruUC6h7/xVZkmEggBCfTj9JAJor7nSkx9NKh6PnP1x+Do+91RFRZX0FRbWd/KlNw+rNJH+dlFRdXYlmtTLKJOVeli2d/qT588IuOjpkbpC/3Vfn2D0G1IpfDe6Cwqk6o2+3RtOExe0DzyGYRjFH6pEXfyvnJdvumRqGQfayrL/R0Ac81zM/j9T234mf79f5LBbd8Bh567wuaSVJjeJ1lBXBphvz5GiBeiTX9zlbeAHTtg7iY3LE4xj6cuVPqY3y2gJgk3tg6/LhUBsUvR8ruvwbcSdziI1Bo9QJd9E0LnlZVvpN4/G0GBYHoKCaZdgdf1zCejzRlAAA1Ru9ZOheouyVk0xhkH7EYP9sYPd1ABTisrFIOhR4+sR1WodhaIKhUxKoKOZzptCemRxszgSmYtHtNDYqggq08a7EP4qGOlwTP+V4R55iS3rXs9L3c4Qlt/HbxPjMsS3Sx+Ko7ZbyR2mBXd0SzkRB836NAa86QRAjeLqH28gRFemoSs9IYFqycaFdCEWEeeyb6cJk2ihyxMb1/3c2wiWpT8/b82nztDvciSu+Km8svLi33hAFhTIwpIlN+7YHpmi6SqIcoRoN74xP1k55trhjSo1cXre8W+1kPewN5ncK+QNmopgYkVoscPKfba6Xmi0eyUcp7/EYWZJj63DfyC0q+hiQ95ZUTS+v3vKKjxlYMolWzYT4fGVS0MyTEzq+nw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wmaVcmAJDbquEhauJ51i93hm/yyAdlpHSMqI7bRpcVwRoMJl4Q3nV3mTefrI73BrGz7CBLNhoy4fs30O1JL3X7rb/6loBTUtKle9fJyLGo2A/whNYOV0nMdoR8pRYG0TP11at7ZYE1L0rA0n/d/ybS3OCMn0GF81hcfrimhOd1HqR35N8+BamX+VR6JLb8PTm0k/FRdBAlscnwDgfOD602fEZl6xBB30jVL68ELXoFBo2WCUiKr8wpJJzXd2pD/3Pgk4ehOohP2kjwCSbJTYux6NxF/MaFbDoAnrEfag0lS3tXSGeJ0T9hCfeWCnMveGsWHHCJbn+SdcvlYjyyaE0zotNXZYtHBtclw9RVwTt7v3zkp0KSj1cO+NRifa4pGnseX2l/6caMfPNi5InONQQMMU6sV/IJlAeX06F2qx9jyQhrv3hHsME2tAwqbxZBMHTvERf3259zg8DDXZj5KSbOA6QPknQTAmP8GD293Yp+bCZurJolbSx+IvmNRYccME0dKpN2hBcfUhVPkkMm7FVMEAGvwLmANFbelK6cETOvJeHG8d+KHYAasA4/LkxsfZr7eWhyRxo7+Oql1G0Ddn94V/e++JONFWNy4l4tGH45RLQ/oEr4BSzg2mV5OOIF4aIJA8Cyu25+CWCQZKpN2WfgMCi6bzBPXKeNYTAZtBCKjIjZFTt2VAI+Z3Fwscrytch15MifGsJEeUOqc+GYExAV/Cw6HpAltSZchh8QiVFUbYqBQ2fAK0JlTsiyhtkBR3zqJhyeJN1KlQJ7xjdWq7VWPdhnGbQn+uhsEyakyHzVbKFfVoSGHTLb+GP0mvnCfKEUSeJrtP3Y3ygceEpXhOTiwewSrYf2vLbND36+/+FpPiYENNVQLi/G24ExEs+0XBB7OnPDPScAjoFtrwMkoFgzXonax55t+wlCfbR7OwZJFiM9YEUwnzHpx3/bxVFT9xqc64qO7PrGboglbYpwOBa7ZQ+Xc88OEJ2rgfANdY2rujknadqz5XxmeVoI5OpVJ+VKzt/zofrqL8ekVZIifzwsRrK6wZY3+ItFSXIjYza40y8q3KLqELfhBJwSy7noyMGoQ9TnbQDsXxZ2DLjLk9hX0oKrhYHIrWiI1q3wlz46aaeOM2KDD9oa5J6wJ1dhxZWqp7+MSr/J/i8hqkyc5M5O/P+Ksl3W5d76PrN85IFSCxPWiToidmmwJNBYri8AfIxIsVXmkpacLBt1z6mV0dwvbIdZKmKRzdDU5o3jySluFX65rMAM6dsR2Y4Jnv2YEs1CCkxgQY7eEBfeTfDVhuMLhO/LPiJ9EEdX+EZ0GdvxboQBC2El1aTQCgewnzYCXFgov5LdWlkrw1nRScFOmJfYGA19TjsMZxM40VYK2mvWUXOwuX+7DLUV0PPkk1jKd8LD1MJZG+GM28/YqgAhBB/x3FhV4FjWyoba6dcA38AroOBy1r/MoNQDWcQFE2XOh5yHyMzfM04LfVtBp7KEHyEIALtm8sV+OyNjWy29Hzf8lK8TBT02GpJgZrU/P0Hk+wbDkxd6JDwFj4hV+6BDYU2rmHY1JwX+Kh9SAiKwrQo4Ik1yiDB4jy7uzNz2NN2gu+nP/vGsT0mp+q1Dn/E5xzKw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MLH7YRNfs7F1QWkqov7NDU0Mw35v354GOenz6kvvzBQDF9lemjrmzGpxFqZRFaNnO9ld+URDvXBCF3RpyClqWMdtrj5rmP7JEMluQauzajmY4oaGnvwzKJU1mSNsjpk9pGLZ8MaSbqNIBHTYZQYj9sWDq7xcEWqwRFUXiLW2l6jQ1isM+q2GbQoS5QT5jnhDnB2aaKLWiM02/O3uLEzrCgjbOGpvtz1cia1x/DRvUgFdbnTnR1cyGmWRvR1/MMDzYgibhiBh+iN1bzP0auUtXtZpUUI42nyCHCy3E68xsm+bx8WhVnKculo6lxObRfhMF160A6s0I5QTc9gdCSx3pGCZ6GFtModEUaUcYv/3QhS0RG+riRoUPAefP9zxcjXFRHrccGWH8BIm3WAnYRGSI6kpTwm32QXSqyPOCAtKcjilcGab0nCqLTBxv7iDtNjprQfslJoxLEQ2yDZM9FrLaNVpF4oWfW09D0kfZYdcP9bHJV0FGLOsxt4PJX75/WQe52OiccXpTfv7W7+ObTbZ2tAHR7H2nbvHOU6aifXzmhpjKFW8tTonbtqyC4I/AOOCY6A5y8qvP68BX3DmqKao9IUKALEyfW2JzBwjqGDSTYw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: aea3a16b-beed-4a78-28a0-08dca0071877 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:51.6771 (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: DsMHpf1AhGiXTt6PsxZkdy08jenG4+MlqVMtJQcrrbk7anrPuaBaJBI/qFsBzSGM0ws19Pfkcvy0vvUrPw9v2A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: FHMSg8ZeoNvX0Ukutk-2-440POThsXIG X-Proofpoint-GUID: FHMSg8ZeoNvX0Ukutk-2-440POThsXIG 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 Tue Jul 9 11:05: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: 13727669 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 51CCC155303 for ; Tue, 9 Jul 2024 11:05:59 +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=1720523160; cv=fail; b=bf6wlZKBChKFFY6G3okcf8vZ0hrfA4MIn1zuZyDcjbK0U1Y4u1NhRWcr5hfbYGl+rDMfAKUfAJHlXHkcDB3GkyOWD4VOkT8jBGCvZ23E+iOr0SBvGc+btxxuHO1eWskx+cOgrwDfpL4f0O7QWa30Q3F9MLsmOf94bg51nYHd558= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523160; c=relaxed/simple; bh=FCks2QIeI7ehOU5U+9epxJRNgf+ixSh5x/lhP/CrnDU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=HzUWlZJCF32OeHy0488tiT2e6tPCwpi1/XPQOw2nP+SyEpxsRbn+68umqLpR1ibf8+tZDZrRrCnQNTTKNMcQQPBsjmProzaICuxfDScckLQbTfo7XBvblKl17Ep6jwEasiGmTZRtmi9v3+MHMOko4uXBUjdsmrlsOQD3qfz7meM= 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=EKmJ+bCX; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=Sv/43xNE; 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="EKmJ+bCX"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="Sv/43xNE" 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 4697tUB1016137; Tue, 9 Jul 2024 11:05:56 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=gVPI01woOgMo/dEMxIkqqaxN6hu7sWhV/i/at1u7cgc=; b= EKmJ+bCX0JfO7Oxbr2g60kpWKuPTCpCh+bBuS50Q4s6xhNLFq7ONbA4tBuQ8Fkf8 eMlBtRQ+DaC4efcLIN8Ir+j+RUo8W2iBVdJA81h68vGJE4bLxd2WYpVcuUEfoLJF rHU02mkmP0M3YNyenM2F+w6rwX6tMLhLxuvkIcLNhzYI8AXXpMa/PVkCIGgzqefM 5Q5yCS2HdtRyAZ9AeZKYlE6bI/iS9m6r+3KKvvC2+4DA8ffWFvBVqU8IYTW5c41I Wt8qLPAmiotm+n7BpFOSfXdKe4VmmrmEu/LYA6zBMULhyVEIRfLPvb8TM58zjGOY 4p0Eff/q5UeKQl/Hi8Z3JQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wkccmgn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:56 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 469A8VA4005730; Tue, 9 Jul 2024 11:05:55 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tx2hh2h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:55 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cS1tA7IcGgys6rFsTYWxAmgADbTT4nHyCNPny63LpwXs88xtx44V2NaR0XLVBgqls+sRSwr4G3DdPgdMbkOTrB9foVjuZzEvv4j0Ip+FkJbPS+yKcAzO4UZAuh2p532K2aAmcFdkEEUdeDJHWATg+Ey3hmQl9Qhrzbn8UWal3D4AKC9cknFCndkAX5W711I9IpKOHg91P04Vt6IKO7rzyMy/hbMufZlgAVF0v82+uwo+zGow4Iaw17ZUpp+B/XYKOJ7TDBkXBAhwfM2mw6pura8RsmaM+d3mbdh/q5UBkH8UbZoOhdQM9gqlRvZHpVCbBLfkMuPjkDrtq6CjkZovHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gVPI01woOgMo/dEMxIkqqaxN6hu7sWhV/i/at1u7cgc=; b=mQF4inU0YLvgq6uVAGylXZijUo1w/gBWWTOdT2P7B/L1KiDRHZcwduBgcJt4Lbn7b0aE7Xch/71BU0DDW8bKDCWKWI0IkAV1qMFwxj6gVYvqL2KQNGTHY/Wjeeye6wYHAjGMqZEcMB8D2Yx+QbOyw+30sqHBbyUVtWxCDK0kqs767IZ4qWDz2E1hi6x2GR+WDIvQCoXjDmH+kU9sOhw9aJW2exR+rXBRzY2bcTrYN19lPX/4Lpp+/qI126ZB8z9wyHPROvlXbdncIdNtGuDkXWcifxo2yKLHTp42AQ0d1RbFv8Yf0W6vH3rYxKcn0rsA7RHRIY+wf3v7XsIWVKTshw== 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=gVPI01woOgMo/dEMxIkqqaxN6hu7sWhV/i/at1u7cgc=; b=Sv/43xNEC+T6xjmQSYUzPeaUyd+Yt8d1kPD8T67Y8jJHFtTTTd9CGSMdOKC7U3P1AvZJorDp4hTiQ+RxJmK+8FNAMnvBmjThcTcNXRrvMg+n/BtbqCHNqqNFUqQTsDWTA487eV01XboQMjW4A+0KiEJRyXxCHHXLkG3WMkNw7Mw= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:53 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:53 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 03/11] block: Add build-time assert for size of blk_queue_flag_name[] Date: Tue, 9 Jul 2024 11:05:30 +0000 Message-Id: <20240709110538.532896-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR19CA0031.namprd19.prod.outlook.com (2603:10b6:208:178::44) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 63a11bba-9085-4a2b-26e1-08dca007196f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: afOcrk4H2Xk9ja/UKnxExQawrrDBbqRkoZ5cZtn9eNf8pBvXRzfAJfYwgJsxLh0brVGjIplPghPcsKNmHaZ/iL5FYCKB5BLEcrd3sOTlVW2ZRgjWKKKXSN8TV1OJ+UXRTuYt2HfaM7PTBWi9XIZ/fxlW1YUyboJmFZXI3jLe2nS72JWMHf9yBcDBmFCKnnfssIIAQHKUYA97C8ihM26hISNLjImsjUVfm5TVsOTsQtAeolcsdjaxp4QHZPMgL/ZYy7Ee7hNoJcPVMck+lmV330GDe3t1wCvQHvJPtUjdy0Rc6pHywQFs4JFpPyDu7JN+YyPetdYJiFqVudil1/8p0DJxCTXOiX/iAbkyQMOas2u2F9YlJ72Vhx7si4194XGrDv0nhr2RJulo1gBZIJ/goTOKGia5TDMqY65BHXal2ZFMOm0OB8+ebUZPzUxVFOPO4Jr18mhYGkUNKKsgjeC427CTYVASbUZ4l0y49XWiWLHm9p3NVUnaipeVQ1s3+SzlhVLAFI6uS34mQVEWZGa0krMa90bRNaxzHczbW5qnW/yolq6Uyz3l+mtjhmCvJK4VVPJqHUzVEjwCJ/eivAnW/TXiZdVNlv8aaOP4iwgg9JXb8gzGxW6SbeueYwK5pUVE8Qhwfkf44ynFUXwP12Wo5QZAa0LDth55oJRsIj0DdWTrVPZSbCtPejFpcR/0ru5lre+qz9wmRgs3OEExFyDP5IXQL54Rmkr3KsoIkzoioXB388KBPiV71Kt+zeQ1eriatD4Kd53nrD7j1fDHL8AJDNpShJIPwEAZ3hWazmHAgJapg7WNX8U3d7HAUWb003E2HeCZUPbp0DfSdmmgXNmQYBST1TV43iKHRWvu1VWlaLCY/AWli8EPG1BBuQ6ATQdbOmcsd2EiaxFDtsY7CAbEnephKr0TzBq5AFT0Ohwd3M8bZVuPPVrbhWYs/IT6MtrYVJh8VByYNrK1aLedRPRA2xKhymT8QDjz3Q+7jOwsqwLzLfj0Ma1wRgubSuhiOBjFjvY562rJcFMcHQGzcxSpVlWcqbI3rg8yq/LXx/QCLz9KqCRaulNVYi9WiEi4VRhgcSd4HUcBW694IBE8QIFXOgxRReEFNLyE9LiEXe+KNoSK4ZXBK7e1n25YOrVNwnZ8Qk/P7S59/TeqVN79R8UU4k00yoimwa9V37O0NqqKbEcKGFNSrRRtV8wIXGOnkuoqXwYfIrbOF32LczMEkrBmrtPjmivSzRN8BgQn3UFhnDTo8ayqGyEj+FtKEsSyGmn+MAWEMPvtIEhs04XlCAj8SP2cJOpRrbJGI+lvPbZidyAT9IozqYf1Z2F5tXdo61PPlW/u++5beLJaM+4fYCm18w== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xrEK/Q6cKxthP2fMBFMwDusZimSwQv+cGkAO/xTjMnxZSnitH+XZ6HeOK2DxpQ2/y1kvdeLgrxpMmOGsg+pVhqf6/Ix26oJXTOY/A9wiOEhVd/dKNzHNzWADDCOXJr9K56beR8Yss2Q4AuOzeTmAVeUji90uzwIuZ0gKehYby9ZLwQp2cVMpvtal6cLm9fZYkwWwhPWvU2ezIJKrdf0PtzqskbEW5DYMZ7g2uMcmkzJ1kibjWr2UNppcs62K6hqBxVAfNyn6GhaLSBNqGhOMr7OD8xEde31lnKJRqbY9iGA3WaTlzKCdQV0wAV9Y5ZsbmjsKDzrrAXJ2vwvNS4S7R+j6577DPoWe0FIhnbQ8qo9ZZIcLSw+iDDFN7M6dYZemSnELOYeX9CUBgl3qcVSOQENKxQ7EQKFiubG79eo01ZYgGrV0dOeAB1MPFKGRLQtoovcfUTBXohkDVIiY0mw1jhWMJUL+BbO26EC7AIEXQM5ThWHOqeictR4TZh8XfAexfzxXWM5Q7IKwTSBt7e4qHeZs/3JQRN6sGrFilnYajQXwN34uPjARhttxIXujOL6VFhTd5djdc9zp6X5XHP5gexYy8drvBvk2LA9r+9D1iYR2m9Tk0Oh47CiLuZGfaYcCcVWUsMHP2z/a/x+4rpEcu84J6zxyYFh2Kcdvj+fouNYHibKUO9N1iVJj15XH7Fg4P42C8fVVoYo2KqIqvIVVNCMsiNR8Gpqgg0hv8xkuEglzkJ8iqoVBtgUSyZRsvXzc9UKSa8N+qV5e3bLPwbe4T1l65wjFkfp5ru+VfUTPBnJ9trAx0drIqmDLtzfyNSm8qhropgqjTeUWVi1FZt0XMomWR9RrxqyE+77AzLmxfrqvDui2SgpdyeoRqdWpe/X3wlIHF5fKH2CcNuYVTroWN0ZclXRf3I4JsGea0hfJOWcMe5LCMWOluHfnfLVdQEreAOraTUt9s9Z02VMRXOTMKg7jI4Gyoe/oi0xDZw4N0OxfbjteifsojVCisGMTQ7zQFVdOKBxcYG3pysbDoLXK4qI1wx9k8qa2DambcToCwtWzUiJdcHMmafhLsIfMuSdAaqluozeqDL0sBgcVefMWIGKRZOn+qkJPwFWtzTrTOsSo/VQjPIOXZP2cb1St/tNW6Acn08Pauu4wUHlYWYsrxkVx27slfc0Fgme+HLgzc1ExArU9TG9D929YjVNffud7v3V1SH45ItnCwRx0IbUIUEicSkXtQI/kkYyZkmRf+dCjflYJs8Pp28iIqLlIuBccmNbfH9xrLQdX9TU5gSaZaBVu4ZXWCfuAJRobs9t8PcSvDoDftQ5dwnpw8JzRz/uIR9mXteMg/1mx5lukkPxBL7WmGlKn8GF20IPNJ53x1MRAG01oIkMmvLuEz05ImfFS04lELkjssI9Eme9M/KKSbyiAuGwEcfalXBaNNo9YVyoO75SBZxoF9+jwU1awp0rsmTjeArNZW7tob0im8HNnFyGJgDCN7jQhIu+1zL5rPb/AixBkHoQ9XmKjaGKQ93TjZd4L3jcjl/v/uEQ83sH2Q4NhyHQVtJIfq05GMh5gGTVE5t1oUIh56nGPMBi9qnVr7O2Y80kbJpxHBi5DndIBvA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: fhXSTDmo6S/RwCYXaImoIkzXUsj0s7Ufc3X7EiYmzRaq3N9OEcUUD2yPGy/OZ65f5efFHgBtMqTRggPgd+9yym5aPICGd6D373BYaQLR+ThvT5ERigANsFs/9pBz5CVmQh7uWtYM/ykI1XbEdG77hZmFBbCzWdMRauj5ws3dDh7lbuW1Gbe56y08wBQNa1oYWvdiZVIC1lWcVrejhfmjS7dCD+yJe18PwzgEQd3znduHdYs+oX58Sv0Z3ZJE3bsc49jQI+D7x7BS53EePXkzlwkIyzY0JiTjyylpLzTeeefx17aj//05A4+8ti/Bx1YcQJzwvekjQkMR2YhlIINxol/BGMN2ZHbbPufxQb2eDyqGslDe1zIHbkJNiXDrtUecmskcjZIBQhWt3fQa6UmF5djUh8+TII5AM5vSYl0VLL9JDu0XDdim6icVaxVE6aFfO9Mb9mlFjK/23XJ0kN6rdIU551IrtGPg4E7owfCZQUqYmz4rJ7fZxdcYGZ/txxBeY6ceUGfAleeID6BVoaiDroKXAZXjIC3oQxk1fq7mwvSf7hims4jsJxah6w6ckb5bsRjbfP9XezsOhaTgMnzN4J3qk5Lpi3vLDwT+IZh9O08= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63a11bba-9085-4a2b-26e1-08dca007196f X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:53.2834 (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: V16pZInwkglhVAFe3Ku1tniZjKZP9LwtZBk8yx2Jg++KZPM+HcSJG/vuqBO7olP07YsiOmWhVR5Pk47ATljOZg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: E6bOgepp9focTjeABK2tAuydKsH9wJlM X-Proofpoint-GUID: E6bOgepp9focTjeABK2tAuydKsH9wJlM Assert that we are not missing flag entries in blk_queue_flag_name[]. However, we are not catching mis-ordered flags. This should not be necessary. 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 Tue Jul 9 11:05: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: 13727673 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 70731157E78 for ; Tue, 9 Jul 2024 11:06: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=1720523170; cv=fail; b=bgMvl0i4iQd1/cJ6PgLKeD2AVjx9371nj4EyqT2iJ/xD0KZBkRQJpfM/S+Yu6RjT9WSlZeuSTIWwi28gyFkaJ1AUQfRHFhDgfJFYrW0CUoaHpfERXF5W8U4RDeeaNv4uwlG5085Sy03zlHkcvYR1VDiRGu9vAu+KJIQJCsADhi8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523170; c=relaxed/simple; bh=s9WYORsqys1R9bg6nBEVAhsqoi4yPt1qeaSszqfjDHI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WvAQHtvNvlsuy+cmOi4dh9IOUfjov6Vb0/GaWvzOskNyFyyUwbc8d2UurdeTrfebvAtQhjf5IZJgT6ds/KeFSc+3eURWFDOjbBu4yIC6swjFbLbVwnwAoP51Rv8M2mMkvotWKN2c4wzX3n8iFma/AiOZtmf9SxnjvaQicX8uJRY= 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=IqSUd+fF; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=byyo/SCI; 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="IqSUd+fF"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="byyo/SCI" 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 4697tVJA017900; Tue, 9 Jul 2024 11:05:57 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= IqSUd+fF9VC+gndKRPbCPkJCWg/hdanZKrKx6PU0kkf+g96ZgqkZQUR5Z+DQl7V2 8O8Ook1FfNp9mq5+SVcldzdq1S+wBVGoxL6ggPiXnP1uyyfWyIzAOE4c8AePiO+z WdOGv6zLiFjSbLezQ7KaQaIvQ7b0s4b1jy4i7289ybSA9CgSKO0xqAXWphK1tDMO 9wmhkups4f66ZXJyFA8C5UNaIiKnucwhPdoaU6E03NB9YYMPs0OW5DFyXCg05kVG 1f/F86Zjsgeuu5L3mKbgyvInxwgavPFGRkg4X3FZ0GnvMAAqqjQMHzEtYO0+b1go MMfnNqXa0KZNEJ0DUF7VIQ== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wgpvntj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:57 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 469A8VA5005730; Tue, 9 Jul 2024 11:05:56 GMT Received: from nam04-dm6-obe.outbound.protection.outlook.com (mail-dm6nam04lp2040.outbound.protection.outlook.com [104.47.73.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tx2hh2h-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LWMYIy4sOVPLMs3ah1ml+Rfo7SR+scIbF9rKOtLjaT0ghbq2xU/ujNFNHHqkcTErVv5Xhhc1TiN59jW9wxSFwwAP1S9uCBr+QhDW9lPIVS+FCmGCN9qE+P88tOqD0Pom5FMcppjUoBE7ttJQIvtN7dSpW/NVLgvU0Cf7Sk4VRsWNZY4LEV42tVMfjtFjuxspHzCDCVoZeaeA04AHzIw/SJZXXATSykOXkxC7bHTLAFYcKfpGWU1SVfSybxoeL3oy0eD85CDG9DMB6NJ1djTu3eF7PvfN2O/ZCCcpZQ1jOoJ194dtUGhQHvkdzbSTgaESLW5cbuA3xHQrA02dJtO9Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bhfu50rABaNzyXbydtgUtu9fAssH0KemcghAlnC5wfc=; b=U/KcSFn7Sfs1EmBi9qQyEn6UQBuIN7h+aZQz8nIGD9WXMXsMPvkSI/y0elIvkljyLf0ueLdahxFufl47UVklpwKLL47ryqO7bOnKNCOgSIMYfIyqqB/lLlYPyUqEbzii1RxWPKkMxPbPOSJ99nNQYTv6uF9OzbinIANTdLWbrsGmCC+d5WYQf1k8gZRAsHV7kqO4WRj0IRClzGY3pjlGpfi2gWjFmNYDpe54jVC4BTbP+Ad9yk5PKx0zGoBQOQgN3eV/CZw6m+BVZYanRBPvywS7Jrt3jGwcwWfGWHRQzGWHAHe8bpQs1EHIqBFnI5y6c1QWit7tZBOdZ0Wc8waWBQ== 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=byyo/SCINo1aE5I2q7RNnR8VbZkEk8x2U3Fo+rsFAkazzwlAIJwBpwmKtQ6YPh5vDQnlifUl2HdDGjitt7T/COZm7nWEKuCKQOkyq4BWS4OP10jQ2vSJ72PnOdTLS7FxE3m3iOa5bIRdkQn/HvC+bxAX2w8P18PJy6hVNNqiDjY= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:54 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:54 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 04/11] block: Catch possible entries missing from hctx_state_name[] Date: Tue, 9 Jul 2024 11:05:31 +0000 Message-Id: <20240709110538.532896-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0075.namprd03.prod.outlook.com (2603:10b6:208:329::20) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 68c5a85d-d1c5-4140-d25b-08dca0071a4e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: eZK3s0EtxjyQ7+dk85kVV4c2GAwa9ZuppiWGlQu/8JJkqj2rIBYHgMhK9+EQb49gUAGqgqKE6gyfAZXDbsR1gIdgLawAW0g+JosPSxrW+kn/Af7xNPhSPaIT38Jq4g/55W22+tPiIDaFSLfxlu6EhmLDsdq1+IgfDuvbFYcRZWU+cD+dtd/3ZmGqaFZoLasxZ4MTMCM8SXo5Yll8Vz3G5zMev3nG8SH1MhFaa2Bf1fo0+G3vR8hVN4crZjHqmn8aFi2YUdagYieXEz4C2LbiEwKHFs/UI4q3DwX75zBDUBLdFOFkzN5CkBI61J1Xv9kfkbYi6KvfjJefz6OvzpfTh4MpX5z1qpcCEkjXA4b3Kp5dQWPmNkrXnwAzSEJPWDKMrfNSEhYtNkNBHvKM1iGPyfkkrfqkPHCJsxI8CBXRbUBYSRo3Fnqpsg0bLYzuLhEcaGsk/MjYsobI6iXWzXLhBbCuEmUqTH2udtgl1qZsLjJEY8k4T46EDQXmXDWLIOeL2tvf0IX9tm/MpMZ2ifIDahE0kYFnHIWUUTGBND0Qj23acMzCwzhszB+bcYPeM4WneErcfIG/rJUpjMAivoEMhWW29jOUfRxaREf0U8Lg5k0YUP5WsQvRnEslXVwDVqCAvbmdCik/kxgdyGpsnauCy5mecOPoMd+UdlcTdogM7js9ekBTuGPsNE+UXwRD4RDc9VcEcJFeYeB5oZDRrnO+9HWk9FYsLnlsA2W/njIf3xvwN9ymq6ykVNdxBk9BlqFimtlaiKj9Asb8PyK0gM/pkR38Nfcc5iyShq2V0wWCGV31/iZcQ83kZbLn6f8sqGyZHbM9E15bybHSwOsHWtFn7U1DMKYWa9mnOugrjgzEc2UGyZWm7Z45nnxtoqamisrOjaooX9Vv3g8W7Prgwaz0YwqxQPTyLszNaxeKykOTFFVCu8MQB3GtbXY7wwImXhNHF8TvHDutu0twO4b+MkJ5NBom12Cf/EcxDq6TOteO+j3y2jOk9bUS5GfY/VqEb4xyJEG/0vEHnCKP1u0bprkZ4QlBhqAuRT7h4k26GysnktiLz7SYjrk2+/kT/zyfVK5qSCzWHarB1wX7AJbfe2pks0Yx/YQ+pgLsM12FyTDMTbklB/A3Pwfd9ht1SMzW7w//rbJW4UeRONYh5bBKo/O0q2b9oRJRpxzRrVW5iOYpnscugdCcNgSuGHewitBED5+noFcd47NZSsksYXJ2GRE37WCNSkykNMt76mXCX4voZUERTwGHkADsypOA0P0DXWgiyxhp+yyON6S3r51uc5xkPkRH/5ad6KsoHvVls59YofPCo0Ts/ftXYIx+6+Qklbog8q/1ExdE027BuoKKggLhQg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: fB6o0XfRb5Y9779Z0u0xupIl+bwgrgL9zXZLTDaJj0SnLERLJ3KbxyhUdNahGlx/fq5NnuPKMyEYmQj3KMDKPWPyUpYKH/y8/e1j13c4WCLHalYdOU5WqzISEzl4sIcjV/ovvzET2/Y+E2u9kOWUQa6y+Qek+mJZxWEYDDidoyaD4ljx5X9zIMN0Ccxw7quIFfi4HiWcFXwEuLTnnXbg31ZMawirydSShSqphf38uQhR8Tf830qXucZLVq1P6lBUkeU8zKQa4lUMgmhJOzaqyEnn62QeYqnoH5qj9LnSBXiScI6WfjaAkbuLPfqcutRl0GYLT47Q2Ioud3ZxoVev9PrpK71cZ8ctH9p3rBf/wbenF42j3HMyrJPGVn1cFtO80GLOHRid3zG9IirJcUJQR5seFkf5R9Uk4g03F1RzhaIbDS6hLjQnty0znxB0WD4D83A4K4hYcKmaBrQs/EHvGStWaJ2lNMDyLBlEGtRC/F0HdOsIQvBpJGvgKAtjGMIw2D9x2L+hGGMs4qweELw+G/itdzlAKXTHMYQaDNj3H79ILAY5+3FUWaSU/dI04pZSKGF3IhTkq5LNlpxejjZD5zSKsgrm5IaNr/W9JqvEHGL0pHVf9HJ0V4++ipQpwAAEvTrbWRrMF7+IRz+qQMmqecZ4vcCBGPSWpXkQ3xZSrOoLxQhgVTHOZG/oJwkdjlzJ29Y9HfXDinycJHIkv0PE1YSZyNiy1n70cIPhvSBOglX1Qw3JSOkJCAnEeY2SvCnUxz3h9UpcXQe2CzCAyaNfRCCM+7ldB8l5INweQobA/WGiBABFhP/0tcvzaeGdPvr5rSWltwttX7ttXWx1XhGsS6/Dg5KdkNMpMIfgS9+8/x7za/h0MGtIGHfQqCXbXI9djhb8NAFhFVmBBkk209Tjzk/+SD2pg3meYxqahAxTj0sM8TjnjTIwrzSRIqpbTJKXDehpMY5J3WODcbwdCwxX0Ez2iAuiUfDNezQ9NN28AZ+sHW57kzHxtkv72q018OS89Z44GblXXY2IpgcBKKAOCp0x6uJZLiuRRkdV26SFe9NSDy2Ru62zF5izr7eOKetk4zw/yoxQHPac255TReRauuSSnq+r954bfgXv/7yjIdG0yIFBXnIzNqPkY30jLxXK635uwJBrYzaz2IxuqWg54eVLSX7y99TjbvbXe6Xa7bYLpuSzjH7Ib0SSKZquIems8UTrykMvk8vkcD1nQfnkCGJE1xCHSmNGWyn/xqJDhemImMhcYYXE0/p6BDOPj1MkU+mb+UJ3px+eD4javLA2n8sA+1DZD6kL8aEswNkXdTmCXbMSVKNR160PRXCxHTFs/KKtUbzU5ICjHgWysuWiZtqWplORb38BJUbMjWibZOk3Weoy5JuL/pLzOcJ5RQ64+WNfIDtaAY383Ar49MlthGL0p3q0pvVH3P03awphl70FAUNFwvzkDd9q7NLXCwNmWU2HfmHo0mN9acQM9WJrCHIVeHuwtuirGlifGcrwa3iIgYRtvDdIsMiW4DBIlRT7vgCddKfhYpSUBSMFqRAoQPvnQBf41UyEdPRQBPEWNbKEv4LvZvCzvBswM3VccwBbuj70KOAc79LMRjHdU/PpMQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MYS9N+U9f1ihL2VeQy1X/fL5ROjKwwJ2nERBXmVpDBUJj591oUxEMTm5nz4ey0OfhQ+r04bxHHCGu8PhYn9fylNdmvHTeRD75xqCzUfG6agbKsyhNPpsSj0c1gBjx7BTThxZUlQknpxT18UcgykgOpa4HHvdII2DtMmuD4/0ElDyqofGLWC5dzBZLb8iR77dF840qAgnYKvo7achB7CwUWNIg+l8idcFsHCcM/j5mdpSxJPOOgFbC+JjWyZxnVTiKz2MkA+iM5CKyvvTY8blLR5mz1VvRDCuhO+Za2VIqeNUQe6xER5jFAe2iJzvzPkkQ7ydw4M2rBdRf9bDaqTFEdYRm7z1mWatbwpa3jvyUbqJtyOAm+7YaJwzTwIowgxaApfY7jqoaXhUcPcesPP+6QP3HoBi6rfUjRvv8RiRFUlGM/3addgy1ozDkV9KXz5p33jn0UNEmCNQoXIViQMmRJqOXAzk5hnbfkX+NxpgW0INdPT9qHNnmZ1uI5XnK2qFT8f1IRW+frVR0O9Js83cc/8duTSaxDziNBaw5QyAk01rtLQKVGSofym+f7HUHZhJPCAmywk7IBhhrbrE/+OwvIw1MDR05VnBd/NLMKS8tr0= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 68c5a85d-d1c5-4140-d25b-08dca0071a4e X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:54.8484 (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: 3esIFGPzDq8j2Z0F4bCStb/tlIio0eIMs2DLvl+9aE/WehGI5tlqnm9dMai4Gb+bqMdIv9Au9mXaQitwnijz9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: ppAxyVKw9GCtgUhUmR32Tem4pU3bOj8C X-Proofpoint-GUID: ppAxyVKw9GCtgUhUmR32Tem4pU3bOj8C 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 Tue Jul 9 11:05: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: 13727675 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 AA3DA157A72 for ; Tue, 9 Jul 2024 11:06:09 +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=1720523171; cv=fail; b=M8A9hANcV+6xN/LBzRBUrtdkfet8vOeQFJXw5Q2QTbdfnQ9Ku5ka8J8yD5fFKNyPZRY3UGI2bnmgbX73/pc8ug1cg7qab1puK9njusL3BUDeZJ+FIwFgO9OHkP/jvqANdChswr+R+SubqrsShzZp5Z/p6lQ+/j9/pL99TIYc8J0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523171; c=relaxed/simple; bh=0gPrLrf5GZLiPez9+kIcQXccE1qWHGFyueiHuHdacio=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ILYMEZvI6CYSKuEXrHeo6sZRCdHN4CUcon8qFz0W9zqlpdC7gddj4WJvWFaBDOkIP0gQc8TOB6Bp0c62EGMueOwW5KADu0N4L2OFAud3FT7cRyYwaaq+zP/QF2SgzflKdx7g/KiOQgZU5QNNL3TPPcKrYb/Op/wpmeSDAfLVOls= 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=Z2zObFPI; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=kgr5Q1cu; 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="Z2zObFPI"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="kgr5Q1cu" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4697tWnk029526; Tue, 9 Jul 2024 11:05:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=+sySfszejTwBfYhCRf0axrDlVa4OKzsyUDayVCx3RCk=; b= Z2zObFPIrILVyn7B5pRC4OBnkcth81P4gGN1C5mWjkhoBkrt9ljq5hp1oEfGjyX2 IKqeiyy1vfTruxetH8i76vNc+BD56AUu40iv3tFK64CV6dKws224P7WnZrNTir8j ukjiHt/Ik2F/Mtr5Md+zo6J2gc3ngFa4xshvfZmgy/gZDJjrMsh1oURok/x9H6dj LvmewbRRsJE9NrLnkupycdlO/abRC6j0LDEtADcol/C+9umrNdDDwQ5GTbIwQche WTJFOmttRNcn4MEdIewbWH0fY/2lPnc4NOAiMtD8/9SEwNETTp8zeP/YuHQxImhZ V8a+IjYca0Sq3z/uxdd35w== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406xfsmnr2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:59 +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 4699Z6Je007435; Tue, 9 Jul 2024 11:05:58 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2049.outbound.protection.outlook.com [104.47.70.49]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tu31m3u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:05:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KKyzc1/0R8zrr0vykKlLM4PmYwp5sdXouYCjdEo2LwBoGvWSjO13VzEs9k6BNk5oKUcAKQ25+MpDLdkxujn4zVKg6og8w/fnhM8RhGzk3AEM0pcERvc08X0B7IfEKjc/7mZzdAH3sWEckfsue7qzxrU8K0jfwPTuZR1iaJQ4kpqzk8MB3seojphV08Ay4+HL+vGdbbB9GzHd9n/vKDlgDNy0Rbu9pIkxTCG8K+t89Xe19LFW3dGmZifDYswaDPMPVuLg8Ll4h/pRHb2O1SLznMML33yUEHCxZtZvhCgO/mIqrjJMqlRfyoQPwQUG9xqrpeBko5snDseUeYKumwRyMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+sySfszejTwBfYhCRf0axrDlVa4OKzsyUDayVCx3RCk=; b=S1iuF8dFAt6Q+vNg+DLSlSlSD5bDUPdxCRktdBCozehU3GI6gJ69hARwIaeOuFsfv/J16gFHF4VVhsysZe3V41RD1C1kymKlJg9HwCAt5eF5gxMfk881xgu4FIop/bneXH8Nbgm34TjqKu9iTzJ8FHiz+qW9mHFriWs4HhJpvucUxA8G8DQV3k7Fpfv1mWaWsTkLL62W5i8IGBJmMre8Fv/BuVSOLe9hqTb53l86dezv7hJpKWOXzAq1fqnLiOBGo7ouFuEZnaDsWefZZm7KXjllfrrpotA3MVfQwKgluP8FuIPhqerkha6VR+WiSeW8z1R+UeF/PuC5q/boSi74jA== 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=+sySfszejTwBfYhCRf0axrDlVa4OKzsyUDayVCx3RCk=; b=kgr5Q1cu2kVwaNudxlLWNKTBqCL5B3zC+8C/GeLmDxYFJDt5HrbnvIQTdDqO/VXlf9rpfJvx1nsQURD6TbWQWY79PORvjeU0oUB+g+aZ3ITE2v7Ov3TRz1v9QZo2HEKDhO7j7/GM1sO8yohJWFhikr5DAGR5tCuUTy0yOh9gwU0= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:56 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:56 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 05/11] block: Catch possible entries missing from hctx_flag_name[] Date: Tue, 9 Jul 2024 11:05:32 +0000 Message-Id: <20240709110538.532896-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0150.namprd03.prod.outlook.com (2603:10b6:208:32e::35) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 4cf140b1-6f13-4321-581b-08dca0071b5f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: ryk06/9nkIG7WLWfhWxAyQCdYUNx6oaKekTll7KGjd3qkIQa8lL3M2Ru+yIanCptMLlwhcp4t7/GvyiRYYXmKE42m+h622KWS7E3Qz0u+kN4yOypmVuUnzv+4ik5UNWRI1AiV4bnKsBRd6srq/47plzUC1YZLG/39Jz/qr5dWF5UsVeNhcejoQP6fG39eD8r2Jp9Y0hajdqO4T3Ya5yWNgQ8TYB5mmDuSyCPvFKFKsU2fjQe1JQG9WPn0e/sSRJ2CZaTJqVRRameZmjm67i0ya/wnq2bKFEh1iSJiM1A4e9raZ9p3wPLMj1240K4fZSf5b59Qc3mjK5BxcyezaxIJMF7VNEzTEv96SZwihYZDmkC6RUWD1imu9j64AYwDHhhXhrJVehVMuHQAyfUsQx++YUnRdgRuc1xCRy/z2u6I/YYAGCuPcy7ucN1iAMf4A8F8rHM0GqWOGpe3/JdcRhdnamn0emSDZoptw8CN0O9rnelpfObq0NazBiXAGsqGaXshNsnfXfvjgjG/1JuZqY2yom7ZM4SvDoDHGWTu1mtTe0OnSSXWB2PlNWUyfUaNkHFW4OIVwxSKP2aQoUVgI7e61SK6cblXBKdUTPUiau7Ufx63PbIeY1JYE1PfI4Lm5hq/R4efF8PXCzb2YDAnZ7KuG0HIJ4SN/uJNm2F3stu373CsMGK2dIiFrGVPKN9dtim8/UFG0KRMLNV2kDEwaPlwx0Ol1pUhAxQ6YLZw3Slq/JMlTcXfcGdwXqzZjg/PyG0SRWI5+7ahnD3XcpqB4Y5k6sa3LC1ZVHcQd00CkU0dr2I78WJnuEJ6EBwafJ3BP//3ftnXfi01mXvGNzyiAAvDifxedAGecVmbdHe6zIV7aHrG53fnJeRVbnDqZYmd8x4NrBoYUUid2o+G4P3qAuPn90rqp7OisdgMxkwzmH1i3m9iNJKfjn3SuAXP5f2o/B+mW1+QCix9nwLLetrCbI3unWkPGWttnBJfRZlvGJZP0S37HpEZ6X/Ww80TZ17qfdEf/Sfw8pgacm3QzuFUe0MvMXnNkQLsatRxZogDkiPTrCm1l88Fe7G7ooUOkb/3JmfCqJ3ZNQIxjBGPHLvGpXpnQWAjkmqvt5tpyQcC/Q0E78cpZR4zNC09Et8Y7samcmssuXSXsU26XXs/NVXYZazj4PFosk9PJc0ZPx6GIdI+6W3dlgfuGNvZB3QoIvyFjG1EdmjMggSNpckAyJjWi3qT/nBnWAAotiJ2vM4cRo2VFYiJrlleb5j70bdCVmB+cZCMOSQMeqakqxMHh7yqrQ8BFwAuxF+D4daSbSR5EPNS4s4pwnBw1FBJ3fP2DLCmWtNv3PDRp4Tlxj4BEg6QGT45Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: H7Owuibo28NDLdS7v9OB7AoCjLxPfcqScuGXVX5cZ+0Nriu5uHsZlQzJI07BrnXy1NswT12fGR2RvJbIWO2OQL8fbfEuAXzGRFLCSihX1u+3+xhvJzZ4TC6FLGBwFRhNqSNFPxCA9v0oE2LHsYOlt36M11LZ2VWkrnS+DgJiddipJgbflkvzfXRGWhXgbrhjk5YI0gxJMDm1N5D+3JOuCN6MlCKNbi1TbLP6uVFJnbMeQLMX6N0apyw2lr1Ae4SlYCuYs6z4YWsqF1dgHhUE1mGii0Sl80CV1RFw+Cpyf//uIumntM9M6S0nlhu4c460at+aFhP4Svh3tYK8NkPfYNpIbBzFcJHJ1W+knDjoXdmiV8lCJBNmvujBs2TFCjZ3riR9wKj/vjzZAZkXSoDgsCIK29BtgJXJtxAGHUADorU5WQ8YeEGWZyxIpfI3DpyYnEMDQGDv9lW0eUwC+EhPmpbkGoR63XU0lAbdxp3GORNEfHJGLvcvTKIDQrEkJzP11fIsRqrjfbo9PDeptH15zDxIu/K1WlQYMPRuD2K+ldUuAhkVH9M2mYWzZBwHgHysjWu25V5PHxpMQjirkEJacoJ05ndy9gG1+23GevrAuttYcUpheymIQAeNlrNedXU4JN52T8v90WyCSYp5fbpsTiLMj3B9lGNvFAK0FY3OWemBIWwYK3weNaT85PoUb0lXrNsK7pzqyXW60TrPdMeUcCnA2IQSWwgefjwj+e86zlMVwXZrRbLHdBj2wVUD7vU+kMmCeJFXLau1RWOlR/1+G9H80gMMP3bSO3syVUPjuihTmVmzlNb2nNIorDXGiGCL4xcXtZuwN/ZTfhXtrkT0Ficr1Oe1nJeHMC7XH0iAHo0bBWcZe8J72Y9PVxNmbU1Qh6myf7Qz9wF3pA8vMQQt3CTjqrsLvoaqq7Un++iPjThvCwo1HRzmUpAgkJuS8mt6faf1M2poPXGG7t2d8rKK0W7HjUW70pazgkhiEIa0HAoXvyZdbDYJ3JRx7WuTj/zs1mmU/t1rNEkRevbktQsOtS4s3334QykeYVboT6OAARtGdlCYPbC3vXJPM2rH4gv4BYpE6+i9hjNaRiN5jiBxV5EO+zkpymDq1j0wKFh45jGZ5TFId22btp4G/HBqE2JQORPb1i6VPTRI4ZolReXsTH3O3QsOz8eZUHEkh9XTmVBtDEXsvRJqRCXeAYM285YfHGzHhih0fCIdmxaviFY1L4Fm3dEFaBiGtawRfm9f8fpvQ+72cLz2/Ee8RdOZGXOalqyjVttzEtdMUzBl6Du0/sSCzXPEgkTnpBCyekaTHqLqqUfxzllw2cIcrNmaKUMFKJRgviGSYAaz0aKoNfRpQYWSNm6p3fKHcgdPQx4p+/Y/RnILd2u2lJEo/F7mAVTUP9ItfqSBPqqJHaT2vTUqEvkWoTRy55v/4J8YH7BKi/aM5kIzbDd4HOFuoF2IF500ORJytKLTnH/uAcEPmfUjCRsGWdH2udZycwPc6tj4y2u10GaUvibYuueKChWaCTN6AH3YE73qcaf24JpMqcvxTLWc/3EfrUZOsa0jBYCNEhihTBAV29VyAEZBoSDCACYQ1Um6TDippA9nDwZnDrBv1A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: PMvGg1IB670+8zfjSuD95oxfeMMHErLrwabODKwHUVVe/gWnI4shJBWZ8unvKLOwuHuAVTzWFCYOWJZssn/jDmbz+jMWn09S693/H2RY/GaqAcXQdQ0LlUEJiJLmyXUKFJxPK7EGcFZa8Dl8vaBono95EABtcJQ+o06XEArbxTZmPdYD/S9Jh3PsZoZTf/8iuCKZG6cPpyK7N8XemPBLh7fqYIjvYEyS8drRXOVw8op2Wsgp95Ay8wgu7AbhlchpHH6kBWjt2Ubr8ChB6BhcJcuL0Q9NhHQu8GahaD9kyNfJgN7WMmTIx7yqkTYJ8gu4s7Gaa+SsAgmPPKgyoIOogUU5yIj1Rj8+0SFilQkSm47kskZkUrtdJxreNRcRBF4iw1dAp2VQidJdSfgOzi47LmuQqcDTwnPavdhuSJVlacoy8qzetYlRrmZJq7CDNJYXAsXaQ5fSo2kHphoA8wjwWmdEuTjhliu/pomhvH0R7FUBVVuMK86+7RBcNE5Mwt0tBrrZexAjk8H+0NmcpSlq7n1bEnTuna6lNxWk6EGqUmKJl+6jXmXF/I7DMFrnEUKkn6GfHQo6L8RCZ8kbLlpC6Bj7LfEPI+RvuP2S1Dq9v3k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4cf140b1-6f13-4321-581b-08dca0071b5f X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:56.6829 (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: rKTEJPQczkHotcUt2AT1Zi/BJWFoJ2s1BmBGYmKl0nEMX44tvGl9HwYi5AU0Bw/MXAz5koIbOCkjJutnYm6qRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: bmAJWwhRO9CLmeQN8iNqvg-2VPfm2GZA X-Proofpoint-GUID: bmAJWwhRO9CLmeQN8iNqvg-2VPfm2GZA Re-arrange members in hctx_flag_name[] to match the enum in which the flags are declared. Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in hctx_flag_name[]. Signed-off-by: John Garry --- BLK_MQ_F_MAX is a bit odd, as it is a bit index and not a flag. block/blk-mq-debugfs.c | 6 ++++-- include/linux/blk-mq.h | 8 ++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index fca8b82464b4..74f470d0e1ea 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -183,10 +183,10 @@ 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), }; #undef HCTX_FLAG_NAME @@ -195,6 +195,8 @@ 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_MAX); + 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..b3905b77f375 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,9 +654,12 @@ 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, + + BLK_MQ_F_MAX = 6, + /* * Select 'none' during queue registration in case of a single hwq * or shared hwqs instead of 'mq-deadline'. From patchwork Tue Jul 9 11:05: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: 13727671 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 D1984155389 for ; Tue, 9 Jul 2024 11:06: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=1720523166; cv=fail; b=LXsEAsAU823MkwWaAYuHGt1nVNOVjMy1e+FlW/O8kSwu7LbLhANzMfScyGlutmtR+39b2xoCpZiUtKojWcWBkCn4f6QSMzTJ3ednzCEdUxW+mWLu3/s2tgLQ8opnWj1jcnxduUAGc+jmXt8MACmJdxn7Sa4FM36op+Zynd7ak0E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523166; c=relaxed/simple; bh=RlsFu1RZBLRNHL/pd0T9NSWjn5fl30F3Swwwjkk/RD4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=ItLJTXw8ApDY7yugUp3JeZsgspotNqA9kQlzTEHKjOxRe5zsi4TXWjVZYYjzD5eTws82uz0XKTX5HpeMzryzbMr1iEOv8qp4MCRVqjSNoy+WJ5c7R1rT1/dTNA+N5aDjRaGWBDWZFhdua+NMwQcJGIgQ2pqh87rlwSmPWP7hjw4= 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=Y+VoNt1e; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=dCaZlubF; 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="Y+VoNt1e"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="dCaZlubF" 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 4697tUhg007106; Tue, 9 Jul 2024 11:06:01 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=XWwLZFHR55qqHxuquaMBGu4+6YwTbj6OH+EkqacQJ8M=; b= Y+VoNt1eZbHboKybIXhrQ78u6k7K/ACAFHnCNWQ+DcoYgFyK5SzHvXXD4hAPVHtb eOsvHpc71qwdE0fVGiYp3oF4S6W8SQIBrXihp/zb/4xlTZJKOKWe24brRtNf7K3n s2nfrBg0kZNlK3bvj3WJOwXndWwsCW/KP47qffpA73A1MzyekgY/jwwdxHYpt9Hx PrCGHMCt5sKMtftsrotO7pwHqJn8SLCNzF4ltWL8wPLBdxDZZLSGkXgEGpAqrQ5d ohpRwZjhBzWnnWIVWALUsZ3QnD2oMgoXZWZQh1IOHA7wpj7R3awLXr8IRnROxKSA 7ejg8cvBtsLPsNMxQvMong== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wybmpte-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:01 +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 469ABW8N029950; Tue, 9 Jul 2024 11:06:00 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 407tttg5h9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UAH/JhULuTN5rAvp0VM7u78qqHRl08OrjM7oA5Kqno6ZbbzgWQ+ocZAnqzlfg6QLqExzCX9i76ireYox5gGidFjs4qZcMGJzKvGIYYA5xPBe9+8uDxpJ1jZ/mFoggAaEsBc2aQ9eg6ue9PFefxAfdtlXCIf19xFyiprvwtSoLAXwYsobKCnGQUxvorL5sMEPfR32TVpDsCZci0rLuEaMhjRbqBA7mQO4RTiB5885Wsw5y9jR5IE9RtPwEi94mE1zX3gwmyEGGS76bOSd7jJYz81o9Xisk9F9kavHoB7RGr8zyrupIBEHqVkoEbI3kwAHhUCfCVt69uyo75AMHXeRAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XWwLZFHR55qqHxuquaMBGu4+6YwTbj6OH+EkqacQJ8M=; b=NsaeYkuU4BdV36/z1YBQ1S9ondvn3+6ZJnO1kH15tLrxNmPW2Xpt8oYminzlXBqwK3ctbkanOP6ME0GdDJpSIZ9h1WFZ3Dd4jC8bYHr04wS8Ha+UBn37UTt5fKcp8/gkzRHiokD8GjddIUd3dqiPNnYPD9Nf8MV7S1SysUxa5tNeYki74UqzjuHrSX8AFYGpaG+uaVoqkJMkdvYYRXkKpo6bUAsEyjJwAteBkSgFUwfqAcySEOBDA3KVbwbVzd7N+oQv/gmKDlJI616k7D/SXTBURn3+PAMXMf3pxIA6mHHWD4HEPqiPLBCX0Zg1pO9t2GfcCN1krnJJ2QO82BAedQ== 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=XWwLZFHR55qqHxuquaMBGu4+6YwTbj6OH+EkqacQJ8M=; b=dCaZlubFyw9KtkYFgMRpF+Xa2Q1JK+nAjVx71hjeuEZ5n+jPAzgS9McSkKBkk8jbTSpsI/cV2PC01tQkash/Ga+ZsEe08odF8em8Ng5fIQGVjPEIDjMPEBkpvIRqs5Uro7NfIxZOzKMiv3GiJFuzPLZaDHXjZUd/cP4cmveBvBU= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:05:58 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:05:58 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 06/11] block: Catch possible entries missing from alloc_policy_name[] Date: Tue, 9 Jul 2024 11:05:33 +0000 Message-Id: <20240709110538.532896-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0084.namprd03.prod.outlook.com (2603:10b6:208:329::29) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 940de3fb-e00a-418e-d264-08dca0071c54 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: Veb3V8pC9jR4XW7L6aoATGAgeA7hQq8VWTZ91PMbLxiT7yz6tKs1djMFcGSTeVfba7WZ/FEMitCZPbfJk9XKAB+XRsgXVBlzndsi9QMBmCmzMKwgTO67PbNK7qFUeopKjV+yzoXAW4uZujkUreLRuFhqhQVJmHPp4O7Y/vi0W5e6zlDrHnXLAU76pfwFjiUIhkMmQzrkUem73+UhzAHehVlYg0PEOAjrCTyloji8zqBvIZHIXviZWQqzzBLrYWDsgR+YsmRGz0WbwvgWtJiQyshXLI76FzuWohbzE2wMnOv6LJFXlOaHYHcbbM2hxq/+c+2oBkQ0gSHUaDzqC0f4S5f0MXgxVXD8a6i/SXQGPUpb7IirLuLSZ71iC3Ps5MKqD4uT9S+EViwr/tflktFwFtPRK7FVZUQILOki6gHPe2nMWNOZYZIuaTwc2YeRnOafH55FCNRWRC+pP/EK8gZqqAT6QUOaUUGSzG3pLCFJQeja668g0gi2gnSAp2rpo1H1eErsv7Gw0kxZ8biXEw6X2+0KnEr5EyEIcAvaSGmRau/7eA/HeQJDjkZZuzfcyONBHcmetmW1U4xZnLLqUC+vGf5TtyLCMw9ltGxYoxwP5QoVT0H6TWXqxoJ2prfHgqEifNq+iJpma/9CwzwcS6BiLZubyIn6THHG20Q8/ArumzPFbOKw6X9gbEaj5FLZf6Gc7NrnqubxAWIb5pimmKXpzTfepEH3uKq63aW//e9xxJI5cLLO9x3xda9iEg7faouMGpWjhAA6FibOEoUNo0i1zXAQpTvcQyvqhoqOjJSLfYFuXNcSp4sdga9QaXojQ989u7ZO++nKQVej2tyGF6Y34Yxr6NlCLHibeXA2ohXMu6kH8Y0DZchLeECG68i5DnPW5IvCZQ4xxI+YtUS2xgg06LSYGlRAWpCCZU8boPaFN8EB4hWF2O0SRoihngh2jFFKZkdWXEkdfvvuAk+WmYI34WG9yvT3fgpIcv8W6ao2WXlORxEY+X4+aqS39UgwBQ8PAl257gKheY9DYblLHRZHZszP15RRBBwAOnlR/UQgj2mZ9Nao67B34/E2RZfrP3CtscJBEnUR0sR7417hTiH6PTCxXJn4iSjPmLg+VTkmxEvfFFtsxyroqpIsn+VaCeC5cfDcqP5zZg3rk9JjTeIJfwBKO5DNor61d0zJMnexiJ8Yzce+k2bQ5USS2DlU/WelyNxhhmys0UQuRiWdLbJGyvbPmQB1gtArJBMGvXVWHk4gzL2lpw2b4nh9GddaOoES6XE38CZM/oG8b8MS8ywV2V1aEbrV0N6YEZ4kwEz6aJzWUIAExCCnNrVbW2ViSwdg6FF7fObQw6fT7SQg+H+jZg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n4tyJypxSlJfEISWBqba4paDjT+9P/ZemjXEmzsI1T/AZKgnMZT69/5rVXrM6XA15wKtHxYfyVoSZoI4zDuFYNro+xOutplepVPbgXJZ7KkuvvlqqIJ0aeSkKkrdbYTXTZ7XU0DJkaAPe37GDzUnlFaRTJWXSMRn4pdnLVETK9aPrhY6UK0Ei1n9QbWJrssVMdjPlqoY76BU2QH16eVoPJLBTY3eO+wcWqF4fTinpCNO14cGyblcje7oi5GCiDD2W4Lp8/aJeh456miaE6ojkV6i0GcSbkErlKU7OCXlMY2fS500ygRtXA435784jYKVstva4opQBV3cX3HmIwdyHSFp5RdgREIqMr1tUvL6fSleLz6SXRGGbPbReS5So5nyneQsOZK9Az/HRDX6JwqoMs42GM+JbfprcLot9X+/GZhE4Zs0Q4m0uppwm+/hImsI2LoM7JP8Mi+8lqTPxzIbhCag0RwzQrfNQ4L4F0/u5S9qCrGw4HpOHqNk0RzZG3REam0pVZTBIzOuxL+gAiE/KI35vfWm2g5KMC5pLm/uqBg9S6siLNv+s/Q1tOJL78gy1i7N0HA+a9dCg6gCQOmoYFbw15Od+VKC5+t0jZAXKImxWaRqGMTx9EJqhFFH1aNx6TZf3zTyWJo2aM+I6IzdqwE0N/R4n0Pg9XUuVbXp7zxhYWngHLbMfw2sJtB+Ne+bizhMlOJjwsMMux0dJ4VRP+VWyr/dibv/pBEmCaYX4DdqqGZPrHy1V7BCsBB7Y/PFGFqfd3fH4UEysMhGLe//7Dcig4/nZVmeNqvmuVlC8X/p2IARzIXec/XtKNApajgJUgpFSUFqyivHC/rfxqKFJrnyi+0Yx0kysG6PIr1+ENF+dwht3JXhau1v+siq2R1Ss2kD9zGQEd2iripzS9dgrGDu0iG6n0sl0EO5RHGm24oEDqtRwzNDcpnVv8Ab0o7iHvehbzhN+w+ZeFLROFUNz3RLehd3bG1EhwzL3b0K05f+cJmwYDgYgUp1ptdoinJO0Mpq4gIulU9FEyc/xEo0Z5TA49ij2ChvxgxF0WI0GJHdujxafEstw94W9JuN+fP6SGX1mmvNoenBQihYqp36OUDs1Z+WwgMq5Tb0AACegbf/z22T0RgqHc8xVzY9uaau9aRDBNPqOEKjtRtH1sMrRkGzgEwxS1qABPFk97nICQpslD8pZBO8QIRnFVbzVoop4R5SIaP4WiekdrPjDp2KLF9CyhytxqWNdPkhv6YwbBDqZSLz2/GPAXorkx/zxsTcgOQ9DhuBMIw25+zy/sl0EbyY5jaHbOxXuWSDxMaG4GHM0ugJ0xf5+IpKMp9L7KAVFRC5Tcfs+S7owytoEz6A9eAAHWH5tUiPD1blHM70i8KzXKtwoSA15ywIO73rnb8bfMifHhrtjdEqRXEdcCcXFhRhA/6c7K1b/Dvs4NDHuCAfSO4zinc8YN0o2cyG/iMEoTEKiYdl4Bw1xPRiX8rrkEoD3HvWBPPr2CCajGX9Q+iOZrHVd7f6SYpibi7I/U83FIWiS9lceGkqWflJ5ZOZM1HY4LrgfrZA8L5wGd3vbuijcMj8Ove8aSXEUtkt2+wH4kA2AjBSDcVaKzW+i717iA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: tQmpwnUm9FM5gpuy+wcrPw48DTqPBEx00kljiG5HhnMoj5W48s29ZYlhMiNNiYCAhaIgZl9CKFmJTjXcflvWpMhW6FmNBmsV/Gi9DdanxuyReaLWI1hnCAF7BNbOW+9f1OpfTe7mfMUU5jQFSqQlKb2uDvzoKjmArBWV929eIQZ7cc8sVD2Ul0kKdzcjogBRwZdiEiP/TV0awMA13mmLXOtJzCL+W9hNa12ocYVK/t1OY0g3TP4XHAChGLYLWroo9r0NxXNKCz4y81thIfYp/yR1vbd/y2ghHe9sWLYssBxkO5w5cJOkMcQrRDY10QmulMRE4G8GKNiDVV4iR3V2wVnbZlX1cvTMCU8oxfaXPxury9zPf7KxPEmopu/XYr3ivCi4urAkQEvehi/jH8yL41rUYsUu2ej2yDkdAGsRawSbt0xts5CuOBuJy/JyJ+g9lkDS7mBCWYgX8S4ViFlwwplojL91xKa03ZUnEIilc1iwgEsYZTi92wiGAb9FtjrNsj5H2Y8OJ3lJNmx+KWdf0b8w/PL922SWyJCyhYpDXnYRYvjVJxB+hAkXaAccnRv4q4BWy91CcldABWDC838g0NXni6XS1UC8K0ImNsJLW+k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 940de3fb-e00a-418e-d264-08dca0071c54 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:05:58.3319 (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: wr5idf2nknhMII/8wWdLreKdjQ0Kdh+Pe7rfcol6LBiqQulPE7w7fHzjy57l1EDoANFgH4z4FdwYEhfe/G+uFg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-GUID: atr61YmQ7oka416KRBqEKnj-ezfp13QH X-Proofpoint-ORIG-GUID: atr61YmQ7oka416KRBqEKnj-ezfp13QH 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 --- 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 74f470d0e1ea..e37d5a2dd942 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -196,6 +196,7 @@ static int hctx_flags_show(void *data, struct seq_file *m) const int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(hctx->flags); BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) != BLK_MQ_F_MAX); + 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 b3905b77f375..aefbf93d431a 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 Tue Jul 9 11:05: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: 13727678 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 3CE99155303 for ; Tue, 9 Jul 2024 11:07:05 +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=1720523227; cv=fail; b=B1GTL18O1vWTYWkinPsluMO6nM2eCTFfViGxhC/yhAFTqOXppfzSfyuwiyP5ntSK1+2m6ufj883ZKGRjMsTojNS9loU+0IZXQLbifWKdw2OVluh6TuN4pnX145Hkqg0eI7lSYSHhqn3xa1LYQIDgzCAb7BkF+QHdZ05Jucvxi3s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523227; c=relaxed/simple; bh=+544KEqbgXBNsn/4+d6UPy0kC2U09KDUn1dnBBtKPj8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=Qs5r3FaVVaT+VOnOlq10yTAQAUuvz2c+u32dmssDigaZFoySr8aRvk29rVitcPjvJWT7XPalwQjvp+szK7+KfA/XUcM193QqcH+0aJgIQ7zZLBN5rcpFBBjLF+5P+hq9LAfehTKHMMFxXAez9W62x82JDZ87bEsbZdH7G/kwM8s= 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=EMs9zO3F; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=emIVO0li; 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="EMs9zO3F"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="emIVO0li" 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 4697tjgT001495; Tue, 9 Jul 2024 11:06: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=/FQcLX9FA9sIGyi/b/Zf6UCwKNRcC3eq6Q0TzMHtkWU=; b= EMs9zO3FKz4eisCgzM6my/LW2TkHt5W/MYlTK2f1UBGp2lr4PVCNy31WT0gEXJt5 1BCNSgJ+7+QUx5exyy2vl21I/c76lC09JSRozsze84ilR59Pt+fwWVMF9yjwfiZf 5VS3mOlgJZB4awlLlb+Grmh93GJv1/YdnuAqAPMqEEDO/z32q6Ct95xCKSwquoxS +EScuffYKBxdsMCG8b0ZsNHZWNFnEeclQ5kONHsJBxCbmLKRqiQTb+o8rxLMkh4y vKgw75K6XDfrdJm3OvQLUiVwQMszPKD3AljV3iYHc7hXfsBRIB5HpquHVFKf7DSw lqn2cad65FSZGMI+CDL7vA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 407emsv1nf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:03 +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 469AIZw3029928; Tue, 9 Jul 2024 11:06:02 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2044.outbound.protection.outlook.com [104.47.70.44]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 407tttg5jr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:02 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CNwtmatmigwrMnBvhYGI87Ym9v3cDRoKeb3hsDMbauoGZu0QrGgtPW1S604lxiKymwqRsC0CVzUH4RcDB9Dz155sVlVWRSunSAjgtvSeDC19aywG+4VdVoI/lWawI6udbzCAY5WVMO8m/vX7aHDkOeuV/AZGt+JN/L6tMGhYmu/xRairK0qGQsJJhkM7zm3DPTiG2YKnpv5GUti9Zrahaau6taCAHw0DQ/WzscqXoO1sCOlFO7DRW3AoG+brUx3mV20NxSb5VNK/jysoFoEFtKA6623Zi9z5bKWsnZgcA3vQKoRMY3Q5ypaMgQs2xXOY6lGlZNFRBecvKP1zFCPqvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/FQcLX9FA9sIGyi/b/Zf6UCwKNRcC3eq6Q0TzMHtkWU=; b=ArquEPkEUGVvU3c+Bm4yEDHW9dFa103f9+GV32fKiTQrYzgFjUqGHuAw/a0KRiq00Hc7CTp3ncJk7YKBYDbT6ioUAGGgWGiEHNrrfDpBS/3wQV0WHn3ePVok/Uwz5g1WNir+0WuI78d8bgrslXTvse8RnegAmjg5DKBYtTjtLWv+vEfrurKQhCiDfgtyIzsegiot5al1gzryFytQLN7qwcndQbiVUvCuwfg4rzf64LnKtgILycwOXOZAS3AFgOz/DuU59DEWytndzMM6semZY26v0a1MfeSF+ehNfAGZuMqFQkZX8b06DGNxptHV4IZ/NLeXhP9kFKQvc58VfH/CAA== 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=/FQcLX9FA9sIGyi/b/Zf6UCwKNRcC3eq6Q0TzMHtkWU=; b=emIVO0lif3K3+0pxiOpi88HUCcT9AFzuVW5k9Cd8zPSgq77yjXAmGHA9SUAY23Jm8U8+wLHEEQI+ffpqu2k65P1BJZRApgrppOZWdI73BaqcjnvuXtK2leLnJme5FtcUilDsTWSjmaNjLFN9YvTdqt6NhcngN6RQbh3P4715Zik= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:06:00 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:06:00 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 07/11] block: Add missing entries from cmd_flag_name[] Date: Tue, 9 Jul 2024 11:05:34 +0000 Message-Id: <20240709110538.532896-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR06CA0025.namprd06.prod.outlook.com (2603:10b6:208:23d::30) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 617cd091-ee11-4e1f-6cf6-08dca0071d60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: 8IOJBKzcYVslHjWnuEiNQm3Mn1ETRzJRhDhPRnVKiBeTwElfOI2i/Uf8/OM4578A78TD3hZBq9ICbi4R4bTbNsV/xNfOR7r0nRhVeziytESGHbvbD9arHc0vzHuWJuvBo9Mx9V8c6Wyed1GGTDyhtJSpkQA3yQsrrj3CCReOHyH+CCoMHdrINaNfhRdNLLHZ1CcxVeBR/xsTGm/jO6Q64cPSRb02hYH+dpShWHMPwFfyilPwRc2jv+TlQbVejud1qMaEGqwLE6wkvzrgF3R9I4EC7Fw9RYyarL0SLMGpaeW+oJMphuXanPlsMOfiVUh8eZk+70DwzGDBfl/4q0PcQGZ2RvEnAaPOYhdVCL8LG45Was0xEx6o0bhq4Y7j9wYWsapgBu0mabAb2k5o4kvffVw/e0YameKq9Q1yMM4WSOROpfw0aDj1QHGpQ1i1ED/3foF8li4GwKSeecUyGsnarUuDLyJyY6Byb7kPh88e8cDgtxKPQ1hdXSp1a24sQMyVAqB7s/RFiy2xJLcaURc2MBhISm+wN5h5qK3B6hWvqqR2Oxd6BuZASlgbxAUkBhQ/+2nUPakGN46U/zzX+L/i3kqM4CQT2Em0mQsbl/Chizh72ZxtC7Xg/C9b2PiHbXuY7mp2WclSYPNbMK4OTHxoH/8gNYYA/JVYDgOpiBxPIGniavACRQngKCp8is8pD7v0DV7d9dJ2okSFzEbCNhDqRdYOC5YAjuaGvxJ2+NmfwLzCOjAf4UBUxthQIUxvmQDIbQRW3d+69kzEYVeTdyyGwXCZlyYGbdWL6uNkE8ZjeyW9HtXIB3ddeW/w8tthUWjHA0qVCv7UJiW/v9XeiwA7584cahcjJz3ACV7d86Xtqmxvw1RmIPdoQTC6ySoLa2kWuZgx70estphEvIGoouaII1tqLNnt0YdCKFr3P/Yabsa7uy5yfgYQ9v5ohQdJp83wf8oo22tghhehIpOPgbRHJBvr04CIoEVa1m5b/HmcycwZncsUeyU/QzkaWODD8U8bpD874QUVU82WUbByTPCtjJh3egKAVSI2ANPdXcZ9Goav/pA+VIMKtZskD7AUiKHrcWUkyPaS7yDOvfnRk7jCbEikAV51GJR0TQVfDTcXkS4Bs6BdFvKwew0lF+6qM+tsCE/53YNac/fhKmlYd5YvhwLiBJ4zEtFkRZfoRPdX+8Mt/Ul2A7pktNhSeWkuCho9+Tn/TlQQxZZBSXPJPjEsDzZ1MzURiMM5hcwMH9L6elzrAeOa9drcrymM13txMLtF8y3mWag6Ib9Wmkvgf0rADtn31BMniJg1G6aOkkGpbeY1lXz2DqeX7SegJ7hIN7OKqXKRPDuzN2ZTMKHrIhRMNw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n8kVUdNtNOPg6tkbgHzl/qYr1ssmeWIBcS3tDbxAGiIbXr2TWfyk4vMRi9nCnBifpSWD9dCsdKFa/YNNItU/b6DhrSm3WS9m9cqSahJY0j1ZQShh+S5vsH6bjp2gnQnBACfj0h+NODj5M9S2jM1rgfqNm8j3tSkJCVUBvH8X7CPjLMFDZjncMo37BCFgQ/ydiiCqAd2qVJ1A7KCSfwpsvWZqr8rK8ClTlxVBmr0bTY88QPpNDBMD29kUJXT+aJZwYQC+0xWX+CYSLTJu9wga9462RC0k7O9SdaEoZg8RW6DtTc5axtZfwijiDEYQXSnrxgThmKCvnhnLsnX25V+7diLmFyq4V2KfD/asnd3tkyAAyR5FLyhRDP6rGuvTNDIkXqu2LH3M/9YVBERwdBrdKk1Lm0sbhVih0Ap3buJPj1ymgsndqMkHYRUO6/owIAp1KXtPudaaesjphrkIGn51kNLQDjk9oBbBtlH+scVa5gIVi2X3FIw2ZFEe9mvz16NutS7oGM24NL7PhASvp49rojio2mpcohuDMqoq6d5JJ47w5zPCA3rByoT/oHc9lkij36oVnDC1z7WTwKfJTTIBnsKZpMBY3AdSmXRQmQSPOtgRGrg5uD3AG+Zi967eaaCO0tFifikA4ftyKG1SdTP5W8HMAV4KxEAlyUg+o7JLxs4yJcRmtPwZZj7yOhIG3S/qYhQzifGbUKf8kSSaHDTLVR7DaumzdhGOIpoN/la9Qv5sD5Odl9qigKSkBYzeFuetz4elUwsnNTpOrfCkheiUMP5vE2hpItZwEnqoL+Mbs8ZuDhVX6K34a9nk0Kvw/KJf5ejlDHnJ9/Y6F/CuO80m8yz6KlUz/EkSIirIdx41sX5spoxDdaiLGzYyb4J+ElC7pEQHOPmUggkNSESYdrckgdgVXQHoE2B7ydmu5ldsHCh4j2TyBv6k2yEfh/HWWrbhMncguM2zlhNzezNw7Ob+UXJaikYtJZ7B2uLxnjTIMDf2HLziawCwFS/PbQcuGYLELGB9MEEEbdo2AYLmqMy/gB4bhqnmbKaK66uPBVrsHkJk5byNLSt4shdBPBMh6qCfbmoaizNyM0BTtwQf2A5mtUJ8H6dXxVX2/5Lyd9F5UNQbdLkbnXdEelN5xbbKv0x/ZpXTboxHPMOvX3lxlbhqnM1i6w1iI1SKLApq/wJE3ouPDOP12ybu6HHRB4KTbcghT6FX12+za/1NV6w7hf/30xcjzonf3bBxCxE11eQXcd+UBkRSbJmF75QGiEbBvnnCWObaEt/eIYPnfs/MBdUJWc6zing4dNuO31EZM250R4WwJlUlsQAZ0ZboBAj/KQi4n6kXiPloYjMk9hekwgkk1Uo+AgKXs66koA2KrBXwC+wW0etHdks0B++rqjQvNRiXfxWroB06lyVHrgZXhKzv/B1IXk7j2OvwOhjMSSzzjFdfxm1Hjjn6A9+F1uk1hsVfxXZ/PHO7Bn9n1SQaSAZwlFi8HoXVMVa9SOW0A9XxQnzK93+uj3R/0lNmF7Vc2Ecp9NCG5ECqiIOOOhn8AY1esl37GT//LHO3eDRim8gTrrRmeGSoCAjOHLXRGjT6CKQcMBtpeYQy0KyxP6/yfTEPZg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: BGlFycuzuDi+Fe7CZHXsD/SnZFCqMtwJAWNFKxnhpdvAoGCbTVRseqrm8Pjh0yXkuJHpyC6zw3RScndzHXueyPpauqqAMzROFnfukeJT9p1SzspCILHoLK1dSRDp1RtGK+6YIoLj0KHowzERX5ZNhqCBfXI7Wx3es/rXSPCkKOMTnKsIam29p919rSMDhBr+x0OT9/tCeN97VV3d/mldQLaJJiCltPCAaofdhqjAULpL9ou79q0dbKyG5E4ALyLF2Fn+l7axJzjkOcasnMcKqV9sD6FPX5f+wXtsd+IAN4YV7RIuUxbmG9jN7XbAaVQlKj7fOLqvQL2QeElMPDImPXK5OTukUp/zudHbO8sisfC0AnEN8CeWkegbHtOabtzFK8iaxXyEtlLZSBk5j0FFA5yyW05zJdVjXpwb4LLwt/WQpHZpLKXX4oIuUB69KjDxKTLobM1i5ks+9RUa+ZITT0WjM+rrUVUehbC5qL0/xDDZsKAMo+TuT4+GpiI8fpR5fRtZyEO0VM2IhphCy3djY5FmytejhFifUJrer45cPn458HVmO6/IQj/IeKqdMR7r0qxe6bQsYKfcCrB7QSfqiJXYycwZmN85VNRj22xklGY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 617cd091-ee11-4e1f-6cf6-08dca0071d60 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:06:00.0599 (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: LXldoOCqaRdk2RK6vL9Oi5W+Tzx1dXzEmJzXyKhy+f+TXrafcC/WZvfllCfN2JGrk8L6PrYYldNC+k+TcTjuZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-GUID: mbUP7vuxvwANt3YjpoQBk-pzsanEQpMk X-Proofpoint-ORIG-GUID: mbUP7vuxvwANt3YjpoQBk-pzsanEQpMk Add missing entries for req_flag_bits. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index e37d5a2dd942..62ad3ddf0175 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -230,6 +230,11 @@ static const char *const cmd_flag_name[] = { 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(NOUNMAP), }; #undef CMD_FLAG_NAME From patchwork Tue Jul 9 11:05: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: 13727674 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 44FA6155303 for ; Tue, 9 Jul 2024 11:06:09 +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=1720523170; cv=fail; b=LhBNklCEyrTHXFzLHEPxmUSwZXHizz0rp38CkCMNUNpUEPk18xS0jOS5PaGkdPwfipRMSEtJ9tyQsZumscGAod0TCnrsfAWqbRYZKJjLaf3HrjkhuS7IRU7lK4zXi3kkosOdggiA/vGhaLH6k42bwHqHH25wOR5nupgMUVbaAQ4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523170; c=relaxed/simple; bh=YSAfWmQxthv7CZxE1FZasBdf/exc/YRRb63pU50IPq4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=hL48ykUJqP+A1osUvptO1XYBnnxP3YUW6/GoetBQPp4fj1zr1LJSL8k2CyeOV8HR0HQSIk+bFUltcVb5GdTLg/BYXMM91Rgn4SFTqFx1inbcJ2CbgfmdWCJ0nRPZqapZccfyGnbwcdX3zPe49PpLJhfgER+zZwvEdIgYtQVHhrk= 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=FxCkOjt2; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=mY7pW1qU; 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="FxCkOjt2"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="mY7pW1qU" Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4697tVlO029509; Tue, 9 Jul 2024 11:06:04 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=uEUDrmPZ0x2Q3si2eXb6PNFZDMXy5CV5jGtngHpiKE8=; b= FxCkOjt24lrlzgjN6cRVfu7oiGPvXR4ippWXkFHj9SY5Z4hJv4oAvWcJyfQpFMPk MXvl9VvclPqZXMGzepKFIdpOgZoonCuwgSFhJfdOeDFDa61Z+luJ9WoXq8EDYT8B u4NAVQTX1J8SkZanAVwFQZy8QSG6J4LGZvNDQKE2MgLKbA1gKcOABwVnxHWnAgob ZkYhVQUHIoEZ9K94RT0uaa5l5pJ12IpxHjWFL5mCZxF9whDTfU/DcdDsBh+au5kz F1zoGyGA/pRS3fmw7AKpHi0rjOdzcZroe4xsw/cp0Zs3hFeaUzCj2+Z8fq3cjaHO F2jraZeosWxkcDxLlcd3ow== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406xfsmnr6-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:04 +0000 (GMT) Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 4699RE3I005701; Tue, 9 Jul 2024 11:06:03 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tx2hh8f-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PAqjsm3b6JXCR0QUzsH5SuRwL9EpG4sEcKiayVzEzi0hS2PY1D4bXtWwwzwR0oN3+vvkQ8afHTz7UkBPOqawYJBCK284SjTthkcr9l+WhV55wouuej6WGv833BvBpUKKGnKiKERWwQHRjd9qHE6P0FG/Opis41MLRcF17sOjkhfK8EB1ArCOo8z18qe8lCqrL9uJMAkL1f4VVmoATWhJ8AHye6cMLFY7/H4P0Et6GsKKmEwW/Z8h4j/zUXJgU/ZEPsF7XERZLos6jFY38LL6AIt44iokx1/muRbsEJpvpxxqRYdfU4TFi6E5z2UpP6Tn9PYoTmf70MwpiFPiesHyPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=uEUDrmPZ0x2Q3si2eXb6PNFZDMXy5CV5jGtngHpiKE8=; b=DGivQ4sdvg0Xl3J5VakijxDFfI/7HxY/tI4NsRlvB/Ic5RT/FOWkdh/uwuu5yJEbfKWldDle3yuT06+pCTKNPJWF3fXQDNAO4Qh+NQ2BHSunTcCr4sn92U6khrqN4HlrzLdtii8MjCCB5nn1rvmjGEGgbaUpQEvMPxWJ8vEqJjgSp3HHkqX8XJfHkfBJf6a5ebFvE8zZrGcNwOY5bES2QWCh1oyudBzECptrYQtdd35c4ua0SiSiGd99y0Bq+nCQkXZJPrztIKZU7T+o2oUlZ0jYmY/z6x9CVDVngrQlGkY9D1ENPOyfRRr7qXHc6wTEy4ZUvke5Wfg/rtHfqBd4pQ== 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=uEUDrmPZ0x2Q3si2eXb6PNFZDMXy5CV5jGtngHpiKE8=; b=mY7pW1qUgWbwVGsHz3qqSHEW6PVtO7ZLK6AWpq6fG4qsiY+dxjtAq+5X8Zu17SEEXQSyRrlbdaMa/pFDDZM0cIerzRRIlelOzxBe/YiGOqSRdcVED3GLaMJN7ox77vryqy30u10pZU8LWb5v1d7mS84gWHKfAas62F0Qt6ZXSX8= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:06:01 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:06:01 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 08/11] block: Catch possible entries missing from cmd_flag_name[] Date: Tue, 9 Jul 2024 11:05:35 +0000 Message-Id: <20240709110538.532896-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR03CA0014.namprd03.prod.outlook.com (2603:10b6:208:23a::19) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: d2860471-b5ce-48c1-71dd-08dca0071e5a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: v+dS2r6ZnOPXKkuj3416b/oWJOHwhJqMiLNnxPzgx3Fqfm+pLjlj5gwu9u6pMLSYQ8FzJFeewWA13Pz29LaeVt0MCiQ2iucyk2fsjXPz6iB48VidhWGIZptfeljYqYS7OGT1hP2CApyC0u6mnE2Y3TerUVGiOyCaBEJj6BwtJ6EHoIRkPZfEMLjFhVgOETc4t63ijU9bgoBs/mBhYy12r/GpRnUXLgz5YvJacDRsBTYXeCAOLpHodkstq/TBsWM9AnRoP+mqQ2Z+IJLGDz+657F231ZWgilr5kT2ndYNer8JAHLngUTnc/bgsrjn8h9pt8lusBKRWC6Qds+5X6tJOGsuPdN2a2ieJPpwadojCoEyKLywMdnGIlCB6ItkajF4X/g597j+e3ajFCXIHonK3FxHazzp7Y61wOoLUuWwQovO2wgCT10Za3o1M4pXJNmqKJsfCwNrIK973seTwC7Nsh5cvzuvrE3uhviIFbUES9zf/Fulye124Fb86Pr0+cAqdoReU60Sre5KQkw/hQn4Z0Tuac9Kcq11lK8MD34b81r7ucAApZ1c6NclhiXChsA2dn6ss35nHXUXVbAO0dyNKGxMJe8GNcZO8KmrnZcLrRuz/D0RE9CkATb19zrVXgU/Chl4UbZCy3hPSkSq47AdzInCOCBaH6NJTIeW41K78dExwc+qV+9oeDEhOrVdGDfVrGxkG1uiZWo88Z3HTS8H6mROmW2ywdyO6pU0c5icD5l6ajJejL/qkyRAB0g7fv32mN93rGfjwVnpH5OrGkBhqusF2aa4ECpCwVnmNuL25ZZXDus/fzt9eEwuHg9Q/yo9kaOcbQW+xfG7Ya7x9NQeVu5a2zp2AnnVfbm8WLq0+OKuXVcm7CtTeHn/HqXe0L8w9IbjvisIbXht443bMDzFFQActMeHky9m9aNLz4zi3SFhNcWyZKKlgarakmxsBFJzPalLLTBVanYYydiScs0KAIly85pgiBft3dSzTt/0reXo7dSVEE9hVJJZYxlIYIwvAFIOjIgIWzxWhXcnNebUnot6FyvgkDUlR10fHd/K1ewKLduk+f36ppr5NokKEZ9Mps23Iz6sbbpDbLLxWbbclu1yttXqudpYnmmBSr7o6ZV5zj/+HXRlexICD4E2aol/+2EpeShKdaDlmbzXmtOms9aiMfWiysR2SB5k/W1uxHhBBOqVqy+jCDFcLAPEUBG3hFGvZRufRmVU64JKViGtsMkot/VDGtnBwKQteayK6rEXrZJ1YqUsl1EwTVOQocZGbRDwzvb/pRDvBwjOHUM4iZOgztxIFI3w77waVQ/5GCmn252rGZozZ9rd/6vZ7Q+OP7V8pANE0vOWXyvnnEzKRA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TsSFhLs6APM7VmEKIwtTSguLg8I1vRx11fwen4qckBmw5ZRVAh4IqDIZoEdCCZ/A2q23snkmP8ONvsgGGC8EPOSVRVRIdoGpSrPuB+sJ3Jbl0nyGlqh5nBpg7S2ObXP3Lv1q1JHCbLOFA1leJRqJAIRhjrsNHFPvLJ1zuuOCmxoAQ8CaqKnw7PvRWGuPx7aYV5YCae4BaSz4KlIxyIvRv4HhNSUDDS2riCiff3ubv4nj9VBmsn8F9kF6b4zDnU0ZWZtZovOMdXTWjsm8kC7Ju8jr+4QWCZQL2CZnJiPTlTOZ/ChBc7z7w5rP6VZApX+wI4pzkja5RFidDvVry4UTVuqvEzrUXBca5d/hfInVdH26nqNbLmOCPe+WNuCsXnW8f3UGbBYns8pgdgx+jnvOeulBWfqaEYomRnWE+LkFXSWrVoqlB4mBeJDzo2GPCLwEvLOA2msLxhPjfHNk5GO0UsCNLAx8PbeAq5P67Xq9PG1cLHdcx6MmC1gHqiM0rz6NUEDS6gtqv5WiOm5ko/3q4DbkRm/lFLTLXEWgoyjsl/wnqWhtDlnkW5zzrg2H9vWQf4xPPm/Iad0jASEXRxk9exoWF0GePtSIn5yp9Uoivh/s+m1E+Cn5R6VlQPmC47468d8aB0/I995mJCvLdWhVGitU4p6lqum8Moi+2zudnbEzAIb65NWr+8z+tfefC29df7As7xtdq+Cofc/42Ppp6HXHbCwqonwc+Jh9qPIns6qgWErxgFPBDkT4POpIj4TGjwEPyOKzSX5IRQHrwa2NY+nwH3ZajKyADwn+AWlEu7ajJJOnW0k2UNylTEWVI8jGers0yZxZ9pEhDUYQAI6uk7EIoHSw0luY5LW+wvw3otD5eKecqmxHIXdsm5MlMd9U0HUPIZR58Z0pJvvMvexSQEmV2XZwKii25ctqaF7H/NwTfIR1lDKsyc2ipuQcaV7o6R699I1lUOqKNpZkrVNJK9KdYqNg1Ve8NDybFxtoEKbcXMn5kloDJFHX1kCwzkN9k3ZOp0D9YOlN4e04Nmmh9kC+XGtsYDEeUTlkfnRqO+jrLN08vb4y1HgxAQV1/xD44ljgsBxEs3BYpJDLtugisJFu6koF/sl2qrwqEZlWzYUmFV6INOe36BRsti3HioZ7hhwQc6vn45W+SUpiSr0+vG8GErwe11bOiDlrFSsvfMVdXtf5ko9xRDIQjEfbAiHgP0VTSjiQsGh53IQ2YJw7jccsw68YHd4JPz5Oym1IdCuNJKCVJwGaQTiXQU356JQ0P723/9lhDqj3KIipPxbZUYZJq2a4UnCqepSgYz+2N/pAt0NPrfCQAhnPMkDkpW/ym3AzSjxslEsNwA9JPATHNagRzb8QRHiqsDKPMSfbwC/O1AOX7Mdy5esbUjjCW/wwZ/898aw5+aMpWKVBeJcOed9DD7NOqUsIK3jsEH3cQeNZ8nk5IdMWovm77OUQImkhinjjTBwnbDGOtSre9rfKv9PaFRHPVGLbvRv7qhKrWb+NRRYWGkwvQCocw/9/L5oTLhy0WnGaBMckbs1tQM4rALu2KuwDCB8naKE2ia8Y+ViyAOxltUxg3P8j8cW+THr9AQZh5p9zzJk1QeOFnC9AcA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: VSmJWilCj745S19EjUtAtfri4pckBbLlug9DH4pHMcLolKnS4mftilNwrDJjhLW/F+6HuF6eHzJlZWsT5nPRKvJcLTZld+HsUoan2YplliRIS0HtuYuWZPonT7Xi5yO+pohyPEF3Hk36VXGUt6aYa4PXG4ASV9a/UVWojN6phUaizoMhDJq/ZO4b6DYseMXqqIK6sX2GEckRiBuvPNbSqHC6ilVm0uXrIbfq5GBgjtv2ljfI6P5l6Mu802O0cik+C4acMTYYoAq78siC8Xz0p4RRzsALMLTwDvyqfFphC1Bt2mPcSXuCLY+85YsYLXF2QZSRR62zUnFy+dP42bzwbv9p8qjfEHWqSuP4bMp2OwHo2u0ON6f0vOvViDZlHp+RSOptTGgZiWzQ4jsCkbnq+rW0F7Vh9BfhBidXlCdf2won+SqTWMwT4dKfmixU0Jk+fhvVerlhyXfwZ/VeaNWy7ZANiiseGLm5md0wVB59yllLnejKQv8PNRoLWPviLKSXZAd1OMvtatFlMs+j59Dv/BQkddeiHf0GCe+uy/D2cD2lIu0XFvY3BImOrUAOx+a06yGPin0uobIzw/Y6XBD936Hq+SdR2K2wM96pQQr3lRc= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2860471-b5ce-48c1-71dd-08dca0071e5a X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:06:01.6448 (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: 9u32w/Bha2UZMYs8J0dC83pOVHnTRSR68aL6SmpFHHBlEbdIfTxTqxjP0iFkyytMNpYs8VwaU2owxTRJWkDxZQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 adultscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: LX_Ojt-aT2WA-E4kxg_hS-nL47lksFH5 X-Proofpoint-GUID: LX_Ojt-aT2WA-E4kxg_hS-nL47lksFH5 Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in cmd_flag_name[]. Signed-off-by: John Garry --- 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 62ad3ddf0175..f764b86941c3 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -278,6 +278,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 Tue Jul 9 11:05: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: 13727679 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 C6B17155303 for ; Tue, 9 Jul 2024 11:07:09 +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=1720523231; cv=fail; b=ZG7zr8eU99cLuRIClLuLUWh9vhZPi8KJg6ueBW/kx/QFXOig/PUz5v+0Cxnwpmb+8SUn/9xYK1XwIrfhiuyC+nvzFGWlqVK9p6LReZ5J9ek5Q7PLIS3rLyJVg0V2BnNg00yBsQM08cFDsDP0ck4mOBETy/vEZlK7+EGrS9jjEls= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523231; c=relaxed/simple; bh=PHFtsaADugRFpMcEFoaQOVX4nK7PHTWYgY9vj2chtRg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RVP3XZmW+22ZiC/czMWZXxK595P51cz0AzpdENFg5SrXzH7xg/35wTGMAJK2n3oyMf3LX+D6BSJ+KTPxWGao4L2pil99D55ViIs2W1PxIInrZ4oIbuwi7nZ99gCg1CCTeFlsKNVxx0WVB3KBerXVGqsfnRZo+JLXiGNdlFs23Pc= 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=mAh0IAcd; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=HSLIhG2g; 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="mAh0IAcd"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="HSLIhG2g" Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4697tYc8024846; Tue, 9 Jul 2024 11:06:06 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=hANCuG6R/n2ecFhxuXkUPe+YMAkNKvqBvgxZKQySCPA=; b= mAh0IAcdlaVhn3DfNCen+Axip8lXLf/8dX+K/eqsQXSCxVRccPYVi2QBgYTp9lDl mi12811+iby1ouo6KrZ9uFX0YSJEF8TXnX2Sj4uOsIvZ9/jC3Ug3tbh19dAMrVB7 IUP72yTQEALIfCyF8QhsuKeD4tHWC5vNPH2lafPtJ52ZPf+I5mt+bIrIslAMPBBY +3AbMcvLRQsWCF/6upPT2vM7ZCBik7uTMY2TxJSJZr5jeR9v74m21Iar+WsMJ0+n gr6DN/hPr2Z1CRQXcqcTfwRCdb6bVMXB2sJ7fXK4E/JUOctHfRxoAxeBBb5fdiwC MmASEQVDukU5KVBNb3jzxw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wky4ps0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:06 +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 4699mwL5007191; Tue, 9 Jul 2024 11:06:04 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2042.outbound.protection.outlook.com [104.47.70.42]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 407tu31m8m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DRAsmdBYOBeZNr91XAt3vP6Yzr8kQ3FZ7UyoV+BE7fTShH0g8BsHCLqQq74j7fHw7ZaGihzffzrpOvYVrZfASrI7iqR+9rWVg0ac8E/PPn23C+3RVFoxh7R/LBW1vlLxX3usep7TqjR2lGIHcMKmdIA4o2q7xOOduBdrpoMC4IwKlEQcAQaTHL9EIT5glfyIjv2EEuE/FZnQQoOPSRA7AZYclmdxvBnEK+tgB2ph9ZvsiQ6LL64QdZCbDZoMuGfDmi+KEew24clQTW5UNFuZ3m+1t06eDA71/IzPoFvceGq2drUAHTAiOr5LfYm1jH+2sWmofbSQUySZvBojcy7/OA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hANCuG6R/n2ecFhxuXkUPe+YMAkNKvqBvgxZKQySCPA=; b=QUbvF5yDq73P1r5DbsXm4s+WWPW1F25PTx6rnPtB3WAvZHdcne+6wuOzwVCO03FgEyEk+SQ4d1BRfbff1a9DWYHymmyQBUoCfWD92JwnVPjFup1LebYuuEyb3bWPAqzp0Wt0mKbTZ56G0QCGiLSFPI1t7hPIy6V81yN8fNZ7Uc8ccQKIgvV8WM8IirM8npjplSjK5EWQHiIMXHnBqb4wOyIvYqF83+Pe1rBLKJq14y1noEIwzgYOaUabYm1W2FWIcTHDR1WJzgBRO4oNKv4PdIYnbi+hsqG7RDzMKw65HgO0c40fCuJF7IdSAJZDdDERGReQzXgIbCNHsmxuydlhQg== 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=hANCuG6R/n2ecFhxuXkUPe+YMAkNKvqBvgxZKQySCPA=; b=HSLIhG2gmWDRNcBSGErswlTFYnfdiOdKKAx0flxa12+c6sjkZ5KeNGcorNATH0B5wu91/nx0ncrS6hfDXGuFjxC8GiEFp2z7D9KpCIV8P0vujJH+YuVtQjdbtU39UwDXK6RUnfqX1ir+bYweqEbAuyBmXvyn2Ron4fn2JRVzdk0= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:06:03 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:06:03 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 09/11] block: Make RQF_x as an enum Date: Tue, 9 Jul 2024 11:05:36 +0000 Message-Id: <20240709110538.532896-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0121.namprd03.prod.outlook.com (2603:10b6:208:32e::6) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 6533db19-96e8-4ce4-b9fe-08dca0071f3d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: CJLVqqZIa+xRItQnKEfwlgYW+cO5neLWAr3HdSrb9fMC+PdZ2fXcVtAs0wo34MSvtxy5GD/HXsPYIvv21qOEclETUtg9QTbPgPhjisQQ6vhSS71B5ee++zHpkc9fip/DX+G3BGJAdy3aIJdykeAdkTfCF0xDIk+d6Iu4OFqAf7b7jniUap94KF3DIRwNO8EBteFohxSCY7XEQjWMkwm67H5PilJv48a7HZtSD4TTLsMpoq9QNNUyse1l7bwDNlsO99vojiWoIL215kNKXNRluPqB4sUVO2MhD37x1ffJ+87OAtQzbTBeUO0Z61M9gtMerKy57qB1ifjKxaFul46IY5mthh+xMQPcDqZ1Ekjp0P3McNp5ZkwEZ2c97yhb2pgoAROkXpZqqjrw70gBn3+GSD/j4wO5qgGJWwgkApDjwEl27H7dwbwOCEIiJun45ZzdWkkU8M9iF3HDC4jp3U9bm32uRplyu8FEP93bvcc/4uSy0Ifu2Esr1qcJy2rDAJuUKJsqbowlXOFKIEij2u7VBhErYMt9VNr07NJiwBrq10bMbUBzyGM5tZ4EkYdB1LwTVmpi169GettTE+YinjckdQgMcVKqGxEBLSgpvBhSEXtXtBsefxhxPubRcx/euDVLqgN4B5Kaagasqy1rXi8xvriH+1vvdSxXy/BaPhSfSld6kWq6Y+rLnXdlOF6YiaP6bYNZGtSE+w7U2fYKm3vAwDaeN/XTNJqdy4GcZ2OxhY4X0xeLLT6sOafLVmO2GthjQNoGt6CoVYw9HVQkSobWuetVAYtjv3DSzyHEyGqUF3iorhAdXLudIPF7SQSEAt++t2ZIfuzZsRgCrcSQJGmfXRNHj9+O4WCO3rLhhARbW+TnrSzJn/sCmijMKlhFTUTPd3H2/sEG59ekv5n7owBH/xsCEOJJW+ttT8gF3KygD2jTN864stegvA6zqYFMBvArieOtMPA7Jv/agCG47ecP1xsxkbpX92BgNh2XNeT8PrJebBmyvWrNU7ssE/Jmzz9YUFyJ62FCqvMvtRlc2+0qKQPxyG79wEvV89sFdLSe3qxBEf3OM+1B4YoaBTw19Zk1V1N2UFnzCNJLKny7IFXpaofgtKO+Gn+qfGqu0//YZXjmqG+GM+b4EcqEOZzKOEe6h6zMF0EaNhzw5LIunSIuIEGOBrMyQRJJTgQYu8d9sFOfYyj+nyLM7gJl30cV5UEziC4c3joP6Jy5SQ1uVsrpMB5cC8QDAE/hyhOkI+51Xnmu39lZMY9KtobE9WNX7knQ75O/Sc0G7O6tvMXT/632FPn96oOJkhnX1ek86z0ai7O0c+rKdyEzMJUDjhCKQAgkoLE7h3jLFRpXUZrL8d46iQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: slPA4zYTjG8zm+6wZlQ28U1PSklK5IRc7NKvv/PNTZ1WxAL5CSRDXQbgrjgaudFybBGoBwrtPHMidnrzJjkIiTMIaKKM3H/kYGrypVeWHGaVDMSVO5/Wq2NcwbFJ1z8GmcmER3djWqHv6PdEkV4swGFdeD10BXuZl5yRvLpbdEOr4SgooHXhjEfTw64K9HuB3iNaRl2oBJFjVmzKI2xUL4aXKMyIO+ug/5Iz7Rz8wXd2b5HBVTBvwj62GxZIDUv8rd/VD8/D4viXbYr0SrWbIkY9gg8my2tA/K8hk0+Y9sAKopxmYQnrrTr0g1nppUMkl1g30vNROsF5JEAmJYmvxfSp5mQm0Sq1LV2A6xC6qfn2qB4MvZpp1/d906Aog0lzIM0x0q6msvC/xRW3OSETWe0mNRn4CjozO9f7V1q6mhpESsAbnKZSaJaJjwLhhKfh2LjTwdVQ/b6YEyaj5l5x65WYn5f+6wXPf3Ax0KzMgNa7xF/SigYUyJ7C/TVZYIykSmO97XtGzPWGW0ZBItjg+b4x9jAGkkB66tB2MGWEOJ4U7CzhpC0ahMZti9R6qKOTv/LwQ/dRA3ysxHEkjzwrhTsaxixrlvhMV1eyUrVCHNooh9tCHVFjxZrEI/1m/9mfVLo/N4WtGOBYd/CvS48Ua+cfrVuJ7fNCo96P1KHbP2Pw9MIsosJB0r0WfpD3SutF34mr5BFcDmhI3m4x5eE6dhcKNChdRBQAbL5BqaKDj79uRR67tFCqNF0F6bH/FY3WWtYVscxqrLDR5n3YQUUfd5AAbFeZx7F6lN5XsUCyIHQ90EdU+MwyqlMpOEip49P4jT8elW9td0rD/DGHkXvahp5AL34SQ/006ea4XlyPSZq6pcb29gNZS3/iDy0HkzgC9AUnG55v0tmhDI2Z45GIpcM9rBRSNJKZj/uokEtsQNRbRVFl1UVKjzTznoNJthMLLLxMrQQQhfkk1CdXpATpbeNbY+FGYR7P5qMHZhsYEtBgW6v9ZcpExRZDwcYVxEP47mSBD4CA/K91/zXmNrjBuOna6ENkmlC10X7DtS4UH7rqIe+q40GkNh4RkClLFTmQWrAWpTnk3NyC1oymukQUUJ5G1KpvWU3PMbXF9t8ov1L98J4TkNjSTrqdvN3KR2l4jGFHntRfWKI9SzVYjyNob6d7b15eyYaLGMQ6S+DMYdrMMYwkjVe8bLc0MdODi9lJH5hGqU5II+YAlN0Oyg8aXN4mjtgEW+evHoPNe5fsX3IJKaKcthoBideuDkMEQahvZG3G1eczVJp5AtjbeReqhlDMQWfa8hMcsiT0OW7fhRROh/NPVpsL+rvcrKQBiIK9ksux0E9/k7VgGIwAPpZuI5ydIsycTvlTuIaeVUxROOljTT6DEGMlhjWbEcm9txzkJAsqQpVTMd0FTkHOZmozAu4SXIsFdk/Z8GbVzKIME4P2ZOFzyvMOIvJcSXKwrFn/+zgcljJkGiHv6cBkvQ056tLgBk8f3UFWBANaC4jJlKGmV2jNIL3zsSzF4EBYE6Q+f641cTA1zHeUmzovQL2l5kDh8vPJyLde6BQEwGDJl0tgC4H/0GDBpQyjQhnVck6hQcTomIJkJHhDgjThGm3+Bg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: mjW9BOoXEW8Ua6s3TCn1Vw2hKw8JEfgR4ciFCvTF41iGmSEe2q1w4lJfX8IciqoqWZC3VjYkQYITZX504iy1lLPVOLmwvbR4JTeoOgk+3fPWv9VGjz3hffg2ECYXwpVX0vShqECb47PeNmkIrFQqD3PqssZ22GOfCvd3Hzb3v1jSx/XGuIANz5UTWVI8ZFLGhiyqZx+USBzcjaNDpy+9d3JoSIhEPfG0rm12CfFl3WXzeKbwWPN8lzcm6Ct/rgxfLCAKYXg4l4ivUGxIk6vbTCjtTz0QjNJOrucOFNZQ9Sigw/Rppxd/fLcTsGqjcmDpYR0enE/J/HzB/nDuMffoKrd61ySdEmBT8caQWhbzUu3Mc5N/8MgIUmWE7JqfC80RiPvb+kpcdkwBbWsXUcwYjrRWehjlzkr9anpokBjVHHt5WeoywrRXOt8Pch3Pgc4FxBKzQVeMcLyDDJ0xSmWZKam4PtBsZN5kJ4ClHR0nJeQFyaTYr75xyBQvzYBD5b0gewP1Q/KMHhXrcG1fCfwwO/xYGQw7kBLQ4xtZR7/2QH+q9IAE1v3eNyoRlzqzqYF/89MH20XunQJTBYNl+TOLUUx9/J2hu1mGywA/V5U8x9k= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6533db19-96e8-4ce4-b9fe-08dca0071f3d X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:06:03.0955 (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: 2mNOq07j3d8B4quuvNiELTrQjXh8qnfMulPcP2unhncnthoQ29wUxwm8Kkl91KCf2OcF6JWALCXDCXnZxA/ziQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 mlxscore=0 phishscore=0 spamscore=0 adultscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-ORIG-GUID: sU98eem7p5LgLxZhX00URI9T5Sr9TU3j X-Proofpoint-GUID: sU98eem7p5LgLxZhX00URI9T5Sr9TU3j Make RQF_x as an enum to better order and number members. Signed-off-by: John Garry --- Maybe we should also have an enum for bits, like: RQF_STARTED_BIT = 0 ... RQF_STARTED = (1 << RQF_STARTED_BIT) as RQF_MAX looks out of place in later patch include/linux/blk-mq.h | 66 ++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 32 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index aefbf93d431a..f3de4a0b5293 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -27,38 +27,40 @@ 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 = ((__force req_flags_t)(1 << 0)), + /* request for flush sequence */ + RQF_FLUSH_SEQ = ((__force req_flags_t)(1 << 1)), + /* merge of different types, fail separately */ + RQF_MIXED_MERGE = ((__force req_flags_t)(1 << 2)), + /* don't call prep for this one */ + RQF_DONTPREP = ((__force req_flags_t)(1 << 3)), + /* use hctx->sched_tags */ + RQF_SCHED_TAGS = ((__force req_flags_t)(1 << 4)), + /* use an I/O scheduler for this request */ + RQF_USE_SCHED = ((__force req_flags_t)(1 << 5)), + /* vaguely specified driver internal error. Ignored by the block layer */ + RQF_FAILED = ((__force req_flags_t)(1 << 6)), + /* don't warn about errors */ + RQF_QUIET = ((__force req_flags_t)(1 << 7)), + /* account into disk and partition IO statistics */ + RQF_IO_STAT = ((__force req_flags_t)(1 << 8)), + /* runtime pm request */ + RQF_PM = ((__force req_flags_t)(1 << 9)), + /* on IO scheduler merge hash */ + RQF_HASHED = ((__force req_flags_t)(1 << 10)), + /* track IO completion time */ + RQF_STATS = ((__force req_flags_t)(1 << 11)), + /* Look at ->special_vec for the actual data payload instead of the + bio chain. */ + RQF_SPECIAL_PAYLOAD = ((__force req_flags_t)(1 << 12)), + /* The request completion needs to be signaled to zone write pluging. */ + RQF_ZONE_WRITE_PLUGGING = ((__force req_flags_t)(1 << 13)), + /* ->timeout has been called, don't expire again */ + RQF_TIMED_OUT = ((__force req_flags_t)(1 << 14)), + RQF_RESV = ((__force req_flags_t)(1 << 15)), +}; /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \ From patchwork Tue Jul 9 11:05: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: 13727677 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 7CD8E155389 for ; Tue, 9 Jul 2024 11:06:15 +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=1720523177; cv=fail; b=g4kAo3e7WLsOeBH8EYZ985YQ4zzPxoH2ClYcP19SJot5r3KMU1PFMPgPo4r9iQ8NIyWophOU4FPv629xfiy1p+zvmIslHL5mWILZ6ZMvU7sBn29rWQ9KYnLadVpWJO9VKkJ+1rOB62nt3ErKc4nSZjwA91razJxiYPnxDPK2jFw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523177; c=relaxed/simple; bh=vYlw0ZmowrIC64pfFMZzvhi/WVeXgMOPK3bsT20UJEY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=dsm+trywCIEvl/CIPUtKXdCLbB0N9sBWxJr4JHXS66yuMn3HrLcqjON/OCCCzaVdBr0aLlx6NPTbCdd3qDkAiOvoH5bSNR0K/FDi0ALnDm31STSNQIMoqkRlylMl65Z4FKcFcNTpOt815lWURWLAO15LuSQyHcHu/r4UKOxIGtk= 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=F0vqZee3; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=sqAMZNGY; 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="F0vqZee3"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="sqAMZNGY" 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 4697tYAf007528; Tue, 9 Jul 2024 11:06:08 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=TUIyKy6bkikfqyg5a/Su9fqMn5KXoNDkHxPyCP/0eA8=; b= F0vqZee34A8bQc1zRWswxOxXwXkPAHvITR7l5jUhGfP6ydUuG44H/hxDb2RPR5nT YYpURrKzLe5Jk78CwKMBmsPz0RmwPQeq1a5aj9lfT8Ho0mlJ7z6L8N2gLZlSJAkV mgcHVEfAqW5PvuunYqNnmlQodBcixsp3iQt5gGqbQ8HdJm32sEq5dxwBs8Zf/lwt dqTDZM5aJTPufrZnpYjgiTK3LybSEm4S8xLbCGWsp2rLstAMrZGRKCk+x+f477b7 NePap2QA//eCkL8IfjARUHoMlpZNumvCzB504WQVtQ8aEOjsNtFlCaMmkr2XpwSr c2qCDD9BnBWG7QnVa6DghQ== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 406wybmptm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:08 +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 469B4i82027737; Tue, 9 Jul 2024 11:06:07 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2047.outbound.protection.outlook.com [104.47.70.47]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 407tttg5r4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bVeepgBe1E6ddjpUL9ppYj8ptfOvdRo0fTDUxhkHx9ODNwl937ei82Kl/lb9HsdNDDn9XRGtxsFhJc3NzRIqCIKeLeoNxJ0sfPw/mvofQBaf4pzM/KWJSPIIBqidk9fBXqr+GGqy3NVy9J2s08tC7xjxkCY3fiOspaeT4FHe4D4qVvex+D288Dxw/fTmg1DXaFBmdcFb6O9p2lN8zKje+DHyDb6W5YHeT0pEIj+m00nEK2uPu0c5Pm1auDMqlBeNdUdTi4juSjIdK0vE/PrNpkqtTKDJA//S9OiLBny48bpoYka4R8/cxNiSQCyW1njJkbZpa8unTQqIqGT1uIfbwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TUIyKy6bkikfqyg5a/Su9fqMn5KXoNDkHxPyCP/0eA8=; b=RHU38uCIr7FY8GFZ0OK332M20ewG5/F6cL7gTaaI/MuFxcaxfD5TAHWXTh/kddKVYIYjyh4DyDNFbqaeC6zxa+esK1701kbkq1dw/uMk/rAU0p/RFdxNrvHlMoGoQEBoNbEh8VS3LSjZLfkr/92zkw4ZDaWiIdMaE0zc9joyW5TQHzM5kUUcmiMDaeObE4DoHCmqmBP73lZHS5cjAJUii5aYV5Y/g6IK9VBG63m8T1BA3d/pnfkxSMWXJD2P1Hd2TsMTLtINHmMk9fImDNxaTEiclE1x4AkE1ccEtbV/vUAoC4uItxEqAYuV1+Yvhjt9fiHDwEtt8iaK2uPJKzk9dA== 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=TUIyKy6bkikfqyg5a/Su9fqMn5KXoNDkHxPyCP/0eA8=; b=sqAMZNGYNYCQpY2Tn+WEAxmVDC0hbifXvtS8Xp3g2Goh7nWL5cmX4tKRnJb63txLugGmub16611I1VXFtsiJLJgm+wPXd2X5w+tHkAlpKasb4yPGGacEPx7U0IGREMmXSH46KLYbh5yFnQnxmV6QKCVpDEPNAygkxVhwUTCNbac= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:06:05 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:06:05 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 10/11] block: Add zone write plugging entry to rqf_name[] Date: Tue, 9 Jul 2024 11:05:37 +0000 Message-Id: <20240709110538.532896-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0175.namprd03.prod.outlook.com (2603:10b6:208:32f::14) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: 89b73cb7-da1f-4ef5-b0e1-08dca00720a7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: ikimhP5KM12ax51rso/At7ruCjFfgcJFGqGEkRF0XP2Lhh3TEWzAMPsLD+QOXTc9cdBPaKgQ7GqOmGMmK5d0OjdM5zGJjn12aTlvYks/Vh6dHqMdO8nzdZsGXgedGmso4N4npRsqjoA980Mqk4WMublfxrvn4HjehJGgJekxhxPpdZCtIfIjT3gDa7SDpeSWT80QPrks4L4V0WTRKnnJyxyBwg+FaHW91XEjXg6LvmAGJrXHaj+/ATOg2JPbxY5NHutAbmYSkG3pLJInm52ASBCOK9oxFmGeb4Uhqa5uAU/rw0SNjhqHVHrID08BihwAhX6GaE8gT2GNVublGThjMQsZHvd+CXdtng1DZiu6MHHsxH/RuFK2lfdLiiT4kPbqtEedE0oR4XfPZ5ZMOproVutu8ixvHTR4NPiAP0Cs04uliRTTGy7csNrJkwvdrrylR1dvLSsWGh7FIRnDIt2Ws6x1yuIPtG5VKBYWpeU1WvLJ9bIuGHTmbqJ1rHM2Jmfp3zqXdfswcg2iG+R8CzvMZ8jZaWfsiAU+32wTtRTBSbMZqan73OXSyGBwk/zi5Fo20XxX5o7DxsS4GWAZu3RaP3ga1iq1TkEdLr1S4fldPbSa10sVBaX4EYzLJt7rt94hDO0XIbvevTCCBlyO9xx7FPjRvuDJsE/yInEJ34Y1C/s0JOq5d2DP4Rx1dDvP5PwIJ6mOodcY1+ZmKXKslyswo/8vlburFj6X6Qhl9d5Y2j7XCi5eGHy8uoLjHiCvMFsgGw75Y2GNgJc5HZ/5q+p7uTDUIdoKA4iqNb9TXUUts/+Ac0Oqt9mTSNMMYcVFBohsBXjWNLqNawkgF/SRHvw7U1FfJ+gEyXlG4h3zTtwEbMnXDXRlMF2/GjbhMW9QamYjnDodllEZKw2KxbtNfXEHJEEKNAhOybmlhrj0IDMzX2iA8LvE3+t4Y4SQF3RxIK34oTmf8THe2YJPGbWxrzsQdx539zSWTEcJg5GhX6rakCqsZ/ve79f4QaRRwMDqIMGM0Q5xNU1015Fe98T1ZW37HX5TwnVEQPM6G+xFldgnf9vS5VrnktWhHip0tAk/WeWTdnbn9Em1TI6rXp/62NOfD9yXyK5zw85J/PKUz4AyRGZu4oGg1ApTkaXC2YA6EGTsz9ZrAXYLPvNxpMfNPVt2YrL5jwd/iyOuCP2QSVclBgdcOc5EKNxSQ6L8l09XWDMaov4OaaHOv3NdJaWpHG1gC9Odi/QWdi6VZ/b5yMk68PccELhnNzX6ayL3tmeiLJd4/CQkERUcZ2gCV/XabUI/7PEg5lKB8PLi+y2fvKg7Dy4TBF30i/8Xc+WxSYssZy+waL02Jqkz1KhIGijAdbbjcg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XogbS+A29mHFvC5MlWC0vu69Qxi46b4OBA/zK30UnE0XDslybSDlCGK/cRcC2WmkZOHVKk3KvpAwbl9up98kFEuV09oCcFwnigDHo1ZlnO0NJmeSmFWSX9TY5JNIQMVxiDfNwT+3MvL6YAjf5EwlsQp/7i3HnoyVvrlfKBscJAHXV5ri/1ZhsdYbyvSFW61qYsezWhmtAoOs9Oc/KBj9Lzl86Q+03ZVjfVfBDF/4+TEQdjsUAlkcDU3b1SZ5sSwH4vF3VYpoDrFBxyxamBI1dwVE7q9foNGZws4jNfsbRk7tk4kaDqF484EEpkvacj/NR+F+sIaSuWPqSy/+M1XLAqJxBGOQE4SfhdN13E9CJfG4tl+LNP/2QyHElzU2y28ET81T34gEVDIWjyL4Vr7WReqKO0qrhi89FDTl+PMIviQgul2WXkXL5DbUd2SCBVG8hE0xyS61PNfiWfmQYnXoQC6G70tPq7qU9WTY5+N3jEr+RsE/3UNDJuzqyYLur4ywBFaGrnlZbqlJDBJBRf0foWxHpCJawvUItadKUozPV8VNRdAW5kBmW7h0QELKKUFxC5LAsHVn+IO6FoJ4HDyiH7ru0kRrLL3DVv0hxHZuRweyJTOuQimtFraayijAdwQMDQirA52eujGy+24slhc7zsSJpULNXP4xtlxql93Lve4CAFaxz2iqR0LxhaHDLZrU8Da+clkZ7BNCa+zavyhylzgP1umH2akfjz3XkOGWmVghwZC+cf2iTIbQoHh/8WVlAOZnZjuqs/EoExtB3inU2IlfGT5K99tpWS9KANi337zMYqCOh3D5hYwIEUy2zPHGhFUsrCJ6QF9mXI1wIH5WXTMzInVWcgYHGzBF+uN+Cye0GpiLLR3T/EmMC0AIPrxmApo86x0ZMRplNl7V5cCnzjayVn7X0vpTpq2/pRWRzYOJasnQmtbZTMhlTGDNXa979n8V9Rm+C7WMzV6k6Vgh0ivtssIIMlHClUTg6SNoE0JPA84xVV+nWku020mPwoUi8JwQDfrMyGt7n/4Ffe2fSDcVQ572+hwTny5wEMX05eEEIjYuPW50Up6OZm2xq0xVVz6rGPZ8g4hHBjWtcqPwRfgjibeGxxUqK9Hpr3vHzeKlhxJ5wZgbQn47/Hv01wza5f1U8YmBKdEhm+p7zsQsD6G2+Ckopjng3i+0Qa+lBeZUo43YKZXCll0gsWGVj6iywarlB82eufTLyLn0QNAaPXVYnhlOdk+5aSrHpUWYMzI/fMI1fixvwEecKqo4J0B2n9Yzm6vDBvqACat+SYkqhvvb97yZzXDYFwCzl+DLCdHClgdvh1mFXc+KxK11bIwfz3qpBSVz59rSDOQuf2ccdxq7CmYRLRFRtYE03H7LEfCfEGqjSZWkrFMF3AJEo8QGGdqrzbyDC6dfE1W4+Fg/SiOZixcZTooyKzorNlHh55SJgOvIcSJMQcE0/5I44HlG3VEozMUE5x6AkYg1eFJo2nEYZVWwnh6FqW4LnK4KsJiC31s6WkgBHeuGhoTfhrYh2oDWpwbiZzjCk64Wdynry8Ccne/x8wnhhyS96yINIJowomeTp6Z3kGhkaMOn+yhtmMTpF/qlmiD8FiVZtpRuLQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: gfV91OBK9WVjDPiI8bp20ecTfX5PzmydrwfVOmX4mKz5tk2BYz1fuXye6owiiAhiAijSaR6+6G/pxY+AfB3Tt+luSOlzvUbPVg/YMDRa38lpnP1nca0awT7dQPGVCBK+GqOL0iM+Ycp8SuLJ23eR3Oi0+jwf8rIZTt/mjYRSLxcRnIDET3JY/f1gtkvEfhaVQhvkcV8zLbPz0Ed/reaBwqEdWFzBgI1JEJv+3GMkoh3pRCLd9ZWdClJu03jOEwr79k/jWvWKIYti75YY9MtNoL38a2k6W7wjyZiC66aMY/NYS75zj6o/i+RZsyoiuK+hGg1VDt5PVrPt0RcOQmJZp0G+3BdSN5IEw6+BHmZKHCnd+FOWLcYacF1ss9GUBxWmaf6GuHshxyCQhOn8NNaTEOaajjXYQl+fE+aXEKGYSuFtDtc+IuDh4AczmoeF9Ckdg8LZFGBz4BiBmQCIjNOODNwhw/mIJbHc71eos3SvDHMBTG5wF1Wss6hN3m5265hQrh9J9vZavqa6xtdAfykLVPEVhmHJfesZfPq8MIvunwpSeIwLT3vqLCOzXLQkmo9NPjaSQoLLzNtpf3pWD2bEWN9t2Nw/RujNU5EqGbgrvUg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 89b73cb7-da1f-4ef5-b0e1-08dca00720a7 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:06:05.4176 (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: CMXzdGVu9kqZgdEQlfnytSr4aMq04rqSqM3yYUrWUsPqNjMLQ3uOFCEjiitYDtO62Fod5oZussFlZvo+Vq/7mA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-GUID: jV6qDp24hJOzAo7wE6QSvVrJPpHFUvHl X-Proofpoint-ORIG-GUID: jV6qDp24hJOzAo7wE6QSvVrJPpHFUvHl Add missing entry. Signed-off-by: John Garry --- 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 f764b86941c3..97741996b5f2 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -253,6 +253,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 Tue Jul 9 11:05: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: 13727676 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 8BB3D156F45 for ; Tue, 9 Jul 2024 11:06: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=1720523176; cv=fail; b=eynHHR0JgpYj5WObWNfQHFmQCkyv4HFP39ISRX2F8eiqMfSGp/fu8xMvcSMqQRkSharESy8qzmVaQ9CA8/tclkBRjG5+0O0uLMSVJ/7nDwNyF6S2YSx8EXyFpLF66KuOmBXop4E9kF59oem2nQOZOPc5x6rhWaUioySbzIuDKdo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523176; c=relaxed/simple; bh=6gKLEd8/fwkZ00yzok3JKFIFEupEkD8lVld7tVOk/uY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=WSPSN/zU9hu6XvuLLKGtN/8kHEHhRzeJWcBc1cVHCPSECl4jpiRBLOzGQY5rEyjA82n1KzTAUPsv9CVVL1Vt/mzLtoFPE6SaYjlvBrsrSyuVK4fvhnbUEw2m/NMbpUcNOokwQLWXK++V+OEpY6K6xPsFHKQN8Xy4ncEUhMRL/LE= 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=HUy+C3Yd; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=0EHHIpQe; 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="HUy+C3Yd"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="0EHHIpQe" 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 4697tXI9001430; Tue, 9 Jul 2024 11:06: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=e5dYvvV8NCzbSKqecun7hb+way8gPQxAIsqEnt81GWs=; b= HUy+C3YdjNIbsuhrkGcsZiF+ZdzUqNtQoNn/zgxMntuNjWc+VZUlQ+iiVqeRtx9m scGTp8mXIsyrQU83kUJ55TUBqUdSBK5qS/CTLivBKPQqfYo/mgQCWNFEdwJowava W2u4tkUagIAPYl8EQz7BORYKKHW3BLpeYRtUFwsHWLdz8HTBq6R8hpy9ixSIt8bg +tLj/36XCc41UcGiF6agWTE8P178Rxc4fIVL6Lz0YTGyhwHLOI+MxYBqSgNRemvR 8cQP7y9PTBdUcjh+iG8FToMvhzV5EOCBa3IXtOMQ6ric4wXftwrOF/66EDVWgBU5 8iYuM/Yk5tROxM4uP3xeGg== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 407emsv1np-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06: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 469Auh89038189; Tue, 9 Jul 2024 11:06:09 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2046.outbound.protection.outlook.com [104.47.70.46]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 407tv14gn3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 09 Jul 2024 11:06:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FwAngR0+4CserZt7ADC0rC6vBoJSsFa1UCoD9fNDqOuYS6sZnUq4cPfEbtnZrqQNmon6h0u1GbB1RFOZSRQQEWtnbwjqP8dDixB6zlB7S/2Uf4f9g8BAMHacppRPh87H+B//L67ixJ5j3Fq7FqE8Wgqb7vYdnzn+wf7CCl9ledMyKq3hpyouI201fjnZyK8IT8BR5pwNZVKP3H8PpmLAQe45GgX1ixzxJSdSp+tXuIyZuQOkuzt15VQepNTpfemriiCEmaU33BOvKK9uMdWD3kUpwAzJFc4c6bBhM3+xFKpkftnMq80Rc0VTqKsO5Z98maXf+MeI6rhJXi+kYPblBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e5dYvvV8NCzbSKqecun7hb+way8gPQxAIsqEnt81GWs=; b=ixA2BXvR5q+vZ1lwQfbIDzLdbc5g910IkSJRgLQJLXPbRnHl9VZfF/g+wCOZJUN/gMfJbjJ5iigWTEf0KdXOsaohokVqQvY7vxxKIjRG3K1HrAFWjLNHo0e4qOIISIN6TUDuv7j6WhTWbARRo3CqghMeDSV2e9Ogf9sEm3NWdU/Uo+YEvzYZBUtbwZ+UnxjbowyYTYgpk9WufIccb5w5U8yBvThvnE+QALK07VpkFM8bD4rnHY+X+BN8jw++nRgZ2oRy8CxxEhVrFbH/iqOSb4Dmi64H4tCwXgCaRuFZY/j9+QdYbrlx5Bh2yklmGHfy5DdqqARL8UVWGKeBNuueNA== 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=e5dYvvV8NCzbSKqecun7hb+way8gPQxAIsqEnt81GWs=; b=0EHHIpQeuhLLAv559sN5lENUYZW6lCA0QtHnvlmegk7Jn/2VYu2O1zgyxfwb4xILWLJ2wVLlDHFsuzxEHX9bsepCwz5rHO1PKVAEo8cVtNbjpGFUmfhxpvF0Z92vRor6mC7z7fwwYnlEr71M5MBg0ooy3ghugjBz4IKe3qc5U9E= Received: from CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) by IA3PR10MB8068.namprd10.prod.outlook.com (2603:10b6:208:505::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.19; Tue, 9 Jul 2024 11:06:07 +0000 Received: from CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2]) by CH2PR10MB4312.namprd10.prod.outlook.com ([fe80::fd5e:682a:f1ac:d0a2%4]) with mapi id 15.20.7741.033; Tue, 9 Jul 2024 11:06:07 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, John Garry Subject: [PATCH 11/11] block: Catch possible entries missing from rqf_name[] Date: Tue, 9 Jul 2024 11:05:38 +0000 Message-Id: <20240709110538.532896-12-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240709110538.532896-1-john.g.garry@oracle.com> References: <20240709110538.532896-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR02CA0005.namprd02.prod.outlook.com (2603:10b6:208:fc::18) To CH2PR10MB4312.namprd10.prod.outlook.com (2603:10b6:610:7b::9) 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: CH2PR10MB4312:EE_|IA3PR10MB8068:EE_ X-MS-Office365-Filtering-Correlation-Id: d5ef21b0-3f9d-4fb5-6332-08dca00721b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014; X-Microsoft-Antispam-Message-Info: J92ZgASMV74CXgUQo++K9B7grgMIIRS38eoq31szVjDYECs3I5B4z/G0auR3ZJiBEzP8NkXWFvwCyrZrptWfKJOX7tCLK4djujCmwyoZP0iCdV1/sXbaFftVS4KPs18hcjcBKAD0gls3b07bSz+6/F0nUtqkCnFFx9ND32+gpFfE6xsFo13Bhu899pXKQwGyKrB2QMu8VO2yeATwKDtcW+Lo3fYSOcRMMy2hGG99PquDLXAKPZiajrjUVPorwcndd6qQ9ksGR24LrXuy6vxgsOgEv2Bjz9sJ9Pj8Q2dHrzTaIg/1W4ilWKDuYNHJcpkmEUcC971q74wxyPEEVbeeJ7OmA75ID8QSWO3j2HQ2gMa4JudsAF7YwvH3sr6WArMeI8vpbZuqx/WABaHuNGOA0cdbxOBiSBIRmIfX7xifSKx/YChGOq3HoBZBY2auN/hGKPhqq2SxnD+xnv61VLPSfeQDAA6tgCurTJ9qY8p8XFQ8GZnQqDJwhiBBve27jsg6vFAr4aaNPVGwRz+drnZ7eVJrK0p8T5nGYxsdRwwDvFJ1Fs5qEuv71O9YUYldSmQSAvecvF82tk/HBhwhPVtOO2ryD9RRIDbJQH+Auw5mhfygOClFSBKaS/t7pS3nuOEwu1DfFXwYL9jfUK1SVpweNhOaXriuP1EBDpd7oHxTNgvAbh+pHgjdF7ubjXjfRTyQSoHZ0x7C1TSFHsiZxL0jPFO8cM9kzxbOiSspNIgojw/aY65CwmKa7SzsRQmQ6bwJVar2EhzWHf1DSa7o+eN9nccRnksWOaMXrTlWE4R4mtZz8iBKDbTo7Nv3LM17nNqEOUpG9LnTHqviVQZnqlEDD42BJniuVmhZDgRDJ2kEBHLJFkjfxMDcJ8ISckpAzV42f4gQEbq/EqNl0r/UL9z8S+/XC/BIUvGaQeRw8v/gMvmGnlW/+Z/V3c1E43R0HySgiJj+tPqJz0aL6R7wT5OXna7PBw5I23k0VM5+EIfutupF2QlfKzYZJnHNEndSdHngAqvjrM2PjavCVK7bxXfaQ2PRe9oDbfg0O5b7iq01xOZh78E/vLb//NrAolwtDu2T+VKvheY1Ffkh8apX7NPd9/rNZXEMtTovr+3wTB+sC0ExF45XY+Z88MC8Fo/n85zw82RLkAW+fl3s8V2LSBTwx4jim9h0iKo/UuYrhTxP+hlW8ma0rKaqIjXIEhNh17BYaJD2ZZPf+JclYY/M7ea+c8dfCpYTBTIPmh6B4Yzcw3GWzaGbbsbtuOuq75Cte6jQt6dY3XIyV/eKqG9m1bHQF8dryDsIkUyrp2mTKdYTYPpAkb00Yfm8+eTg7Nz1Lai/f8J8SetDRTuKV7G69hXDPA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR10MB4312.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(1800799024)(366016)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E2ip33nFZW8c4kgGxQ/78jrIySrbMNXzT+DhoiFs8kAEpHGtgjxE3WMSdgEPnGyU8yRcpnlOpHiO9ZSH/ygBxKYtKQy6XDTGDMSSksjASn15+UgUERrB43r/PrKuZS1vkaC9YrJGk9bozhsMPdLWot5Rucbs3WsPfi3ffvSGpb4umB5kh/5T6aI8ZGSxBBXqRITM6OFFGc+mTkiX73BpsEbmPO8Kecv00lbvPAtSUCXNsd+ERFyEHnfi73DUd9VZ8+9K8emCNo0k+KCrvByuc2Y0/AuwrF2CpsxlBbTAzl1ltNYDH+dvNs3v9tXA+c3auDWY6kd4CvmLH+BNJauGrET+abCEbkf5yOkXLFagel6yVnR7mX8F6ZkD+vVZU5Ze+IpnNKeFw99RaBJ4ORC61ZFKvQp/A8WrJtQPoc8yVyF1C/LYg9I+jKuALjArbnPuCXSJtGkr31MQwFxdA0vgqX97hjvUn7FmQ6AWby0dhYKBOd40fsB1eAY8gR/9qqJzpA6TX6n8VsuQ+6ReyHIswuDyXpCK9E1adr6zy0FEIHm56/K/oKLhkbG+kLmokekvViizDdwAvlo3WcsfENDwcGUmBfJKDtGK7T2MUOMvjiPI2d/yK2J2i5gHYa2kQGbyUL80WpKiVD+FJ5QFmpzGnge4+zyJeuUTrSO9DD2eQOUfDQznMgmrusEMW2fl4O+mcfAk8AKO9ViSTeY8PvNLe3w6NDmKy7QxVIWMT5+kyhJ0SXxjXxgkBqxq8dd6/8A1yvM09J1lIv/EyjpzqIM9wnFyW+BxQDUDCbMPSYv3qw4uLGFPkt4lKbkEX9PZpky+TFlMCkEAW7X+3RmbTZ0hYsxXHMIsHEi5Awj88RBKF1vaHGqhd3IR35Zg4kKNNgowabyup1lRVSapbFip2eDmRvuFSwf2nQYYSCrQAAvNmFDW7nSX+1srsFgI2a6FQSzZEwkaKYEC8dUTbq56xtCxNta3mg3qU/4Fb97oHU0Dx7pRUkH1/tRA+aH58PFIDeZgKjEW1mRmdjrSbysIz8B3b7y35+fCY3c4WT6rhLlKNwQhonRPMokZ8t0pebD9/zOstm6DUlZ6Q80i6vPlqjf13KQEoKyonF10BJPTGsB1SlHRrDaXNfj4WMhTtYbWd9V231G61POGP15btOhyWTtcdhQVSH3sTTX9x9A4IE0EzPbALRjSTZ49ZZVDJ4xcAOKj8Ai8g/nMdiRwpDSM+7pH7u1erfDGxFT4VC3f69zISHwGWFyqT0/xi6w1jVX27yeKkuI+DZsmnPjmtnyALQbfhCJ8WfEL0MfLnntwJPVwyPJbr1Yk5+WBSY4rXagiWxDLEZXQWY8RVc4XB4XIm82YS0O0Y0HV4D0UdddGGW0HOceLCgdImzR4psqHfPijFY8Hf3W5REpHSfSj/Tfo+oiymVF92WAx4X78t9MZuIN1z913tEE3HRfK0IpeHYQyEUKNAUFymY7RKc1HFn1upVqyvR8PBYzCVX7kPWqWNAfBWwlzhkQdDyX9ZZDJ+SNa5UTqE/HaSoJ6fsOPa6DlO0IIXu77ZLYC1Ynw+dePXDR+N5zuJYd9bZqOWEv5XzafQ+02FD2g5NXyrG52f4+rk8j1Nw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: haKUDId1TQjZhPqpOiN3bK3zIYpyrDaGA5k83TABcPQdXbK/PPBoCFTqMu6zfsp0C4E4LIYPH2fO2VScZSbfxQzsmW56IU5jsKbFNU15OOmlJ7XTB6SWAj79p+YiwbQ1tYuURep3feR9eN9VTsdLFICrYp21OfoOMjepkh+AySQYod6aySE3hobGARes1NA48vteY8vabiXQUUQmkfFQZdNNjw18Eose0NpS9jdkK/OV28uI9HAUW2UWuzNJKscWk8NCg9Btea3RRFtdLG2YRZFsmqV9fIiG3s1pDrLyPVHol2zxGeJb+v2t9Cti4d33hNg2ByABi3oGkwR2IBJ2gLg+GspvkgUuj3X6ICmnR5V1CyD408fAdyZCsK02xSkD73nGGMWPtfekQ+gE5XvIkh7jKH54+la8klLRtKTLlb4OVt7XjIyXAeS0pMUMjqdsksvoJT0O4BEoDVO9LwddBW0196BZcXfNXTPuHS+4hb2Z51aV1D/9FwfxZXTA9NFNK++h9yYsous56gVsiHKjU8JvV9INoQAjhulDed5d+y4NVUjZi3QasFB8ACFKYbPeiJXLZikvOxj8PoCu0IjK+yCh5Rz4uRSqDEdC9RLFULM= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d5ef21b0-3f9d-4fb5-6332-08dca00721b4 X-MS-Exchange-CrossTenant-AuthSource: CH2PR10MB4312.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2024 11:06:07.1809 (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: AXEY1MGVZ+ehCYhYbpNaBNb/KSCfciZSgZ2dlUEhQzQpD+ULGDHSb2ZSm6BMia+bJTdaGVlbCQQ9szXtrY3mww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA3PR10MB8068 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-09_02,2024-07-08_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 phishscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2406180000 definitions=main-2407090076 X-Proofpoint-GUID: 7iCnP9cgjlszhFK5en2MN9uo7hggAHtW X-Proofpoint-ORIG-GUID: 7iCnP9cgjlszhFK5en2MN9uo7hggAHtW Also add a BUILD_BUG_ON() call to ensure that we are not missing entries in rqf_name[]. 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 97741996b5f2..c829406579ee 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -280,6 +280,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_MAX); 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 f3de4a0b5293..928674c026b3 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 = ((__force req_flags_t)(1 << 0)), @@ -60,6 +61,7 @@ enum { /* ->timeout has been called, don't expire again */ RQF_TIMED_OUT = ((__force req_flags_t)(1 << 14)), RQF_RESV = ((__force req_flags_t)(1 << 15)), + RQF_MAX = 16 }; /* flags that prevent us from merging requests: */