From patchwork Fri Jul 19 11:28:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737217 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 6F42C383AC for ; Fri, 19 Jul 2024 11:34:47 +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=1721388889; cv=fail; b=OtJcrIUDAJpO+9P81ducgQHVtzt4Zxs48eBsbjD2IgGifibOe5vWW+Zaj8CM289fdV+YRYu5r3E3HSpkKrnJdbjB8/CQhb2znftkrsaA4nRk2QqMIA+Yae/64siGmYj4t9DhCvZ8elo/vWd1/krXIZNltB/Wbl/FOsmDS77Rq6c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388889; c=relaxed/simple; bh=8AkFNenfaM2emMydzH/HLzf20IOXd+eiuDhjIxt0ozM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=kXxVrXfYrS/M+rWicOep5q3z5TcQ3NFy6d23LkyiM70c5aL00lrCVDYHWew2joq1Dm7TXwoRqvdoEItx9tQZW0m61e6XKYJrDTataGj4JsrI3de8SWetMIbiaOlBqm5VwrAsot7yGQd6nRSo/k7s2BqaoV3L9Lydf03Ypdaa0nc= 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=mqgKxf7k; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=riZRJ+P0; 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="mqgKxf7k"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="riZRJ+P0" 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 46JBKKOG027862; Fri, 19 Jul 2024 11:34:41 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=+jKZ54eYUTnM9N8xnXfHHgPZmovH9b5heID2wUBX28w=; b= mqgKxf7kH6ZoZDLHk3VpWgAW8d8RHRC6S9s/DC039lhzbrkcreb7Kk00yVO9JChg iSa9LOi4URtWHp7ydh4pSLsvqA7Ehx2dIIkS2Mt9sPGNYOkfI32W1eixjcMvJ0hO 7V4+OtImhTBEEyWTu0O2mN+ryHjGwJU+LgX+ruYJluKcuV9JM9uQWjUouwvn73Kg jI4USTgRNwDE+epB6i4AVqlHdwcWQQN2CgyWIHdfK03b6SY6kdRGEKU1823+tFb5 fhSuH9aP2AWZZRvx5WCLX6Yy47eV45z7izgbpGBsItED1Fre+Z3Dhp3ltDqh5bAe jd+5752+FpBRJ2afszSrOw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0xq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:34:41 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46J9dRlb021734; Fri, 19 Jul 2024 11:29:40 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevt7pb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:40 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qzYBhny8GY8dPZ/FfYmvnhphcABASJTtXI9EBs0CLFaFtIXq1kj7EIKUEK6f8AubboGPDsyla2h2oUl2hYNG1/maGqLrjC6C0fH21mwNhAGiPOtLz1B9M1GYaSXXuw4E89d5yGCiDJetPT3CPGTrAX7CAEIBclRVZj01iLE6LQvCtfhgPFwFE7+nM/z8ozTiIHQS91Ie/us67WulQGXBJrsv+m15xF6Zk8NbD36YMf+OkID5bbvzraOlBPZlXidqUZc/JWqv2VJo8YSAg7TdPJEMIZGqDhf3znwGIlYklIjv0te2YS65GgFNrksbhgSadfGpi6EEmNYYztzi1PoP9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+jKZ54eYUTnM9N8xnXfHHgPZmovH9b5heID2wUBX28w=; b=eypopUXrBJQ+oFX35m7q1MtCf9mDdxx3GtCV3wr6Mgxxnrzcd+6eTVMwm+IVceRtOxvSxY4PpveZnH5elHS73L0b4kw3MnPl2KdTLp6GfCIKSJAtvNFBIndCtmca5ndVvNrOPTeTDZRsIWaBe5Km/32E2KCeKo0Y0P2Pfapb6RF6EVXyIdW1glU2/fT9modsC3qLJMzupsJKFpVuOfTH6B+Xgk63g/n+QW0vDWfXQ/mwO1h7FlFvG6QjpZX848Jj/3D27CMb6lFqFFjYr2hg7wh+jQWdpVL/sBgCdK1+Eohlu81yOt/3OHPUMsYT65KSnZFuQy5Srubrw8wbh11lDg== 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=+jKZ54eYUTnM9N8xnXfHHgPZmovH9b5heID2wUBX28w=; b=riZRJ+P0lXObrbVpFLWFe8NqlzTy3EA/IwZU0LiAjDXt6YlZDnIlRtYUB3ZEPDZsLju04g+T/bfa+6oF0st2jZhj0D+AvAnZeKqDKTcWI+gi9eiiZ9fPrH9QNRlfhT2vtAWUoJ0wGbvuGtF79ubrT6++tWX6rlOqGsmYauvvEmw= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:38 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:38 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 01/15] block: Add missing entries from cmd_flag_name[] Date: Fri, 19 Jul 2024 11:28:58 +0000 Message-Id: <20240719112912.3830443-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR06CA0054.namprd06.prod.outlook.com (2603:10b6:a03:14b::31) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: b68a815b-6977-496c-7969-08dca7e612e7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: zMaEepfQ5wySrhjc43YgrkDMFonSfpWQJmaqpD/253v5Oo7kL3SR8YnEfopulqvG8k4v82D/kWj9OCgDokjLG9sSrF/Hf8CrhyPoAx8hGLyVGw8m3NQwY4qpBXaPYWTSFBmxSWX+2vcQkJSPm76FQbR3Z2gehwnJHVPpDmGc3QZlUQP94OJwu1ZZCepzKsutQwpiw9Y2FI909w93MuRGUuaGH+m76bahIAg3Hj/OeoS+inqBL3TDFXpuH9zS4ZY66hJakFe5I/lzb0SFH+A+UiLOMdnPDDlZHZUOLHUrBqxbFWL693g1emPB8sQf8CP4ifp2fShDcamqkwIVU92E5sGEZdiXk9p8OIE0shw8bAKgSycjd6XcMICNrnw0xmw1CPgS9RY8H3P9iLlEdmpherQ4ipsOsbG1LWFd+emvXPnqz6mL0IBrgBsGGCJ8WJFR9Ec1jhX9N5v1oipcsbNtvdvLsLJpqpuvpEYkPKyU1C2s3Ve2Ujpfy/e2vK14liDrR2x9cM7kix0gt/CIW/GL+/9bjdQHq6PuCBVeXrSQtoVUJWIf/rK7JCHRRG/jth9w/96sry7GoMd8FVcetNG07y1XKLnKyOtsKYYeyUakOh3Gggx8Byd6ytpeJUKifDqFfdBkEoHFiWG+d8WpvcRsM4NX5/xVp0neqhpp4+J+5E0+ZZG9IWKYnqa55fjrJ7CaYZG7syf7rmFe7bQZiBaWd2ARyMGXg3IPub7ZsvIv9JsaviPVPLCqHTaRMHTmCwRNnvqzIpEf5LKoQ8HXvIAYPGwKJSZskShYtuHMg41OWvgVH/yiE86PanD9x7Sk0K0nzloi59/15eSsgnDTR4p8QiiF+YJLb8w6fHl4rAp0Q0z5Q01puEN3vM3cN+3hOT1mwqfo4oZ0uWNmHU2mK4TbTB8njLw0gayIBslv5OjYkOg9C3ENCiNTUZ3GVvVQmd2ZUr5p+9VKTPxIgM+UMA4Caym5ZMDo0biYQsVEC2Ze3WQ8A26HkOXGKaEaVOdFFEdRPB0atsMnmkCfUfknUXwXZ0Tp0wQmEIiI2McY2BFyMDNfaYzgS/CO97LtooB6QADlcqJjkJ1sCK5khYwM0ULnTpsEm6Vmw/YLXtm/BH5cj6nqYTHJZWXBIxutgi321A79yJU6o91MRuQfxd/nOWJ3Fuk7UInA5PVz2JgOOPxkO6jgKG1+AHyXhA2nw/EOSMsEk21gbohv0iEn1ehOAsiy+XUul7VP2qIPQ72OFmXffxu+EHwY59d3GDmo7TlKWOowcpi6zjddwWheb6mUvN0q+vW4tQZXeKP/xQ3Q4dBNue/7zk46NBuSvbcd5rUbPdkpfMRALh0MJ4U8tJDIj4WrGA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: n8YY3wrJlZJmJLSo62fW1AzwRCU9t3zXeAD+gsqgBf+9I+vdxVoOQDYViBmcS8jVULMUvPQV6QF3VGUy/Q2nYRrolXEHnGMJ1AVUZUKOuo0lCBJ01FNYjQlUACoapWwhJONAGPtj0jrgP6I4jKG8ueUArfySskGmvJky7jWBUaU56wwJqatwNB685ru0WVvkGLUegPC+pZZBrbulwjrrKxQLX9KCkxAHTgjT7XKQR/RCK+p1sgJUa0d1m3CDQ+N0oEthJZqNYw+kqxNsw9JdtGN24X478TVdixmYR3IT737sQyyhQQHr0q4knQgTCGA1aO7kPZD4wRIZsHl2YEEdPrwfX/bOMUG8sDK/LGwQZ+MWHO9vXn0erV3AaYkjNtyYa5M3mWf02BLnNbaXkc/UmEYoQfNaTmlSJdWfaK5A9muE8izhNlaa43nQoyvGb/q5sWmIQQ1W/Jm+EJWW7VYodiezNUF++PkeWCaenclzd9pFBm+HE8fn9pKHhjOv8/OAu4Tb8vkxbUcfrQJaNcfAYwENb3A5ik5LCK5Eyxj85pN4QGi23ytZgF2DasyCzfqPiPHpQin7ut6mrLddk4HTvvJDsEVkh2eKPxJv8KstqbvYej2gre/VC+0UY5E5Pv5kCBC8HiK4AOWcwMyQpjhOXr8SLn5HtSXQooX4MCL4zEDNqKtXzhw6UG4pJNZduO/4C/6DzdJkye+bE/fdJXXyC8N8oY2E7Z3ZoAXjuzGMproaQItM69GhuEqO9LZ4tUbbUQzF2DNluYnsq8D7g+PoJX7Dc7WR3buhPqtWCYDfbpD7t+KWz/08una9JXRuT/8PtldHAaNTe/K5/GUpcTdXDra735YEh9QrwLH2S6443EjJPOnBQSn3A9hTWaIuIkWhpNwt30+pwDd41Ob5m4s/xbMI+EIBaicsKMFqTD77/1hWQKCUeJDDV8SrL3jq0DDfFbgcrFcVZ07/gDwMxdKcCt8BpnV4tTqeeif3d80dPDxvyS3TQHFb9PPRkaO3QEUUyG8U2/61GSFfPIQ/jFxMGLyv2/azpy6PxLfdUlIFoboTy3ob8XJAWbV7jDdXcDQ7MGpswgAVvM8YCd6OEPwUjFDI2qON/yQOEl9e4TZ72XLuOFNedZYJO28BD2JXFrfy01HdnnrBxzyjDIoLgv4qTuMFGP6A3f8fyRKPb4lJycfadWq+TWfYUbqKXZYhuy6Tm6jYibAxOcT20VmGYUxr6qICBLLs3CGa3C8fsQmV8Rwnlpfe5NNOEYsr6uSSraLE72HZ9Rr9NmUQMlU7mrSROKYcZkzA4kxFabEqq5/ISt+8bOi/ilSgNmQ2/Z40Y472XILHK3lJqWo36JCyO2lg5+C191MqVwL79ddHA5vNHYEv9kQneRKrVSxi7pql1JMS3FWANKKkfyRMlOoHa792bR93KbnL48gC+fMKzsHG0xjdAP4xJE7AmBWhNezierIboGYxv84sZQ5YyskGWF90e5/Ys1M2e/LE81ZXq9Q78+0Dpn8K0fFE3IOJ8H0hllGRAdwTvaBVhjk5nb2HtETnbWvaswdXUZXgROWJaERILxwgaM9loDSIr1xiktmkMW07cim1q4sTBddsBoyo0SWNqQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Ip4mhIGxAgQkRNyEXzGHf6x7GMS16190gpx/ocuuZlgR6V8M8guAJTUPq3IiNxK2bNXcfMxoF4/jCS2kFjnQHnDeMyl41uXTiexwoC6ws/LP3hQd9qgT3YyiJbX3Ng0JphMciNLo8PoKqism0vSBHKLSZdi9goHN+R4kR24xuezor1DSr7UreEnTo92POmlKPMWwvyMn4gb4/Pt/ohKGdKdwzZyz4+eRDb80aREnTvR91CiuweE15TMWS/LNEUhY8aDo1Pb+PfRc/pVRgCl6+60bTsOKakyOdxL6eR6DT7HMwGnB+I7Tmlv5YU7CyXpObVouBHhgXrLoeWifMMUb9asydq7BGB+PGg2mhu88UuKVXx5kO5G4QRibUnMJYwGbA9Bsyix0fmQ6B6vCc2KDGaAim7AOdmdw+r2pVAq5Sen18qFaS4xvbEpo8AQ6gHEoLJPEt9ScxRldTvhZtRiuqxxf9VpMRPCYJ5rHytEvn7Qnwl+tL62aJrwEvO5RGZ31ujsODYwL2LU0tN30NxHa/1zq1TPvQdC3HMrJUk6OTv4tHQJAuNEQSVEPJMXqUefkg151GNGiSVybwG9B12mNW0D/9utmW0z5BH2mVtnP47Y= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: b68a815b-6977-496c-7969-08dca7e612e7 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:38.2302 (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: L9Lg8lEmd30mSvU0SmNvrGdIeUzmvq1MkLHne+joaPxcHy8xyF3+OEBx4EcQiftJL/3tD2PFmoetMA7v0AoIKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: zO5l--6hXA_JFj_2N6XylUV0tdknmuy4 X-Proofpoint-ORIG-GUID: zO5l--6hXA_JFj_2N6XylUV0tdknmuy4 Add missing entries for req_flag_bits. Reviewed-by: Bart Van Assche Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 344f9e503bdb..786fa4d6e019 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -223,8 +223,13 @@ static const char *const cmd_flag_name[] = { CMD_FLAG_NAME(RAHEAD), CMD_FLAG_NAME(BACKGROUND), CMD_FLAG_NAME(NOWAIT), - CMD_FLAG_NAME(NOUNMAP), CMD_FLAG_NAME(POLLED), + CMD_FLAG_NAME(ALLOC_CACHE), + CMD_FLAG_NAME(SWAP), + CMD_FLAG_NAME(DRV), + CMD_FLAG_NAME(FS_PRIVATE), + CMD_FLAG_NAME(ATOMIC), + CMD_FLAG_NAME(NOUNMAP), }; #undef CMD_FLAG_NAME From patchwork Fri Jul 19 11:28:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737208 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 1565983CD5 for ; Fri, 19 Jul 2024 11:29:50 +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=1721388592; cv=fail; b=JHlvpbcZT1ZiuGZYlYoBhH2zOXOlT8Nk19zAOoR53X3J+IjyVRAYM5LPIM+SwrnplrPNSs0jXzBxVBwS36SvQtZKQsfOc/pD5ndW5tDTA0E/uUymuSbTJldWdvlDNUUes4nqHwwaH1UsGE1NVH8dZkK6qEg8ne1HwoZ5aANWqbg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388592; c=relaxed/simple; bh=0ytB0ZuLGq/IdMUqa071RdHizSsv7L3e/p2uJw29M94=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=BGQNpIXaFZUtX8U5pMJKa95jdmwBh+PnVK4GrHXjvZ5zUbDlVmbGCtlGm008oTNKH2TlC5kPTrUgg3rvRW/pgK7JApCDJ44sfIJXCDglRQ5o0NNaWzNuZNlSIsgrPlMw0xrebB+qqfK11AtsTucoCQQwRtsAeNcPPQhu7E4QphM= 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=BM54athq; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=XB7nesRb; 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="BM54athq"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="XB7nesRb" 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 46JBKKCT012235; Fri, 19 Jul 2024 11:29:43 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=w1K0c1FGyPYQq4wQozYLM4RprxF1JA2OGZ2SxUB9SLQ=; b= BM54athqkNpB1QFzI/LdwO1koFtogUt0IEtQ2GOUNHUcY6CUUh+6AYT4wyx2Kk72 1TZ8fF0YjQjp1pX/rVqp0ZMfLCeGzpVy435wGt2lR6eOgRbbTNBKEnn7fuKNeD/i ee6+CCf/zI7HTlM7Mk39RWocjOQ1l+6GBCRMRAshZaCcVeSJGuKOaQ6d65jXhmqT Ik6jdkBOYBa5xigL7QmRyOGxDCAfkNdjksArKl713lXbAI0gp111Y+IACdRMX0ZA S1mPQPQtcjK6qJ7vYhOr1Z5dDocbeoCPHY6A0Qun+RZ9GWqCdgwrg+RaFW7HgGnU 9dYxdthW/w/X2xhhq4eRqQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0p1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:43 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46JBBN3i021786; Fri, 19 Jul 2024 11:29:42 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevt7pv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H88Ml3lAFtyjdU9Y9q0sUK6tGKORsxKsYXKGnKMlN+vRBrbMTwbtA1MJUyR9DDfHeoHI8xYTY+kdZQ6Siwi30ZYwN437xcWDk5i3F9Gf7zRXjN8dIBHN5wdg3B5dTyCRI7xn4jheHInap0jvIKSfFpZDEyqsZDA6GYaHSh8ZixrHnyq6WGdzSjwpzyAXAmw7lEnUYtxUADOeiloWq+UeA8ulOlQ6GJReoqfiTWMy5SUIZ61R9kM4wu2Sme0QRil0RTcuEDxVhxLpw8yPqp+lE44d0k3KGxXfT2TwcGP6hznHCagGFOmNUWGw3wZ+eytF7/dX+Wqa5aNiElAPE7qQxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w1K0c1FGyPYQq4wQozYLM4RprxF1JA2OGZ2SxUB9SLQ=; b=FxDOqpUfjURGJpWSufG5ErUUKsHMygqU1Lw2Lwm4yPSJ27plZbz+UJUUUN1N4H6blxHjGQUTXsStjVKGbezKvMNPX2A1Kqr95jQeOj1UNXap5CqhfWgej7jkXeqa6WAFv80f7X/RxdmAL2WkOGfDnoUhCoaaP16Jc/PZtTON5dcbc5kNiZguNk3MVjw4uqQnFC+g27x4MQBXV5+PunnxsicWQ5Fx6c4Lb3tqbmLuuYfvt7UsgIoHs+r1yDTUaYmKl7/8JcxR5G1k9EIVAEEvJWYF9gFfOL1ZDCkmh5NuxJFwzXU1flk4MgM8wnbNcG5yW1pRsHdDwhP+xN8kGFVH5Q== 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=w1K0c1FGyPYQq4wQozYLM4RprxF1JA2OGZ2SxUB9SLQ=; b=XB7nesRbzDZRArriMJonuKIXOyBIxkvs1fbufm/FvjB6qVpKT9dutsN4AtqABcQd4iAdUIr2+NWMmaQO0LIDIc6LQmtSot+7qd/My90v8M4QeZGJZ6BVsLKxUajufTiTES5ZpCtAmGkhRVoKzKfvunhhBZoo6jlJJcUFNoXXLys= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:40 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:40 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 02/15] block: Add zone write plugging entry to rqf_name[] Date: Fri, 19 Jul 2024 11:28:59 +0000 Message-Id: <20240719112912.3830443-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR05CA0016.namprd05.prod.outlook.com (2603:10b6:a03:c0::29) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 9361dba6-c3f4-4878-3734-08dca7e6144d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: sQgox/s5CfjmsZMKneFU/4Z4p3RwXTKnYxKr54hm9SsNuEc807vuqF7EtExN07n4PKUn5vV9h2QX4S6NuhuXqy2uDxehxTWK4u9ZeGhY7hZkrFHomtEXQi/UYJC2qf9nIitYDRn0CpjYnBVJHx8nspxIPmzczLvEhy2JDSSLHTp6XN6Z/bh1rpB2QbR3b/xP/1X0h9xvwXMHbrM/dPtrTnlEYe4qCHZcVzPS9lBFp8LrQhLjjr3eFrBRRQl0JGMh8G+2vFEbboIH0n1JvMzWT7FTpkXdM+GARqiBcUfF2smxsNmQsad1T02qjRkij1HueHHlQUDvghGexJ/DVzvc1eGP94f4JxveU4etHExilZ8M9+moaZ6hypq8NEvzJEP1Oz3eOf3yrzzJUiBVw660ulPjBgfqSYz+6qs3oi33r3zNRZMJOPgNrsPWXAhJD3m+8SbScLa68iBKO2m6EzssGNcMRzpllYRv+Gl61sfH+nkEYWfmDXbsr3S4J8D6oybW+ooA7BNsZp07QsbN+nxwkfWM7fXfm6iSv2XLswVFvsVIYIaVgv2sHMKdXHv+Wk71GNo2o3TZHxULOwEwLV3pCIQWvmesUFRTBL82mab8xvNnnFM0a08T0MYt/yhUpSx4LtpyzJU2zxrLPH8nK49c2iJOCrYMj1XznSC8ozEuQAtJ5VdEAT7PwDphZEBy/kSJJ/S4R7Go+rZ0IfIl9rcHvuyf5df86JIYysBQCoche7THd27dF9H3JqoS7U+nSOxZxYYR+pRdh9lA75obNPCqJYX44N7984UhiXDAKTsKU3dJ76fdX82h/AXp/2OByfrkbJZWGddZ18kaFvSwJQmQi6VNNRFEwVVWZ9ibBUhm/yTQCef7jVplGLOTwSc9jLwGvRHagGe3tBF0dVFDmXiDfNTVm3XFpLbBc7MEJwnQ0C7GQpmeTyytgW6xPGE7sqMlrBSp7rCxTr2lduOyPq3AIjEI98R4i83pZwyOTJWAz+yQiazOeUPQPRsmaHIaS3xG9k+hSbANM5rhGb7VzfteYauMbNKMRooPifWnDTE43HTYRwHrHlQ2kL3nkyAt9MEU+CYx5/1/RqlKZgFIotI0QNXXR55Dh+vDlSSqHPZKfs+mMICqyAgKsmKWkES+6Xhqfak2bhs4R2s/AvSxKpybfmjmdvtfVjkF8dqQZ86+1jLjQyDRsJUhA2jYxpd8KO2jzbQKUJyA8RmKEmNQX7QGaW4gdvuAve5GmMCXG0pK/U4d5bWAzOONkzLQr8+HZHoQeercFChANzBA9kcFG6Xs5jMjFI/WPC4WeS/vjJerfJeMIx3ucQc8HGBwFgo7h3ngI4+sJ2mmiRFAOJGVTYTE7Q== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cTS//1pfnCyWjYhNYWGx1E/whUixoBKHleBf9aABFzpIyZUsdQgOBPCoU40ODuYQIgwR+5DWRE+rWCkGGs2LVCGyv1dae6Fn82Ank+Kpz2MMOB0IMx+CL1kl32AuCaCt9GvSqtBvJoufBVDN4gV9vPn2E226djEqX0rF6cNk1P+K/GYMIskYhN0rcUQGrMWaG39cGxmPEhM/nkqxFZVnPeT12J8Wau3JeZCCiLabqqOP5KTGmiX8r6soApk/mZ/2P3BtdI5Eot+f2+yx4dt+BjrdSrZZp+ixTZhY6R9MXrM0pXakvqJtV1I+Izvw0BqoUyh3TGvXKzmdRwvF3lK9kWwY8EARrzPPkbBONEinzy5Et4mGKJiSkn58WZgC3MF4XXc59evATOViPvClxX0NzUNoFa5qC84oPHDGf55zgE19Zln2Kzhep8a/aB7ZIpEj6q9cJiSpz8/il/84J3ccUrS5PCZsYGDrLvI45PSb0FnOynu/kEM4toPJwxZiyJbICIfX3Hzla35F106OHOKNQCYeZQ4ltKlPmQI5onYp4E6b5aNN3LvZDo9C5EsbcbMAmT01mciybuNZDFDW7CAdxOAR6kr+xn/iew4nsAuwnbeRDxpcZ+bcxcsjoqRoCWFI9+i+JigyhF9j5QYHqLg6gHtHh0XoWvDKInapS63I1/J48CZwVfNWbK9LQiI/0EdJukPaQJUTmwiMfr0fhuoad8SiGa2Pk8HzYxIuw8CzVZxpsUfcIavwwD+/IrjaJtkQJtNxaLzWiWi113kiSK6npOdjbMm+TgtUivxGoUj6Iyv/KEeuqxes7fAEfwUBVklrx31/HTwQOhCJb12U0CZZlXOTHJNwPgpN9pxqH8RmpDk3FTXhEi27aoo8K66a7r790P2nnGIPqAh/rW5gT/obdrK465mkalM6Tnyis84zqRqd0J0ZqjfGhfXoGbF7U+lXXagRjctSZ2ly540fOwHPVQqFkMCJSSYSnh/ItIKfs7m+BqB3uiwQseJrbB87C8j8f0caVActYjG/z6YjNIozdj1hyHioxqNmBijFFR5h+ZwAQMy0135dJfmfClKU1hj3Qiytbzjt2YvaFFOWS9s/HeJhF74iauzkrr8/PDTxjpn028NbtXg4TTLuYtStBkRvrOvwusTQEwZuyfw8InQvhhsiFizhqUNsHcjnD2Hy93KuN1O27xo+tIhROoyuTMr0sJxXT2Qyjkcxj7jfijaPyjNv1cLY9U0LqpnajOxBR6xmvAfqASgP0r4AwtdIiFB33kzbWCaDW0UCYI2ZDSg/DkslagLP7HylicpEbH1Ie0kbEubnH2k5Sxjamht/Gg+Cx/RTW1PInbkprw+d/0OdNRjO8WfkdHKXC1VIieVQpAlCl6OQ6sAiKGc5yUTImpCLvx5/i38eMMdvaSijXX+9Djz6fqf+xnhPYYsqOmp0FDqdfD8jk5H50Qj6qGTChNZ4+/CYo5jkRIn/taFz8PPHOm6xycwuSsgzTF+OmNBuAUqDhlK2tHDpAHhUVwItz/XNgku/jUALEuPSlbQlfzUht33SkUqDPlUyQiDraKCUvKshPqybsqDj2vvUcn2F3WK2Uyc+tbjoMweo3bqLeHQLOg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: Sz/qLvsnsXvDTZzKuoKlaZ2THVtFBbg+WTJfyDrL62ExdAXUQvmFwaZ4R5/kmCHYFZXeQIObhVneJ9LV+e4t9crNdt71GVtQspB6ESRgiPFJLxX1J90Y/Puyzqbz88YdZYbz9dYVq0g5AwNm4MU+2L+2tJBnhHoCMP3ESAwBQT9EoQRV8lyTvgP1zM67/aBrA6wBWevzIbeUZyMhp13mqL8msIqCdmbz6UX4dI5nMJtPUfrA2cZz4QC54sTKbpEjRzqRK/iCQMfxJmlS2VvRInRzc4BCqdnt6NH0nnw4bIOeuW9s9co/b3WsX9kmJQh9U9AQcMLLbaT0vwbIUPPJb47jVRpL2jyls43SLLkRDnsZ/syIlsOBAajmXLrGqA3mUdDRVqc7vtjWt+d3EuxR1oG3ep63+bb5WKfG28vSyGcTNsTihU3OJZlEZOSr6pzdqqZC7aWEF0XmDSY2BMD6C2E+IdlSWwahIG91tShBDallGVed0ZI5plE1fXROlpheCXfxm0UweIlKQJcAFZqakSmfAsixLUbSVPnz6qczP3TXhuyUKzxmVbwSOZdfjc7/wzHMNW2On6BZg9H21KS75fHcCvDquXbJfE3s2DZHtOk= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9361dba6-c3f4-4878-3734-08dca7e6144d X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:40.5894 (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: 2omi7lWGE/wXz8/0A88KPQ5q7Aq7NiA1F6Yxzuc2FPdn2WWku1E/NZlng6h7Tk6Si046nJVzSfH3B7dzZVDZnQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-ORIG-GUID: eSVxIQmFDenx7PV0UvehX-drnO93WsWy X-Proofpoint-GUID: eSVxIQmFDenx7PV0UvehX-drnO93WsWy Add missing entry. Reviewed-by: Bart Van Assche 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 786fa4d6e019..49d4f6e0a719 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -248,6 +248,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 Fri Jul 19 11:29:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737218 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 9B578383AC for ; Fri, 19 Jul 2024 11:34:52 +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=1721388894; cv=fail; b=dsY/6BmjbV2veknTCFcUMWlem0i4/WvVQn3A6b9rqjdj1r+Z5dEHFo0/fnXAPTVbKL6oAkIqpU1vY+LdDShT4+B0jD+CH2Y/y3HA0JUUPxSD0A9XaSu/yf5rfDlaZZ5GffOjifPdziqg8PccWBM+/yoJ6wJucdkKE3AAvbW7x50= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388894; c=relaxed/simple; bh=MlAImvu4sKhaC/PxB8eFQ+q6w9vnPA2fVpNkxcdAKb0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=jFq9U3Ww11SJlBck2NhOcY592IZDrQFdEQSmqzLQFc5IuvCxm9mGslKo5pUSsJvopVmXQ8RXVKwaKkBiQUNIq/JUzJEV8IuRljZQKuxqatWBk26YvN99XQRnttOEQjQeXAc5SjhnIWlCHYsovkZ+d7qmimmg46PVJeBt1o1CXv4= 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=lo472M1X; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=o1brX3jj; 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="lo472M1X"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="o1brX3jj" 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 46JBC8YC007723; Fri, 19 Jul 2024 11:34:46 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=6VYa1FDYaORkSmGxxEAMWmGDdF+89LemoQRC2Bs6pX4=; b= lo472M1XzZQxKLQrbjY/7f18Q+quobLuWpYHHp2I1H43nehAfK3G6VO8l1F6stPf nRmiVNhYIJLpXqkDZnyeYpHv7QuJCbc1DBIz2QTJEEoWdrjKWjoMapNdCp0TadPu 3VAy2asxsYc+sJU5av1HavCA/75En5O61OHlrzOD4rhc2pajhFF4jrbs0migJeC4 8h7aA6LOvyI1Ec7MKMP6SBcb8C9NKL5O78CkffCHPrLNLcuqWEltNFYxGoe/8yq+ 9ruRh/gxVGXGBJfuBd/PShgFCqzBcHacglkAj0ueIj+MT55P9DXj3K8nTU789rEt i54xUsqEJhhDrnfQkEa9Bg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq2h0150-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:34:46 +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 46JB3bn7006724; Fri, 19 Jul 2024 11:29:45 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf14cf2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GRKHt0dDik79zisZ0icwf3WXJRAkX3l31EjjQCIqKRqCbv+FsFSttQAx95vJzTFR65RoB7cA9MmpbNvTUEpZJOQ0gOztBtztX4kQEah/aNMWfHt9BMWdNFliZgXtDHO8k98x9YhRO0dtQHDnEktRjoHVybgHbiOq2QpnLhkcjcfuVYaK+Q62SV6wF0/Bvd8oTkO8sQYA02P4qauNcBMOGK2wwcSo7RkGD52C7Fru6EGzoTYbbW8XpcpHVgagP8BfrHsmapa4XYz0oyjyb+gZfi5Q1ObssBQ7L8KYGAnkOiG4jE96d69btVdKnr/0YKpYm3v20FH+pBkNC+we4uXhpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6VYa1FDYaORkSmGxxEAMWmGDdF+89LemoQRC2Bs6pX4=; b=nsDVnO9ft8hKqoTw9Axi6dhxQ2pxQ06towGtFErEMlY4aCr0lLnf4PCdPORd05p2DNvGm7b6S9mq6Z6Qtv31cnQJZnGFUWqgwtZnH8ATESVcKdF5IcjvCjcVwx0mVzREJJHRwyQOD7gz6ZUhUwbDPbeQ9LkziFeK8KB0NLWvuwgO6k+RugLzge9/4uNQ2wHXyJaEzG20hoKPYdqjIwIWWz1vpsptwwwqJeSES6ZbmUmYNgKgV/Yw67Xtrc/oIP+XGDER+E+K6Y2gjr6gpKYVmlGZwl0DyrzhZG7CQJoXhvauLXP+gDJAORmOEyNrC7rgBEasd6zwKCFbUALvt+Nt+w== 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=6VYa1FDYaORkSmGxxEAMWmGDdF+89LemoQRC2Bs6pX4=; b=o1brX3jjzHRCdpEggUJU4eS/eSdkamQhiLLSqKV5KcWfRJr85R+QX5aSj96BeMyQIxybekKYQNGPGODOlpzPTGe3169vC4w0PtcZJrc0XTrImDSWNZeGbLQ/bE2IAoZgtZZPTzFJZRdqditdlpSmW+UoX3mjezsDfWDcNmUW23I= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:43 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:43 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 03/15] block: Add missing entry to hctx_flag_name[] Date: Fri, 19 Jul 2024 11:29:00 +0000 Message-Id: <20240719112912.3830443-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR13CA0049.namprd13.prod.outlook.com (2603:10b6:a03:2c2::24) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 64412017-eb19-433c-b8c8-08dca7e615be X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: Zo6S6HS7DgwY4ezXZF/9WYh5XpLH/+u6Ceisl40wEhar48Z6GNuHEYi3faDUibe3AuRJVz6lfVz2a0DY1POa4JZ1vi+ePfOr+5g2WIZpGsi4BQeviQnLIbJdwC4LpD2MTQ1/5FFKit++KSgUNoG7roDl8QxQH2VtBg0yFgxDYaS9ToPeokw4lkJMpvYADvoV+x5f97gE8EqMLCzxm1H3dMltwMWNQWwrkXFuzq65IpJI77A41Bf9++ebfVLANjANTJwutK3uZ6x9oTIfoEJ+A+v7hCu8BVzeZaO8UXFSjzXdKQQXepinzmiwNxXv4J7SrPwYybRpEDitbWMVgb8PyJ14RqYr0ghjXozYVN23MSPp/mHyy7Gtu1cp+ETnIgadCo5oR2NVVy7HkXT675hhlMzMuTH8Y3z4RjSKpdUkwa5M4ckrbUOrLy8zo6bYiGhHJ8oFRARMZvYs5nJevA0za05U0RK60J7vHsUj7qZaFUgwgGnPFwPoGQ8ACNHJflC84JsaXB8nc9Gz63eYCGMv54yQ93XWP5fSeVDx5BqcJt1GavcBZR5b5scuU1gtnnW3irC7ABR5usSGZmqX+rd2kdcMSWXkWmss1Wb8YkSCGLols3rN88W7MoMkiOlg7oq5UixOJsoZ3l5z+t2fhqVeLcoG+dZwbxoiP+vjiU3lWnmA3/YHMKmc6YtO8n/iDaB+iCGp3Mmo+l5yX6ha0YepnjP1qNl8uSqCJtlhx1BwYQnUsdHzhdISjdz12eRp5NenRwvYawizD61ZqK3qPnPs4FGjveEta1MiqnPWZOqA/XsOuTFNFO6sN2DBVWpPu5uQ29AmBBMBn7y4aWq3VbRL8wLwybcKu1zqH4hUKNiwOW0onYb4ARdCKr/ec1SqXtNuW9wMf/DgCWAuGVvQ+/nTpOlBMer4YELcM2t543J2rkX18VG3r/fhbmEzhAuOHAG2N+Wt1uQ5j0E7ybZ7IkzTAn26gwReJLZvi1OMnvzymBm888PLX5UphNQVkLmLscaZ4voKgVDDhiyzxWmXv3zkiErocxTme1nj0+o7ziwfkjFGBpO8+C93DcyUaWjwDNGINj2/vTSCm+jyOnGCuVfKb4Jv5xPmqrsaZwWkPM2wA2XrWOLpdyGHa5GAEqVDMr9+Glr+ty6Fw5GSk5WKvj31iuWxNt6U8/gTf+HzE0ds0awQWggFVZ3Ddf29e4Ax/FP3oLOf0T7hveqOQI05kvHz86gOiofedqox2b8PObRYk7Nynvhtm2QxzOX9HIKiHhWH/YXfT0VDyP8y3dgYCc4F6HZkSXOi7PEvlrgADeM9g1de+MlljbsSkboMebm5oRk/kWo6teUImpIJcvOsfBGXZQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vEWjpK8yXiWZVqB9qtEwxhkBEYiLNyNXnNTtSMzhJyESgbXw4PATIL+cPmt64lZpU6T/N8DZDsR7wY0ZNxD7t1nR3Ipg2pXevDHzoTkZgi6QPxvfSEe7Oa9Mqf6K3kejq47PHXzH5FFSLUZUikJfeO0zeTLRV1TNOZMD8CzF2RxJwPvg26Z+2iqjCxYxkWY0ujqyDRON5E7zhnciOriDg58pgr+g1HVTTZ9zTgxDKdGVy4GYFpTKhVDlWeTqSX6AKDV9CwJ8usIDzQu7939jRX+olD1cc3g+UsbUoXAX3MoFjToVppt1lW9gSZXhppwXd1A7Frcwj50q9eQf4/rJamCHaW1F5blb7N2w/5xnNLQOv1yaSLScAhmuvy+tcMKKs6/9YO+KKeqb3lcBJ3sdC0uN0/iVEu86d8WAzSfn0db8IcxtrbowhoXPt4ClT+mwTIUSJFEDfTPOy4ex15kkRGBqlEYpUyrDeX3UVix4CQTs9IqIkqGDy5i/kiydRtrc14HxipEJFXYTy35eyHMdr1kWPPIdz+xr2w70eG+oXo7lYNrBP0rmc/n2b9TEVHWPln7scjZ/Muqy1+9rZpUiDAu3nTuZPN8mqHIXbgOibY0UqbA8LQkX+MRoB5zZ6lQ/GApAbUXrDulTvir/mfU7TXqYblaLPD6h+egBtLHW1R4YvUliTIp4JtTX7EC8ducYOhdxgi9Oa3a1lf5O65ZJIHs7sTcoUyhBTYZoaYPSUZBXBIobhZnB8cGOtZUto5rAQeYns3VN2sad4f3k9IRzGmvvCWhsb4wfDMOuHpCXbfjD4cBe3NZ/B6IVjFaLuudPozDKQ7X7vx0T1kZZP7C0R5R6tefp6L60GYlN252j60E+uT1wv+KGeqwYPHDZLCtFYOYFYJZiQkFygdCz/TNJK+bj6lC7sWoCs08rV5llhDx97vTHYakGDig3bgXegpEeyxmsIxVvApaCO9dp7f+q/HpcqXolnALyOPNSX80OKQxTtWReb2InoFWDcT0kBhMh/vZUAq7Ilv9w7FBsgMXoMF05lF8XqRlPBF4LZxKBYAKDO9L/+Ru5NgLgxpFsQRdgdfl99/mMdXJHqkzjUzWi8Hw5/ZCl/a7Eg3SvBoYLcfxj25lDMgdexh5XZWd5RNp4lC33mJs+y+rtZfac+uhZzl26WGOE+B6/rImo9SRed51fpShRCCNtKGwoenmobybveMg8/RmK8ZnUJGPEDO0wPNXk4N56CaTYFOzlTYFfVVyP6nKQ9bsnc4A5hs35IQNIX2jXWKaJmodalUFzh0iWbeRvgTf6r7rWmMbEst4YQqx0tN9LHcTj9yjfM/CUCKu1ySISfDKYcciaWM6+dBXlwTmwMsaSpzandQ1zH3dlLfmSqOPT+sFUrotEYuktXuHbdKURCW9+veIfVnBJxCNykH6cuzMSfMBEVMruvRTHWoOK9HT75aZEte4k5d4iyBCgCnUTY2kl45ADwf+32pn/fMWJhIIIPl8/GWR95FqTwwvMuqfihhreJM7iCDu2AiEoDqOtwbSo6/tt9uktkkQ+Ni8NTnP1OZeULEayfdXmQ97jVihCg67oAAA//RdXkSVd9ccg2x4Bw4gWEJOMMqZD1g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: xFFI8pxdEvvuui8w1uKiHxocVL8sG37/rr10tbamrNngIy7BaveUVPWABc1bnum+xNRgMDPlVMPp0yAnHM9Y3fIK2bDJApH5QzSHuo6dSkCrSzn5MGJbg15g74rlmxBNupZ1pSpx/VhjjabGhRSTF1J/ts9iPQif70y2WcjWtaK9cBmLk549fTy3SVENppIBjrBnMZhXDZh6p9P17BYJy39+OcXGXi9m5iQrY+j0om4Q4Zidv+kCyczzi+9ObaELAFYNbLz1u/7i/AJYill8CeUjlcXi7lSXzzmTuC2Sru56IKSOV3ZFFR67nisR3dC/NwRc1WkKykZI0YWXhllfUJSFIGuIDbqpO2xMmeR2mZ5uPiwcwdMGdguPrKUDcpwzNQKt/LYiiU4dLwF7KvzYLDCzck0SGRd193D/ERZ9I3xHVPK3IsFG5orUKH9gX6NW3RmC0mOdnRZGFKwNT8d3dI7+WUwnTuBRwhP1I+2xsFN+CSHjYjDYtDv0HJiRzPYHHk6rJH2sPiSW2ulOJMRHF/l+Nl76JTk3IFzW3/ttEtrPIwRegrN+TerO5LIlM3v+x4bzwrXp7yKm350GaWeyI+NgO8+KfBw4oHUUazuBeMs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64412017-eb19-433c-b8c8-08dca7e615be X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:43.0255 (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: YYkmo/AUhsSLFPd6ilq95oXufzu++gAZkTfzxzRsu7BRUBAoCIL2nZ8qdJbCwEMfuD5XsUyuZWmoHFHFMMXQWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: 4kXtdU3ZCB4bu4vhpkXv-15a_CmbdS6A X-Proofpoint-ORIG-GUID: 4kXtdU3ZCB4bu4vhpkXv-15a_CmbdS6A Add missing entry for NO_SCHED_BY_DEFAULT and reorder to match the enum. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 49d4f6e0a719..5f53796bd6e2 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -181,10 +181,11 @@ static const char *const alloc_policy_name[] = { static const char *const hctx_flag_name[] = { HCTX_FLAG_NAME(SHOULD_MERGE), HCTX_FLAG_NAME(TAG_QUEUE_SHARED), - HCTX_FLAG_NAME(BLOCKING), - HCTX_FLAG_NAME(NO_SCHED), HCTX_FLAG_NAME(STACKING), HCTX_FLAG_NAME(TAG_HCTX_SHARED), + HCTX_FLAG_NAME(BLOCKING), + HCTX_FLAG_NAME(NO_SCHED), + HCTX_FLAG_NAME(NO_SCHED_BY_DEFAULT), }; #undef HCTX_FLAG_NAME From patchwork Fri Jul 19 11:29:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737212 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 3704585931 for ; Fri, 19 Jul 2024 11:30:07 +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=1721388609; cv=fail; b=PKw2ekTR0hWyk/Oq6RPX8SQLn8eV2rTWK2eMpEp73gd12Wq8/aTPIzsPgjK/msE1V+WTuz16/EJXcZBul15d1LJSXNVY0uoINziKExd9dflV3zcI94C8He403Gl8qvKGU/5NT6gNCPKsfNssJGabOttfDeEkZ7xHSw9Ojdu0p9E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388609; c=relaxed/simple; bh=dxLj6xbFfIPMuv787U+48GlMhoG8Gd9LMp8smC35mAU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=i+iZ+xBmLGF+7OuOn3UgTe6tWFOJ/r91dv45wf9s4xlHF8R0voi3i22iQ+qyc2tTImiciyrwozmJMil4F60veR335K3EIUatdaHLJYFwQqJ3S+YFYkq/9cPLCA4lY6GvOIw70vzdxcpXAtUhrn5c+XD9/TjeMZR6lf9xEzI/ZLI= 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=NZylmhgr; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=DBsOUv5S; 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="NZylmhgr"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="DBsOUv5S" 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 46JBCIoR007772; Fri, 19 Jul 2024 11:29: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=lUwRWyOOeew8bw5GshXhSjH+KmjZF6vin+uSEpzyBMI=; b= NZylmhgrqfqmQmeqN1nOdF7Rhs8fd3RpWcFhyarEeesaAaP3opuMohMBb98vqklB CXTpqavFZYS7j7GWMdzIxPYU0GgQn0X3F6WoviNJzXrPwhtCOI9hv32nQsaDCcMq Po0nD4Vol2dztEUAjWy/5M2aR6rbyHDYDDPO2FN2aoHTJwAkfhIE7Qebteba0kdj GMTY2ySsTUIcO+/iYPMRPX3a7eqLiPNvjfM6aFboGhluXW6vp8IBjHYaxMTVi4Vu R4NprW+qRdOikOiFZjga9K9FuQqxHnnJU3mmy9QSa0UPBC0s7ob3WNogrt2f/fuI dpybz7XI5lZwLZ2SFjBPFg== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq2h00un-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29: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 46JBAtcm003757; Fri, 19 Jul 2024 11:29:47 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf1mjte-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JBVhKBnIiOHjrNhAa+m8A5/q8ugwiBhqkgJvaMtV0DQQcqhEwzcj2mbfz5iv/fcwnQqqBCukppm/8aAJKt8LHPhMETn8colH2Sq02Us8sdAq6ZIZsfG33Wa+L5y3o8kd2NUqprMe7XbCBhUEFtaTq15cHA1h+Wr8S5To1T0HIRyZpvY91sC1yG3PscScRA9FCArJXT96lR5aA+cW5ycOzuEWfTmj5SWn85hRfaE9G0/ApMitRkb5mC/onPPbedTl68VQM6XtL/GfFymSyQtehUXu1Nx82Skqx6S5IYI5BRgJ1segABgitr0A0r5Oz08XkkmB+envK9uyTJ4srubeZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=lUwRWyOOeew8bw5GshXhSjH+KmjZF6vin+uSEpzyBMI=; b=hkhSwtfesbnQfo7ImVXIPiPTo6FXSOgWUI/yYrO1eEx4E4ojJQYGtuxeIiFdlk95tTf98ZqU1au1Hbnc5kNgYhDjAHy1NjDSKhWwp+g7Z0FOqqE5oa1/d2o+qcj8oswpupWTA0udymg2cagcwdBvw5I76qdIzLeV+BB9aVhng9u9/PVj1TBoqnASssg9QKXTg8BRTAd/S58AkM9Jo9fIwGjtfYkn/UyprTiU0bFgwFUN55XIfuKzY9LNJbLUnRVi2Vi2Voi4bAiNUxQlOSQe8FuTYru712R33tfy64xg17hbbUI5MworEvI4u2Jp8bI37YscUDaVdtGQoCdmB2tGrg== 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=lUwRWyOOeew8bw5GshXhSjH+KmjZF6vin+uSEpzyBMI=; b=DBsOUv5ShwbT00vO++9OFF/gKp02f/jfGl11TLqFYZJ7makvPIWW/u92EkCIctOo78hH84+swNK4X4RSYBBxfrgMF/NiHp2IEUEYw3OxzAvVHxbON4bMUfYzxACJh4msEVdDHbsMWKc/DD8bllVFpcyYog+NUz0nAZkodIY+iN0= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:45 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:45 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, Chaitanya Kulkarni , Johannes Thumshirn , John Garry Subject: [PATCH v3 04/15] block: remove QUEUE_FLAG_STOPPED Date: Fri, 19 Jul 2024 11:29:01 +0000 Message-Id: <20240719112912.3830443-5-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BY3PR03CA0002.namprd03.prod.outlook.com (2603:10b6:a03:39a::7) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: def9c614-3c0c-47c2-c2ee-08dca7e61711 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: mxAa9WpQsLI9qBg1H4484FUrKiVUsHV758Hc2i5TPVfuYqHd5AVKFYm2OadETMAYgwnZTD7X/oFBpsee2/UafZtYB+msuY8WyVQHdBl+fJSV3u/aPTMadeHK9g9+lUy1Dl0DZuDTZ8sWDbKXHsiXJ6Mmm1Fjevs6c8YeUwpEL5eRSlgIC5wU3jlmWC+i35ODuR4CBrm65bH4U0uFx5BM8dG+LW9vyKOp4s/6RNyj9eyhHsjsgsmfBDe51+AMGfHlVoc2ALGXHp8Qg/9DXwEDc5iijo7PyGfu7hGrI6ZtAoR8610y6lSUfqs1Bvw5yyPXrZmEhhifDlvscCzmcr34SPisWWX2qBnJRzGIbdm5PGNX+OL/FEgmCOwSwgUSHfwgDBl+ueAmXVCk6XN5PZP6zJtYQV9cWRSzk08+cwPRPCkJSYRn+VLjvoJHdbA2wLKjLg4IPKoWcUj4kQXsw2o0f8MmhPMuHg3PtVeokqxogAd0iU71dqjvDv9Fa2lrLlphJWzSPLvk1k4Trturv7bazqhDNvfpdTNM8pyYpy77h1VMfHlGe9DW5V6RmiOXea/n1bi92okBE2i5d65CmlbYT/NeW7oGdaIniNZmZ8kAEsqcjEjuf9oFUOs4si35IiRlG+99i/KTqa9nogT7u97bzhN6eKSU/IJn5WtFkME2WnxYHzuOY+V4xVRgquXx1byL6dz/9ioWagmQyb7F8dAYeo1bQyBXM6UCVGnpT4JgbKxsFq7g3UWU0ePe93KAxyR4WzxkwZYowCyhjgTmD/rECb6zM8r2AjHCuFuNv4Bl9mG+hKzaBx8pXjvsxRwmVn10MTGqSDQ64+vyGowS3dTXgtjxSRWXAbZ0XYtZnTPuU6tKhoPnPraDmUAJG2R4qPzQfw4Ll2zkcBfI9EdOmynjr0ZsSGi6PtZRw2k839GVowfqzqvjiq2eOqai9kxmg4O+P5eXL6AWTQsfQ56hdKmgEoGsV8acDYhBWyzIrh5fLts5SkypcmYc5qdZ0ZSy9iAxHpV8M3/wxD+VziXmayaEt2eNvzGPmsQHoTaHaNyJOkLxaQd4AcC1cludeKDaNA9FEn1Xaw8XWDgWWHllS/Ouj+l4R2nVjmA9duvT4GDV02UJROrCh6KV4ZO69UwTgK1bS69I9h0ovRsnfjDgj2iOeaOx+++Rcc3MFh13+7Tr4Onp1xHFY5tHDm7puAFetJjxbdH1o0eJDmN6s6mcF2KtHo5gVNhGRuPNh26Wy9ryPwyokFF8od2a4l4cq0u/tx2Ux+bLTDEtb0h89uctO4/2r/KitgEguW/BmAMY4OzeGTjnrCiB4N/7pGWIFtgzexHCEWXvaLiJ2Ph8qpsGGV4sbw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: g3Y9hDflsqNCTzvk3t8VqvikMEH8zNDhw2DxLD04BSgIpIj5rNs7B6FS2XMU1PIIyAH1nWAfrbbWG+B1N7vPEahe8+t8Es0udomLhXJffwPgKBZESFmAVJtyFsiA/cfNyoiE0/2Cr3AfTk/dPoATU+j/gEe+wP7OMKs3bTWhTkScMGiBZetlnGPHFAhd0nTL+vjlf6v7SQE7vcGcmjjNk9udrvAQYG2hPHxXliz+YtNU7kzjCR5eYcglzRkFNw5RHrSxu0G2yNNXJ+aNtfav3Svf9o340PCN4ApszAmUaPS5qc5a7vpk8i2hmYlfZawBtQ++Erzk9IhZmwYyf5na2q6Vlw7bt7g5q0LKR1ZJa5HYg9g9ymV9rHKzQMv6JM+8fRpSU4nNh3qyzT0PMdYSpZMll+H5yspCz6Jm8/NKvWO+B4Y26QNBMvJQXXqabjiFDtJpCKFv7t/jXRhgc9Vtt8Nu1zJm13MecJdvZShbl1YMbR/NJ+DnOdlc0ggUF9GIdaA8ZqQK//TN0M1qGkdH2hJa+uahEhSJ6tL/cGaYOiGLkMu/4MKz/iC/Y1IV9McEE3cEcoI46L8R6+g0e2nF4KcRJEDKbFZcmiN4hneY7aTBOQOTxkkbW8Ef6Z1EdDA+NF306/anvLJwjTL+vV/FDI1WZ9aN8pCTcLuTcbyTqgM6dTozkqhPweYTuAy1B0jUrAzrAdQyfhfAqvSSADy2PyBZJmHT9qtfQn8qBle1mt0eh0uCAwvwG0V6FAsrGt2JoDNypa1QDvGO+OE12fu/ZpS3eSlBbO2gaCcbInVXD/ks3KYZ02R6lS1rb2ODvau9IZXI+VntZvDkLRoa3bb94+aF1oTNwSrNeGzSkf8R70EOO+XNqJnY2trBajWrheA7f9YXy1xgmHL/UtflUuy0iWXbCBuUStOlx7X9GRvPHMBZPkh3Qju7dk8sBxrftj05kzZS/7Qr3F0DR+TcHwMPGiEWK211+qKedkp787fqhiOgmmNLtW4lax9nLtPt17g8wPj5nEjzOGAkWSvJlLn6sVfD7snheIOuZw+7L3jRM+LQS7vto2ti2zyj3iT5DBMENYckHDLH/KIkC2ZOj2KcXVIFKAVY4J2BlLnckG6vypUzBTLNuDYWZXGqIJ8xl76SQMBg5Ju6oDGHUWuakZXYMh6R1L4CPmXzkyRA2sS+xuaGVTlHJA80LzB7qfsorMybw36QyBaFmg09zoGnNxcf0sBJqldfsG94nnsRvHM7QYAeUGwvBDQEEgoary4D2XrltqlJKy2Bcyeeb/R6rfET6QLFYoF3/Hjs17dFnHbxaExDk9XvLvoAhROWksT9dnt3lGebfiDy7/lG/3nxtdKHu++IOmdrNdTrnIF9QzTyspH2c1PDkJ8evjXwUfMxlQb4YAvJs5mHy1P8hnCdxjTig7mIlpCOluOIVLZlnWlNvioXBce2MnSN53/BwXZtF1d9dkIQL/nmOQJuyjuVsVUjIaVhkwSV/fL/n1H9qpRN4baS7Y8FUuE7t27FrAs7t2z8WkkPPoh1HIGrmU537J0wIJlCutY1RgxjEEFFqkYFZpslxqywChFsZov6N9GnaIkSJzuOiPuIVYpnBLKd8WYvgQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: dfmJDSXVgXg/6xTNIon2yBZx4FvLzhVDBgFjuVlM2imIu89gmzcdi86YPTWE1cFU9UxeZBTYJyDjh3HdhXpQ42l7Sq5Vtt5/+JM/2cFebIaJqP1JMv7d50pSstdQWRTwT2wkjde4UbDRF48AN1PETxzgswVSi79QpZDw1vn74p2Ul73wN1EdCsa24houQs3sa1r1Hr+OTLHY6kM/CW7y0Ksh7bFVpe7v7uT8brg/Meab7Z/QFwuPL1gEadsbY3pyxATAIfM+OhYYcoC+REfmDsvissz6HnBBA1newk4g/ipQGhJk1OLVfwTMobUgSmz9r9PX/rGwaGgERsRsnfo1hYnXa55MedDPOhjfSMIFnB/Cc/I+ecEaVx+JwUFRDq+v+Ww8h4DuCsJlqhe8s3yv8nJoAvdV4BAQH+fgBuhg0Nfyj3Qts/Q9BD1cIstoV/q0jrUbN/nVMUMEZR4eaZsZhQ3U3lWiMRIjDi4+8Jloh0/5iHtYqSaKpbtv5L3BefNOTczeF+JyDapUGZBOOfw11xbSzKP9j/DlfLcswCVrTFuLhtk75+lyi6plC6zjP4B0mhb41kpXCsBs0H6NhajX7RiYOikZZ0XZyliduvBLPWI= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: def9c614-3c0c-47c2-c2ee-08dca7e61711 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:45.2718 (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: 4iEvnouZM/cYYhTTXbH5H9CCWdxEvY4A+ntM0CUR2mnGPkP7UsqCE0nrJqNMTv9KFV6XaP4T4l+nvkEs04EGFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: 8ZLa8Hq61BPjffqM9U_Aq3WlnA389Ftf X-Proofpoint-ORIG-GUID: 8ZLa8Hq61BPjffqM9U_Aq3WlnA389Ftf 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 5f53796bd6e2..866e8c6bebd0 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 Fri Jul 19 11:29:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737209 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 798D41E502 for ; Fri, 19 Jul 2024 11:29:57 +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=1721388599; cv=fail; b=ggHt84HB5u+Z1wwh5PaQ5827GyPVJu4gq8PVc2yCoLSAcYl5OYS/XIB5C53N6FuSyFDAjI0B9RxYWmaYMVo6ATxsKOIwO9HEjljHwKnoMU6wBC1f9txjxdEf8hGsLNNxC5FMqv+ZsOcr0kU64hPttyNhcgHf56UlWBBd8/RdZ1E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388599; c=relaxed/simple; bh=WmsA/DGvnnISX7r8xJcZQKd4LN53JSRVzVTPN5+Mx+E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=VNratBA+HiVkaL7PCeqwEeFdDE0xrS01K4tqwDC7RCTFS367cASMeFiWaPi2jBonBMR0irwncYN+iJiqhgv4uwpZkGj3wad1mROgOy+q7dZC9UfT2YzevVylbSpRdEUTZOIKYN94Pu0vfj/r++8+XITaZQhi2laApm+kg7lHgiI= 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=mTmPHZUJ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=WEQ6asNg; 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="mTmPHZUJ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="WEQ6asNg" 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 46JBK6Fg011788; Fri, 19 Jul 2024 11:29: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=aym74ubHp5pCJ5v0xlTqN38JVFm1jlE/lLcycpDpLxY=; b= mTmPHZUJbFaKdyuD/MrFsWF5VbknDSwZ/edLbVFp4wAaGFBcwHTmluYC729HO4qD ZgnFebkz+rOVvp+FGvS+0XRi8AAUXpebBz/X/EH6o0mbpAsZL8tEyts+yvnFHhd7 kXa+NO2qrZPXSo5lXPf8mNPCYJMTPL4x7Ts92nnlcOf4X9CmH8HMqSJGvOUWQ8JW /h5X/ZGTxWG0hhg3zSnKJZQxW94Pta/c7prx2YysjQDGGVTUDaeOc2r+0vP07cET zahm+d3fye3acKnMBGoX90I6HqIXcrYysVu5qLjEWZ+9Cbi2nrdjHbw5oZEcwhmE qOxEhU9D5ul0WBzXxmcn1A== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0pq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:50 +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 46J9Z6EI039675; Fri, 19 Jul 2024 11:29:49 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexj2hd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:49 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jxfJY35uQdiNstOPL7epdg3OFvfNrDPSDG9ZxLmuxDrzpZnpYOAiWSzR5blF8/djwfVWnYF4/XchQBl37zttBgLQcAwwqh0CTJdMj4j0PRiuB9paYlP618lnrCCOi7zfAFqboHp0bsgN75g824I/9m/fa/ra2BJr0UQocVsI/km2aQNtJQ5R9HRpQBhIe7fmzeUGTARjBuUmuCW59uiIzhGa+n2xPZXhJrmMBVBlevRS2QLjI51enrwKfMF8WNDaIQLFB332LjWggjzD14jjVqDO2AvVk3lKvoCJC4TgJ2JQ7+H73yFrDOlzJjwmHHhRg7f0Cw3jPhknlxwqhjNmTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=aym74ubHp5pCJ5v0xlTqN38JVFm1jlE/lLcycpDpLxY=; b=n2dVqytsTRVeD+syPTgQsGBK3+QPu5zL8jDNf95Hh016RkOqoYCS2CcNKWUhgdnPpwDMxReQSiluMq4zJlHm8WruwaUjcYH5Rrtu3YrfkhtI7tgPbqyZDvtcexpAcyRcQemgoFHYjp6WZMISiMvrLG5ja5Pi6jOiLmrONJhsBt3TYWiSc9/EI/UNcmc6gkkhN3ig9MPigOplk+QpZ6aY5XxDLQg4iC8/eiz01ZEodHeMLZHWIcqjDz2yVJivu307wxyYVgZBPgnCTouiQU0aaJMdUEUIyRe07TeDtxUL7Elljd08UTgQi8Zp5VNG2D1s0UufacrJr3EWSHXlHVnZCg== 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=aym74ubHp5pCJ5v0xlTqN38JVFm1jlE/lLcycpDpLxY=; b=WEQ6asNg/AfSGm40wGP1hPzLEI4bLz22wLpBNYQYKUzK+xG4qZo2jE7k8lJJ9PA2SJG53wufndQLFv1LS4fAQtkI4Iz4bV9mnz+6Sv6VOknFy0UMKlF+zvmV+V9ELGZyTNyLSdI1jpZbLK3pwp71Yt/N+1tni/DgjKXsdu/3y98= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:48 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:48 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 05/15] block: Relocate BLK_MQ_CPU_WORK_BATCH Date: Fri, 19 Jul 2024 11:29:02 +0000 Message-Id: <20240719112912.3830443-6-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR04CA0006.namprd04.prod.outlook.com (2603:10b6:a03:40::19) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 5aa2742c-5bbb-4703-8011-08dca7e618af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: LZoULgRopUyk4311WoqDbgePW7NprM101ftH8a196CeyoFs792alHySiRsBIduJZWSYRWk+4+uB2e6X1nReNF1sbIWWHXUND9KpdY10/QsTKa7HTJNL9EijPU/0cvxvBreqi4HyPBNVgbtajMhNVRelpUbUtlg/8hTWWVLwzTbBY3GehX8VeF0MxsqFbgdRcQoNCUnswYNuG58/Rms/LLPELLlFJw5OUDHJ8F8ZPnx2yQQSHfsBLP5RYFWS+j/QOSqTY0sFB7K3CT1Ox+MoT7uHtd+3O089DyvFUaKMrqOejpQyEa8RXui1ZhBgIuv1ejH5Ap7z97jM4M/SQ3y7WCFBywXYw6P2dOqM9qvxK7B0/k4RmLoForT43vL5LeLMIlJwJcJAg3Bx2j03min6kYrexADWIWbuwJzfkyUHsEf3QYUBj+hyfqrERpYvWGFU8beLImdymBVSCp5GiLL43VD+egdn1tAY+Lecf4v7x4qdxUk6f2Ptr8nENdh4dbayF4wp34+7tT3exwIk0PysuabJYBiuHLEExEQOsRguYheLtNAXxUP6Ltd6UalSETqW8MDoeYIWuFEDAhm8TuhJshEExxApdPg7ulbtbTNSqGfj5egAc5ziehYZPYEq48GDUS2C5ZGh2eNYuAxxZ5F0U1mjLoIymEGZUyB2nn2FJ2EYa8AFHnVtQEhF5ys4ZybY9mfO6dU+b7EYhMs3AS8HvkSGETLYZlqECGbbb6/lmke4OKm9qMqUOghzMjZxSwA+rNN2Dj8CEnXk/nzzyt5p8N2NlGWtGpbQCnCA+0QesT3YoRLqG/dd6x8T+Kit7PAMksu46StRf2EE/naDbxPEqEWAwl2l1XF+mYHXarCYYG704Kw7KduKCQViEqYkGK6+23UV35KFC6+Ua6YMSnkm0RiN1AljMpLhFghqHJoPtFNJ0y+nsYgpccsmQJWWCIqQURAWUtwxnY9nKbY+YgCPAIGdOi1+iDykqPLcxyFFJTmHjzghvsUVjKc3ZswW2kPzVkhwqEscUAq18nYwPtDokaOFdkSm2+iNfisbntdmRLL4xuG6RrBuW7L2nLUEcK9xREgmetm9AqitsrRUuEGmEnh0HtBbat4n57WQ6JshsDKlKVv1k2eP7CaUUeRZj3vhEheIXK6ome1KBOOPRKeeIN3zTBvSx+qgYhl61Phb/dbns9j4GzQGsggMKmmAhrTOCHFNkn7e7aEJmqEIcyChyKGOivm6vQU9YAKZYGHAuLNtAghAIIzibPAMh67S8xpP95o7XU171N2sAPHRamUS3ZhyEmYq2gfOHH/4ItTn66m/G4ycOvs1OSuCPrwsXLs79DXg9jX7a6uVpr1zsNzFdIw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZNr3adZ5JaV97uoY1QWIOj+M5rfC/QdmsIzG1F/jJXm9Nl90B4GLBCQLazBricXm5Qidl5/g8E9qt/5iMMTnpEmKE7f7sXAsZZZVkN0QqcyIg9aa+SvHc9F3XbWL3LSwTB7N46FCZ5ISUAhcEEzWMp0ZsIZDE9Tip8fqeqgYQ9ZlCPtPpNlGG4zBloRVD5TE0ofx9WOyXQIbM0wK6ooOtsbmaXM31Gb9XNXacavcALD6Rg7Dxkjwil8NXUocLgF8y7eVrFpC7QZOnib4QzSUBWW9TZpvHjaXMZlRrl8X9pInXlv6zxSyHEhmyy1z+iPD4ULbKk1Yp40ssZHE0+1dfGRqPpsdMp7K3F0yS95iE4Is2wqTn7ZANZ4TjifzKI1Dx72iue2gccGS+Y3gG11o+dFa5kdwNA+Sd32fMV0iPLV095hjWzbH2Ui9+CUXGEr8qK8sQF3/Qt/b5T6v0eZarWSYsTYp0qz8uj7kJrRcGQqABk02DwFU1dD9m+k4M3HdVR7mVvJD0WQCzUgRvuaEcngomDBEC51LcIqQ0plHwiUHYf7x19AwfTUu2qGMIQE2vspCHm4IhUnz4keHn5HUJITvdN0dVUfPK6yCUc96PItp9PtwTU/PlWgeJTO51MDsOv+kdP5cm4zYPVkd5sQulDzvX4GWP+1xfMzL/rHiMQwtVJzpnbMBcsiw7AyJxzBrVr4j4TxTMgCCbuUn4J6rEFmTjm5Azk3Az2/PRBFzMo0xIDOT8OmyQ3LvFvVMzQNMGmOkOqjkaBuGtssJkyJUMvxndx/Jgya+s7xsfpNPn7e4ySaEDQL/LChpmOuQ6/a+mHdYq6pBsKdEqBHX26/ueUkSwCQ4SQScNnuUotAq4bqCblQM6mndR4l1pnEHmGVQsozLRPDTWMzLk0BSqY5lvEMjbCgr10aQo80Do3Pu8C9XJR+EUElbN/ZwQC8vTN4G2pgBRe4hMOSOw7QBCwUp3GfxqNl9r/3nI/7x5s/BWV5xe19alON+6W+IEwNzwwlV/3YiuYja9JEYpVkGnNbVn1vbBsZ6rQ+wHNv2zhiYQveatZcJmDMCIdKoN7zYDYpermD9bEmp7Yow7ppuofT44Xp4cK30NphGwaIBhhePy4+u5yDWvoUPaL1sezn8iRXeh1UpfvHgSzcIgv06PBNGLq4H+v+VotPryKKrkToLK+lH94PAuTTT89pmQiTWqqYSHnHPkYQ5MoteZI1O++NJUvyHZnjSxvUARzHxu9DP3AovgNmYq3eAyQiBMKn5qhYhkoDRHq1iDkf4xloqfXU6zK94Gi57Z7GH1l0tAS5EDVcvYE+Qr48AAEDk5CVzwH+nIEW0CvK3kbCLH+GHhTY2g+1B04CbTzUSspHDL3zWluCHi673v1duFg2ybiHYvjuVfllyFgNy6AP7zc8llMX00seKMiYUqPv34jrr317rWWv9amd3/LpbM29GIxXDg4A8yv9jm68FSKvPwsYzj/tld8FZvxv9kFJ0gYSGFT9eXVYxMs8PWHh0OLXuhysVqAVL4ef6v12lVUC2tspd6W0YNeAQrfbMQJfyRMmNCZcrx7s3krVIvMYZLHzyx6fxuDAIQZgO7l80rwGLj0nwmVJI8g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: LecW5jjDUari/7EpA3rYLkq7a7YYwbD9UNu9o6fKlf29Y/Zc/0u29fvk7YV1OcH0xyAL89O8IbuMqEkO4k0xAGbqXNkcq/TumH48jBwVv9krVySWETCyZUi7xfRF1W6q8lfXPDl2xYN+BZNSQeulQk+SIsOeZcKc8mqyNjaup0EKNxiC2JHQSwtx9491Umo3HOtE+mc5Q8BWvaDH9SMbmOxHpLMCVJ3ZXaFI9s3+j0pJ6uZqW+4PoNBkMlwwJ3SoqGU8uPTq8QrL7nZKvrRgYoytNHDwlBIMpjwVhW9tXWNF7T5c9Y3yFR0IweSOGZpYA2tv8vlyxK90UOn70HIKFmtIAgmuu/jN5RoudWeJWCHH+0GKSMzZtWpDZXSIq8++jK+ltWUCF4fch6SUhaNb5oDo3uttGxk0cfy4Klcof738p8MHfCuD177i+gHUVvzE9ZJhT8Fpsv8/Jq7/XEIKxsn5xEdxnfDIj9C320wXqcr4mnxLcWBYtBUM/j2Dywj7xFZOx16DEao9j22x3yw4x+ERfIK5wqCHlMf9fjQwQiFWrO0vYEjyIOBUGG1qklWOCbno83WzWV7Yg/HD4ejvU6Se558JY7fuuCr5GGnjfYo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5aa2742c-5bbb-4703-8011-08dca7e618af X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:47.9401 (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: zAqEcypFHsGdtN2qEvOy34wYdSHCo5bi2iw+9AvmTumImp/OcoQhHZyAHYXa6b77+Ehy1MhsEsersM0JowgAxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-ORIG-GUID: lQ0ZBQeI5T_lxEKMPD4H6UNzCG9ZCpHp X-Proofpoint-GUID: lQ0ZBQeI5T_lxEKMPD4H6UNzCG9ZCpHp BLK_MQ_CPU_WORK_BATCH is defined in include/linux/blk-mq.h, but only used in blk-mq.c, so relocate to block/blk-mq.h Signed-off-by: John Garry --- block/blk-mq.h | 2 ++ include/linux/blk-mq.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/blk-mq.h b/block/blk-mq.h index 260beea8e332..3bd43b10032f 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -36,6 +36,8 @@ enum { BLK_MQ_TAG_MAX = BLK_MQ_NO_TAG - 1, }; +#define BLK_MQ_CPU_WORK_BATCH (8) + typedef unsigned int __bitwise blk_insert_t; #define BLK_MQ_INSERT_AT_HEAD ((__force blk_insert_t)0x01) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 89ba6b16fe8b..df775a203a4d 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -672,8 +672,6 @@ enum { BLK_MQ_S_INACTIVE = 3, BLK_MQ_MAX_DEPTH = 10240, - - BLK_MQ_CPU_WORK_BATCH = 8, }; #define BLK_MQ_FLAG_TO_ALLOC_POLICY(flags) \ ((flags >> BLK_MQ_F_ALLOC_POLICY_START_BIT) & \ From patchwork Fri Jul 19 11:29:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737227 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 266FCDDB1 for ; Fri, 19 Jul 2024 11:43:18 +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=1721389399; cv=fail; b=iXmZV+Q4EXFI6XXKIBFuMtm0Mbtk7ReikH/9Xzgmo1setwNcSNg1eF1UWdhMMoeTzAErlNzFK5d2C8tXd/6ziBIs64y2SZtEQcQSTciYsyHB9mjmEKGA0CuybduiQuyBJ14/7IhmwimkmfAQzzYBEPrHDmWu0G0tkaD8XHoYZ50= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721389399; c=relaxed/simple; bh=K4pMw0hIM2rVID72dFCOQHxOmYgK0xyFMMlSa1pFkRU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mjAA9TeurLNhA5GGlCa7Hsvsy13dHVrCBRpNFO9E57uJrHPOgOfJc0BQnl6OLKNwmxdptQbXhkuADNw/Y3OEWpJ2VxrzMNrFVnQYm53yMs3gyOLwC/pv5X0eS8dzqdrQQRaGORpCZ6w80ql6xS6PjEoOUjBo5Kuv7YJpokX/g1E= 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=RWpk+nZN; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=tUVg05sn; 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="RWpk+nZN"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="tUVg05sn" 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 46JBe22b026231; Fri, 19 Jul 2024 11:43: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=IpV8HMIXCYfInCVdjmT269NJDVNsJTPRDym+rHM86mY=; b= RWpk+nZNqL2T0Zph+tYFImgAc2zRp3KEs7RcE1gRDL5N5MG++fRgd8YaUgaDObEt jcqA5k9vJST65aQSKrMXM8meUXzG7qXQJ/+JBbYCIj4JYnsJQK/7ryHIK1ffZ0Nd qnsqtHBS6rFj7yeq8YHhB1zT18hHIr0xR4bkBSAoviie6o65sulQhUNAHUVtzB+x cLPqYdADOuFaaB97xxEpfpXtIjc9/kGCNfOgVNTOKSNr3enKmz4KkgvnYqEyxiO/ m0D7/Ssg9O9GtB18Ud3RyhPZSK2JgcoYoz5lKRUAJeOkQe/cMC9rdYtvcoWX2D9H 4+EWnT0V+V3HXq+Jkvql4g== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fqfkr04q-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:43:10 +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 46J9U3lL039563; Fri, 19 Jul 2024 11:29:52 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2040.outbound.protection.outlook.com [104.47.56.40]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexj2ju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:52 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=RVxsddFopXYImN65fcqQX80z9JSHAE4gqPJuMq0VI2MmJaJw+H6okAOhnkpPVuzf6kuq7Q2pfl4vmy+jGArC8N5qbzV0rOaUsLXaCrYkw8Qi3eciuceR1YlgA1XSmrW0wVcJmyCSSLhmV1d1jPsxHx1rHoFw18FZw+EhxFlMd0A+5xLan6K6lwHSTQFHjDjJl3GUDkputQ6TBKhPQfZPk8b5wZd3vUsBXxefFWaPezykBUxuZ00Y9aS/zuUz/Jo/kt63vptr9CloOu7rMx0gu8UJBAFv8B/qBu9ma3MJsNXPplN+NNHh2ep6TwV6QKyp3D+uQyZqooSZ+Qas8FDnRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=IpV8HMIXCYfInCVdjmT269NJDVNsJTPRDym+rHM86mY=; b=MRgMygnPFsmi5RaeeXq49S/5neLiSSSDmVcCL884gAO96QMaUCitpuTK2Adfs6fs0zyct+YQEe0vudGfNISHgmkjblDzOLp/Js2buo4YS9+14/GNA1NUncllPbPho2mrpkwbH/vrMEuu/RA0Ruq2qPWZaZRNrKjRdn0wURQQTEAIozA2WO/iAoyOGj0t5w8gC4HpC/4EMRqpubpHrVquUeMbWZ4P7F2zacyaTpmz/7S7RELPxSkRfHMXtlL5wLfeSqjFarQZqxdPxYov/qi3MItWcV+n0cHNiXVQUVBbsvky3s2Vpcg4gv2tAixQVVjBMN7BxnG7q4XoJMRah1ozXg== 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=IpV8HMIXCYfInCVdjmT269NJDVNsJTPRDym+rHM86mY=; b=tUVg05sn6SubNOM9D80vvvEqnvI0AzSxcCzs2FzX0ntsRPHtLXTra+SaB3quVm3U32VHtpl0LnShnVF35nTYQ+VajSOR9wUqmL8zTBY6rGS9r6BnkJ52jr97JY93jb7s91rUqEDZ2vhOAoSnV/2iVbhiyd//jfBSjlojyEXlKEY= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:50 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:50 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 06/15] block: Relocate BLK_MQ_MAX_DEPTH Date: Fri, 19 Jul 2024 11:29:03 +0000 Message-Id: <20240719112912.3830443-7-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: SJ0PR13CA0058.namprd13.prod.outlook.com (2603:10b6:a03:2c2::33) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 87251a56-b3e1-49fa-f7e9-08dca7e61a51 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: e/bJ9l4OubcYzKpuFxC5NQ8GB0LA1Ad2ZFABqDuZpaV2JaWCtAGDxDcLujUXVbGZYDKIE7Jsh2j/6YJMLmx+dLb1swpigZT72+TPQfh9+8ObaHaglZmh79XkCpWnn1ovdcJknYAlwp7UdOvur6X2CzEWy6gkw2de/0rnS8+8/PbphqBFVfWWPqMQGHEVwESYASgh2OtyzllNhFtAEcCltALmUrKwGHUShzjrTpYYs7FW06GAIf1NdqkOurtAkmrg1UjWUQKi0pgAdtphrLhGLzANE9ykKLa1Q48Dvy12dFCKH0RlLxuK3bCDGJSchCi5rEwHnS7b8q3dRzWc0RdshGUqtVPYqbv/f/kLeMA+wLTUnyI/TY5sjqZIjDe61yD+qQsY0QtmMkO+e65KKNsM5xzzy27sr3pOKonX0jucfc579bL6AukV70275FgPPWfhviAWAnoeW/6LKenw+JEGpfZ+LtHTHcbdTeT/RifYgASJiFfn5JwHTK/nrt0q//dv60Dn7mF+wzejCPvdEpdFwweRyKNZDKefTo+dcGP+8Yja0T3sKEAsZf/XC+NAuseClJyZWyf2qdUBif3NDutGF8WNUSf5ONfgrXpDJU3z6BgqehsLE54QHRQafGcjdR/ZFe+3N01yphKxVfb+SJr3KTyjcZlrAFWrUNy6p4lDZWj16rDbvgDOFB7R3DHcSam0mEjV7cvG0VKFwqX3r3RsUQ9oPjoHzEBCzDUaugqsdP1Li4oCI/v5Ufa82WXtiu7RPyQWMm5wx9Tfw8VKFAT5LxbkWMI0MktcXkd6dvrYn/r/fLb/LIgcIUtncK2vN+cKZxWIzsjzrpHZMiBbm6P+NBZly41NOh+LeYgbom9Te9IU8L6EI3HVLWLi8XLcu1ujL0D7ND30JmCxflWR62Gr+ES3mqC258v0rv3k7/WKjq/4y5cTik5YsN3+YVh59F9lfQyKw48G9t8JA6NQMJP0sPgecYrdxft4mXKJ8z5/6jq7Von/BpPUuT4TsGHo877oo5ThecgPAZy4UhRGdCDdEhxQW8ALvqdj6un3gjUlZeuBM3Gp/pPKOerYfE10H5IRfU6DcdwUqfL67IVu08gEMxAOSytwAenWs9vTjAPLEdnnxZhvVe+uxFL5+50RdInxAjEQjvEMA3Sx2BUbNQZtmvEYaVw4yh7Zt/HNbTyS/S73IV6sQGKqK++gYLNPujd/YvTZDRSFh9ACinBqtZnZTQF/AaRE14f7hU1+e1LMSrIq91Rh+wkpswNesxLDPppJM+OoIsTA5CUkJS4e6CGsPez12s8UDBRfJwvAFIrFKXFq92PqA/mntADQVV2I0dZo+2NePrRjJB+defuJmAGfRg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1K6BAwUHmc4R98iIJrwjlasTeDCBRZdqceQC+2dyyAlmW5YSaf4P9gNB5zF4T89MoGwBskI6nDsxDasjGsD9DOz2r8qDKqj8BBlyj3mUjFS5EVL9iUGwzAWOyP4+FLA2gAiY5vzrv4rl9/liggTB4wZBLQLhFW4Yh90O2taF7L3FDv2bu7WaPfdO/hDlbCxWajKd+ANgmk/NMQ3A9lXZ8FfIi4O5/rx3zXX0+U1Gf+WQYCXwW2tZFUC7zSwIgVmwTdZs8RSy5GvL1sZgzZINP/LdGraBVJZBzKrDKHq6afK5Oe/C7gV40hTJoWdoKVAQzgd8LZ6tu9Aer8N7xpPGhBMC78lgvaEkK3c1o7FXAJSUb8Jq5IPwGTrwn86m75xNHU3jtidThgPPD8SpAwDMfrtWX2nMY0CKpEoKqZX6PBCak9iA09zzmVv6oyAfgp1pEUvDY+jfs/xp9XgmtWtq57/F6z8TSKDiGuCDup3nOS4NEfrvlRfzvGiR/AbXHmN1mgFtNB1D52y+kdgVjyVkxcqdGRHB5LvfWiqMW2vuo9gG8so2yrWYTGQMLaQY585YiTpUI7RG2EaYJqer1FcII1LrYCBdRTZu8R/oR3rgUkGnOlCQ3QXptpKkku65ZSCgdzCySlO4ecW7Sw7/ZIATVcQEoCV91bkC3D++NLy02lTGIL6XkcMjN+HPFGZSVzPqMn8Wu7Xu43uB7uI5DHEuF1VH9jxcgGqapUGOmH2TiKyaQLV1MHUHRapDPQ9mkYlqjGTy2ZReIz0E62K8VbTv+uleaMChExQcyjI/eEc+/+fhUg7IrPAUcNofUid3JTPMwF4XXl+ihpqxI1b0Ztrq2xXIsLOfmH8LDSzxS4/CtiQ+AHkK5ROQTKv1agf1LmXx7rRKcAFWZDcWUmW7nks52aP5VW9Fvh4cisryFQvSfnIpQmzbSLHoe452K6uslHR9iichoKjcyW2eFZjl2tzGXA48dQ8DzalaOq4WQP3/HTSMPmxKqUm8+wtA0QREzMOaXBnghAG/3kIfyyS0KZdRow/wLiLCvT9MezBdr40uRJc9X6lEV4ZKLB4FDUM5J9VmjWncsSxpL/4fgAAiuz4tHfzMoDhBabWtEmL4rvvPFuBMj2ABYNmSk53Rf0wWj0OAuliKfpqI8d1MYfSrAdeQpE9eU9d8mUgbxzQtgY4JUHtR3B/Sz4vToMczz2T1AgUGfxjpDkw+1chNLR9PzZoVhtQsTY126/30LyTwJbnPI1OzTVEiuYnhd8/cWZtGRl8JqlLdKaOMTiBB3YvXQQANic8vK0FBwHPcVDsVluzPSa7PLg0RTCwn9kACxs7Owd2l3nHrU5fALNVtg9U1NVuLirzY7tsSYbWtDEKsW3ygKdT6+nOvvNzfHiJsSq0IsLx4HEfs2mM4soJ6XeEYcYFTHQk9SB6onzhKLJEHRZ2bCKO1HLCxofJ0+hZ3t1TcqFq2LyfZJR5joELZqFWtUlKYYue8dpUsxa8AH7/WUkr2ZCJ4eYoIC+QJQY1W2dJMn4APRm7KCoFuo8Ip5VLS9GMuRYwzTZ5GDCI5++Luk3Ugrxb83Ktj+qdP1/vJma3icx7wOdeOde0GE+7MmibUR2Nj6g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: MNPxAFf182cMCPteoHSOMZi5exe9H+hehPOKHOtI9+KW/Prw3VW16G5VytSqaZs0XWZTBuR303XcBzth/1g6THu2ih7unPl6dCe/0q2iWlo29J7yS9PdcyjUdWQeNgbLUOeIuW6Ajy5NRh/yGkoMRhArhMWkw9HYhsb+IstEFQOPJ9ZdqDklQjFiM/rHnRwVj0XYeSpn/chwnfH4HZsBVZCIMuQLe2hUxpt1aoVx5LeksGhaIapHWTqYpcQ5Xb0U/Pfi+1PeNMcpyJhPFM+FVHMMwF7oQdSFlMifpCFBpX734q3gVcNYurQcf4Jz3F9qvq4Z610ExZIOHcNK0rr9wS/T2776I4vjW9AoBm7/OgMF4PIo1CMkve8gGq4EHQBvh/vusF1tTGuJtM5e0baNdIYJRm8+o8Yi/TTDpvzIn6gvkxpjrkGTs1kHBaCt8/OdkO7/REOHU+n9RyZpF8C88RRGnIoOhE6b8QWFSO4pBTP4bAudM7//VGIazUFWAJF3Ca3/q+eo7ooJp1OLBtOHx1TsYrQF/5JnJy3hASKm7GGGQU/tjZ/btlxZZthx3O0I41Z9vFXMw22KUilq0vJRi2p40/x+hin3fkzzeA4MCXg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87251a56-b3e1-49fa-f7e9-08dca7e61a51 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:50.7386 (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: A7nXAF3hiJwSfCRJFlo8G79JONqCX4JM3zeB49WKyGkViEED8yBouM9XKP1CwrL3Hrw2BjFYlbcWbCmtaI24bw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: noOvM0E1rf1ek2qyOCimOCAYxj_3Myb0 X-Proofpoint-ORIG-GUID: noOvM0E1rf1ek2qyOCimOCAYxj_3Myb0 BLK_MQ_MAX_DEPTH is defined as an enumerated value, but has no real relation to the other members in its enum, so just use #define to provide the definition. Signed-off-by: John Garry --- include/linux/blk-mq.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index df775a203a4d..8a84f49468d5 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -670,8 +670,6 @@ enum { /* hw queue is inactive after all its CPUs become offline */ BLK_MQ_S_INACTIVE = 3, - - BLK_MQ_MAX_DEPTH = 10240, }; #define BLK_MQ_FLAG_TO_ALLOC_POLICY(flags) \ ((flags >> BLK_MQ_F_ALLOC_POLICY_START_BIT) & \ @@ -680,6 +678,7 @@ enum { ((policy & ((1 << BLK_MQ_F_ALLOC_POLICY_BITS) - 1)) \ << BLK_MQ_F_ALLOC_POLICY_START_BIT) +#define BLK_MQ_MAX_DEPTH (10240) #define BLK_MQ_NO_HCTX_IDX (-1U) struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, From patchwork Fri Jul 19 11:29:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737210 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 342BB8615A for ; Fri, 19 Jul 2024 11:30:01 +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=1721388603; cv=fail; b=lGg0c9jjiGpUORqb02QDn+wQGUxJ/Bl2E5PK5iwn6NakFXdhuzkf1v6V3ZSTbZY8nboC19rXdcT5z1djHZ3armyr5bPlzC2d91lIijo6crfN7YR3cEktC1e5/ENnreez0P1K8H/fcHwBxWlmuHLjhzsemIAdAXl5IP8BAPjLpAI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388603; c=relaxed/simple; bh=uy6EA1oVuftX7aVbxhQABPeFFLPApFrGe9YQJdQU9fk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=OdxUmmAiMBU7eotZcBk5z6dLhLbZn6CFThXSf96Vu31+Jslk7xZjOzO+7He/EXjIvd49QLDNdRbncYNuJgkwciz91LZu+3dS0V1k1LRO1qiSgaHe6zP+L/s3V31jOpMcLGKH/VJk/xg/1uhGV7k4c7gQYv3/TNumcJxN7yF/T3Y= 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=PSGrdjVO; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QtTs6mS4; 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="PSGrdjVO"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QtTs6mS4" 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 46JBK6T5011789; Fri, 19 Jul 2024 11:29: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=Nlqk02MxrP1qzjZzUdkLEcWI6bt864zGzJucVX9Ol8s=; b= PSGrdjVOTAyrzXow+RZxs8sUGcgwXt6gNoKKUegDWGzCS6QpWnhHdY8FiDkQlVux pHSLOHr3SEfDXj+FiAaSGuAlKT+jLAwWs/c6JJhMZ9AR65ry6N6LmWaaaYflcv2N SC5XN/KBcMuR1ATYcRrivXIaDa9s6yskQbu+vOHS5HjFMMUp91gTtrmHlqaKPHFX rySx00fdlkwEzCgNazVmo729da9+ZfI+5w+G2p346o+ZHvxEay3ArYjKwvIBwhXy p6ocGb+kIueIyAiZdpFV5b+pBx2FIYkxHcGH+OrXmihTnKxzU+EZKCJJC5wYN+PH 4SvVEKF5Eoh48lmcShzCvw== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0q1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:55 +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 46J9Cnl3019520; Fri, 19 Jul 2024 11:29:54 GMT Received: from nam02-dm3-obe.outbound.protection.outlook.com (mail-dm3nam02lp2041.outbound.protection.outlook.com [104.47.56.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf1m1et-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:54 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=uEt1O7HE6vxKPb0FAGAKlPgiTIC+OyEmxuqaGR6nxuFQsHlRRDHCGwzlHlv8DldSapgbxSvkP/RzJ7pnc3WeEsBja0VmxzVdPMDTg2MDm8rtUwUV+jMICyDofnn6uQvOE/C8j/Ck0GqDJJ0k05SXR838/Ku88PHnx+Ja+Jzta6cFRhgGckpem5BOoZhrjBqLqnzOaleoQdeipE0T/FLp5ngEeikElKHaJOMLxZNIsmn6Ziir4JeSwhnoF8B15xBKu6o48OTsLjOkijcn2ybBWYSGbQMzqTPuxR768bWATrkIr8UeqqX2TZCDnSWv365aOloXXmsYuVx/NfDMFG/k2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Nlqk02MxrP1qzjZzUdkLEcWI6bt864zGzJucVX9Ol8s=; b=r7xcPxNy2rZlEf8kxsRkxWMbLPLJETJgyi+rKo3UTFgujZIHyJwqbR8SOcKVSI5G+U35OXMNg2KvyCEOY7+HeBJMO/KEICqlsuBSoKrUg78zYSoHedT3xGWhTMHTlpyZ0L+oja1PlpiA42ta2dcwv8olhDAsUTRbxea9DJfmEvBdpOsg6eqeMDdYDPa7gZq/6QnS1crwSdfQwWM/dmu4LD3X2Puk2k4rkin16xV1tYoVtRS7NgE5elJNFhLp1koDjLE39+w7rHBZWJhRV3lBvfWzZ9AYmCVIQSaAsirpwze3E5eP9sO/hiYuoTER4UI5BzFzTk4R1tzVVEhU/BZHQg== 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=Nlqk02MxrP1qzjZzUdkLEcWI6bt864zGzJucVX9Ol8s=; b=QtTs6mS40YwN7XEjrw/oej10i82bKb5hqzpZ5BS9BlpMvkvvV82Q7gpPI0y5TTMsmkejuj9or2zw+95Mkn3OHvnTdl9Nc6rO4fcdF8Dj2riw9scXFgg2e8DkQbI8ogFNToYO5hYi7zsF1qm/7mrrpA1pDEK1tfrO5u9Qr+TgCDA= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:52 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:52 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 07/15] block: Make QUEUE_FLAG_x as an enum Date: Fri, 19 Jul 2024 11:29:04 +0000 Message-Id: <20240719112912.3830443-8-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR13CA0007.namprd13.prod.outlook.com (2603:10b6:208:160::20) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: cc5f97dd-712c-42f3-dd97-08dca7e61b8d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: XOLhZCRynsv04EKYLeCzosP+h2Nn72v3HB31AevcirvYcls2KWGlre0A16ula1WbX2x+bqcUTqQNIgzefoEoNwTWxaOsh6OrRBX/zCZ7H1Dkg4lf9Wyh0YnppGCWkHfuWguTxNXcB8U5TULKLgJc6BNLQC8K4fnO/gUkl+syPdwKFTl3nQKO5Gd7cxWxePgZOtq6GnDYecpZWALHWPTDmPtdgpaNq5xGT2cs+Ap0cV+0tI2OVi1M4bbqmf7PBTdlDMfQK/j4aNhLK16D0i/j0C1sUUAR/5aNs4te6/TxPUNUQghxGDmhTfKSnmMVPgsd0zFCNjH5GeEOjUVwRrnV+ukkytQeP7ogb4RKqaJyX1QgyIgbgTtNUHkCvAVV0uCG6Ay+mzdfo0mWtXIBQ+6v531Z1Ee0UlIhUUsSnVgY5rdLHGY9uLr+mcRrRqiYw1L2nf++nt5pDqi1qmHl/50PJBVnqeI/8wPx6gTQmTlY0OUXgZkxHlLPWrnI7CfAeBeI/wZlCBvcKpDAPtOcUuWpbHKxN/5Ae8H4c6w2jDKgL/vQk7yG48T5cOukzGT1emfxwy7PpxINxM1Wb0dw2n8IDzShCn/LQDbeh7JGlyuyGIMhBIao0smKz3S1XprGDnE55/2G9bLFq6T1T8O4uycx4fld3BIaGpkGTrVL1On2az7MuRe+muJHXnNCYuf6Zlwxt5T350qBF7eB30doISCt2WOWvi+tZDCC70gC52COMxyLPdASa0I/e3FL02xz6WeddthsL8FrEn20l+zIgZgiSjv5SClm1syuyizH8fvil+dgpbij1/NOXTYH95pSCK+HxLAg9hmZ4Xa522zMxqv24E/bgrXN3T9n9kL6HTYg6QJCW6C0zdjlXwulWqpAnhS92phbFaChOepjBUw1GY/sVtT8hx7B3lCLDp2/UEGXuDERZ6duHsJ+cyABCa4KXq6V+mAe+XGosFEY6wlYjpYw9hV99sHgQCS7PEJ2YsxOFu3YaYw9XfJIOuOkyGk65Rx9Zl2voIDGuZhz/abuZE7IA+VFeEybbXu3ggOxwNGxdRskz+3VjezvV+PKv26z9vA8PLRTzTbdKjrc0Zb0l2VFqAJyaFJyvgI97bmDsXYmDtVC40Oo88O3AFfzjzW6prHDAGJq3b6jk91xG83ENt987r6fvIfjkrEFZIMcUMQfcqPb7Jf/V23C2VR84wobWGKREBSrrgu6lCK2GlVRYEbe52rZoICPA+2J9c9cUDuMyLlLaK7zV6Gj7qMjUOnpsbE8WImHFmGefjmv9LcY6SCYTkanyF5Mn37hAYH6oiKXcn0B7rWv+5ILeAyg8WHNPEQ0LVTPgxnKTz6BPiw7IubnsQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e6DJSK2hsmN3CNsVer9EaKZGFEWv63eZndIKwcZPNAfLYYWjnexqro9o9gjzMPnwoFZO08LNirxgpQVXqmz2zA14Q0a6aUSXIiSPFRwQQsBeByEoFgv9Uet9XuYoLpUo4EhwjpgekDJCd4T0Ig9HWelfHGqlXaVowEEy4rlvlxAH3fPwKpQYCIUOeXoCG027nIZElaRYf0/st9ODY+Hk6TUUZQ2FNzJDZYBvzEWkqtzuu3reqeSqAKA0WjAKxQLx3rH68nXZxtIO3adWkXi6JBNJ2bY5XXnkr/xuxipkyntVHRu02rB/UsB40F0PxjF+qaB8LnzNZzDJYMzO2zlQyNj1KgwX4z80kxrCMa+PuxU7sxEjZELh/HV61YxjPlBPTgBbt9R8kWe7CiX0Rb0KhtsaPOEvVJak8Zamb66eep43L9IXti6xNp4VkV2eYtWY2SJdqPpZm18eWZAKDXXVNau2Pj2WJNM1BFZYkRVfqU9wBREG+u6qxdABY6ye4GW9vqlY9lkH8D5DRQmriwM1KG67mOhoF0KkG1DXeN8NcTLt04ia+86uJ30p/RzfOakp8EPZsUa66W/10vnzqvF68bx8huMYULJj4mhXEBIzNEJZTBk5WgJTuIIHiYrz7b/hPcb7Ho4/z9vXBrflP7/xEVTGMUI8H9cW3GoajigfE/nvObppQO5E8nS2iYMkwMx7GegDbHbmEGyKm3qOcHVRc6I6DaJlDpKSSk3WfjPFFv/D+BzB5fd+MQg5RyhwfkM8XjIEpfE2zrzf9ou9G0wCAJm9WitFh7Aq91KOq4nsp4kDyz1FP+BGoiObmKb5TG1eTCRRLryhSnaCMg+pvCEByFJ5hPHBDaDVBMpobPDAr5/7pHvjGk46wb2UbfUbPKZPx1/9xt7z2cTvPdp9o0pEmIALzY/HFVbTQR2X/pUkKPKvb8TdvJ8EzXUQszIGB6GPYRTo+r4uAjAd5fBFFG50fGhEFtlOn8DRmctsgUraj8BMRHWJvqip5YLDx0LGG+sVkR9Vys080TBEZJz3Ws0Vp/Dk60mrhetLFVe+Vr2uUFLPQzhovE/mRAbs/1f00PArM80mkGiB6ma6HW1XOfs3P2aVyeqDOk34W8zn4u0iqQEyJ9Y1J+2qkPm+/t9dPfiLe6NdqGIs9OWBpt45anTdVIRVlZ7mUxnchyVpQ5QdOGXVbxN9/2FgYd8+136Bt1MGIOofrZYEOPwkqVBznNGdbzEyyFUlfFmKW8PCaunmuLbnpciZ3Cn5C11zN46WTEVr25aIZ+n+J1LMwiDMNXcUzte6lFNXoTtNi+4VNb128TpLrVF2jgT3AuWymDcZeeHWKgIPwpsEf1wkogOyG8RuGH3f+jkvWIR6DrnYuzLRZobgLcyqx/Fp+BqzsqnRC74YMmpyoNTzqlB0W1k+w918JHk+xto7Ze1kIUtwm4xkWOVVW2evFApLqbDulAhUJersIDLXSCpmP2+CQCSRfdCfdCmYOU5GM/+R8SSzljMAC9rPgZWTP7pqGphLxU6wpk9pHySRZ9uClBVtnBTedgulayTTt6UgdCq9RDSC+dq8U+gd2J3G4pRuUtFMyuG2TkpbpQ/9Fqz9Z7wcVSyssk7ocQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: IKE4sab9+jgaP7NdDdzZiGfHsIaJENhG9E4Hv9a6Qzh7eYjiyZzKMv/UFyMElX/IT0/WBIchSBnH/WwrqT3coFZW/b2Dmx6pqdZay7BU0kCZwM2I75oSnQEkTt4vbcOxnqGS4kuR3bWv926gQjy1BM902iNFny07DSLAaBiZkfdUm9eKJm6Uw63utnGVhs8wWyhI6VxLBaww385ZT3DlaSU5rVUBWz3UvPfTyQ290l/eBxL4tSBktGSTB9i1St/VouNc6xK9RqJrjLJ2n+jlmqgVWocAyuOeFCQspFWtrVuWscbJ+XbqPERvhUM7fi3p5ZsX+DBrJYWsj50NWv7B/dJpT0vYKEtg+DN0bhbiE2XsjG/hgjHiy1tu0bS0Ire8FaOAxIfzLAdaPT0G8eDu1jYPKWuSERgPIJZx1D84auwkKyT2nlomeZezBYBzvOiagE6K8STdIXijIg3cOPJJNABX6z1D+ocF/ErAWb4bX9kLwF2ljYClf5buX0gSMVax/wZbYW+BtMmKRDxdvr8FMvIAh+OOSv6bipBgqrFtLcclb7o4BqZfGNbdakcI6LbjiZgWjiYyokRzsh4FoiDinManEKAIqe0BkYbIwXmdk/c= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cc5f97dd-712c-42f3-dd97-08dca7e61b8d X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:52.7616 (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: bMT+yXyysayGvBWM0Zz0dExhQtBHueDSKBU0YU2fK1VH9Ut1jsknheBus27cXWzaVdt8UmOB5TUHa59XNs6dRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 suspectscore=0 adultscore=0 phishscore=0 malwarescore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-ORIG-GUID: xzMPjIwgHD5StJzuxWHWpTossGnp1IGQ X-Proofpoint-GUID: xzMPjIwgHD5StJzuxWHWpTossGnp1IGQ 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..ded46fad67a0 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, /* 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 Fri Jul 19 11:29:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737215 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 460B525757 for ; Fri, 19 Jul 2024 11:30:52 +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=1721388653; cv=fail; b=jiTqQGL/TfTBno+c67hP85UbpJC3gzXPiscRYL4tPwm+xN0ApSjefFZWqDPK0F9HZPTJMZUj4gedQbr8WfHYG5F6I+bgSJyMNzKL+eNPriN3LGKv2r4jhnKQ0NDnfVeHcBAUlefLwv++IelY69mMpBZkzW9v45FKrBx6kcLpLOI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388653; c=relaxed/simple; bh=v32qEGghBAKUkd/j3WeUVPtBTAnSAkITclLXDHXOu90=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=J+St+UXSRcnljahC5+gksfZ/9VhkHVwQMrtgi+H8kWgZfZyoslikGF+Cyh9/WyLLARue0wP5e4dxeA1MyEb3dTED+LyXZT1c/JWfbLBSWw1zTcO+qt0liftPi8rv/jR2JeS4NB/bTKHaCwi1S327qoSx08eFZUxOGqFSRham+GA= 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=Uq6NCnHA; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=HkU9Ydim; 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="Uq6NCnHA"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="HkU9Ydim" 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 46JBKLFF027867; Fri, 19 Jul 2024 11:30:45 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=sVrSbEJSYFjoyxgJJvLXzHFFV1LJuRHZtXFs8kGMwSM=; b= Uq6NCnHAwkq01xj6Ffce/nSIgWLNOjSl3T0Pgmc6Ix3+aEhOSK+0+HSY+9nN9MS+ qea7LWK8jzrOioabC2gdf/hKSgMZjbAgfPPxap1IkgJTZivjTqGaajSEOWNpx/QS y/PCRnjKZtuJ3K58TxoyKmY72y/nUPHXp1DRjuzFkIUF8/3w1eG30+9I+FvNo8CS /u2aIkgW+9bceKfbTEtJpIwRagzFUywIbWjZYQy3p+2IaZrOZ8eqZCqCjybiDRXu dKeoO+h7njZ8aioTP/Zyhwe7psd/8hkNpNIxrtic8VZZ69WTLCHOu8+vfT4duncN XhXHtLgnI69uRVUA6g0p1w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0pq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:44 +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 46JB20PC031701; Fri, 19 Jul 2024 11:29:56 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf11j1g-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=o9X83GdrQkyAJaTnymon2VTVyZgoGOzS8TBD92tcjX3LaWelQST/+mF8+xoZ5/ElZF/l+PmhEU3qLshl5oZSiHzWQt0gMCMrc4Gpn20I3oGE1isUkbQgHMLrMhMsRMR7bHqmydtqwYFajK2fQzG4RA0c2r+P+Hkmi7FYjyVL10TsmYz3bdlmpGWIwTZ7s1efkiSRqeMy+cxmKNNgt68qmwS4Qu5jJfUOVdq3YhZ7iGGajHKCYyPh77IZGjl8ss0pPjy1bWKhv/YxXoa6vJtDaLSAY+EBw69E0iyT5x49Vb1/KrOqtTzLGaotdNL/ULQP1NpDBiRyspuUPknCzsNX9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sVrSbEJSYFjoyxgJJvLXzHFFV1LJuRHZtXFs8kGMwSM=; b=h/geEaOjXaUIyKOhBc2mVo3+T3HjtQEjIWBzHuHkUHlLrAqtCSvub8vP0qUvy5kt5emTORqwKW22TZb9VJvWXM9rY9E1U8zZSpGeQKg2C4VxU40+6etrvmr+p2OlzBv7Lrdy4hWqotqyKF8aoiumXhBjAmBbDVMuMPLZPf35HnTFTOxMPL5f2PbWeNHmhjVtucQ7iXrbSU7Ia0Dzth3DiJaVo5wKQV+n4kJNiI19b9bOCBaTBviBaXTQg5r5h6ZvARJFyHCzezNrkcHwCHLQQN7y8c2HKW0cP0I0xWqhCzyrqixZE8gZZ8Jcl/OhN3xk3OHyyTZ4wL379jB4eYdldg== 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=sVrSbEJSYFjoyxgJJvLXzHFFV1LJuRHZtXFs8kGMwSM=; b=HkU9Ydim4E3oulSB/0migXpQl/AlUPYFmbm41+ea71Ud+Bt+aDs+dd5KyaCARWZYROmjMPYmaVcJHkC7eZhdC7e7ebdywK8fF1HaUSH+SUM43p/ccSPTLXqIoyowUr+ujwLcI0EtLBNDpCR7WUZn0hqwUUwTHxnkDX7W0U0zExg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:54 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:54 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 08/15] block: Catch possible entries missing from blk_queue_flag_name[] Date: Fri, 19 Jul 2024 11:29:05 +0000 Message-Id: <20240719112912.3830443-9-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0146.namprd03.prod.outlook.com (2603:10b6:208:32e::31) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: ee51b443-43e4-4b90-3735-08dca7e61c92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: dr7s4BBvHnCw80UskFT9E1iXFYyh5s/CjjisSFDlm4RKPY/wJofsoDkB9Ck/ErP94nBIxkFVZpa9q91rs8GjfAVl8LMmaxfawb2fnJ7hli8NoH8m8U9d5Xvv8OaNGV5g+Qr+zVyx3Rt6e3IRfoBZkAaiC8cEKzpYGqIBAC3OxUPWmFtUPAl3tzHPjNAN41Z+lKeDchCV3nVKiMoombiSkqSvkM16zR5oDBZf3cJBVvruv/vvl0CoFCf0wg2o1yE59+6Ot13/n13i3anyH+Us+q38wieKQufFavjyIRYWCMVBpv/MVPzmC3GkVq2Qebhl6MUbXvVxEeYJCXynVviabnaWNa5IGN3qJsN/yhOs02LWvz+YiHdEmbN+z761Dxm2sPhB/GRz1V0rnTjvD/5x7xB5KjMsj15S9OlBDci7R1Szg8AHggQFbK6VysAMGivKw2s4lRNoMcpOPs4ym+dU1PxfWW6peyNntdlWOvUTpaVg5pnG3Yai/zR5+bf97qXiEH+15ccl/N0mmUCSvca+CAlssc0zd6gcNCHKvrn8hKo6JucM3O5PYQp4sb5cqXbYu+vP8dEMXpy3GYEt3CURhOtbf0p7w0f4BaMzGs6KuOPq9nBFbI+QW37/j+yutgF1vobiq+hMRSb1v41zdxFNeacMblnZWQOII2Hgq9fosS1pXKGZGHo6ySKCVs40GYGfOesD8ba9P3oPz/leeUPdo9mO0v3PhNPFSH/5C2t8SD4fS6QFhEBOxH8UbbIf6nWSgx1VEf3zRkSrljKqDbtTX9tf0veztlKxk0zDUaUqWtwn3wxVkaEoS4qskpY0/cxQCAzpbel0b5ENRy2GeDv6VhZuDCUsBnEeCRqSZ+6Dan4UI+ULEf+hN7Zq1NB+Xhj+HlkkSULJlOpq+p/JlburX2d4FbZzrZ8X4KEihpm/Vbmohb7byMwTwlEqZNQIcy7pI7B+R8Ja0zlwV2LO172EuTgTa3wWM5pCxrMT88TJumLK/M8zPQbQNwxD368EAhXQEAeIgxQ4PixRkQfUDkrCTosetAqX3tZGvH02fCi/jV5MeiuVNFNFIQY4QAxebGcTiPTPtp09OUywwsa854gB5WXwQob/SiECk/V2r6HnLXLCt2LdJE3XG9EkcRnQotLy84M1Sm+HRGtTu64cnDuKFm23iBbp+qBKlJWo9xoDVODH4K0qsT5zq3DlUSy5W22SJpEq5bO9hCmqPdamPXW4oAiTq2yLcCRaoz184442Ee+Vq1v+wTfM4w1f5ACSNqJ/2imXbPVA+wFGzwQpL+j5h+JIg0habe+GzcNu/uvMj8xlVfaTpWN3R2cL1YlSRDQijxzT+lUhTV2vSTmVHafZqQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: R1tNI9OZrB+7hDyaCMpCYcu8dYbJntvV4vPOqZZOms2scRGMGMjIkzx4qoNjRDJ9rRsOVOsv/KRwXX9BmU0d8uh4q0P1kFrX5UBJ6NQQAo0G0MbJZvkRRKbO24hUOVwTyzuMftGRlKAzUjBnJzB4GKaHZAIU8hmxWFEGs86WxgtrepT/r6p2BbdyZno+G2bloLj/ZfhV9HiB95Hh49j4Mw39/V5ytX2XVCZYPcLiIOIFYr58MFXWai1s4uwi4F4WtUBKf5F9A1D3UoSmJS6RihY/O5yo+qgdbDGYKINR8z2jygr7mNGsY7zCz2jYE3ubhwHoSkGcSyptjAHc5Mq8NGoASTPPrOdNVEGx2ARPWoFWAz095oOEhsfWmFhQZpZc7pqP8UCx/fftm5sZ5BaSJ942dZlWbr7iupWJKGSQolOxQ+nyWOnr9AJNnbGqAn5Mot7t9JfXwwFunF5Fp1HsuirIbn4qsnZKzJ5ZVaXWmxyK1Zn9yCTYY2/yH+LOV/bbjLXfNF/NvWs1MktesCm/rhtWm90MGknG2KfdSTYGJI8D7mxt6svFFe230FvwSZC1cu5DZIrphQdJpfIIclF2E2H1vOVNughyyap8JBqCmSBVrZ0xAiat+qfRPGj3vSyu61hb4ov5WcWVhpRcmNU43JZkXXqO45Wdvw6rIfoFadk3sbFfBTxnV5NdQqVHECxVSj61YZwpwhmgdul7+PYWpwYOhB/Avo/wc+hLG4DhoL65qeIQSduEt1NuwNl0YVXxpK3OEQ9Oshsb86ujUvTct7Bvk28pVEyvCjNoKjLoUe/7v0s+Mo9T+H9DYBgXx/VW7OEjI7s/gquboj/+zWqAuO4uUPU5J2UcvqgM6U5q3PRapt8jb4ahBXiDfNkf6X+ypw3lowQu07ve4hoxHkYFXLDa3LAoOKZoLm/3atFeiXKFZyVbawoA4PivL6DnisDgj/kCAgKihQ1fBXbybR6OicxZblSfR9ruKLjJeODDU7GOJupQyyOcUB9v+gmdv1ZGGsZbmW8TR6yIzYdZuLmeZM4mPG5lIWlxqo6rXPjXVr9mNt99Uud0YC1hwlUGizQBVuoIH/BcR4+Rad0+NWeOIyP7FJ5uPzPhQWMjF5YQOdrKt9BWwcP74nzpvdy0+AUkqFLSKxKaG61MWTsEf79Go8OTbOXyXf1TJuflYgoQEwGFXlhUJShz1eKWbACKBd+dkZkbiTIu739KNBeJpcOEEJVg+H26MJAykEfD+n/55hPo/9nFN4tUmBXDekYxNS6OzENCjEyUqyGaQQApwoMzDMhcmqH7DnmeEMnDcL4vBJmn8wgJvsJeK8ebJncWVzromBTyuIk8fQAIORZhua+ywy+xovZMWbP4bxX7vD9v9nGuWqCF4R++hOepNIpAzhJuzQVKtLXERh5SwJtT+gbLIr7X4PjexRtzn3elY7zP0dDsQ0SzpaYGozl9Z9QKDYKmXuKEqD3N8PhiKgWlaMv6vmEHE7+vUxv9GPYLnuPG6ItkScb2fHD83OE1X2eKlPWXL7ssGNGLDeBO4mKprbLJiLEQlWH8TcxDYVwvYr+aI2ou02EYo1EWU1/tLpmFRDNWzzxRswzpwMSMi2xK12r+5A== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: cbnQGXH7nQkyym559PM/lSI7fJ8dcF/zATo35StTYn0vd+plf8MBJVO1XYPhSxDisy1Nmz0mmw4FMof1OkTJCzQWKaL5gIIQ4HPcaaF7JAmqi1m4mLFpNCDR/SFMu53IDiYyNrYBUtnbwAEYI90V5jd1Y+eZgCl12dp0KyqD9cC0YbjaayTKxebwd9hU2r96QdxVrJ5ZDNk3X08dipY0ZH0JoIYfP20KKoRT43g7NCBsCaYHiz3inO+dvsNJMtmJa7Ut5QZpvYSM9DbGOdv7MSJCnvgm9gOKARnpnaFVqgXCP1zZ47IC1mzpjlLmb6oTi1zC+wpSgG89BwTkik55u+A4xdswSvlTyqpgMwv+v804y1V9jWr/kGMwMEvnPgCPnQpGbufunbmj4DeH+ZnHHnSVbxNHbZbNvK0yL0Iv+5iC9lk5616a6rOnZRgEk9Je4fzxs3nx6sqsKqvOaIlImC15aGZ9NQ26Jfm7K9VxSR6sDgSQPflAypZ40WiTszV8Ho9sNF4SztHwSw7wmm9+85dCozNEt6GZKBW/nMOla0RLODwamIMgi70dr1TwLtC0C4ZEq0VpueF7MYbfahXm6dH+SohgFK1bKIx792pe9Kw= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ee51b443-43e4-4b90-3735-08dca7e61c92 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:54.5145 (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: 6Dd+azdwSwmt+kdasulndLlH0w2TCfu2VH7VXHgppTCUMKLEFBKpMFM8GGSg5zkqIIHRZrQRMTSG8Tu638wi7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: 8k1y_T9Ia1_nsKzbfb5kte2DnT4muedW X-Proofpoint-ORIG-GUID: 8k1y_T9Ia1_nsKzbfb5kte2DnT4muedW Assert that we are not missing flag entries in blk_queue_flag_name[]. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 866e8c6bebd0..d28784c1957f 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 Fri Jul 19 11:29:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737211 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 110C284FDF for ; Fri, 19 Jul 2024 11:30:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388608; cv=fail; b=MQ7sxLayQmWAuj9p0K2mBj/MVTFqk5jiTJ15Q4xcZgql4jirKW0YuCNr+enQAig+b8dq4aQXxMAmVLOfDEq0KIZ/VGRY9Z7k79hy6lXHWRkxlu+On0BimgxZMv0/2xde1u4Q3o0QApsBc6L7g1K1kuJ8DINVCpacynLex70k7DU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388608; c=relaxed/simple; bh=Dx19eEBdFehdBrtL90E1B5+IP0uPEC5lK7eydNbWaA0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=rXltdeH6P3qyQF7K+syJFup8BK8xe6xoM+B7iW+04TLLdDh9AwdgTQ4z1RBUGJRaEDe0GeRg5jfUaPTxK//8Qw3qqgWPe880OGCBdhtAyBwRC+VcoSC4yHIwLycsIA7VYGUjQTIorYIawyNlxvcHMrMbU1R4srSnzYfDcdp4k6k= 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=FFRNFD+N; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=TNX9avtT; 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="FFRNFD+N"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="TNX9avtT" 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 46JBK6T6011789; Fri, 19 Jul 2024 11:29:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=LInwdmS3TD7gvGQmDOnwOIcY8IXbQwwmCQNy9DsmSqA=; b= FFRNFD+Npt9Zmet662n6wmqzLkoLztgNB5JL365oSTe/pF7B+tCQbRxw9j/rUtEA WlwpE6oqpnv7i0RjpkeSiVRptQALXWqRObD+ImNaTCAetAWc1KF6fHiQ22DTLJt7 11745plI/4MbU3VgDUelwJbqJKIf56L0oDD5650boBgqN4pSE03AZ9Hok0L2mVy9 OPI1HIEI+nDJoUWpIoMe3sP25L02XvAampFODqdxpSWkWIw+0+sTFLCACcnWzBYm chukF/X3kV+a3OjNd3JcdazYcUrVQ9gxVT8U0eUAo921qC/x6nNQDgvzdG7IF9p0 Wy09O6WNnf9EWlY11qRVnw== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0qb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:58 +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 46JB20PD031701; Fri, 19 Jul 2024 11:29:57 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2045.outbound.protection.outlook.com [104.47.70.45]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf11j1g-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:29:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oAAiWHMqIAv/PScJCI5SRRJj5KxvLNLoXtyKyFTnIHDKaJVz+OsJEUcFg0SIGyCQlRPASr5CLNleqBM51ot0kSIzHCEfHHMO2IHmyINByMMg+2/CHSpifpKTaPz1HaNjhLyjicx7DxFyS7k+pgRUWk9AvsJG5GtUdF8VMljt/cxS1NCl5ICH5iQxhMOWcxKD5ssVyMCy1DHziBq336pYaRUkaD9ZtKdXXA26wXJlcEcKEiNraemFQV/qPh/DLwXelUhKYcqWoCAU1p2DkXujEwOEolzDVqRJKOzDAGUj/gWbc4jf3Ws7lJ/+n5U2ZECbqFMyhLYWJLvw/gGqYwDhQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LInwdmS3TD7gvGQmDOnwOIcY8IXbQwwmCQNy9DsmSqA=; b=gPfIQQf3xb0zKHKaKhQm/Kl1RYBTilZhZGIH3kohHBnlttf1CDl+BV27JAZ1ZH1K+OYv0AzySUWr8sxAq0LEidTIQ1EzCXyWDk8EmuxA1v2ZtwR06qMumJqVJngLyuz79aLTRirp5PxvUDWFYoAMY/nRS+SGNBSxGORRyw3V6Sjrgh31nD2iFqIKoZuZyUGp79cyt+wPAvYxr94vJrtS5FACrMyktoHJosPBOqBpJLsaPO8CsrlqFjD60WLr5V9cUsB5Pv1/W5cWhvXQJOS7MQSslonAcTRqej9jCLgas7LUK6aRP2DM4VGueMph9fLfGvjW2awdlRCZxYNknsPM/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LInwdmS3TD7gvGQmDOnwOIcY8IXbQwwmCQNy9DsmSqA=; b=TNX9avtTNjUSY1nTxANtw2tdEfdVnxws/VgRW/8q5EgqHIIAxAAk0EghALLJ1JMkYhbbiM68YjKf9/HevaRf1Z57Py4rTK4pt3y4MaaAeABS1msKwD9vLscF0A3q6IawKyMDp79aFi6A2J6IRnyPWcNNQtUSC/ASJPF85CWULxc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:56 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:56 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 09/15] block: Catch possible entries missing from hctx_state_name[] Date: Fri, 19 Jul 2024 11:29:06 +0000 Message-Id: <20240719112912.3830443-10-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR13CA0015.namprd13.prod.outlook.com (2603:10b6:208:160::28) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: c9a36e91-61cc-4158-bccf-08dca7e61d85 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: GvU2d8+yXoVxE1GGCCul3ih3YGcElJiaHWindcvLzYFJ8mxrLfpnJUfojE5ItQEDGj14OHN7u5cqYAEdPEvGxuDZDvKSYBAwuGblkgjOnCMMiaf1d4c7PNF7+zklt4+EdVJGteUCf7b0wIkoH8NJJCyp1sMI/6g+4ysBBwRH18rzEqKIhh/wsPnQCdEUeN775nLQTTA9vHi5gFEo4V8KkW8EN4oai7gTcCPa82pWSkRepwC8DWxym3F7XRXoSuLZupvrPeHOnqRISmurX0SK5M653y3XTpqg3xU+lUZoDPrEBbmnzb3Z2g9fC/U91WkB8xwjrxSQWXQ1t0JAovlDsl0/6jlSHe4vUWigBCFgmaX6frmSyI/uyM1E1DgzOwe4hB9ORSb63ESxy7WCU3rZsNeNMatBYIYWWaPi0OkVRXkbU5ZKBH+x7VpkrNP0lA7c1A+LSxTAUPIwSsARX/BMLJTnZRERsCR975e6aiPcdhRyOh1uDoaX4WlX6k2HsJT4C8QQcCTL/y3lf6m5xWtk2dwUB8aR9mniwefayEU1coev/zZHXVJy1pW2euUWXhUcWBN5BfzpMHsGb6cqWc0VTtwR0Ll9hnF/YwN7rpuqY+Jg7KemUpBxjh0Z4bqhI7yHtE+f0eoQUJEAuJU2gTmsddLvThSfatTHgKYgjkgGIIeZ7ZP2lWDVNf3AqL+k0Uus1GbwJ1NQ2AvkmGEKipvL5BluOlyHxhZMYJjplEO+0qKveW7v5+fBr1vhTN4iGaV9HohS8R2toAE1/v7y5VjyHY4loEqCzXiSKXMREIqD24NJcstD9VMGOfkoZepYHl8tUhdBkIsGPiAqju0vAWXN7K9vjXPDF0VVQ3wiFUpOInZ3jVlRVTm/d5KU/J/sTHp63LlCKdA3EgCYv39vg8EF/MW0A+dNxOZxKPaIrttafoOrY+SNCXJkAqMNoKtlDbRZR9AJMT0Z/XfhedMo2W8M/Wmxyqepv1NJedO/eG8FUu7IC8Il5DbGCIYzAC3sDqs/TR4QL14nixUMa0LDRldGY19Rt6nrS0fv5Wqa0kKZ2tFmwwTJBybFcZaSzRZVLp7YG7QMi/BYNVX+i1GZ66+QyLXrgBwLheXqwFcOEUf327jdpFzw6Z5ypgmFN7FNMYayeAeQSal/pJ0IIP/kBzIadQ34loY2/SP6XOT2KuyIcew93NKtx1wkLfDm9Jp1FUIfxWprvknXMqf/8WTCQG4WlgnyZbEj4bg7PkGCWAV6HS79NhNUac7/wPUe4PhPdLoM1gKajBauhybKin1Ri7Yl7bqOLlpEjSQGXuTox60ew/AxROzrcaFs8WuZr6tHmWTGVro76+NQm3yKc4nqdOZapw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7j4MnBynLqfa7Ovo4ITJzxMeN8x34cSLiuNPc4JInnw6m03ubfZLn1fBKtOxa15G1QZlx+cfislZOCt1v/dm7lB6iqn3pJQB+9d8HvXbhK+hh6cCTNzjNP7rX8NLbPnjS/o7a8AnEqK1ZFfzmZzwmYl3fhB1tpn4UIWrtklgSh0sPfAjo0kCfLuImvdnQcGitRdM2pHiNYPiAXUlI+mhYJKKAp3+uZUgx9xdOYmEE0rKJwiZxyfMc3172YE+F18X8h0ck2GnOXieLa81sJay0R2KiAOHgeXFeN3UjFZy8IQTBjaMNyAma0SlSdfIY902QC/l5HOp4gMyEeoZO35HNr3EuglzolzHsZCqmKDZo6VrnL4z3DQKUlNROjcT1oYkojNr1o8zq+vv9VZekb3sO42CbgZoQ8BU1N8yNcdkHD5X6NBNBI7c8C9D3mdXJoYXsMy2BGoxT4wINdr6y29UM67fIFBjC7zpW/nwHSRMWnPNBnogEKmYL8tlR/avFs4goMhxIk1C2ePHzuxXXaNl4kn0P2ejwtu0dJkvDh7t+ajzYm0gjt2EbL2ksDmDqIfGmEUbzqsInsIF3t2tiPjXMq3xF8ipK3g53d9MwEiKMxF7HxVDkWQWWj2Stl84Bvj1SaJ2RqxSXhBhavvniX/N3+Bu80hvchzviac7wG9E0NcaK+/Lbjv3yIo1JA+0sAgnTSBhLSOQhbZgCIaGxj+dsBVM2S61hQf+3Uu4QLy2JdQ9d3Sg6h2J/aZKPODtShv9V6/a2Y/KAmub97u7DD62JOZZDCDCc1flRHyhcGsCeTh90B9PDhPKmrB5UFGNnc61OSDwoc8q6ja0SnGGbDG+gR9jUaWnzZ9aH0OO4kdHHIavdRvL6xX36SviYzeefj1YoCwJWX0IoYUS4NkbAZQ71UnPCdUh8tGQqCJmyaU8JPQFJJwZDN8ZPtftapRXIM3yF8FKx69gqOiNYgrJR7QE+T8/yPKoC07eyS2/yPP+trVr6c1rudqmG9gmAsUNHt22JXt4KRnwCh5Vm7kjyJFg2ei5BwxokPAVW68CKbkMlzhBrrhHurBPJhh02Mu15T3x9XU0x85NjAeYW4SAvq4WJRzk9jHciKZkNRVhS3ctxhfK9+JsbBglIp2mAWoDNguQtQiGkIuCSjk5TnkCdmnXZhr7HEQip910ERohhc5Cbi6TtQV3ascRt+j/cLUQYZn3I+SWLeC37TpWofP80uYIuDXUe9sY2ukwFrVKA6XbRh5dOofmq0cN/gROhWWfQcZDThG9OMwUb6cL1VR+APOGGYTius+LMgDmN9pC5GK4uYq2L4QLdaa0u0JRXuHlFarLfMY9NElUbKtpfmdTScepb8GeRGuoa99dyxfCw9vxuZDEvQx0BlNKdKSvWE7lVfHVusLyWzPNViE6FKdZmQi7FXP0Wlq8kSKyJ1bOLP1Wjp47jPeyPs2fO+vnVB4r2JQ/hJuaH3ynw3+qBbdJ0tRhYCoX0w6OBYvMo83V/RZZZjHytM0K3owqJ7G7P42AFIKHvbwFvb729NmJA/vBlm5xGt57NLF6Jjr5VSSuXnGFxetFfk+hKp+piyWd/8wueShefaYvUFFglE5F41VQcV4Kuw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5IMhwFZUnQXquKvl6uCCP9gLaOUFjTYB6lB6Cgu9H0XuygCAmZFwhxPwxklbfHqdCqyUtFLxeUoKSfVUjmFT8F/JI5OKaokpxzdb1xh5qZUfUt93iELjcGwskQJ+LD2JEOauzHZCiuT9WAQwNUqlvsnfbmSalIEHmUXjK55u3EWqO3U5GIDhm18KESUVjKBZUFMGK1p4PTEE6PCMS4fixOc7bQp9+QrAi72RR+QE2yYpVartTbdQVWjp7r5wHxpFZPzUd6Ekp+vfmMtIfDweAnCrscIxF3ISHPeAO/ADqTb9Lyhl454rDUL68q6TBXtGgHkZq5fTMwVLIqxtOWj2FfConXWpD/FzJxG+pKiCE9ocX82P1ZNn979TPu7W/V9/5f+ij6uisp0SBBUjflxD/HT3cGZOkSV9H+rGsxAhMOf+y/8Bz2PLy5HcPlW1DWvkIhDdzC6J0TsQE52JqhP/pkqzXLUNlKZTnON5vaarQ0mIthg2QkbK9vZSu1J8GjIHG2XMg3GSKcD8yAkmQIaIHVnHO/pSgBWOwGlGpsfFQPdrv2jYRquAwdjh40qp9pgb+EcVbIU54zxrkIjTdUtF17+WSkxU0pST6Xz4axu53bo= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: c9a36e91-61cc-4158-bccf-08dca7e61d85 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:56.0972 (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: sjnNJTUWZwm3vhYlacsy8jCRwaq9rOYjWBZX8CuiqrHhcwfyM7ZiHeF5UzCF3LtVB+4BnXFq8xymAte/ZUpiDg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 suspectscore=0 mlxscore=0 spamscore=0 adultscore=0 phishscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-ORIG-GUID: RjwiV3cYgMZ-cFmnEXD2iRpYelVdcpR4 X-Proofpoint-GUID: RjwiV3cYgMZ-cFmnEXD2iRpYelVdcpR4 Add a build-time assert that we are not missing entries from hctx_state_name[]. For this, create a separate enum for state flags and add a "max" entry for BLK_MQ_S_x flags. The numbering for those enum values is as default, so don't explicitly number. Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index d28784c1957f..85be8aa39b90 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 8a84f49468d5..4905a1d67551 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -663,13 +663,6 @@ enum { BLK_MQ_F_NO_SCHED_BY_DEFAULT = 1 << 7, BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, BLK_MQ_F_ALLOC_POLICY_BITS = 1, - - 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, }; #define BLK_MQ_FLAG_TO_ALLOC_POLICY(flags) \ ((flags >> BLK_MQ_F_ALLOC_POLICY_START_BIT) & \ @@ -681,6 +674,16 @@ enum { #define BLK_MQ_MAX_DEPTH (10240) #define BLK_MQ_NO_HCTX_IDX (-1U) +enum { + /* Keep hctx_state_name[] in sync with the definitions below */ + BLK_MQ_S_STOPPED, + BLK_MQ_S_TAG_ACTIVE, + BLK_MQ_S_SCHED_RESTART, + /* hw queue is inactive after all its CPUs become offline */ + BLK_MQ_S_INACTIVE, + BLK_MQ_S_MAX +}; + struct gendisk *__blk_mq_alloc_disk(struct blk_mq_tag_set *set, struct queue_limits *lim, void *queuedata, struct lock_class_key *lkclass); From patchwork Fri Jul 19 11:29:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737226 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 25BFC6F30D for ; Fri, 19 Jul 2024 11:43:13 +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=1721389395; cv=fail; b=Q/G3iZ5O2whAxjTAjakMjr7HfcVdnMYRnsDq8Lp+czQq4MTu3mhz3Dha9hObtkN5q3n1hMPj5H+MUKVBjdcA+f+MSDNFlYTToZmaULZXjTAJqJVsnXZ9QuY0gnCnqhpMKFulj2/UeysBpRgOkTPMJ1+WJoITLl9/hlDlv8gO1fE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721389395; c=relaxed/simple; bh=E1xLET5Veg9AVrj2BYoJUoEdzwu9oP4MMi0dsBiszhM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=RZCNy6PdTikjDpwKaFZDQL//8yvlfJ7C3hB/Uj9GyyHKf7lGOxgp6pZBp6r6CdqmnfxOqq3ltb5dbHCKj6fxEFnJza/WoFGJAlDaJ8tSK+Z9x3+KOTOE+xJ+3ajPcgmdrqWmStrkdDAKsuNojifbooYh1yS6LBMFjgqF85VVs2U= 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=Zer09ZUL; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=s/dfzJFp; 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="Zer09ZUL"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="s/dfzJFp" 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 46JBe22T026231; Fri, 19 Jul 2024 11:43: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=cdZUiJ1vVXWVE4Us1kpjlWyD5nqXoLUJtjw0QY1IVOY=; b= Zer09ZUL5R3s96KGajUZA2l8xg6xKqPB6wDjQMQjRvMSj8iIFhwLHZhsYVBXHhlJ qmLJ/3NODPmkLEWWFtF4sjpQPQWfZMGgfWJ2crUQch2mqxnKuBZcey7eNZl6RbDY KYOC4Z+0wRC14XOcPcx7OKwveMEZ9ySmPOQosVQMoHQTAhQ8hUSJn7n/FaIcYVqh nv+3lhgMK7h+juzIqALzVa7dFo90/nkDk87vGz1SQhQc2A3Lx9bpdze41BsBDVyj 3l27GArOm7LI8vXgDxFgTNZyFMVKUkwl2fTnl4PiKnNFOZEnw26+rV/GAmpRUZMu yjGCQzMd5G7w5Bso2gC/ng== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fqfkr04s-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:43:06 +0000 (GMT) Received: from pps.filterd (phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46JBIh97039597; Fri, 19 Jul 2024 11:30:00 GMT Received: from nam10-dm6-obe.outbound.protection.outlook.com (mail-dm6nam10lp2100.outbound.protection.outlook.com [104.47.58.100]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexj2p3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:00 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f7B00us33s52NUw/Fa96a0vdjsuMvbGNAjm/RFpEr81RUAfRxKEc0So0H9FBWv/0GejKYSTUtIBGTZAyMC40jPWpyGzbwCwqMkqEoKmgVtKbnnD02kpryv7Z/MxJi1hA/vyRkD5jVFFStozZAkzxN3zCgXtmX1YvYcyq9+dg/NyMzeL0rk1IYhGOwqtIjIa0YuOMNx9zxfNk84tL2raqP6blbw43Pi0BxbrvChte9YXk2ihzzYb6+/oTgntKxyxk2DrKl6vjZLoekZg+swQEmfsCvQOcVGwcp86vWXXK7euiuFdqsPKazX9HcXMQEwAHRzWEuF5kHr3lUT2fRFJ4HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cdZUiJ1vVXWVE4Us1kpjlWyD5nqXoLUJtjw0QY1IVOY=; b=ZlKZNmv5Ag32M/W3sHVT5Tfud1FL6Xj2/CTjAiVkhCcVxDT+Jqi/xuFImEl8nO0ciC7kvJuTZOiW2yigIA4o0vEXtWnnaNDv/V6Kp+BpzisVXUYdiNA+nYle1NKInM8rHNkpPw3Db4TxGk3XFC+dhUAaDhdeopy2T4bUFC4okntm/F2XXvbgqySxT31GZtXnVczFjQzEqBwHm2AbSVEfnty66rVcRSTRXIgD0WBXu/gqMQMtguyWTHGUy2UCwbDADJR1l3Hzwyj7bRhNWK13NH1xLkOtN0xU5wxywuitv54njMbOUysY9eTzOa6YvQeqaQpltBuvY/jcJOktkUMrWg== 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=cdZUiJ1vVXWVE4Us1kpjlWyD5nqXoLUJtjw0QY1IVOY=; b=s/dfzJFpdR2Ully0YwirPHNyaJrviIQalDBdhDpDwA2VsZhSeBJHSDVvoBF7hRn52kmQUfzRWO0P3b+gFKxeixn7Hw0s/pju1ZX+gbJ5A+tfyIx9Wu3mvpuk3HfyHCIqf3YInYBA78wvOd3K5VX0aVcZrqbhwDRccPblDj0/mmU= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:29:58 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:29:58 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 10/15] block: Catch possible entries missing from hctx_flag_name[] Date: Fri, 19 Jul 2024 11:29:07 +0000 Message-Id: <20240719112912.3830443-11-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAP220CA0022.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:32c::27) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: d3741568-52ff-4aa8-1e97-08dca7e61ef6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: O+JD8uI914MXktBz/ssq2269kM35yRKvrCw45bplf3RKjtlEp8EQqAj/9DjZEawzeZoJy8EVWxujaSfOKVRld1gLMlyr9b1uheltSCnCtSJbERn6qAijkGcsaf0237KP8EOg1AkgDfGTa1hlkOoRFRVO5umXFj5jBH0/orxpu7dpWqn0CSwhJetyxFYj2K/01p+8VcXS9/gr6kk9OzHmxUYKAg4e8PF9UkMc4o9/w8V2UkONM84RP0aosSJ3ulZj9mO2DGZX5WDl7Ztw0SAVbsShg1Z5fZZTDL7803mCCgVysWnuHSW8QPOpRaksATrc0YjTeQf6YZOBB102AE0A3iVKXLgHThQofuK1i8rknmyxyJp8vq38sWtiQckp2bGu4e0TMWAULTYi7vomWLPFAEnUgMNoxJcXFNDYr+sIa0FVEflhHnyj0aXX7Xa2njxZtuuvoblCmkb6LLBlkPmM5iszjmtA5Ppi9jB62gnVP8wysdLKAI8v9CS1PVwhVn0ss8AuxncjN3RPVJhDDOC4ctjDNXkDL1sQ1Wj7MsUOS0XROp0U8R3SbiVuNeJs018cnm3gT7BAjKDJwkoHUF7PhnjNV3ht9zQSCCAzrpCZj1J/fUbKAeEVc2AVRXdxoOeUG6DKe3K3xp8INzVugUdCQkgUTFv2S1b/ZX5JR1F0fYYsdNxGJD1lmlKZ4TZQ0qwPoZWTMXwdT19fiBoK7MYtwQtq8iHc441xWeNHasTVZncEQCsxRJnVyuQjrLbudWdGZpJ9OzmAZF8ssM2rwWIHfBU3DksZRCJ5ix+DzlMaf7a7qwqb9shRt/qgqnWUOoXgQ5kkOW50qI3Q6z7TNhLMmQ+gusIH4krgGAFj6FGu3mwHNdGd8u7qzVqxkP51lKh+1UIzrYx97I54/Fr8sLD0ZMPE6XSdxbANJO9AA/2YFY/SX/UvlDZ+CpIVc0QQYwGFWqpWZm3Iv4kN+QidMDxpReezUE23TePBp4kXl+LpQxu7bJSj6bPvP44Ay3CzEpmygaVfMVgLWNdSk1YNrhIet999HJH+8/ieZkHWam9TTfsNNIjk0L8zMeduMlKYPGR6tKgJ0ZB6VcXN7/RKM6sWC/3Vy1RY6e3llJ6ZYm33D5QsN9SCMDTrOpffqTVhOFSoaNdR71JEDPeX2Dqkj28DZGSsT1V+jwhTj36F/YEtM7l0Oq2176Z/cqbOHdqRG7JiEX+zSOtL4oDPo0Y4xgfjjD2AErzMdUCBqXiTWrAhMYOzQDiDj+JlV9oFXetqcPmhDh3f0Pe388ixwocqyg3fDChKOxK82fVl4M0JK+Y5uqjDATDRb805FPiIRouyzhICIKWKp8GfdKukPfbzi9QesA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: EPDMkA+Lf/r5z8M1ePMshkZpu8m2KbEAfhfkyKKojRTEmWHtgjic+x5nfYBOyPeU/u4gxs/MwlUYnsPIClReS4DpFrE2C4RzYB7nItMPrh4S8IoOSNX6uZlfqBz7GgI+Nj041CAwOSfmfQMVVYbqj8OktbRd5g88fr6VZMUpEfHFnTV06KFnKDMQx2X0gC2WJOvuwHrJ8AyNbgyjZWWslEIuI4ctyoibETfxFoOIvd6iH5oFkp+9KRdLOKiqLRDwy9OPvj1EvGBEu038DOFTWeJbi/fSxBLt9F7v/YpDiaxO2OFb2BjY4cCeNpDhICwIwTHI6IYlwcSFBol0y/pOnS1XtxFNaVw8vBQECtbczbR+l/DQ2zCCHi61CxUM8tulABSq4QMEF0stc/qtV5gHmaQhcBBuESpV+AYOcijQBuQV5kLcWbGDlMzxWEuqdIu33YHdrIZSg/evqLVuHs6lnrbl3VojFh/wCdJkri93bpZAI5PBojY+DiSCvAcUwEhaM1lbHlSsOIMbmQm2y9mij5R2CS/dHwjgX9lghk38Q4xXQGodByFClOFwbxs9GkXzV9GfHMGXfY8elH7XVEvnI6CUW3khxVjeCQsATsm6WILCfMWr5PKBQPRRBHTrB3vo9XovCiAhbzU8tAZQZm/V3Gv507BtmiVh9mch0afyXHNr+c8yZV+ZOEj04y04N37gPH44mtzS+nOXBCcDoopHdU2CYOXD+TW9aGg9bQB6DKOgkKky3MMC7qSIV4Xqj3aZgZnr8U2+1LPid32Rl2ahjTEqYJPkAAZOD9HgjCKza1dom7nDe8OL+9ORqRMr62UXxrDDEZ9mb7qxolIQhTAbveDgeF9NUk9eQxQb3t2z4O6dq0u0YVdi+3uTPQBKxObzOcTWhdktQEZm/fE29MStBxEYrPwrGWL3zNtJcS7Z4K3yOAlkUR1AhEgzlMqK4V9YINT4ektF87v9HI3a/GhzpDPwWp/UIgd06//Vh/Y5jQsZKVdbpwkduhmZwqTLbem2ZqYkA9w2k2FltT6PMvA++T1UBURxdYOltT02BSTdG4XwyfcnLuLbcPsPkgF6FQKRncq/xAABLWg18d6wpn/dBz1MVFyBBUTlBkE/L+N0c13zrnrZ2KPaIltqjAfjA4xjI2m89qxeiH/DNXNozskz0e9W2OSLd2xQUDLVyMlQfQtMnxg/HBhLZy7Ahttiyf+VZzf06efU3LgabTPNo+B/0uKZvxooQa3GoRyNZLdilR0voLyiNQ2Sp7mPwhquDHcg3Qlvv7JzrbPp8v7vbQro0d4kML/EL/vxU9ZM7u5O3/ihnO+y2bxanmzsgWntTBzkbhYBm2k/4WxJOxhZdoEEkZsnWgEAMqH4dGkpQl82CqgUZGzSdn15X46A8d5W4hlCGPuKmhgQgtWPjdpxPwgJMe3epJGAnJVi4kbouvhvc5vkzjvb5trrWPcJJQoJutj51XNxwfkPBBMqg1fg0r1y62fopUNMyZ/CN5Wc1Ab+hMyrK7QmofVuo8qlnkJZdlnwnnBVxyelXyBKn0UFTzidrfKi3dSrr+s1NP1ReTWlbYItWQYjV1lxrLhJhKCsmN/xlBSAInWpRV6diIaiwgIR9g== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 48g81T/bvOy11Fy9LoHb57dhp1v9YMhAqt/f+wrc8fO8kZFl1Xpz4mXTiS4pCY128L0lvCzavGJfQByW8Bq5rJffpLOaGHozbxmAH7dsU3heUavAlhdrd6BJNaRlzt4jRA6bsmqvkE7FhURIj7PHj4LLt+Pc6CTq4dkUJnurPYlpbmU1aSxKwTCnWRtltn2HLwG2ZHQkRu4NN5698SRAD2X86uH8ZJhzC7tDJEgXALFPH/IdCP4IdXrk+x00c5mjfTio+Ou4V3Stv9VRodDd/7Uc160rUBXJ/5Tb0wtJHc8jHkTH3dhGAwWCA1gfSawdLgwl/T+Rl0g0+BNGVvR79/I71wNESrbOnyy+q4j9/NlstcMuTGEqiUa7Q6pRhFMTjCF7vyC8G1YyJJcmrox2i/1khQyFKCHxYM4jaJVMLA+Qa8o6KUs9RsC9/V2WTZJO6GayC+kS9o7WqPCNIb28UaW2vXuTAQFlTRqfZwrY5gDmLN1QppMsq3HHJBBIDS49i+qwmspcbS5R6nwgd6FfBNG88ekbQ4jnxgrDKlbNerLC8HNUS4yxZm1c1kkWTK8E/SvGbD0tyPyrHzrVSUXB91P3wjOZWrJ7hgQuZYoo9NA= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: d3741568-52ff-4aa8-1e97-08dca7e61ef6 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:29:58.5019 (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: cYuLF0xMF/0C4OqsScm7y8BaTpqZHZn41G3xkFIavPmaiwytJ/OOoWR8igYAMsI7HmG1bAn5HGy9yEyX6Ozqkg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: SE4Sfy2ds_tm7ioYVdmMovRrs19kfbHL X-Proofpoint-ORIG-GUID: SE4Sfy2ds_tm7ioYVdmMovRrs19kfbHL Refresh values in BLK_MQ_F_x enum, and then re-arrange members in hctx_flag_name[] to match that enum. Renumber BLK_MQ_F_ALLOC_POLICY_START_BIT to match the value refresh. 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 | 3 +++ include/linux/blk-mq.h | 10 ++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 85be8aa39b90..8618aa07ba2d 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -196,6 +196,9 @@ static int hctx_flags_show(void *data, struct seq_file *m) struct blk_mq_hw_ctx *hctx = data; const int alloc_policy = BLK_MQ_FLAG_TO_ALLOC_POLICY(hctx->flags); + BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) != + BLK_MQ_F_ALLOC_POLICY_START_BIT); + seq_puts(m, "alloc_policy="); if (alloc_policy < ARRAY_SIZE(alloc_policy_name) && alloc_policy_name[alloc_policy]) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 4905a1d67551..27241009c8f9 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -644,6 +644,7 @@ struct blk_mq_ops { #endif }; +/* Keep hctx_flag_name[] in sync with the definitions below */ enum { BLK_MQ_F_SHOULD_MERGE = 1 << 0, BLK_MQ_F_TAG_QUEUE_SHARED = 1 << 1, @@ -653,15 +654,16 @@ enum { */ BLK_MQ_F_STACKING = 1 << 2, BLK_MQ_F_TAG_HCTX_SHARED = 1 << 3, - BLK_MQ_F_BLOCKING = 1 << 5, + BLK_MQ_F_BLOCKING = 1 << 4, /* Do not allow an I/O scheduler to be configured. */ - BLK_MQ_F_NO_SCHED = 1 << 6, + BLK_MQ_F_NO_SCHED = 1 << 5, + /* * Select 'none' during queue registration in case of a single hwq * or shared hwqs instead of 'mq-deadline'. */ - BLK_MQ_F_NO_SCHED_BY_DEFAULT = 1 << 7, - BLK_MQ_F_ALLOC_POLICY_START_BIT = 8, + BLK_MQ_F_NO_SCHED_BY_DEFAULT = 1 << 6, + BLK_MQ_F_ALLOC_POLICY_START_BIT = 7, BLK_MQ_F_ALLOC_POLICY_BITS = 1, }; #define BLK_MQ_FLAG_TO_ALLOC_POLICY(flags) \ From patchwork Fri Jul 19 11:29:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737228 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 7E0D912C48A for ; Fri, 19 Jul 2024 11:44:16 +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=1721389458; cv=fail; b=fypPlyisA5d0N81dsejXioShEwr7xRf4jKXmyb9dlrS6HVEnR7uZQh90FwXuvpHBQ7rNtDFjCH29Wn+10kj0+tsBjit2qgqYf6Zh1UKWC1UelWHepHMwGf9gCaMKLbBTkkQ2hEbql7+w+GyFZtvkV/AErf0HZls79N3OG+zJD24= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721389458; c=relaxed/simple; bh=Jw8r5ZFmUqXkri2x3U/mSxG2Z3nb+LxplpbydjmkZKc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mf3CMNLnkzUg+UP4suB0Q3MAUjnaWU1OwUkpr1V98PdUSpE3MKiYqH6eej7muLGszTNWIZs2ZQbki2Mg5XJOyWJtLTNK706f3akcLzf2mEy780bdUZabucwLUwfIokyDuXQVn+X/aTNRUajKXBPhqQDCrlzE8lURQ42Y9Fs4hu4= 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=m0/bCIJt; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=bOL2+pzl; 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="m0/bCIJt"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="bOL2+pzl" 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 46JBK7xN027052; Fri, 19 Jul 2024 11:44:10 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=6MfvbxRTNmFuPxN+BbEGIPxPc2ZC9I+gHE49eoqu1wI=; b= m0/bCIJtOiaRHJ268sR4oeS4P45iN0VxpOOjqC2snR3IDLJ1CzWFKLQT43rfCvSM BduoVhWdpNqM46Ex668zPCyhMAu0qLxqh6mPuPAWZp7MXFZFTp/fZLtSz7vAQhT+ hPcs9+JEOzpi91OTbRcnDcVrF5ZQEz3wlRLcdZzg1H9Qa1TCSqK4DlFb65wVqjv5 AYQjXp1U5ndG2SixXDqzy0pWVQbRlQTqrrd++73nA7OVMU6cFMBri9uUHHqptztM FsQeOeVJBOmcqxWbAWu201GXFq5MIqNGSUesmZOocDGL/bBW/+IwhTUkMU3VY2n7 zFIvcOYNuN0BDs2wQabSvA== Received: from phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta01.appoci.oracle.com [138.1.114.2]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g1r6-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:44:10 +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 46JAiKia039623; Fri, 19 Jul 2024 11:30:02 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by phxpaimrmta01.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwexj2pu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Vk1GxaSdcePOmFiv6khMDdfx0fZS34mC1fmuTJcHuh73KGh4yIDfvpcQcViremnHiv5UtOpu9FWVrT67buWGO+zmbWOGlGrYcdUKPVwojYs6P7akk5t0I20aRq/LXv8MjMQQi0fd+9b2SnYSZXobis0GHx2jXk4r3i9KQRokN+QxCG5SmgwMUa1rdxQOGkTdZV5i6P6wljdsc93BmnroWLCMqFVMrG6Z2LiqCMoOBuc+AOSrsyiMLY5PJz7bvmcFjI2vmpsG21hd/Xb1Z9XjZmcO3vZikdLRl59bbaOsgv6dKqquRLBb+CRGjNWClGd49tynrckclZjeT02JovPPnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=6MfvbxRTNmFuPxN+BbEGIPxPc2ZC9I+gHE49eoqu1wI=; b=x8RkEwKaWbXvT1utxR3kbEKPZV90U6ad8bSRs04G6xcTnfiPKmQ3FEneuR8RmCC/HSFT2x5zi/LPX6dj7lifC951GdQZi8wjGj8g392JPkqZj6rSvAOGB3bPi03JFmfqfskuqFJkHrn+32HXMT6ENeXY/k0eocgcqYRFB07Vy2rBN5uavIXtQKiEDzpBEqXMTZNN9h/pwptBCJGAhlzkSVdI1WB0gWGzzUkzL3PIpRb0dsYxnnhNb+mXNy4Omxjxa80X4iOYys/BsA2dyXd/XhQ80j7rAjQ0Czlh5F/R9czFRbU6LIXk3nlJpKCw1bANX4YzoG3onmxdNqIScxrRmg== 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=6MfvbxRTNmFuPxN+BbEGIPxPc2ZC9I+gHE49eoqu1wI=; b=bOL2+pzlQh6i0b1X6hkfeDb4Ds1qve2uSQh5xFQEbJ47eRu6JJYtRw6SLNdfZlyhb/YmXOup5wq1hfoYyqF57a1oxn4N/YElRj6sz60gKgKeLS9Y3DKFE2VDg5Wpn9q1dFB+oHAR4b1OQ3hAZ9WhNiPEiteTJsv60FNGkmjw3xc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:30:00 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:30:00 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 11/15] block: Catch possible entries missing from alloc_policy_name[] Date: Fri, 19 Jul 2024 11:29:08 +0000 Message-Id: <20240719112912.3830443-12-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BLAPR03CA0125.namprd03.prod.outlook.com (2603:10b6:208:32e::10) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 96d03682-415d-485d-b616-08dca7e61fe9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: xEbwjjpXLQDwAUSk7NMuvtJJ9nLZkTlGyu1erPX//Z2cnXXaQQR0ics/C9BMuZDRR2ObCi8FZ4Lj6EAKdLjd6PISyvXKPfCNXJdd+/+8tfICO3Bf7G6KJ+3m9tIaHzGHGNMg493j45GDQLje+dUdWGMiEsXpyr6BWjWP8nh0YK6Yk6pQv1Ybiu03KfkRDjIwRISmGnuXoOMvLmtWcMrJEBCOPNvMshItZb2/yORMtTeeUkkZbyWX0MzKokLjeePxjYmvCZl6ywO9ie6TqzS4yYKDjPzlALvPad5K6w22HoZeTz+Vlag6LHaVXCcdDThLmiwjPVBRRifO8TmUKDi5Vql6r29FR0ZXha4BbavtDPESwUoAxjuzfpsM+sOCyRW5o+JR+ZDWZiaSupkAZOvzEjZW/Jv/xwDhYiTPEHvNECPOpe8rPISALGvEuMNMqypnCJ0Tzry2/85PmKvr+kC7Kh6aQs1nTCUFovzkpLzPZV4x6SUSLXs3Qb09SFFPHkA414DaAR0dw1FRwDdQJ3BOhf5GUX4o2naWAALiaZDOAOvZL7Inh6LXFztudkKYwRobUF4ermfvx0xlcb+1h9uHfMFwSXBV5c1uDwIlehergZdD9UocYywJa2dmG34HwaYj4V3I2kd9Djhz6FvU1YHp7n60xKKiy5Oo4sFomYpUxSaM8/xwrvFfv7XVw9zcCog3CFMxvVmthM2ZBC4vrTeOJevhEjcQcjuIjw5LyWISynrRt+51U2F1jrKJqClerU0fTjxbTsJ3sAq0i5Ocwft+9SMFSHjAYaMS+VbZQDvtaqNkZVxqhq8uy/9bXj+7QgPyoEmDT9kR166tDuqPo8HPK/tqkFQLJS4544absO25I8y61E/6oTO94GlT/gYpL4xtyYqGPXdKoonudc7WbYSlb0O7KgisKGoEttaBEvPgAyLY/BOvdrw/21BOkWlJ3i4MusASO0GmfXeiSqLPneAIq1tChYOtbSjfwuAvlQBoX4XLKi72NHFcrNVoY7Cl/13t7bLnT0g4DLd6Xh5JGcXfGR8L2+ygEt4xCr6AeP2H55kbrP6zg9u9kJqSF0U9tHADREBzsmG7qwY9i3vN4TzO0hct6E07B78RfZO/dJ6xUn7BGwDEsB+rgG2s4U7klGpN1iOtSyNvTpkdSidiKZGxNwJDoufSKC/P3lBx8YeE/u0uW6QGCl5PFzhoMTy/WVZx8hlnuR0VO1SkkRcxMrntusnHdlVNsZJtX7mL0Dp2bA93QY4LX/mRzhbAMIg7QApfC1US1Hj/4SoBPlzo9EScH6i0Lk983cf8EvyT74DbZ6jMSWEDFM4ilBy4lb9IpeowsRr/c3yRbTPVK6bxxK6WzQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vP3jSsj2s2V4lkjZ/i05JARVX1+nsxFf9IqZvdtVNZuVhH3Ya8ywOdT7JB3ljAPfepQ8FVXuyFVIV7jWpoVukTeJwR2jELrXbBR2YNBADa9gModDrj1Ctac5ULYpY4+AwbXMWCxTnHSPXTqKJx3ciJy6o+Ffi3+Z3Yo6e/BeGVDbqhYhNzrwbL5/Ny9GycVMpPtv4+nq0tOVEafs+gdM7tSNKApFrgWHdNJY9OkNX31cOCz43xIalI5m3eOhqDFbwE2Qy+vWMG3UtyBJoc9ZhCZkFrPcEnNuEXBIpq8GQJlxQgJyfqiqpSIeYDh6wlbumtr7dCojWz2P7FQJlqzgLkXV3DJpGbG5Jq+h9V77UVifsVM6U1gjtHi6/1fSHFIxC3aQ9N0oBacnU9VbF803NVUojwa5yHVDmcXJje00bcRDcPktUjL849RwbeHwUSbsOV78+XgdHPR/u0Qy6l4P072Oe6N6eeJIQpmoo3C29xSXgVD7yYpha6aAkoCJFQPulcS2FEk3gxUcLhei0BXnCsQEfUeYnclpREjtC0RYpHTdROcyc3YK6emYwtvOV6EzR1wSm/j474k+BNKqCQsD94m8ALIDpLlAQNYFulbamIaQlwrWIqqg1E77wOhzq/kqAazVDB2E5Tf3gXrt7Q/tnncWX+tvGHpIFWvzUEZpQH4f3mwvJ3K4R2dcZyHu46yVQwTx61GQv/dcrhM5EBy41GEas2tBFzQbi7OMt4u4MAyF6SROuoSiRzrMiohEaJS+xbKDtbTJklxbwsqd8tqZTqGCNHs7VpTcq0mOip84PS+T/i4+Fc+QvDMuNB7poPl/d5FFVQXNBJDF6ImiQZto07CZNkkMHBjlKaJLqNRYOZgXB0DsRs2OsowEcqD9Q4rmERABjevSTW1bnDlbSS1eZWtpnm/JkVZIpcIhMmtcw6HWQoo5XmE/J44lFZPp0pfyrTntDaXxrRSpk+QuwbacqJQ0VrH0Q4ON5+5UHB/huoyxD07DCoMhB+l6GSjF5eehR4Qy0DFw8Deb7EAGlySrUAAdV4HBT57ehsRFCfnDyyXR+csm5S/8qjicDjnQ8Mga4Q48H3KrnGDQokH+t9yrCcEJW775GXVp9IYI902I50BsAz3+H8NgAUvMD8NBRyYMIMF8JeSXnr+toNCFO9Ckh83FdR9af+Vrm0/xNPcwrAXtBrOvB0jhgLtXfn4FLx+kHtw+Qp310lKIQWx06lS6yw+GqSiUuVNWaZxN0NhESoTituPg/BLkU6Y0x+gRIrOIGNA+WF0N4UXdwX1KNJkRUIbC5SX+ggnDPyy53wGFX5VYchQilJkWOLhrnNjvn7pkOTi7dKan/EYLTYODLxHcJh51TqXxlo1MJ+M+7CmLnZlowcCdzRyfAXFnyhZh8/ttPPfBeAN4rPqsdEJcWVkCcPPdswMl0q2gavYUbrUAx1uJeoTbnJr7cIZ4OLV4738LrtsIlvuRtnJaYTh/MEjDoskO0zpKj+4+YvDFe9HDh7BOacJzNVcg6dSEUan0EveNg/skuiHIFN1Vjk2i7P6QCE9+cAFtqgrvhb6bVcM35mXlQtRt+POSFY9d7yloqf8DbHc9bSS2jNvHX64sON0kdA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: QwfVVPXrmbjZ480IXy0nKPj7SicWPZ1jU8HkIliC5VWAcs8HV/xx+QnymYfnWXlJQM0Xd4QR1fnWGSYdX243rmuCfgmCWBTDkqygi/JETzGEkmZ7dkIDOGiIOaPxL0yiHFhGYLjjNegXTteaHm+udk4SDva2eWQiw8J0+QqFRsS9W6oFVIVXXRn5Xx1TAVXkBAX6flmkNtahN+3RfD9lpZuGdb9qF5blsqMhHaf58gg/SLgEQHpdibYGnv2tqr/3qu3eNgWuei+P2IB2MTw6aQRU1pL8DlQBY142FwHjvJluykdZCpCMb31cLUBrURCu2DMZXjLhoJqVVXOQ3tQuGG6Mb/Fz1epiS8hlyctpUEn1+dkGl2KMWLP/P3Fk4d0wNv2hu86CtJ2hdkbCa0aic4lRyyJiA2+RAf/VcNYOKNzIeRLPYIGbLluAHtPsrFBsEhsuSj3cGQXMxvgGWglp9TOGcPNsZaNW9Hx3J/giYhqHK8VPkAZ1WGIzc4dqioJha/U0A6S8sjRaW3TGo6MRxlhELzLPookbnkQxHNXjiUm9MzGCkVHXuc+voUZnokDhqpOew4lu9OX0mdOVcarVCJGy5w+/g6zbMpcZt1uI0IU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96d03682-415d-485d-b616-08dca7e61fe9 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:30:00.1606 (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: 7KhaqmBNSd3PxpbfPNJ5o08wBW3RcyoN7r99vE9QgWXOM11JAcuB3Of5+9NsUkBkLVPab/EpzeF+UPd6QCMvGw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 malwarescore=0 suspectscore=0 spamscore=0 bulkscore=0 mlxscore=0 adultscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: 9UF0I8eOOEqVLjRYDcs_iaAzS639GcUp X-Proofpoint-ORIG-GUID: 9UF0I8eOOEqVLjRYDcs_iaAzS639GcUp Make BLK_TAG_ALLOC_x an enum and add a "max" entry. Add a BUILD_BUG_ON() call to ensure that we are not missing entries in hctx_flag_name[]. Reviewed-by: Bart Van Assche Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 8618aa07ba2d..312e8a40caad 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -198,6 +198,7 @@ static int hctx_flags_show(void *data, struct seq_file *m) BUILD_BUG_ON(ARRAY_SIZE(hctx_flag_name) != BLK_MQ_F_ALLOC_POLICY_START_BIT); + BUILD_BUG_ON(ARRAY_SIZE(alloc_policy_name) != BLK_TAG_ALLOC_MAX); seq_puts(m, "alloc_policy="); if (alloc_policy < ARRAY_SIZE(alloc_policy_name) && diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 27241009c8f9..a64a50a0edf7 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -278,8 +278,12 @@ 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 { + BLK_TAG_ALLOC_FIFO, /* allocate starting from 0 */ + BLK_TAG_ALLOC_RR, /* allocate starting from last allocated tag */ + BLK_TAG_ALLOC_MAX +}; /** * struct blk_mq_hw_ctx - State for a hardware queue facing the hardware From patchwork Fri Jul 19 11:29:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737216 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 817FE25757 for ; Fri, 19 Jul 2024 11:31:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=205.220.177.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388667; cv=fail; b=XvJdS4TFzH4DlOz6+gR8ss363EDh5uXrDxgYFaSW0o0D1QytoTM0KngtX2RNAGMSQaOC4muF3txooeT+zhNfjb68TmkV7Yj5ysIg7TN/Q2GlnbCQWZhjQF/WAooHizNvD6sRmnXoPrFtrOEx7+GscCzSzLo9DoJhYgX0SufGXdA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388667; c=relaxed/simple; bh=dW+r15BiKzsPz/9NeZpFqaQsR0Htc97DhfyNMPnQMaY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=fOuDNLemOwGU4BaJtwNohxWnW2iV+TnQ24k1n3Xhqv8gQwUk74VY3wmuYlQXdomL5tnW/XeN+jb3IHq+K4w8kqzPSSSHAQ0y61hc951HaOGXhSuJjmv0KE0lOAE5IZ3Q2M4rvNFGkcQaVpYsgX9TpJiJQJG/VgIkU2Ixx69jFmY= 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=nHfe18EV; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=AOj8Icw3; 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="nHfe18EV"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="AOj8Icw3" 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 46JBKLF3027867; Fri, 19 Jul 2024 11:30:41 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=imqOXXWEC76V8NVu2FxzFwt3aO2hoHmEOPk8wsFepYM=; b= nHfe18EVmHHfzH0kjvZdofcM4tfw6wAcfUdhPbA3DyGW2L4sTMdkPq6Wyvb1DEUc +Ys0xsDyM7UJ4tm25Gnq/uGVkb+yamphQdsmRA5H8QcpiMHtidsodbzYqBbDFMaA mNY8HzLgsj0ZVCfEcG9KdNN/LCuaEcr15yfwSM4cQn1Yn6S0szNxDlkfdeEjQSA+ sse9eGSwer8sHQh7rM8WC77f7IjowLd6kLLqLZB0KK0otPKPHkLbv0R1234ioVrC L+BUqT0ZhfpHl7EYPOMsDcyTTEbD33tiyVMP+W5pjeJLLiqUnJdyUzxxEQqF7fbr DuKhLGI3f/0Ufwb4nE5yBg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g0q0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:39 +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 46JAYb6i006695; Fri, 19 Jul 2024 11:30:03 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf14crq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=l/M1acE9QV6LiK+rGGiGQ57PTvJy34pPCJyur+lJ8mZz21K7ONSMt0CfpZar/fRkkZcLfzd6TRULp9HnTQtNqPr/y5pzlZo0D4IldJYMXtWXrMkK+GrYuKGx9JrmW046DBsDNCE9GP7hYVzGCh5ipJK0Px+d+ozKi83OgNKb3IZKAIVEFK2O2B3hIXIw4kUd/GM3GuuebhqsL8sHR8JwjU4tIOroMOPgCK0f/2oJ5zH3LdIhwknvsRmbEzaaaam0YUzpyoNV3n8gheXikGjFx5db2AEGVgAS3x70dFm/Ohivl3Rf8CaTLwlcBcanSoJx85hx8mBojywOKKaA+Lgc3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=imqOXXWEC76V8NVu2FxzFwt3aO2hoHmEOPk8wsFepYM=; b=wM7g3O/v1KQ/g5QNZ604i5fh3SEPgc0zxwnEEDHKBo3E5FN1b1kkN1/9J8rxHGtFYdIyihQYefshqGKDMYfjDwpjF3O47IXkFn2Kj1//jDOelL83d8ovZF0zKkF7Yu/Qm28x0NLMrqITznAsT8JxFUT3qMOqv3vWrQLKSaxUTQamlKQNyvJYTmuwRhbfSjk97xXkwIoWD6qIE973eJeQUWID3KSMzuGxn95wqwgbsuC+YwsO/Q4Q4lJqNXaa/mJow4ntUoQdAhFGJzgs5Umja5JFKX1zzdMpEOZWn16927FXAfoJ4ZgtW4Ui9HedYOgYmukXDWVSR+cUCZL2X/hR3w== 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=imqOXXWEC76V8NVu2FxzFwt3aO2hoHmEOPk8wsFepYM=; b=AOj8Icw3pJxonH7cKIJRj7OuaQqtrKdzA1eI32aCeTpy7tvwe78m49SlMEQ3kUOSndYKT9xk9ZNNp87gHfZRh72JiFLQ4a5QYV3LFkRuCl08Pqc2pWZe5W3TtV4PpaZmDh66rA8axAzv8Qdks3cBVumJK8S5hhG5OhBfmj6TlZI= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:30:01 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:30:01 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 12/15] block: Catch possible entries missing from cmd_flag_name[] Date: Fri, 19 Jul 2024 11:29:09 +0000 Message-Id: <20240719112912.3830443-13-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: BL0PR02CA0071.namprd02.prod.outlook.com (2603:10b6:207:3d::48) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: e8d2a768-cf10-4110-fbdc-08dca7e620dd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 0HCM3/VPm5GtydRmvD8fKo0OMQG6/M3DUd2jJOxJBjjmBnNW/W9T7ZRpIXVHxS7UVHCVK6Xxbo//qs3gO6qeaaQXHgzSUnomhOAAW2xnFVAAbs8C6yDrzHP0O1mUQyQU5k1OwLNg6WmBWbgCo4P8AduZr/EsGBfWAXYfNFaH1+BPJmBfcYBIXNiCv+yV+3ysRQj3FwuuHfehyxRxd4jugX/eDmMuVSFZ1QVUwVxTnf5ZuAL34vXuihGvP55wPbZL8dxQI38+x/3j+zgocwL9javviyFo6qfdVppUD0xjG1HkKLvccs9kTivSLbHwrvMZG55/KYBECpmQhpgHf9L2rnwRcZrrfRBtmdfaACOKsnX0TBC2aNLD1uXcH/EDgwmysOPFKXM8TZRfJRxIg66RdT31RTqBobWCi6zMqjsCj1jXPsFi6L6C3ZQLHzOF2KXbRV4kWAHPM7IAclRETSm2B1MKV6JiDvxKzCjGN/UD7/Iiaya4Pg+9pfjFC4HYp/Wl1ygmt9NJTJ85imqQungpvyO/JNWT0uAPFy/nT4/shyzx97ZI6D95XTWqbTkYUze/HbIkV+URt77S4N2Rw4wbUZPNjD6R98JgisUpa8RVC+HBg21XF4NCUaOZyzztMFsdRUZKeq2d9kFnp+6QfgN7YBgcmwsMHgRBUODL3m+I3+iY5ZCRmX0/TL7JDmrNYKIcPYTNSBulcmXaswvq6+/VlQRRn5qGlfhoj8+oes82JoRdNbbrzcF/rq6vbcUxUhGITbZDL8LxSeUXXwRYzvCAQr55b1eHPm+cg7DSlPdVD0Bg/0UGpVaCtwdlfMRr7xnL4tyK+/+IcPkhNzbZeDAG9v5IdftkK9l6kgQC1IyjeSdvG+3N/WuRXsp1rSqHdUmxY59YE/1ZXME5FikPm6j3QrxGEz14bGwp6vJHgs43tLOVigeKkvatpNEpS+JcZYVyAF4U+bcoX5wjZ+ZuaySS6UYhMsrdRQ4W4VRz3D1dodF6nF1Pia80LPDyUzUhkOlBTgM9YOzw+RQZof8VKBaSA49yy6bP8mJO3T7LInHtb+ozt8WSW177pkisWvMoSLjYxpzoXl7j9wsUKFd9pIJrMcaOwY0vcTEEZfMPSGTFSDI0/YpPy7kIOwe6s17xJEQAIF1qv7JBUwgXKXtu3K4Emo7FxAcNnFIgRUPASJVt50fImd+on7T3qfkhajFDixVZVcvxs73wutdKknCrPrvRLuG+B+eNAgPo4O1x0YpJYUWKvf1SeqEMKZX2WX9Bhz/8TSNPoD5qjoc1t7jlo9B2a30xnzi6EvMylsBXyKuBfFpEVF9mwUH9pe35bnrCwlaruuOoE+Xcj5SHAO5TsMUoSA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7rquvxvWF+SXUefRA6m9CANByyI5SEkrHmokSztRL2BUi6tAXAVeOAXDa/CKUFxnbGqY/yEaFeWCPL7DHkkhaj3wlwpekbgfF2Jn+5oaGfLbYgrRo0aG3eJl+Kwyc+uiuBtgZSepEkkP3jddAtpYYI2pIsta7M0xol6NBURQpgHU2ZoSY2hQTL2i4IeJvRc8e8x6omI3YAvRM8G1R/j3fvSWJEnvHCnABzw10D88TTy3TDRysX44xrGP98yGLtwkZrPYK0aAkUHmvW5J4cQL/HtMrhQlbY/z3898aa48/xHg2RvUeQ2ujI5G1fa2MS7LhKav/lZGTAoN5AUMo3CBQ8WMYIGEEvUFu931S8rIrRerejuYP4eX2dWFvnVFYs3QegD/SpavTmlWSfEAa0hGXi+T9MgBu1WqP+5R+REK6lBHNhT3TXSW43G6BoC0vTdrf8of50IAgKpjEvjWgUaO+3DykDoLKOHpzKhO47ubtduTe6FQFgy6NKmiIzqh1aQmEqQTnkFMX/f8zmft54CQTqMML5RLo8Grj54ihFwSK3zdiVLftJMFT/0RyyV7Jwh0U6IZH4ZR9eyB4WWf2nSZuStfNRMcKmru0MUntTsbPSAgct1RpRXVAQGWBjr2SSzVpqnO9wcC3lh0V26waEHo3NCGB/oFXa1fw1F9v0mqJk80+aWSNPQZwa7hNcL81R5qoDzIbz6zRhl8Tbk0X/PR0wdrRFj3+nVDn9DqrN49DjhTO2rYLZx5wBX7WlQhz/RAcsGqHI9m/v4v5EkThaCr1WOCIBDAmzUd0+QkjbUpTWdhJORZ277WDV/LpKfMvcCTz3g4/Rk43MKZ2xovbXCdL7VU3P29mMnp948z6haKvFZE22CSbpg/gfZNKArPozN0Q+4Ete4kYRz1JK+Tt/2O8YQbhy3vM/BWe7SkCjJcKaimOZfpk4vPJ3uyJ5vN7esh7FFWSPf2KV62FnYlPeIMnKmUWt0lpu6OMFQtat+MLPkaFTNwJwhRZOSaCLe32+BHKAitvlzP3TyOGbeLkpSmmQo/vcrI0qSkAsIjUQodqAiM32R6w722UIJNKZPPxBNAW1+KkDT01tordB+02zI25n4ZsyI3VJhAFCfn78km5p5aRqorxn6UPIvEQ6lJYWD80YgMm56AwhEmCGNapoPedleiQLZyGeJoYx7iT2k/cu7lOsRysKdX+4CobTNGNm3V4Q7SIlrY2n6sxejs8cEn7MWyxXlOnFlI6d3O5zhfAqkxhCABbaTp7qUM7TtmOoTn2bfd53eGhRImmkZfNKbjSJGfDAv2H/5Chq/xXwx2dv2MzbYkNbiDkUnIz6oGIg0jHzQaeDNvz4dqhEg5rGKq3lluLJiqCgT39vLA3qxecLIdM54RLj7Su7uJKKa2dbJ0AuFm0pA2HlN0GwtlBnG2z8VtzumWQrKEdRqrFWCRaEMN9lKyjtejwinE/iSTIY2B2E3C7dwKEx/hXUJL3C7n40dt62LNhhE5euHIiZP0NbgD89vi3f77Ln+auhjg/6hDUjVCoEP8D5p/aDMG5Tom6tn11ZAG0U4r6cmmHxDwT41ZHnh28/Jq3awNkfY5PMsJJYScdkY6EyYnGWyg99drnQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AsupNAvlvQagzc56QoegSaZDhJyEO+coNV30GNJQTmngfPAMAjwxp+a8491K3caMtDk/vdqauIF5i++2m8wmfFVfIxPFwpW2xc3fzWxzUNRyN+eGZdfEBtpfU1jaMLeaq1mGpW9NcWyf9Iw3ulB2KBKvPQPxxndsqWZwnteAY9gxPpU6SWj+x2ibkeiqmpkK8vjVJT00FAE+KFoDKz6kZV9/WG2hUhcit08BZ9YiEz8S3GOsycTzuyjEkI7o5Pi1DzqdygJ+vsEjI9fkoTjtHumz7EK+NzPSIVUGji3CLn2e5TYg7Z8TSxQ8KYuk69qICJkrSDmUZ/kw0UnB9cM4qTGL0ifdVvgTNjFG/hfCqzXZBnFHF7zJZKDuH0FJPUnuwES8cJzrZ56wj2pX4W5CArry0xioIxkaHUQvzjfVy+0LdwzVYhaksNz0WF0uWWZI6SDClZthbvk3U8/vl/a9boNAu1flzELD2hO9WOBsqCJlgRMGOzdeYRMERheS0ozuVq5sY8Y/ubdO4mSOEsB2hiJqnhzLFbG3Jr9pqvvjvpBfFmir+CnTCc6Y7jXrnmjHQVOlT+Oij0Ajnb6L/ssOT7nwkvTNJ3Kexc4/YMfamYU= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8d2a768-cf10-4110-fbdc-08dca7e620dd X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:30:01.7219 (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: zA9NU//n8u/0N/hjcrGkq+lwf3RT5JQdyBdnHTOVrjd1QFG/7mpVWUm0AohwlLZpPP2ae+9Z08KKqomsai9AJw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 mlxscore=0 malwarescore=0 adultscore=0 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: -u8AhD2kDxw5p_9PTzZF-9bIPcNPbjFO X-Proofpoint-ORIG-GUID: -u8AhD2kDxw5p_9PTzZF-9bIPcNPbjFO Add a BUILD_BUG_ON() call to ensure that we are not missing entries in cmd_flag_name[]. Reviewed-by: Bart Van Assche 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 312e8a40caad..a4accd79c225 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -281,6 +281,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 Fri Jul 19 11:29:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737213 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 D270574079 for ; Fri, 19 Jul 2024 11:30:15 +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=1721388617; cv=fail; b=fTnkfuVL6+3TwL8/vM60bowdZeAqMQ5X+MBEvwMKj9UGtNnqZc+gGh6eEyYrr98bx8xJIUfDz25xQ1yGhgX1BE9SMApiSb+0LPz5nflxiDejNvLuUkzus5QHVKgfs/FCNq/uKfxVxnZZThI9PHWqgV14qz+d8s6a78svHIme95c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721388617; c=relaxed/simple; bh=K3ELZfq1k9VPCUO5PxnAgk86tPIsuOgqu+m1X/51kps=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=HU95HZF9vfIWAT52KZ/TSbjvIU9M8i4mlAHXFjCmQwENcux5naEl6j0K7hRXAjgUUe9xgp49hG2rkpz3AV7Rzeagilaay3ItLJ8fHVtU/KwrzOHor3wjB+HuoqUdkya95VavNBYjxnwttDjBlZlqO3ckKEZ6rniCQFyaPNlyhiA= 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=keaxAacb; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=BFGX754m; 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="keaxAacb"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="BFGX754m" Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 46JB0u2A030664; Fri, 19 Jul 2024 11:30:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=go+hd9hdpeBwL/YZqEbgNpPFHfmQzUmco/MYAkcf/GQ=; b= keaxAacbTUSUP6jfPLNPgMhATCEm9m5IF2UdS2bkLy4HWWPBYXAkQIu5Y2azdnLw c72eQF1hmFlJDSVD/PTbmaoPuMo11Un3tCSJ6Rpp9c37GU/e2bDpnoTtqk4K5+Lj Nei4KIqnCEVp2S/Ke+pUEWeMpwgxHW2An3jLDLQUwggLHcc9Y9Vx5HvoyKxSgV5q 8Xe35//M9IQQcY+ZB2+YwgRG0WKizuiIjS6nCx1p3oR9wUNgRM65jOiJpwL7IQUh 9aAY9gpy58hC5bLVihh3tN3BfqRAmhF6CGaETHU9ZscaH9KmWon0Hct6gc2SQ8vV gwPI+G9VuV/BE3/HRXugNA== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fpvx017j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:07 +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 46JB6ugp004532; Fri, 19 Jul 2024 11:30:05 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 40dwf1mk65-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:05 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Jbc9EQE/qipfe64bSNaL20kn3ygwX/uNRpdGcfoPBM7lMDXFV3Lmxt4Qlwb41SiezYcP865r2PMhbFHlmHSlrcrt9BqUuJT1WlHEe9Kzi20fPBfp12PrWBbjSIbJq9Cho5nv9GbkORRK+KKUn9c4lGRHEGPZ6TOusL5+c2IkUO5E1srQOPMB17YlFAyugm7nbQRGqmmrhNN0OESvHABSkfS2Y6ihS+KfU5/mKZhGJDESG+MU/YGOrLF/5MSIpp1j3DKHx1Xoqasu2d4acw7XUj+gOmyTfcmjd3dBMrztn5840Q5RcrNGFn/t42fiVGvDiQyhLDJF0GJMFxXLsOnKNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=go+hd9hdpeBwL/YZqEbgNpPFHfmQzUmco/MYAkcf/GQ=; b=sjDzu5Jx/6TSht8hHV/yi6CDLGEyP2IfIy0Zw03IgQTXEWyTHhZF77l/IlnStM5j8SC14wRSyqelrh5ruGuisSsGqWCcHyIWN9LG8vuVeUTokk4pVlAJi1vUqAffxvQh+RSAunOVjBx2cEpmlSQvft1FPPfEIbu+DRe6Mv+DA6SPigaXsKPJJYyvrTh44LB5EkuxJRBJzDIcDRE0L4geDz6Vn0W0QbHHL8hpAk6RmWdcKA2/bBcSj1t1axWGSKyXVBkG66jx7vD3Jm11BjVE6FItsxj7HkvOFtiLIe5QCWPet7Kx1DZaicufvKRdoH+/setMtXYrrPvVGvopU4hUsw== 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=go+hd9hdpeBwL/YZqEbgNpPFHfmQzUmco/MYAkcf/GQ=; b=BFGX754mfyw1dPtyMXmCPnUJ3H+vSo2XArZv+tb/TbQS7OVZKSxk0g+MDAXitM7GKNKzFZLPDqOpVQ68ySG7QkJ+vHXGQbEV62YgfrnMo4NDF/UvGST+r0qfPCK/8JIy2RJ5pFDyzU+eEpa3lXzYe7fAiYmtBDzw5TN9v++sW+s= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:30:03 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:30:03 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 13/15] block: Use enum to define RQF_x bit indexes Date: Fri, 19 Jul 2024 11:29:10 +0000 Message-Id: <20240719112912.3830443-14-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN0PR02CA0019.namprd02.prod.outlook.com (2603:10b6:208:530::34) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: bdb8bbb4-6510-4bcd-9869-08dca7e621f4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: UhNUWcZCCk3g8gzi18rzT6wwI1Z7y+cY0JdnuFfs2io35dQYB6n1KImvwAI7QBu2hpWt7fDkZip9PvbtGZcGE7tRcN1BRYbb0jNhptBBl4fjDQjw7FHP4ckuYMgaFfOpxKYf10mVG3Q0dmOJW0wjHuTZg3NSiMOvGsDkVvtYDhlh1dpmh/qfN7wKLOxoDZRYXn3mWh84tjTycPmJJPN3nbx8Qt+vy8C5pKr2YAjBDUJNbZJZD92G7XizT2dgOrm7fm+xFwAQRCvwmcxG6eqqaocwcUwxIZhGKKArdcEMEya6ySdarJtzFdcFMFGn9gMPZ5GiQ8beYgLn6IjIYkhfZvAJPMpd4JlLeJbQfD7bpO2F28mnmU50FzMMqxe5Fhhud7KCbkhYzXSR2hsLIq4PrbBA6QTB4rbzHpgTh6QkNYYHlmcn9qH4jbbybSFIMFdLMpNGrM36x6G0bYjtBx3nE7YDQmAsc85T/WvK4qpLG0SfDCGu6H5JyU2vXqGZkB42PEF4m03j+qdhzgJ0snp6lytBPLi7/jqrgA3BJ6fT/uRgG/P3qEOWzQI2y11WJ+S9LQ2x1keOol2HEPk7VTnBlwh2F8AdQff7vOqq+6uQgmTuTDiIm7rEyGxPgzaXe/tbDggmACVo1HHRu9czfBfxQ3XW677YgvCicvGMYxjVrUzLUv7XqL64IjuGeCv6WKr14I0p9n2EimRiRpJLbXmuPZN1vO/dqEUoapXgm1UMmHDat5x+KueCAlu0RxET5llBjO7yuETaF1cnI9kitNhEP9vMWtv5gWE8enZ6m56SlA1qi1QYXW7vU8QF4FLR3iwQa3FqxoSYuM8cokJuXPnfjMuE/L/gAOW0m0r/AwWEFk0W6Ro+DPImbReEW6CZnKe2176m08iV4lJid3Xh79UMdaTygpB1IINh3IjsOTZXRa5lmC0In80sQV2FySRuVdz1ibbZtbvioc1sb5ZyWZdOFozYETY8jI8njMlldsYnAgRdFZL7xS/4+SPzbawt5fdesWXBM1Bj+VeOk6CCibYypNzFCxzjZbWgjP+4byc7cY0Sn0Yvga98b+FIjn1LQmjzmMZNfsSBYDW9lGJi5g90fAWVC4e2BhmKN55b2g9uMX+mBy8U9fSbgTeNwa5vAOhGLrxwj3yQ82NS9yZepN3Dm6rty2h1WZ4tDAC1TLi3tfKdviiQeHG1Z/C7Bq0m9PzerJ/xmm2MnZo6ek6nB5d4mSvVHHCVIbu8084Ml9zBTbTPJfJpD8MwG+b5JClVb3+hbtHLBNLg2ExM8fSS2RL6oOqIU8Rg6gHYqw/GCrJV2uSlvx7czdL4VxPxE2tCLCzm5D4f5CyWvoqTFCyKOn+HXA== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /Mz0H9whxEWkvliPuHgXgZ7XDsz2kxofjFQchMFNuRHss5EeL6XeC1daAQVeXgUwY0kDb67Xo9vjQN8RwhXDLO4qaSqvfFmXJXtbCNgpscl2kxZB+w0iyvN9YqHOTqo8jMUAHJGXTwJp1cV2Xk37OPRHlVrVSR2qtxNYn5TuR6R/N7x8B9ilw3yf49R7BxX0WdMTeg2aOn3st+tKEmNsHDEQ7CVqNx6MWmMxTRNIfjS5AUpn6cDNgIbpOb3ADQ2mz8pjRbAMF2wa0VPBKAskJ7ehxDQXXT+fijGijo1yX4t9wQF1ZQJ1f7VS9N2bcpB7sDo+IgBtqu1NPLfC5Rtyqvc3tl7u3jzZZYeZzAoqbSgUMRDDCe+NSLNa29wfna9/1bnfP+Itu17Ml3364kKqiLdoNLDA1ZTH/1bJSmGJTsWq/UTAPypJbbahD0hVBFQqOaYD8q7KV5tQz/LbUnP8wz8V3JrAs1tWTEX4S2uH+Q8GQwdwjrvo1drBuKWMWHioH+KPGmfXGTnIJH40WCwDFNWvmZJX/Qcd0/1OPyEbW4DKbca+4UCxAEYq2ICmc7EYZUPXFfmzNZxbjokgKsNysfKboj2EL7cNH6aLJj1QNTtKmpgIDtfYWf7z96qnoHMD3Cr6yVgGvM7DNq3ra5/MbpeifSFwcv27L610h+0Ccql7NhNObwjIy7Y3pmi4aziv4ELdkpGYYSa0/RCMX04OsE9+Pph53Il5nIMzz1Oim0wLIQr9J1L8Jxclt5OSar0VHnVQeZ9B42CeGZ02uOkR652g8zP0CG23HYv/hzX/KfhEWdSSbiQVuSod/d/YVHQfojg+1hTeuyNB2/iYh3O6vG8n/qYnPEXJZuUXvcmwi6jD2dNFSWuq+d55BINqam6Nt3x5/8IEmwSPaLN2Uo7+pmPdIZpbndGkrNI587b0ZVouSJKFD4zL+W3XhKQLMbohnxYL48IR2hM3zqIYzq6L+cO21biAFse+xWAD4vp8rgqisDoHjxnLMzBq25OgKTIUL7HQTXQpEqXvQuuruFsFkNS7pTnnNkWsUSZnlDHqTXUVlbCeAxVFvNr8aWPKYi4c4vqPC+eUuPC7dKgj2TLvW9WO3TlkqrPrmMxrX0oHux5JQ7g4l3YkBiDckThTi8wKFOu9j0hnTm0Ic7VG3wYHuTquYI0Qsv6NogzjbSICxOlp9B3v8iTO4Y8ZC2VteYJb/BmoM78vUIRiomIuCnzQPTK1tyI0U0ANAzPKK8aNtxvi7YJ0bj/Ruf2Vg57Qtor7zrb6vC8LEe3lq0W0iss7vIU0OyyOpDjEB6BLrax4PyYw2SzoVzKIgs2Rz2fmgqb7cL7uT5EtA8nZrIzLBoUPI36PozpU0LUH082ZvkBfKbhTDSj+CF6M5rkwDGHMbFa/BYz7YcG9w2FTeAhJ0IXQ0n/fOmwjoJVWV8h2wizcGWJn9E+XL179q9CvRI0PPE0qo5liilNBB7D9CiWCVp4ZGWGBNtlQCMpPENd1VxGV00LeJX2iKIOHQf3Zivm6JpK5YHpGkqvXYIhnvvB+uJzlSYZjPk1CJ0pBm4pCdfcV9WG87sHMbJXGaPYzh07kHc8uFXIhJ7bAPyjlTgMoBhWhYA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: D/fY+lPDsX/0ZGBaG2Vqmu+jqzgu+RQ+2LGPSy2cOhjuImPL67rsOdrhshKpb/2xlo4SmnW+ErJaDjqCld4XXIXh+voq3CYqF7ShZaTmfLuY61iPzq04LYFE44GFaOnLGbtbox2KQBDjxRMxk5IxpamP0ZPwylmqKQmHynkhHVqLfwjEj8YVc3qb/yzsFv8r4TEPxTtYEqYuiflNeD6mN3BOnpk7maaXGGADGj5VEFKA8Voz0NTxZxjhzVb8BW/BY+X1B0SySezwo1wO9UGajBoXRJ8qHlv3ADPUvh1Yj5HE40T8DM7qrTiMvQ/cG+2OKVomdfbS1Nr5204hrraOdUNDYKf2uGMml9Sh0vfJU/tU4yPm3VkozCyFvZ1OfAEaPS3eojiYyuCnL5FxSXCQB2MNI3B0q4csv9cDvhdGDGFdBK4oZjbfq6EdtV72yUGyax5CU1Bk24nzb8zqqD9wgYmQ3POjVv2lhrYPgLbCZZJrLOdgUkVuXoLKuRL9cgKdug+ZJYa6YTtCzyDk3d5mumnUT9Ao9Nv22we2CvYkfAejX9ur+eKmIf6KVa5ORS7iA/IUPdCKmcWgpdjOoCYCaN+KuPze1mbnsCRBR8/a8Vs= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdb8bbb4-6510-4bcd-9869-08dca7e621f4 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:30:03.6000 (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: XeMM1kPy4HtYkONHSq1qJUHu5pxAdea3oo/N9Y3lY7SRv6iQcIiV02DM1QgwPNPljYIuzHcB5rerDLg7g5nEBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxlogscore=999 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-ORIG-GUID: TeLtFFciuTzkLbslOFOzG3x0xhguyxw8 X-Proofpoint-GUID: TeLtFFciuTzkLbslOFOzG3x0xhguyxw8 Similar to what we do for enum req_flag_bits, divide the definition of RQF_x flags into an enum to declare the bits and an actual flag. Tweak some comments to not spill onto new lines. Signed-off-by: John Garry --- include/linux/blk-mq.h | 86 ++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 32 deletions(-) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index a64a50a0edf7..af52ec6a1ed5 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -27,38 +27,60 @@ typedef enum rq_end_io_ret (rq_end_io_fn)(struct request *, blk_status_t); * request flags */ typedef __u32 __bitwise req_flags_t; -/* drive already may have started this one */ -#define RQF_STARTED ((__force req_flags_t)(1 << 1)) -/* request for flush sequence */ -#define RQF_FLUSH_SEQ ((__force req_flags_t)(1 << 4)) -/* merge of different types, fail separately */ -#define RQF_MIXED_MERGE ((__force req_flags_t)(1 << 5)) -/* don't call prep for this one */ -#define RQF_DONTPREP ((__force req_flags_t)(1 << 7)) -/* use hctx->sched_tags */ -#define RQF_SCHED_TAGS ((__force req_flags_t)(1 << 8)) -/* use an I/O scheduler for this request */ -#define RQF_USE_SCHED ((__force req_flags_t)(1 << 9)) -/* vaguely specified driver internal error. Ignored by the block layer */ -#define RQF_FAILED ((__force req_flags_t)(1 << 10)) -/* don't warn about errors */ -#define RQF_QUIET ((__force req_flags_t)(1 << 11)) -/* account into disk and partition IO statistics */ -#define RQF_IO_STAT ((__force req_flags_t)(1 << 13)) -/* runtime pm request */ -#define RQF_PM ((__force req_flags_t)(1 << 15)) -/* on IO scheduler merge hash */ -#define RQF_HASHED ((__force req_flags_t)(1 << 16)) -/* track IO completion time */ -#define RQF_STATS ((__force req_flags_t)(1 << 17)) -/* Look at ->special_vec for the actual data payload instead of the - bio chain. */ -#define RQF_SPECIAL_PAYLOAD ((__force req_flags_t)(1 << 18)) -/* The request completion needs to be signaled to zone write pluging. */ -#define RQF_ZONE_WRITE_PLUGGING ((__force req_flags_t)(1 << 20)) -/* ->timeout has been called, don't expire again */ -#define RQF_TIMED_OUT ((__force req_flags_t)(1 << 21)) -#define RQF_RESV ((__force req_flags_t)(1 << 23)) +enum { + /* drive already may have started this one */ + __RQF_STARTED, + /* request for flush sequence */ + __RQF_FLUSH_SEQ, + /* merge of different types, fail separately */ + __RQF_MIXED_MERGE, + /* don't call prep for this one */ + __RQF_DONTPREP, + /* use hctx->sched_tags */ + __RQF_SCHED_TAGS, + /* use an I/O scheduler for this request */ + __RQF_USE_SCHED, + /* vaguely specified driver internal error. Ignored by block layer */ + __RQF_FAILED, + /* don't warn about errors */ + __RQF_QUIET, + /* account into disk and partition IO statistics */ + __RQF_IO_STAT, + /* runtime pm request */ + __RQF_PM, + /* on IO scheduler merge hash */ + __RQF_HASHED, + /* track IO completion time */ + __RQF_STATS, + /* Look at ->special_vec for the actual data payload instead of the + bio chain. */ + __RQF_SPECIAL_PAYLOAD, + /* request completion needs to be signaled to zone write plugging. */ + __RQF_ZONE_WRITE_PLUGGING, + /* ->timeout has been called, don't expire again */ + __RQF_TIMED_OUT, + __RQF_RESV, + __RQF_BITS +}; + +#define RQF_STARTED ((__force req_flags_t)(1 << __RQF_STARTED)) +#define RQF_FLUSH_SEQ ((__force req_flags_t)(1 << __RQF_FLUSH_SEQ)) +#define RQF_MIXED_MERGE ((__force req_flags_t)(1 << __RQF_MIXED_MERGE)) +#define RQF_DONTPREP ((__force req_flags_t)(1 << __RQF_DONTPREP)) +#define RQF_SCHED_TAGS ((__force req_flags_t)(1 << __RQF_SCHED_TAGS)) +#define RQF_USE_SCHED ((__force req_flags_t)(1 << __RQF_USE_SCHED)) +#define RQF_FAILED ((__force req_flags_t)(1 << __RQF_FAILED)) +#define RQF_QUIET ((__force req_flags_t)(1 << __RQF_QUIET)) +#define RQF_IO_STAT ((__force req_flags_t)(1 << __RQF_IO_STAT)) +#define RQF_PM ((__force req_flags_t)(1 << __RQF_PM)) +#define RQF_HASHED ((__force req_flags_t)(1 << __RQF_HASHED)) +#define RQF_STATS ((__force req_flags_t)(1 << __RQF_STATS)) +#define RQF_SPECIAL_PAYLOAD \ + ((__force req_flags_t)(1 << __RQF_SPECIAL_PAYLOAD)) +#define RQF_ZONE_WRITE_PLUGGING \ + ((__force req_flags_t)(1 << __RQF_ZONE_WRITE_PLUGGING)) +#define RQF_TIMED_OUT ((__force req_flags_t)(1 << __RQF_TIMED_OUT)) +#define RQF_RESV ((__force req_flags_t)(1 << __RQF_RESV)) /* flags that prevent us from merging requests: */ #define RQF_NOMERGE_FLAGS \ From patchwork Fri Jul 19 11:29:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737229 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 BFE1D2C1AC for ; Fri, 19 Jul 2024 11:46:21 +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=1721389583; cv=fail; b=iuPpxYp6UUIhcpRjNhAPdVhkMGNtVrgDlkHHmrGeoOycFk4hUvTWEO9hGk7CJgEzqvcLDlEka62Enk4mc9nfGYqNUsIDCuvrLseqxV1phAXgUylSEUBsN3Z6Pq/safsXUbU3gk363VQZ7CXOCSRq5FMVDl9UTXxeWqCs38Kab+w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721389583; c=relaxed/simple; bh=JOA6S4X4SgpfHv+J84ImFfgPtjor4V51s+OzYTb/FCQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=PB6XCVge40UiFFAyCCW60oYUZwxJ9X4PQyqhsugbqTwXl3qu3xrFWztWiN1tPduB/XzSIGIOrJ7h7CF7/3EPxwWQjEhxdpLTiPEusS26v9WxPYjwRjPaEmmnh2H5Qr/UTus1TR290PRYlWfLPOuuBRWVIN6XT6H8UDlS6JfXniM= 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=nJCqY4bz; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ysyEVdBt; 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="nJCqY4bz"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ysyEVdBt" 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 46JBe2MP026256; Fri, 19 Jul 2024 11:46:15 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=Fuy05Bwg2QM8LhveePFdZV1kl/x/ioHY9IPEViISBi0=; b= nJCqY4bzE6OEf8/HMa9beQFu8ht3fCebgwyTS8PLvMUvs/KRgrY6cjeN6vNTTi7U 0DjjM7694TrX8Ute3ggaYzdqYwYYGqSesQprbMYmc999Uvjb6QexGT07MSjNktko /UccI+UW2gM+3wqLiJGplEDA488G7w549KN4zhx2lZPTIazIOW7rcNoda2NJOFts RF97p1aBcRmKDctxNW4Gtw+ZRdIP7WdXPQHelaI35boGGKdjSPasFPIxCUOsP5V8 MzbZV8yhKrZLWwovXFGdh6XuAaTZymwlrfynCRF5bc4XFPRcOl2nkPNwq/SD3ZkS dbRAvbF008yGF9PduKruwg== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fqfkr093-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:46:15 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46JBBs9l021917; Fri, 19 Jul 2024 11:30:09 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2040.outbound.protection.outlook.com [104.47.57.40]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevt866-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:09 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bd91m95TadVoRAZzdWqPkT5UQBXyy+LJA2/zR61W/cuv6o2K4TGUYgh0JsbBgVb80QQZeEEJ1NxGQ3zZLDPifz7Lxw19+SUHtodd7KXvc13de+rjuHKP3xMCD41Ur4tuKIi9v4FSdmRu2qMpxq78q3uhmU6Fa4O5BLauUIIPGOgwSmPWps3gIHjVTw0YhV+AHBI6xfOIeDLug7F5cBsv5UssESLWP2gOZust5XL03DLYnntzgtwysmx0Yq5cpeFHlI2SqFVg4+Vx97yUlInBTRZ1MWLMti4YjE13X2RHuPdqf6tBwUizDn/8q74+/JrnZ0c2ERZI8fcFUk0cC6tQEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Fuy05Bwg2QM8LhveePFdZV1kl/x/ioHY9IPEViISBi0=; b=Zq8v8u6EOb5yDevQirFVQ9tEA4xY8alNDh6qcCJmQBLQuzY5uizZ6CDdC6dcvc5TGkLkEakxsF5NRxH9QhtyKTi/f8TGQzRmUh5XRkAdW7XoeLUoNlPju1hEzQNBIC2IV8QVXrDHoF90ozm7monQVdvgoDxB5pWZNsVhj5r5s2OVqD36UoD+51vFs8zyTbWXJufSSU6iUhqrk0UcQlAbi5cgMjBP6uUv2qD2SioHOa6LXJjQDjRTwL3U+5TWLZ5j9+eILu49UgYIrRJiIu+m2wqXBku6xnZ/H/tklBNlbRVCj1rNhlLrDssJ3Ofj5kynyQ1yERpIqvVdObbYNCKDhw== 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=Fuy05Bwg2QM8LhveePFdZV1kl/x/ioHY9IPEViISBi0=; b=ysyEVdBtq8gwYHiygoN97oWuuu2KGOSBVvb/Vo1R0HAPFIrPZPzu+oirBo/6ZbEGwvDx2uflWK5IJAVjdAWK9avBwW1CT+3WMVVkKlLWMgXZsCJ78il0mEc4c+SF+CzrxCBFWXivBkeuSYns1svBgZ2imShSRwPhFqtCqcTn2No= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:30:05 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:30:05 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 14/15] block: Simplify definition of RQF_NAME() Date: Fri, 19 Jul 2024 11:29:11 +0000 Message-Id: <20240719112912.3830443-15-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR05CA0053.namprd05.prod.outlook.com (2603:10b6:208:236::22) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 71832722-1d69-480c-9dce-08dca7e6231f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: qESJHPod7sfhBmsyUIsl7+4c4kc/0sCxCw3yb6rHHAwZ7fOcqgo/ycJPqUbHhAX4x+ihjjX/0i4EVzpu8uctuzIObqHdiWvP8RoTIfr/IyXQNM6cRUrr1riTgguqsteFgUq3PYW+KzL/7AJq9PddGjj34lGjoejQ7FhFmfYchSrTYNc1DTQ49RkQcckel0JMUhysV0/gw4cDFbpA+E6ptk52PLeIM6JUZepSAClu4iDjUwQQPib+quTK1hmau62G2g3/FS/TCx32kR6HvalRj/sjfnkETimvtrHu/e8kggupH3EIwPiUdx05mglKZxU4Jl1erlz6g0o2930RYlxZDawM0GvmdXLnK1hSognJ0zuwZjK1//eAbHsh7Ago7beZLq40WZQq/SPY6SMiC2okqoEKv7+JGrdI6VWVfA9wGK9fHHeFo9lzwHpDBWZATDDOcMmld9BOOu1/hPWSvae/Hfa2CSBbYzqb2Znh2vsr61PwWWwB5/VJz/UtMz/63PrCVHjE3acRZ944xUQZO6ogtCu9SsjSUASPgKDyfSQD3VCpMkxFasMw13q1UowmDFG4+12rNTco8cFDpOLYWa4NwQg8DfGHDj3SJ3DHJMhkLebWZnmFPgDK3zsOMU8O2/IFr3ODhy1tULCLZBXFzxgkXI3moVzCDhqRHf9xixZNgTGXvGG/w7E5XoMZ4GddkxtqV/+t/itCOde4nhVD0tXpXALpReoM4unBvEwUtNzGhoBlDGvV+q834b6G460NKPihPFZprBsK50gFSq7noiEO8j/nncsKJvO2c0jZvlxHkLwBKoEIBB6sd4pUSLtw8+OpmspO50mDwvwW3TlwxffpC2sIhKfzm8/RjJiKvSklcoPYDB9BZ0o5Yrd4pz4E3imkgk1jd372Yy6kBNn4SeoosgcXTvlKwWOaqGANH2sVvjSTCshqgOXCQpEXRsdmgmn8BwYxXn8Zp8Ho60hWVyFPlUv5Bo4xz663k0T/agYLP5fQuWBWdqkETcwtEZLqDdn3T1hCV4Uf8vXnAy1RXq4odl+FCenEWYBF9XGkBZFjxOhzaRbnayYiV45pUinXZqMuHuscKZN0L4O4zByNV9ndvBOo6K/bAEt58XDYVcPCcl0r7QsUbQbvDlA0UKShXdZbN8BSIBUSMMT0JRXNJCgURlhpC+cLyj89fF8JfJvyZuL5OdYXZGHxfELhRONgz6OcPzf5rW2Zf5SIHf8ltMw1zNTzWflqVrBReL2UO9bI7YA9ICxUENPvqukl6j8amlxGUadXCNz+cfcVBuwJ0WdTqWvDgqC1nPRGNabL2xc8h+zhSiCeybFho10qEdOeJfsYkugVY8uTLNy2DayO4aefOQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8zzLw4nND6NIzWw4cHgS7MnnqczlGrVaqh97Lm7D8sMPmsSu8TpjUCAhwlcCJBCdMbSve6ujvW5a1bEdsj6uGDUJCy8rDYSn8jjIVOl14PulwXaSwNkS1uUMMouWUG2g7OQ2akaRWf9qVtJ/6RyVvR3w0QgsPZYh8i0T+4JUbh5+gNwopfmmXkdAtM68urs8KxZ3WU9qEgptCuOpegVPdAEYh2W5CeD4QbzVVVqpVh+cOsSzcKxBu0L9boO8qHFF9RS2vnFWMdaauBMjAyaIqgBNORhvTc1MqrsGYrXKEj7vqFJEAGSVJmB6Z5RupVMbc2ev20gNxKJWSGFe4A6DCrecZ9C52lj2tH/DSjtoQWN7zzcMUO1JjTFc0ubk9RdW1tCRmGDPfNTG1wHD1RHG2oNAlSG5EtC7JqzYxd+cVd3EpL+EQlM2zefG9ON+vtEJGHn3v3595j1HLgzWpOv8eXdXujDCa5k0DB+jlIKU4oQqQ/GSLnbMZ44l/UZclymEH4t78dagnlljpYkH9riovylN37QuQiMfSa4H9PlLu/cy6UODadaN8n5F88ERoi1SpOxSHNgfnMRSfhivLKS/7vZvBx2x8/OLYYIQ2yHI90+flnoo3QIHDRr3te6wFeWpHy5qnlzY9Rrb8ZQtFDMbH/pZdVVSSarFqKmowtC3pzabRCijCZtq4GKDF7WMNKItXEuUEqB6FK7PmZpi2b1AV5i+9QSV+cXwD1Wek6iQmLvHwq1OQLDYSUr3Yqrf/eX2eLijZbTOSbN8wbIBvCyK8eZ3srIWWJE8yMlHxKQZyJj7hd2Z0djDNSJxm6IM+YwrDBnWi2duVHHcL4cWHmF/Hat+ggNd8/O8nrlinqp7d3a/87Z7+T0TGQjsVfeOaTQWsBiTYJxu7tusMOc7LliCegWkz7FMEjPIY/TaYOJynY1CfwRNfA5m1Y8oSTOIOpy6YK6A31Yi00MWCuF99Yf6/l1lwSg77BIDcn/XqzX1rq5rcJRaHakvc7q0gNkeoENrwhdwkTbAQIOL9pvlHrU0PIwvSVCaPtypNC1hgvBmvapWdw1Y72OBzdrHztUxaElPtZvz2vndq/46xtaK1d/Nm4bvu6rSQogl/NcFYup7gS4RqOd2tEYRsqzqq915KinhzMnsPxUbh8vTYtDRtUXTjEfUojpNsR/Qh0/Y+tCr2l2Z3zPiHb2PMwwcpMyWEZXPEfoU2Qy4caW0WCazzYOdHTdxUkDZi6gtCdaPbvUPl9qV4tRJrUyFk0rOGAzfGpfGqJlT7boEXA9dMbqjUgtfjQxkaFDCrrHuDrSaheWTjdRblF6DAsbdOXiWmCgQgzaBqwSORWfh0RCrTo9JcRfLmmZ1xY/xrw7VaC/UialGSNf2HcUVDXJ3CodQTEvgO/lx16d/Na8aPi/COpwkb613KGggLKEnNgKxBa03Ki8WRNkIMajHYy6KtPYPvuL5Mnz4RE4PWWKhj/M5aJxSHomQkqZUFT+i8EIQh0KFDvLe7EfAUUxKdC/3Wb8KA5kn4pAkDG9LKr4M7euyYD8//5zpE0LhnYq41Lv5pjOdFO9nghgm/VJMeX6se6HMXgFLFKtc30Eo/v+S1gEVH//nYz6AMQ== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: AfiwhAR1zKZUUGmQTo7JN+Be+aiZwHX65YFEevQ1/w7ruoNGE1E55IqxceJ43qLpNGdwXUZytdzgMYLxzWjcpXTPQny1nv+3TIhJKZRty26zFh5ZVRfr+0uJei+wO8W6a/DeYNcUaUllkbqhvxgfIY89bZvQkzDXsTckRqDMDFp9ZrwlywFssAXrMIK6n+69IcihmxRHCyptRHuxagsT1AAxWgbKcjwcBvYo9QB1Pe4eDdj9+DoC3f3KJLmZMnbeiFeUgAhnXGNRByNhESht6RZZUHlWciG4bh43ho2JySEWNFTFEYPQd8M17VBAWwSnVDH40r6tTqVdUo6r7xHIwnjSTvESPN1YgMT0V62mlFxZi57z9HNN++lBn0GM+Y2+8jbzFbM1+9PWK9hIAblPAzY9DC8CIT4klLx4xSWlhoE7Qrc4fPP+MQPNqSyINNH1g55eGANs5xvxALNpMv/QU3oG4wLIuqShM94jm522YGT7l3T24p3jW4TA/PXkzELN+PDfagBwJIV6gHeYUgDdY9kcCcRXV9fJwfQRTvogqknY3h3wz/gwe3pHyeWpxes9erWYGydzd2gKL2ouK52tXfTJdniLFEHcY+XCXRRb5cg= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71832722-1d69-480c-9dce-08dca7e6231f X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:30:05.4445 (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: YRuEjQTjJdAxj5R7N+WRmkwQ22mYO5SHvv+p6oc3O7bB+bgWfh4zDbijkq5JegT//812rpWyz4RcldbpZQS9hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: PvmhfIWo3NKrXNsAeae2-zgnOaApAqWz X-Proofpoint-ORIG-GUID: PvmhfIWo3NKrXNsAeae2-zgnOaApAqWz Now that we have a bit index for RQF_x in __RQF_x, use __RQF_x to simplify the definition of RQF_NAME() by not using ilog2((__force u32()). Reviewed-by: Bart Van Assche Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index a4accd79c225..34ed099c3429 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -240,7 +240,7 @@ static const char *const cmd_flag_name[] = { }; #undef CMD_FLAG_NAME -#define RQF_NAME(name) [ilog2((__force u32)RQF_##name)] = #name +#define RQF_NAME(name) [__RQF_##name] = #name static const char *const rqf_name[] = { RQF_NAME(STARTED), RQF_NAME(FLUSH_SEQ), From patchwork Fri Jul 19 11:29:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13737230 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 A124A2C1AC for ; Fri, 19 Jul 2024 11:46:26 +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=1721389588; cv=fail; b=TFDncJit8gOvaELrq1RFn9X0UhoYGQK3WZ3jWp1jmChJ4JiQUkI7r0wSpgNFnoWEiud9Im5YounFYW11U3F2RkWsmlpjH3PmDIZLjm8dssNMSk5PxlLTx5vwQG9jvUPxNXblBeMOL95fZzs9/eWpO0icUg2I6D/6v+0NRs2swg4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721389588; c=relaxed/simple; bh=P6TNQMkRBCeJNRRfYZd6taYpcUtOVerBUpTDZfU7oPQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=mSlbUsi5C2qGq1308Mpm4ZsMLyN5+SkiZD6t+8/pbwTJATSH8tYDPpIAmoo+eTM+KX0eWK3eTidQeQwHr/J3E6es+2HvRakZiIzp5HbLDfK3h8Eu5ZbuoewltSkzGeOqdbTbTLoU9io/F0W+QmH1f1nrYVAfLzAhd7lqpk7Ig7U= 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=OPq0ll8V; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=ZgqU9//w; 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="OPq0ll8V"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="ZgqU9//w" 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 46JBKLHb027867; Fri, 19 Jul 2024 11:46:14 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=QMtnan9Ue1sDIl79BTMr7IhrIAEXMYzC+CAR8XvkJzI=; b= OPq0ll8VvX7CUXXfpJl0yXZqOIcB4s0lMJj2OgBxYbxcxuJRRIX1QwS/5mqCpckP 19rTp4/5gdc9e4XsCbmt8ywzqb7B3yT7aOYaHA+YHvJydAvYivk+JF8PYGy9aVSY DkUswr/mZ8WssaVZXzpgl0qdklO3zkBt120r1dYxI6lNA8mo5X2+y/ThqK+y1/Ja 2w9J1Pdtpc1HrqoQ2ghVc/MUnriE7rqkA6+IIss+QNU9oqIthtOXeKWBtKV32ZbS gIXIwOXXaST6kYfryNz2lEsQlNUGWpLAzXEigxmryYKD2WXAhtYkkJcigpAD1uvi kdnObX4sRTUFMdwu8Pn9Zw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 40fq67g1w3-8 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:46:14 +0000 (GMT) Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 46J9KZ0O021743; Fri, 19 Jul 2024 11:30:11 GMT Received: from nam02-sn1-obe.outbound.protection.outlook.com (mail-sn1nam02lp2041.outbound.protection.outlook.com [104.47.57.41]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 40dwevt8b8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 19 Jul 2024 11:30:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OkohNKJV1mLq6Q4Ys9eOj5Bbe8raDELMbFD8eRcGEeRWCBH7C7ZNDVYyQm4a+y4/bliGWfOgjGui9Y3A7mrCpnwuFLqVTcqe5ANsxta/ly3WXhZVpkNzHn1Xuw/EZTzpyh1GrGwxUe6bipVIPyaZJqA9izF7GjXhQGQEPL1QIbyOKoHZs3YlDkh+Hjz1AHphJO54RUTvjnmk1u/WI3zTH/9Jfz37Ab5MY2/ipTH5IOBRl+qGJ7ncsHbdNVf0/2b1JYxrAyAA48Uu8xHij+JW69mkJJmop8t18Z6idx3fA8u+VP5FoXL0SbLV0Mr5thgrjLT6ckQK4x0Ueeoz3FbgIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QMtnan9Ue1sDIl79BTMr7IhrIAEXMYzC+CAR8XvkJzI=; b=jERR/SaRf+xI27Wg5d7tjL3OvO+h2YuLw+VLVhuVtkoOp/RgKMlUBzVjysvfC6hE+pN76usR1rEX85Tts3WWoQvxlb/VxMTs5bVSvp94I4rLLkYfcub5XQPnd0YMDwfy57lmqBlzpc8Jv/ocT0om0vKhHgZj5f0DHMdmVnsUkzkRBbIPvQgKc1fIOs39v/MuQdSOI2z6yjzmuUy5xaFE7yGtJou78vPVqvaGQ+wPezobF/jGr+spTsncEcxB+U1HG2MrM+zmFt3e7lCpSzowF4/z9/S8wciBbK+DP1yQEP8Vs2suVGH1lJRAEH0ku4fXOAqJNsFL3l2hYnWVEIXxCg== 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=QMtnan9Ue1sDIl79BTMr7IhrIAEXMYzC+CAR8XvkJzI=; b=ZgqU9//wTweNFgLkSSoV7E6Ok+VwKQngvvR57Q+AehyZq9tiKNnVchPwPy+k5/XQI+sXXJmsQRbsMWOuxdFdR8IS+AVz+XwRPk4jPEw/P5avGfF2IeJGU4ucAQ9J4HMQrAkHImQFkN6C4RoR7nDVFvU7gJ+uc9VwFfHybiK+sxU= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by CY8PR10MB6537.namprd10.prod.outlook.com (2603:10b6:930:5b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7762.30; Fri, 19 Jul 2024 11:30:09 +0000 Received: from DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088]) by DM6PR10MB4313.namprd10.prod.outlook.com ([fe80::4f45:f4ab:121:e088%6]) with mapi id 15.20.7762.027; Fri, 19 Jul 2024 11:30:07 +0000 From: John Garry To: axboe@kernel.dk, hch@lst.de Cc: linux-block@vger.kernel.org, bvanassche@acm.org, John Garry Subject: [PATCH v3 15/15] block: Catch possible entries missing from rqf_name[] Date: Fri, 19 Jul 2024 11:29:12 +0000 Message-Id: <20240719112912.3830443-16-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240719112912.3830443-1-john.g.garry@oracle.com> References: <20240719112912.3830443-1-john.g.garry@oracle.com> X-ClientProxiedBy: MN2PR05CA0066.namprd05.prod.outlook.com (2603:10b6:208:236::35) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|CY8PR10MB6537:EE_ X-MS-Office365-Filtering-Correlation-Id: 2dc13bfe-59bf-4016-7f87-08dca7e62434 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|1800799024; X-Microsoft-Antispam-Message-Info: 5HuYwwJBxhK1dC3/yEb7WfJLUsG1kooMxkn3XUoGMc/bbbphf6XFzC/1qFmhc3Cgbejo8KpJbxnhhWh8nNzRm4ImH0U0EVGu1UzVWjDrv4uWwGKBiRvtisVcI6jDpyGf9zEeb+p49DavWwunmEgxzcRkVuJQuzwsXnsHovJhg1nHlyJL6JH6TudrUr5OguA/T3QfYbPwpJudU23S0gHop/qFu4aP2pXJDcOQjZ58oEN69ZJg9dUg6osaOoTM6kdhbwR86q/rafLGJSFk7ry6LvxATnhk0YAL8IB93QWFBg5rDYm1HAU8fRtdqTcK9s//w9WOSv9X0Lgtz6116zamFWA6BxcvnJDGb2+HOjW+7CnnLsNiiq6vXxhmUWdZ35VAh+7ZSaA4TeybPrmuNaglM1RxnJXs2katgtfsvMQC7CJNgmPL5pGFhoe+yc5PQRSRWHWnKQJh9dfBOEf9qKLgv6CIgiHDt84mWF6X6KKdqamYZ4bpvHFOAJLZvyC0FkxzoRZTwJIx4tEDO6ZDnN+cG/upoWloaWZ88K0qAOUp6/NE5gCzyySovZUHBUeKgyCKfTR4VWU61+AS2p0EugQ7kXnLA1zMLt/ZwiIWBl4qPFHYAo+0BfBUwSwvfHs2cEQJ5KVFA2TkdrO6svO2qwFsOW0hskz4hUKXZzuWSQGAC3Khm7F8Dpxrh/kXEkmY21E9kvSZyc/fgL5uvfIBVUsULJZrqSbNPgTSlir1EpCx8vXDUFwml31arIg+W88fCvrm90pP/oVuUGttFCTy3f1ypSj2wX2jxVwRKvT+SZI1mcuylCQ+fcxuAcUHma1kD7ilbF1HKwSAGk/+w1g8daHIMRwGTcIhs5mJighuD0p8OlTQodiH9DbACF+LtsNsgPMotfDX1OoE9FGC2sSo4mZd6ol6xLgh3/Szir9zAlk5NnjSL4cF0O/auAhOlURpFYOSe49hL7aSjNrkU1CCjIiOXwxEi9r2RDD/auOc8dlivOcb8A79M8NJLm00tZI03d2mzLm0Rx7Ksx6orTnyVuUIHbN2fVRboNGeTNF4ZJ5E49dt5xywRgrYmwOQuAzX19A5etnvGJY5BhsG8+snU5EzDKEZhfFZCsjypK7xueGsvR6ymliLr6pUWa2v2LfPJWkCh/erNUdHUktBXryzy2r/1H4L0XwojY2aGQMrOTqotY0HMfAiqRTzoxk7P2zpH2LdVdZhspf5K1+p8T2MysZbinFV6JrA+G4klMzv0W+hUdAMuIJ8hsM3m0ziO1gQTBVi66FjQIAIRFbCB8xmoeaZ2IF1Lw94fd+kmVjPFqZBFm6t+M/2j+GiwH+XCtJHxDugcJuaBL9f5eHDbRcSyTkB4A== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DM6PR10MB4313.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0ONC1nquiK3z+sO9D70w7KEMwVlbvhGjACelSXwJEi7GJR3xmT+n4dETl7bButTWBIIXH7EBwqIEqZUOqo/tMIfKRAcwxv7PmSTbQtEg9Nh9UQCG1IOXuQkuyu8wRETNKAnYMlmZ+XSa5/P32susvGmTB68ZQ+dR5BD3VvD+e7lVl3ndXTzdLTypGIfssr66oO2p4CKYCI/aDXOBIiDUdH2ca+6jXkDu+6Dymlnaluq/D+D4UuA583F9lVN7ySDbUWwnbDICaFrEAUIOFzdnmRD377NqteXFNtXhgzeLIVhBiASgEkfAL7QPdGABRNvTgO/HOsibNTeh7yMjVb0ivabFoHQYPEfmaV7fwzQ31QFol0AWgErA3FIdu/95GFlMET7kZE4IE7AHahLd8bn4kWgmXTJUBFEiOG+WQzTa+3DyYGeEIysuRtMrgorIrps2Z87u5IzkZMTwJdfGvPwpTfgmIAWug8GfB4G8UqJ7+icSgrUEHOA+Da3bH0F7fQl/hxdXBbgR/pEO2bEVwSBgBmzTmwDMJTyoxHui74IVpfvhvY2o74SK+T+oOyERUR6tGviohXKGGerKDs9BM0mzHU4QABj5+gt0qVtmdW9a04Ykd1cKsQAsDq9CrWPaO74VWgrhpys0WC800EsCW1NIg9yvvs359CSrCpVtMS+XqG3hub8M8mlgJP9oZdHwcND84moOg8jLweQb3YsfoGrqg/sWEjQYFRmQjTgUBhgHYL3dpvgaL16SNTu/GxJJtYUd0V6yJVAeokU7Dy8DTfkeohlHknVINcOG4NdiRUH8ggwA47qT5MsP4oqEK1DFGrWd0uGBJSitsg9rGrJys7R9l/Xl1gd4vb6Fj/FWYhfYCzxAex+TCjOVC2zRYQDsB5q3Ux1TjPwRvT/9PWk17sZHKGR/Rf3aHxPCtM+vb3r8ZXi5i3whmL7zTYC3THWdNgpvd1etNqxElJwVSfu4N7vxZgWyYj7z310NpPOMncF6Zcfo26RN99jhKnj4Pr9IdZOOT1DG3ze7xy0JHmR7b2qEay6aMcuCmcmmm6L10wWc+KOqwK27IDQRFWq3Q/BVxZNlZBIOJrot+YKco64cHz1+fRthgzSR0yIRtaPPMYI6hqSDFlvJGESxG7hcz8sMg0IsMKzifxP+9GK07T8gSROOjaPaLj56SwLJjSO7f3HAlz/5VCkq0ns09zZueAKRQ7XZCmJrbMQkTjlJ2ToM3MzvRhUQnJ2EKp6DSwejkFU1Z28iUOswYPzrAqn7M8HksaHY/v8AF8NFvsgfN4svOPc6gdV43drkVPjnJah3IsKhStKAYaFQ+xlyycdq4t/88mqHZ/Re7kHC/NgW9yhQ/Ws3twaiZGKowp7nOzWiLXrGHk7A6QVah6HMfnhLlUenhW7lC8ox0q9qvZ/OK6xBu6woegYbHGdcYJeZbBDYUntIqIuBjpad6i/wQC8ETU4xbMHioqZFr/dxmJQBZlRbooi0LVtSq7O+jNRzf3KfGtoepQdmHeQUUqgw+6E5XhsLZBsovGGdSE0QJHY9A4vpV1x6E1KSvn2bny52AJFsXpgB5ztaRPpf94++/2Cs4AEI32CvMwp79/6VfmdGX4SCwWf7KA== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 5b/9xMCvV0FbItsGRSWGAhLWmT4VX8tAY5ti8XFd3LZEiVTLVliSMONNBb3JgWOMcCNt8cNKwL/9kF8XV5DVbZK9QSkWhdhWSkpO5sCsLpqIixdRBSZYXIkqs8z8OLGjO+d8DBzwG6hpxosAgsf1Wjon3EoF7IDyvSvSv5mvbQBIZzwS5p0h/YEGbx9SEKF65204x8srrDh5feqTWf+rJt2zgPq6Wvpv3fQjV5nQLkYdTN337DFZwh5WxJ72MYkVGwwqowc+JBTHr+B9vnJHdqGkEX2GNIloDvcR9lGqXSo6twZ/+a0iK6wDS6nAM/cgIwFO3mprgBiave8dd/Gi9wA0WmsbFiUph22aO3b2BiLK0XPVcVS6yivotLXftALaKlKLxg02jlPuSOwn2ZMKy9o5JjE5ebIXa7faMVCoBJqGQx4hHGYTmSYgBSf+QCGNRfKQ4TXQ94YqkgGIGaN8k0mK9JcKDTBWB8hz7unlXThiHo1Oy4Lp5H7isVlgg6zB5mr6JuFYfAul1fRVREVdrFmdss0t+jv/97ibRbKejecZaiXsJr6p20ZFAjbso4uLHr7Kf8qJCy5C6b9VqKjm9OR42PyuTgsplNPsRPvfzUY= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2dc13bfe-59bf-4016-7f87-08dca7e62434 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2024 11:30:07.2541 (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: SiPbkpr6AvZCUjFzOaaL1L3y6zI0B21xj1Tq0KbRU8dCIGLlccmzqqB2BHkwp89Yjg5Op51tiLZM5ttsZafAaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR10MB6537 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-19_06,2024-07-18_01,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0 bulkscore=0 mlxscore=0 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2407110000 definitions=main-2407190088 X-Proofpoint-GUID: dITGrQ3wrk_NADvr7OyUlU1QjLE5Z43s X-Proofpoint-ORIG-GUID: dITGrQ3wrk_NADvr7OyUlU1QjLE5Z43s Add a BUILD_BUG_ON() call to ensure that we are not missing entries in rqf_name[]. Reviewed-by: Bart Van Assche Signed-off-by: John Garry --- block/blk-mq-debugfs.c | 1 + include/linux/blk-mq.h | 1 + 2 files changed, 2 insertions(+) diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 34ed099c3429..5463697a8442 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c @@ -282,6 +282,7 @@ int __blk_mq_debugfs_rq_show(struct seq_file *m, struct request *rq) const char *op_str = blk_op_str(op); BUILD_BUG_ON(ARRAY_SIZE(cmd_flag_name) != __REQ_NR_BITS); + BUILD_BUG_ON(ARRAY_SIZE(rqf_name) != __RQF_BITS); seq_printf(m, "%p {.op=", rq); if (strcmp(op_str, "UNKNOWN") == 0) diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index af52ec6a1ed5..8d304b1d16b1 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,