From patchwork Fri Jun 14 09:03:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13698210 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 7BE74148844; Fri, 14 Jun 2024 09:04:08 +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=1718355850; cv=fail; b=PbKhTJSoX0mn7ZtdGDaPftOc+7yhbzK5td1egxHL28SwU/0oebnUfWEWkudBYCWoKrxWbY3hH2AB/4hXB/w13auEj32jAq1Uo1FPiRTBlY7+s0mv3d462K9+pBnGwZGpY4k1UxaZ4WK4Ug0Prak/bRgOHV4EtJ4DWftGuNMHUB4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718355850; c=relaxed/simple; bh=0+1Gu2D5OXFevAJ6EUWSB2dYQwQh5sQJnO+3mqxvERg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=DvlgAjZQ5hs1dagPzIWHB7iqfrmxU4FIX81QazJC3A0ClSwaL25zStJqSqMK4AVv3YrkbBAKpoNr1N78ir3nK0TJfZ3YD3zVFZkFW/cWtFFvysioHS/AaWgDSBoTTS8kL0SJl7o1wQh20XLsknejd1o5Y2hYp6Zcg36rr/ZHkoo= 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=ZD+XsORh; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=F1hHnR0e; 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="ZD+XsORh"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="F1hHnR0e" 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 45E1fRXc009888; Fri, 14 Jun 2024 09:03:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=jQBTUO51UtFlLvWVGMfTS8jAwrXdNqSw2EEqKgrhvBs=; b= ZD+XsORhjzHFyXpWI6wQ8y0Nnm1b2EhYGYE0K0p3+nRqOtVb4oFR9dp2NMnINMRf 5Iccvp20ShgZ6pPsHfPDL2GnbfALtJZvUYS7PP5uJGEmG3yZdNaOHLY+lAtLPKBs 53yMibtEda1PyW7AYspHNgkurOgEtj3ptK8sTAiJLYCW/kj8kJxCLlRLoE4nMZHW EUhvtBeB4qmv2gA+6gAJuZL39O7HvRXU/5wAyAZuBVDyIrpTiJ0HE2petttDRNwm ZFvbJ7eXQk7kAITTDrn/iU2w4YTTTRR9HxTKbMQQBwuJPk7GYF/77vuQyviSRqNc +6LOsUW6jU9XM+/e39XGMA== Received: from iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta03.appoci.oracle.com [130.35.103.27]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ymh19b874-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:03:59 +0000 (GMT) Received: from pps.filterd (iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 45E7GMpK021164; Fri, 14 Jun 2024 09:03:58 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2041.outbound.protection.outlook.com [104.47.70.41]) by iadpaimrmta03.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3yncayp8d0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:03:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YGqa3xrha4ikFHnKdoIr2B79tFjJHHhkz7/0vFERrLtM0bgCtxzOw4VWXHywFkyaD8zu8BF4hkgCAxUAFRWs3VhuS5huIJcS/JuC5bo3Kgjp56aLxdUkFFqDrTc0+mwpAm06sIHGEq1r7f1PiLrQnJZjubnLqOi//a1wYU+wXGxyebDhfvc2a4sxIrpsC1Rde3zddlyptOVTDB7FcD0O/PTWII22+uWieEI9Sdum8t+d+CVOV4MJHoSwV+DpMHcYGoJNO/i+/urW28wu96u6JADsBwLDQmG95HVdJ077TPGp+fgZN8f8L4UPLw3GccjYssPINM6xBJTlmPazKH7E2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jQBTUO51UtFlLvWVGMfTS8jAwrXdNqSw2EEqKgrhvBs=; b=EbWHc8CVJ4tBq66vcyZbxzN01eZNtGHJQUuwnqKmZCupCxZs2HntMoIGrnbuWml68fyEO2xEOpmr/uENqnXauPMZZkg+CqkanFTUVus5YO6FFS07grnMkALj5NTKoWBk6XsAplhJ4C7UHx82blSqXtm/0yBlcoYo+7EAKI5aU9RMseQ64y6KkCTHVGCjsr3HmL58m0FmPFMW3wltMiYB6Wcz8ykxGKLPpIomp5uavZZj7yORlJk3Iigbx7V9byFQLB2gI9ILQLzL6MYXlIABJbk4hdN3Bm4ntzopiBcSwf9A2HmJ94sFRGQ9u8VpXoTtm+qEijZ6/nIzIVsix7YZZQ== 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=jQBTUO51UtFlLvWVGMfTS8jAwrXdNqSw2EEqKgrhvBs=; b=F1hHnR0e118QGSLZaxMFwDDxetfynC4lEm4h0JILuOT3PuSrkrhj7Wcmgfsh/BD1FKlR3vDZkDx46I5+xDm/3oW1yn65VYGLZT4VoryZGLw4MNUMbIvntwTQxhwtuv73md95XVMI3ovTsU1GuyldJ5R/xF3Be3o9LJcSHSpcmrg= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by LV3PR10MB8105.namprd10.prod.outlook.com (2603:10b6:408:28d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.21; Fri, 14 Jun 2024 09:03:57 +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.7677.024; Fri, 14 Jun 2024 09:03:57 +0000 From: John Garry To: axboe@kernel.dk, paolo.valente@unimore.it Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, jiapeng.chong@linux.alibaba.com, hch@lst.de, Abaci Robot , John Garry Subject: [PATCH 1/3] bdev: make blockdev_mnt static Date: Fri, 14 Jun 2024 09:03:43 +0000 Message-Id: <20240614090345.655716-2-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240614090345.655716-1-john.g.garry@oracle.com> References: <20240614090345.655716-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR08CA0008.namprd08.prod.outlook.com (2603:10b6:a03:100::21) 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_|LV3PR10MB8105:EE_ X-MS-Office365-Filtering-Correlation-Id: ac11d8a9-eb20-4508-8383-08dc8c50ec66 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230035|1800799019|366011|376009; X-Microsoft-Antispam-Message-Info: AeJ2twTx5+ETQefu1+6LXZ61YMNtuem8FJSciV6tofkwyAYi0GY4Ga/E1ikPxk/70ojEVrFxYnA+ZkTWPutYs0EtO9zZNG5WNnRR/Zmm/iuSqWPb2BxMxFBMtw1Fa/Q+ZO4VQG6NET3hvwQg7lZPySbGZ1dU8bTMn0fjdg+v7/6CWZyL7WsEMDWVfCPAzMpU5lp4SM3xn5i6xOWvHnV2mE521y6vZ0Zw3IlwognTDdjyVLFO1RJutZbbJOBG7otv+2ahIjVl1dJCaMWvP1mmcF0je5fA+l1XvCvz1nBzyeW8KBZ37ATpxVznDFUYvSLwXsyNR4K6zA+8N/d3WuOEzRORECH2i1WqPCOyw+I3wL62pJPQ2L4rEt9KM55SH+2XqDdu/o9w1FPwUu8JKJudPSsFEjhFe/NItowzF3ZpKP8mzehPMFL/P87NBLjqcXhbpTAVdgNRVNPvN14mfSH94ZqXtrhCzxfc+bMEJYowFaEzbWc5kB1S5LPU1jdktCdDvqdx/adSMbUChSIGd8deKXkXEbPJbdJ2zIBLW579hvsND6UU3zZURBivv8cNay9YjLl7MYZRiH4i485fRDUVOiAlXEvsiIbu2nyhJxwAW9qxUhB25uGJPFgYN5M8AOcoi4Sz2mchF/GnvklIqnLZKhlW5aGX4s2HYXxCxihrCr/XNomZv/2HZwG7nlje9N6eJpomRw6CLEhmiksb73fg1JRiNQw/j6cYsgCoKGjKawDRvLOVFgFADo9ppTUwAyJfrklZEgNQ0XzOaTUuiDY2r3MJXRIoxXGEyUDqO17L/xy+Q931ARk9caVRzBA4+i2mCPWIz6geWeMXPaIeT52V/KaJwUcOH4X1mJMs7ncKXrF3+r/ED6LUuuxt2PQhqLz1y+X2i+6c4SkxuLUjVxQ/plePPC/8Jn/zc6D10wGXZeeogjWjRAZks82P+OIhTGaJZCzEPNzNvBoo79V0PmXk+l/Hh2Uk3RXBfCavhcgD9bI4aEOegvBMXpyfY7jrFKxmdKAe+T8XwM4xcm+1/dk/Jx87cRy0ad5zM6DtFb1L0W771zV2Jjsu90f9JFizhcv9fsi6YAwmTWsmOJFr9oVfmCzhDyJ35wvEsw307YyBQgQWWcEgy2O4BAjvLGTxA9+qxEnziVfKGAaYGLddMcY3wZWabvjvYFIWcInyahMeutIOhapDKn263hJ3ZRN2GHiyXJ+oo1jGJdMg48sJ3yknw13MXvCAW0SjwmEuxWoJVgHNkAfYZ7lc5Jv4PB2jK+TfEdJBYF3Jt++RMuf5DC7Wd91YhQcMQwS5zKPw3BjCpLwuzaKLm7RSGQwqi2ZNolvM 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:(13230035)(1800799019)(366011)(376009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DSB+wdhmPh4/4SViPtVUsFsg+pElzxpKyANxfpKYjDlq5CQLCe9PEuQo5hUeJzjLwZFNoWYYfqET7ADI+JzZxrJRbvrsOWeftv4Ss46ot2WQYL1KUPK6/PaAUy5yiE1SsNFv6i7IZiLDmvqql9XbRpU6MKmjTeyItJBH1DMbc0C4m2fQlpjmliGP932LFH2LNA+htiFQR8yuTcZjlFFBUnzbV2XvGJ9Vjd1cpaSPhtk1OzB/qtPRovlmFEcCJ3GO8Jx6AKro3TphplsrNc2HW+echU5l6qC8S3yPGzl0jgF8S77Daaako0B11PMWTGYm66bGpk1weUjZoVUusjDlQrwPi/4m/FokyqaUm+5cbHfHW47RVXnyL5eLvCHpmV/AWDJnay2HpKbunauZBWEBwR6Wyd7b0b/W3yI2k/XuIEJ/rBO9AbcYcRJ1I//lMhiWBmH2PN6DxjgVnG9jY7c7lYVahU/QUJzBxQ71pUnjA4wte/CG32g/r6dWoSF6Nv9AINcgTAzRnjORiO9QEr10S8UyhplqTnwfZ18O+Y0hlnqCEhQZBBV5Wb+MXA9/9wnz+tgKvR672cElqtln726XPSa9CPlrJ9aYXTItyNy/c/ddV1W1olGKyON1pMfDcNJk79dBjGJM+hi+eMbyqk+/L/oG1+YWycr9TOW50hUGI2XS6a88/hhvr8RPLMr5FoKzbPTj9SozOi0mFeTgNae28MxqXvRn+ZnGoQm0lUS7D1UXbd6tBWHcdbGP32bdmJzdvXlwForQr/YbxwSIlyoD8mHlGt5Qa5CAmBLnu0edmY1gmP5N0QR3MqolJIw5dzI59Kx7HW6Qi0LhcMrZGXsGgZPzZTq8OwTbEmQdI0eFlZ6gE8RV/vDta5JUa+V4aJZzv6lFZHJD5yVNrn2DP3c8kHjO24UIu2SWlIFPwm4e3ziPRlpDo/DYyp+BakFnkpLsS/g232oAa3a7ZgYvyKyL8aMvAoWI0c2mkutoNrS8v/80XHaR6hmH9Y7Z8p03ez4QJnFAyFdGV4hk8dlaAqKqfd4XWriGfCVwEpvPGE4Dl28UJh4+1zevMl53x2tRU6Y6YUmP/h7y96+jMAvDa+AwJtT1jhNiG+r9RbCb9u6dPqdfnEf8090ZkDHtkqwQS9nC+4o3CwsgMU+Dvh5UfxgCu7d3/Y4naCKnFkcnUjF0tOG2HLrHoF/f+WDfz+phRHNoqzj2Udcc7FB22ak8P9ozW7aYTt1e5jSGdIgCvpLQUSlAw/TuIiLgqTt7uAIrq6ndIOIIwWD8QKCJrrsgvBgPFCwI+hQ5jqFmz9qVEbajQjNC6CgU+raehaSre1qLO5u4tzZwhwtIOD+gZC+rVIY1i3zANZxbN6qIaULEpqDUExFdKgMqx1u2yHBUU3DsiFLayPv1kGGAfUJ9PJkJeeSMV5RmUKbwQV3XtwnuyP2U6qXDJA7U1uMlSENQOySmt8hdKcLwdAzgyp/GhmUbgIghL0Nd16NYeSwoQak8c5cCC0YBt22RZjfzWRGld/gEv27x4yyT5XUK1as1i0AeFhsCbuIyb0xNU2c2zybiZUvBGPahDC0ssdRI4V0rA4ejVDPMvgzyNOw0YKIcGlBp2lPMGg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: lKbSo/UEZUJHFXTZHZeFrhYEyC+sifrDlxOJDAboAdc97a82CTxbvLc7LAbloz4A4QF695qu7Ypw8TXbUAjiojIDf5a1m5V+c5YjtNDtexPNg1GSxXXVBGlxrCICkHKUEs+ZlC26/mX/Mai5/vBmIskjctbShacDr9TyM08ChOO6DZ8VSEi00i51horlBw97PryI34B8SemfwwIqbxdOm6IRGqYCo+u1dJ0HTezcQp4pqREwMqvZOEThQtKYDf6rHFpyCyAuUxpFqXTJJUZ29Zt/vLYXar+oV7Jt2FRLEQLyYjefuYOq5ctqZrwDn5X188p7zyPlPcdEU11GuNYAAHEJFGW2hSKl8+NkZ9vcNeh5MHQufdFEV1xsvM7+OY+mn1X0+9B9MksT0SNBnBDR6bf3JMtfwc3BQGYDa/8FtQnwJSekNOOsw+gaSJzOPozPyFVNFbt90K9PrsHMdd6E3OW6ZR8aMIxkJ8pLByN0vraGWRSzoKWzxli63gt/hNlsdcHUiztvoGMazeF+UmCl/wCjgWUKlaZPqTmLRa8clrFxlWXPP29w+KBszUvuv/kSTvfGLqZ3VI8a4fj7kuW+LuIwFyVPMMRYIWjg4ArlqME= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: ac11d8a9-eb20-4508-8383-08dc8c50ec66 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:03:57.2155 (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: ZY8vMVQmlCnTQWNUwVApoSyElywMeHcwz8lYqenO3y1fPlJ0exMIz10Q4LxAe042pjBrl//3/9yPpZfWg7Xq7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB8105 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-06-13_15,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 mlxscore=0 phishscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406140061 X-Proofpoint-GUID: pZfBEdmsKE6qkVpZAslx_tJcYyw1_FjX X-Proofpoint-ORIG-GUID: pZfBEdmsKE6qkVpZAslx_tJcYyw1_FjX From: Jiapeng Chong The blockdev_mnt are not used outside the file bdev.c, so the modification is defined as static. block/bdev.c:377:17: warning: symbol 'blockdev_mnt' was not declared. Should it be static? Reported-by: Abaci Robot jpg: Remove closes bugzilla link Reviewed-by: Christoph Hellwig Signed-off-by: Jiapeng Chong Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/bdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/bdev.c b/block/bdev.c index 353677ac49b3..ced4ac990ec8 100644 --- a/block/bdev.c +++ b/block/bdev.c @@ -385,7 +385,7 @@ static struct file_system_type bd_type = { }; struct super_block *blockdev_superblock __ro_after_init; -struct vfsmount *blockdev_mnt __ro_after_init; +static struct vfsmount *blockdev_mnt __ro_after_init; EXPORT_SYMBOL_GPL(blockdev_superblock); void __init bdev_cache_init(void) From patchwork Fri Jun 14 09:03:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13698212 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 24FB01922E4; Fri, 14 Jun 2024 09:04:11 +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=1718355853; cv=fail; b=Oj27igchCd07aVfnIQsqzCRBx+3fkoHteQxOSp9wfZlObGTs24Rh2oyulP/EDZvOSUHfoaEKhMlC2oGXq/13/PTGY4nIk6xP37edATTGYFTAj2FG+/5tW5kMS03e4XFacAAwgcfOy6sIp6n3kTormrQp6YXpFi9xLzX5ORttxqQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718355853; c=relaxed/simple; bh=8WDoScvqZJJeYJIgHHLtfli8WlF7Y6jLW+VcVXELMIU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=AU7uDHcDyUZ37d+yXoGNy8njSC4NVJWY9tTQDAt5FpKabe9+KoAxNEaRVbJ9UwI/GAfy0lNBA0lZuC0VefekM3JFkJcg6boeq7vsLEB4greosZwTVP65wjYPtiJi35z0297z5e/tpEJLDs16qYJ2mODLzYHZtck/yoPp4gHiInY= 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=IwhsMhD4; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=d4dC8uPI; 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="IwhsMhD4"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="d4dC8uPI" 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 45E1go7b023646; Fri, 14 Jun 2024 09:04:03 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :content-transfer-encoding:content-type:mime-version; s= corp-2023-11-20; bh=20K22XaoqX0f8uwbDdhDoMkexM0cueh+IXXVIXjjk70=; b= IwhsMhD4uysyu4Zs3uQaBNXEvr7uSVhxl2zEUPyz/yHss6IGQ3/rteedCwtBGshm FmccJA4bMDTfB67Q8J95h64b+XIh5SogBmhoabBUGaoaSVc+u4JWEEcVqopym7d7 oOX27r1wUSwd2QuKbLqQ/cFRWDrpkDPc9TD+5SLB172ubI/Boi4kO4Is0qGjqsAw AjWHR0cSyWN5u0xicjBDywMPvwURYOqYhmBMvFkKOqoW8q7h07buejQ83zmkorup rBVLNmv1N/4voodmtswxPeuI4HZfmcRat7I+AJWLv5dMvP9ERsjFF0Kc9+39qmS1 /TgWf+NG1ySfNDqTdgp9jw== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ymh7du9q0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:04:02 +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 45E84i23027148; Fri, 14 Jun 2024 09:04:01 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2041.outbound.protection.outlook.com [104.47.70.41]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3yncdxea83-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:04:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U8vxaP6ZZZ86MqCFstKOApzDuf8OOZG1VI9Wbb7pkK9IhdoiWfVHwwxxt5VvX1Uo0DL9nXQapYyDBPq0o6yEKSxl5zohCaoOXPcHWkGuI9v65kAnMR6spNy6k90BWxbV0CTz9qsYHDf5A7o7p1XJnl92ZdgxHD8jg2Hc5aQ55aDTXGFGnNBnaRJizJdFZsoKAKlgSbN6DannFiXe+x6rmOFUxmUZp80hjxyAsLeW1xbmOZ/KQ/7WmGEf8Ak9c05Ad7XzfKlsnUVcjIQUxnYtjP6nj0UQSQxKeqh9MpWmzkwbK5MXSTTUh4BcT1Hf31TaZ4S+cdqjbPd2k9edEMJpzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=20K22XaoqX0f8uwbDdhDoMkexM0cueh+IXXVIXjjk70=; b=KhShkCmcdQPl+f19s4XBYEXnN4BNcQkVi1O6cSLdtvsbjKBQpzh1ZMouP7mmEDjmhzjnFooS9U7Y3ZWmjtpsZeh7y8ku+zYJ20QPijQ7AjQhEw870+Fc693lkqoi0qo1xag29j0AWmewqDPfD+jVXZcdX/MQ3d4TXOjjBWEDXWCEVfeTXT6UaOscOMAOwMH3MxX5hW++v7g7C5P3AV/fty7dun0hz42Wf6PMwHt5alDK6XtWESfZBlflL/LPI/IrpZUt9H+kwOWisHhPUhOwQOKuMmJgALAvcNwVhLINfd6JFGmto5KEeCtP6pKksTRz46iq7JlQjtBIW9ILORRjtg== 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=20K22XaoqX0f8uwbDdhDoMkexM0cueh+IXXVIXjjk70=; b=d4dC8uPImyzdeYDNZYzd9yQogGTOisrKknpMS49CRzvflxOyCuvWgCrc32su2L934MV5tYntjDb9xDILv37r2h0PP7/dDUbO+8RdnLFXbtLhhjlfEwFWMLfoXCp1EZRYmkFZCHIVg3jsEf74pQ604eHEaMMDSbegCsKSmrkGtyc= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by LV3PR10MB8105.namprd10.prod.outlook.com (2603:10b6:408:28d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.21; Fri, 14 Jun 2024 09:04: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.7677.024; Fri, 14 Jun 2024 09:04:00 +0000 From: John Garry To: axboe@kernel.dk, paolo.valente@unimore.it Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, jiapeng.chong@linux.alibaba.com, hch@lst.de, John Garry Subject: [PATCH 2/3] block: Drop locking annotation for limits_lock Date: Fri, 14 Jun 2024 09:03:44 +0000 Message-Id: <20240614090345.655716-3-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240614090345.655716-1-john.g.garry@oracle.com> References: <20240614090345.655716-1-john.g.garry@oracle.com> X-ClientProxiedBy: BYAPR11CA0055.namprd11.prod.outlook.com (2603:10b6:a03:80::32) To DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6PR10MB4313:EE_|LV3PR10MB8105:EE_ X-MS-Office365-Filtering-Correlation-Id: cd997cd2-ae12-48e6-38c0-08dc8c50ee08 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230035|1800799019|366011|376009; X-Microsoft-Antispam-Message-Info: 8ill6NZrW9MOxSVkpZg3CXLiBCULcYfAIpA7veF80deMuh/GI1ydJa7og++WB58HEUSR8gKw8NDTC+JUVOSZSGczZ0NNrpv8aCpE6GwCJbpIZeGrGZZmbrZdyzi+NRlWPxfhiVe6NBfzonH0BGxEWBbOSHOEknXVy1qYbMav74XbmOANZqXAos48Fn+oepfKB7B+KbaLHZfEzaFiRArNjDRFENJqYYcO3//cOiSmD6/Y26SfCFwPfqyeBjQO74ymg/4kjD6EipUWdLxNGS+J/hfTVPEWxcwUK2dtDsVJkqEvsEZ+yZf5zGYfWmTICjFHrjUIR03Ix70YGoEdS7MfsVO4jfVL55GVpbPXkrze/bPdgqcKt3cmUPX/32ZStbyhR7ZlaL2x8aaK574IzC9z79/P7jX5DdE0JEguwsA1E6HwXyHr8Zkncg8CcquT/j3eTgNntynqsFtk4rnTZ9hLuqNfBcOSeAdRjSbGK1neYUVGuDz+dsNpdFmhdvKimZrQZVIhQ1sHEgvFbcUhg/nhf5goQaTm2YljFCEDRz29WpNjyqSAl+VqV5g3tAP8ITq5eoi39DEK2N/orEqDPvDsa32zljtniff3b8HwfyKK13xQ/zF1L5R+Hod9anp1xurmD0Uq0ZDz8BiSoQvv7D+iXwm7OTEcCg47G/AC+44vbXURk7zV/nI2RkLEUbMwzvA9f8Fer2Jvq528EcSGmYzV1gB4RgIsOue7Tf9s9wLJKKfWQChkxcy3A1r7dTj/nEuxg6HKIMHuSvuWdY0g2BWdaqVRe8r3Eh/obR/oXL+ruZ+Vr3RbT4gknhL+ImEr5VZ4yt8LUfSFm43onN79z6Nzp4hYPFcE6T9w2wbJkZfSlQdWv3Glz8s4CYTrNQaRLFCXDQxyru+0qAmON8SJEBN6ER2KByjmlCP/99p5p0wrvsW1xhlMlO5JjTAYaC/QRX1cnLY1QWmTgxJfCuUGS2Yp/3VSTH5VHOqjzFfhJXOQ4pqRkxpiyhUqeYLtl+ulVbvaEVkx2GMr6NxUnoAt98wv1+Qdsq9gQxITyAWPwDQrb4r1JUKLwpf4/3VS8N1Sj3sA6SCrppyZBIuENDdBs5/JuyITC4n4gXjnYPQFvu+tCbkTK112MPcaqQCeS3pvYrGv5ipuY0HZO1gLu43jSGeQeFW85FgpZRadig0Rl7+x8getMsFGfggu8RJRV0HmC8VN8R62zbbWAzonSjxfrYnM1HoFOlSaRbpLLIenP2GwZWK1RfndRNaNgAyodhwPie0f 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:(13230035)(1800799019)(366011)(376009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cGAAMjuGFIN6s2A1o8W6dh9RoSiqQxtaaq5poJ/gu2nYO6Cc8pIV2bFe6FhAnZAuC0y6ejpf3+zVj5Faw/Dc0BS36HApM2Ayo9TCELAvIX53oofz543Qi3RLwaz1pLDiwhQtdaipemtyrjrxguBPPGQAYB1WWx2cxbFYUC89MEflaISbV17txPUB9iITvAdmxnYvlaQQoiWwufPr4jS7+MvZ5fd/2qvdS+HX5JpOSO4+G49ld8pzXiT+p5iwg/oEwcTowzBYUs69rE89uzJDAg+24Wp86pxMBcUHNZSp9ou+9ysOdvj0kICLzWpHGSZKYXFG5lCr/9r3NGs9s7Nkdkn8UgPBcMx0Sntu9cpksqrOjcX5240Xwyki1m+CV2BO5i7BSt9DsUGdgEkd77YUqugpYeZ+Kap62dgRwjG84Zbwoj/JEsYP+HeuBv19Pv9YLvbFMifq+EqlHW3wg+DbQIFs2UWE31iUFibDYdI7LDB0jaz8VlSatm8n3Av9fPIm1MoVf85WVzD9MH2PZfpb/MOsPOwiSx6q0k4yEDPgxnykG2bMfinP8NmzxNaIQ+CopQs0vQxwpyuscmPwh6aDl0qHwsVN7yw8WArldNiCTVB57OZFlYHb7WxbbC/yl/paN+/zjM2cKeK7wKsTmwPkLnYDM0u76PVEzqEPFefqNGxY3OPOgWZoMU10S81HOXVpdYOScnHYFyRby8uvg+oscGf0Y7NBklOZMOy2FAykK3dNB+O6UICtUsPGdEmBV3NI8/wP/ix0ZUdGYf4oJTWhW32xPBVmjlEspBgf5hkIdlc8WanTcI9SoSBROB9oKQNyUsLkK6fO7uM6DAP2wQfB9V5C4Rgt98O++lokWc2bYo0AUUCdArGhU5eqo9tVawHcMKqfgQnBOjNr97efIWe6NRIooevQCBeJCr7Z/qlkwWr96Tqi3TExecELp2/GPUJp67D/mSwnygWlY8n+H0ODJuOFCnmN5FO76cpjUG28dG6NupSmIf4Gcl06Md6Q/p68TdKZTTnEPVNodVd3bYaAZnfYMlqs+DagAKpVOxyYqNhYnJf2ilry/EjMq35bUj+o3nzttpQslyP9aPwyxdMf3vjJGe6Vkhp9yphdQZToBMeP4ZfA14cZtkfNYj2VxqEnseLgQL90lApg3DvnYEqiJpD+oMzbTq7gubsDnWyPii4Mg7WytkbQB4waTHCEue5OapnCFUi7H/pXFXuMUlbVW9RpDshYW2KRtPJ7OkUpoBZL+ZTC0+Sq/I41KDkwbtm1iHbVWYSAiOcT7TqHOOAtHlXGI5uLMrpVma7c2ZlJZVHgLpWeLwQM3UkqCrd6Fxf4RlogDzXQU8l6KUlemqg5wbhoybC9ZTykxIYbKkj5YJfFD7QMc3dHLLYh1XIhAPnIk2R753l3VQZ8LCb6gYedDrNOrIX5u+9d2Pd+TQUODtQPgev9YklwAar7A3C1A40XYdnwXpfeqsViXx8XI9ACEpWsHglTK0IqKpwBLLY17s0Ew3QHsaEasqkEFN3nozUJU0tuTnIiIzRqSBUCCkuXhHYYa3Q1U4Y//3L3A9f5EW5MlATo8lFXdCzSXUTJE2S6hhU8la56GgbV5qEBb4VoKg== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: ghSQ2w3BLPW90FpsOdP6uuGLtpg8Owa7aHrwwIoYHQt0kPpNjDzz6ffdyl8T6YDaXAXeW3SytwT59mRYuiFB4fo4YmKAMXAwK5mKeRs1RguBurZpw2hz1JfytiiXul/jHuwU73i+18FvHKPTyWFoz3tgBeHOJaVWo3JdWY8Kxi+cDqfRw0adWtSn8mBDV/+p/nAqlwYqo4tGLgdMq6pmaMR8qqLHXbB1eGe559sCldfeZ5Ow1zc0FEwceIR1sCLWHihWoJaeMKvs+7ndfklBx1Lz6RrGDOLIG3WxApCWBCTy6VubWQBA30lDvqjhdUE1p8OCzKaVgbkMdjKF7efagsatkmNksR3gqFdulYvLpqsCh/euH/gOtXLeWf/qgZoivZJczoJMZj6qX9MoYwsUtExeIclvYjRjCc9qkEflQZuKF40CNF7wWIut9Pj27IcbgKlyowx0NA83xgQxLRV7dViLlhec/ct+3W29UqaNe0iQ6mKnD8prlzhBt12Y4YkWVPY9zygm594H/bscj7m1SdFeT+ubPBf/fnPiDAV/31T1EYs4EfwDmNNSJtff7iTUICT7rb61ATjpgDGYHi/iqoSBVUKZk0YwH5rauf7+4/A= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: cd997cd2-ae12-48e6-38c0-08dc8c50ee08 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:03:59.9730 (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: tApI+Xdj8cRmkQHNGdqumNkSD/l8IB4xqhSGvIodNacYkbLp6I4w0v2Z4IjIqaKme4HBEdz86SBkacT+r96NWw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR10MB8105 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-06-13_15,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 malwarescore=0 mlxlogscore=999 bulkscore=0 suspectscore=0 spamscore=0 mlxscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406140061 X-Proofpoint-GUID: -vd3GrfVQM8B_0_h9nMm7S67qBNuTsBo X-Proofpoint-ORIG-GUID: -vd3GrfVQM8B_0_h9nMm7S67qBNuTsBo Currently compiling block/blk-settings.c with C=1 gives the following warning: block/blk-settings.c:262:9: warning: context imbalance in 'queue_limits_commit_update' - wrong count at exit request_queue.limits_lock is a mutex. Sparse locking annotation for mutexes are currently not supported - see [0] - so drop that locking annotation. [0] https://lore.kernel.org/lkml/cover.1579893447.git.jbi.octave@gmail.com/T/#mbb8bda6c0a7ca7ce19f46df976a8e3b489745488 Fixes: d690cb8ae14bd ("block: add an API to atomically update queue limits") Signed-off-by: John Garry Reviewed-by: Bart Van Assche Reviewed-by: Christoph Hellwig --- block/blk-settings.c | 1 - include/linux/blkdev.h | 1 - 2 files changed, 2 deletions(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index effeb9a639bb..cdc7845260b9 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -254,7 +254,6 @@ int blk_set_default_limits(struct queue_limits *lim) */ int queue_limits_commit_update(struct request_queue *q, struct queue_limits *lim) - __releases(q->limits_lock) { int error = blk_validate_limits(lim); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 24c36929920b..f798c9c6eb30 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -904,7 +904,6 @@ static inline unsigned int blk_chunk_sectors_left(sector_t offset, */ static inline struct queue_limits queue_limits_start_update(struct request_queue *q) - __acquires(q->limits_lock) { mutex_lock(&q->limits_lock); return q->limits; From patchwork Fri Jun 14 09:03:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 13698213 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 D69826E5ED; Fri, 14 Jun 2024 09:04:12 +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=1718355854; cv=fail; b=ctcaCK8skWVwgQfP8Xv1a2t6yyCDIgtVXDwmw3bMSOUTy5Vp1Wmd/QX0SKfXxJMwWwW3F/zyVErhtgRyOxwR9NULClglzft6h5z3LSHnMzlL2LIAvr7uSMFn6rskEGRDPaqoY3h1efUvM3pYK1iFf53KbXhJhu2iiVlnDDwOsEA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718355854; c=relaxed/simple; bh=3PApisPb1y5fyD2vV7+p8lFnlHzE6/hFEpEPBBQUgd8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: Content-Type:MIME-Version; b=O5uvU2+BqSN8X9ZUIsOtxU7VDH2h9mkI0dMfuCbF9Bo3BwQ75+AENIL/kZSAGei/zcSa3SuzhSRNCU85E+xP0DkvJ9cU57pb7DEGIsCLFnu+Ff06WhLmEpmIDC2O4Mng0c8PRN+AWmHpxOFu0FfdTO9sfcIixkego4BZ49Igylo= 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=Wm/KzpUJ; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b=QQ66QBi1; 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="Wm/KzpUJ"; dkim=pass (1024-bit key) header.d=oracle.onmicrosoft.com header.i=@oracle.onmicrosoft.com header.b="QQ66QBi1" 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 45E1fQla022828; Fri, 14 Jun 2024 09:04:05 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=h559c+Qu/VZRVT0432jz4DVyJDWOcQQaE5fCUcczRmY=; b= Wm/KzpUJDFzrFGUfvIdpmlcyJRHrbKoGaDYW0TKxfj/ZSlfGVzfuszZjbcNKq5qh PKsSBOrwzdveu1tNDZF/R6HpkUe3xhKsBOaQGWxDyNzpJmn2yMIQkuwkPyJeyCE5 57SUH0fjQL+SXCeI0zMn/gZ9o0MU8iww8xDWEHwcd/jqJrA2jWtsBX+40P64D2o1 Cu1j4U/a5RrQ3DjiA2sXBQtppNGGt1e10Fple9kXWs+ljZ8X7C5qnwj5uiv4KrkO p3cCnq2BzQya0gCfnfy11FhfWHRkE/rHEmtysILbUyiCLUpNrmpjctwI5+xuzfzN N64UK7xoCV7X5DsKoKLA0w== Received: from phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta03.appoci.oracle.com [138.1.37.129]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ymh1mkaaa-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:04:05 +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 45E7JjcV012525; Fri, 14 Jun 2024 09:04:04 GMT Received: from nam11-co1-obe.outbound.protection.outlook.com (mail-co1nam11lp2169.outbound.protection.outlook.com [104.47.56.169]) by phxpaimrmta03.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3ynca28140-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 14 Jun 2024 09:04:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LgNWpWESBwyLkutfnClQTU34ouPYD5bTZQewvSzKODO0yA243oVm4i5h0TpNw0cTfRL9pJvqxXrmXa7q4LpHW+m4dlzOR01dZKxFadRZDdRAuDW00XPgNc/TcTdZjNbinpkaP2aoCp29tqvCtktxO+h6/vSd3jz3MWIpbjHTX7eo5ZNMmvwulmWgQo4+e3bNW51DDR5ELnZ8Qww3RBJrsqjPMkzMbHaPvOEXzzCS+odjGY6Ip7DA3nLwU+pMtBsJnIF++jVgxXjnjX6dCsKB2CIdZ6b7IroU0fgvv0ddnfRWsKNRRTu+WJ36ORITn5JhFKehlt9UHb3apVONUzjIfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=h559c+Qu/VZRVT0432jz4DVyJDWOcQQaE5fCUcczRmY=; b=jWv7j5VCSzqAuU5NMOnsCbsr8ZFKYV5LFsStcA+D6Jy6nz56ZLIUkJ5MOoKZjqgi6jrdE4Y8lWMA0WfiXE31lBqvpRz9x1/l90jbdpN9/OPkcad0hXm1otI1FxoDa0eZ64EdtUMAcYfFcsFzh+GxXF1Kc+bwBPoU/4JVBbcb+8iVK1gUYArxDqGhKXufsGDcQnRV5VoVVPTRiA1zUPPfzKFGPJLSS3se4/bRMQ9BJbsDOqr1yUIUDNKrug+7ehXxIk+Hx0WlMAfp4WQbatUBe+ozdD6HDUMP3xfpCaEUaqfWKITrZ5WvleMOiiAO5155PmehYq9oeZwgZCjJqzbnVw== 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=h559c+Qu/VZRVT0432jz4DVyJDWOcQQaE5fCUcczRmY=; b=QQ66QBi15tsH/5eVfumrzxgx3WyrA6beWh6FEzRMb8hgl9bEH5snJLJ5VS2EK1oRxUIgCB7Hw7UpwO3nNiqRh8zxmxskNjC3QLqadn1c/gh0IOZYtVbaYGx1Rl9AhXfMvhF/HkNV2/qFX6LU9YUUZQv48Ix917Zp8c2ghPaHt1M= Received: from DM6PR10MB4313.namprd10.prod.outlook.com (2603:10b6:5:212::20) by PH0PR10MB4600.namprd10.prod.outlook.com (2603:10b6:510:36::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7677.25; Fri, 14 Jun 2024 09:04:02 +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.7677.024; Fri, 14 Jun 2024 09:04:02 +0000 From: John Garry To: axboe@kernel.dk, paolo.valente@unimore.it Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, jiapeng.chong@linux.alibaba.com, hch@lst.de, John Garry Subject: [PATCH 3/3] block: BFQ: Refactor bfq_exit_icq() to silence sparse warning Date: Fri, 14 Jun 2024 09:03:45 +0000 Message-Id: <20240614090345.655716-4-john.g.garry@oracle.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20240614090345.655716-1-john.g.garry@oracle.com> References: <20240614090345.655716-1-john.g.garry@oracle.com> X-ClientProxiedBy: BY3PR05CA0040.namprd05.prod.outlook.com (2603:10b6:a03:39b::15) 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_|PH0PR10MB4600:EE_ X-MS-Office365-Filtering-Correlation-Id: a83ccd39-3111-426a-4a59-08dc8c50ef75 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230035|376009|1800799019|366011; X-Microsoft-Antispam-Message-Info: nCUY9Mr8KDShRF7u9wLex3cziCgnkaVd2+//MgL9nmXMLXMGzwQfqESsqbDw226vI2IKDWUcXrB5XSrULLbsAU2U5iWuF+8qWlZP4blN1DC41Z9MkTfWPIOZZKMfKAGnmhoDMbenrMzqmWCyCPNzzjEg3v6os/QLFris+SS2vTVJGNTzt5O7bLrf3YgEyVOSyDB64++vCtCYUtm64YUnwWXirVQdSR02v9wdGU+X6RQBoxb4EagZh+QRSlyl1xjINr/xx8gWhI10E5OwQOhVl4Ps5BXSklQexLPYCGeWJKGIQcNxeFWV2Mo4DgPbxM1gvE60s77Hu/O3dhd0+eyIkbLWbEayU1WOo7XHE4BA24W8t+t91DKSJxM2sgVM6Vqcmar3yd12q2VCDTzIljQg1wHJNf2DVWosu+C6MayvA/oaq1mdDYdinOVWOeJfrek5perpHnsrC5aoedUML6QWhx+/wtSvetkkgTbCUoRtcP3RsczLoeHBDhizRStDkxpvvB8edIrMwux1TYJao05LIPdGhUVET0gcs56Egw9gBYq7QV3DmtLEOhqs87sKI7p+knO8nVmz5M5Q0GrCi+jv82WIL6QXDwQv+tE/cMYcFAEeitjS8zVNB3RXWwFRf9lfXX+uwb3CUwNDwtUKKUp3Pek/e8oISIu8S8gOC4TeC+eq3taMI1PqBvyhdH1/dQU/19Sg/OW6C5vCgrfiSKOUX22Y/4u2LnchNK9HH6uL3t6pRp/lITSAW3296H08qtLUzLELRDjkeN8bWZpTn1PKo+ugGUZhS6mybNFp2+YZ/T1iSoP7wrsp2zpjwgRCXB/p8g90zecU07JcbnDqUbWmKHdoj5VVcfoSyJ8fY8ot7I9q0Egko5QlNwqeNWiMEARMCq8QGuNbKCQowVPjRLhGAN51HYWTzHcZdtqtOZN8oVjzyPS1v2EpwEt1hYLmpsnDdN/8jpvNsMMZj4tU19daneiPyuu87qHciPgAGq5bVMkwjR7VpGlyHKqKt5Nb1r0TiRGpvolLkPGrTjhihuy4ki32dDyqwxxI09SmsCRYIdrs8zyt3gf4ZlPIM9s0nP5Zks/QOMzX6HpJEefrbGmgYwNeQ/GILj9cfGYEx2OwdBqJ4gvu31pvmcFrvdJNxIU+WzPWNbzhHDf2WlXG9TB1PVRV9oc/R4QT5z/7yNiL60KHiYKH3o2o2EO+59E5wm6EYYOK3uefTH7HuEyTPF2mMA7hiJKfjnDovlLpXv+SWvEyILSvpJMzh4cK/jgQGx7ZEh/iqoPooTZAY4NjYA37XcGotjfNrs61bgOc92RhCrYl/uOEI2U3DE9o+8XQqmlA 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:(13230035)(376009)(1800799019)(366011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: db8vgU9EnMQsGfB1aSIlqerX0179HhzPZ6G9v5y0s5GjwSaZO8i1zGgj/00pD2cgRzakNJ+g61oPfhyRqacD7H3OAtj3oKsh8VYy1aCFQ0dvfi9Q5cBE82V9YNiHe3wK2bhlB/5MEzdHRZr4UPzV7QkCgjWV7AWWlrIuxQ5FmQlAHPVYSi4J6KbJOooHuVs9hCvPoo7Nyrt+0iTKrHt6c3/nuT7lPhsPMGlTSHTkpZzytRoR1Ny9/ppxdeVnLRezw3VcTZy3XAoz4MOqVX1ZFInUhAFYTXZix+zQ/ZeBVoidJYHe52T9o8G6UNgGG2e7gAbnuwI7FHcK4O9d0CybbvvIcwWosXoOJswSRahpYVabpBxAKCBzuBUXpIJPxcw1d6onAF/MwRh4/Gc/olghmoc6GgsG9Ap1kIc7pr8F0jWibq6O9/ms1kNFEiDaDsL8KzqoTYyFwz+R79UxlEXSQuzMPYby7rS31J2Krsn6w81sBfibus2j6RYniqHAdziJqE7qErtJbWK67pjaIMFsC7ywtFF38XkiBsgWmhJWHAicVTB+pz65dIebRxbcXuybS4WUGXWB1EcHuGnmr+/BmHfiw4dBHg6Ffj25HgyTvZQA4gdSLc2VVHpVZO8R3gMsIV9j8ud+Zzb3U3Sjc1nWGYof+axjRbxbmNTPRqcc9wBNW4+VM93PlwRQmCOAWz5Gsd1WsSRzbkA/+tlgoRfOf/yg25SpabxCOWMPy+lW7tD13vlvMJgLBHJPWWX+c9xVOL1+qDDDVG6zdXGRth+8u7rL+LDYHXSsBTWZVWmUGZFrLymJl5jKGPMKunhg+7oa5SBWuDU/yubpgtsLU6MDy3Pee7NNju+PVxrKLiFEqo60YdrZL8y+n7aHTNr0geNOlSPQ2LM+0Ax42vHCFGQ7IBWzGf/pcchv7MVayKz0ahg6uSBBJyNc0rlk8y4qubcpP5NF0r9OD2Fet5itGeiSX1t2brOOEblelp8GeRrsxg+Z7OSQVAlb0AK5NYO3QNXvuzJnLXihvIViHHTaNWGT/aB1dTtJO9ryFF0lylyEA4SNLSiPBD54lTKud1jFQ/naO2s/sDflVf/b00+MWIXObHVXJx3er/L/3nGFpzy0Kqr9ZgQmbHIIcj8BtJFVLxyeXGt/jV4N23FZLmfVeZ7Q1Ss+raf6yGE8gKvRx0LERZjqHAer9E2RSJEjmWnnm6RZJz9ms00OcW7ORy5lNv1ItBQvQJuQo4ZAJ5k00Dp02ADqweXyuHJLZHPnqpmVPwE+DgKSaduL/pSL+F1bsL3P68a5x4CsvBS07QQ0BgALdwC+bUGiyjhnQeX6oW41UNiQGW8otxQcDh5F36f0UydKniyVrBb/HNH4KG+a+Iu7AEgCN4wpLdE2hknP+v7hFK33yRdXCjDoNJr178n1zU0GyDl14owqMG2CIQLnFex5YVASZ253SaHhnjU+XiLyOcPAdfgNxZfNUXQQuhk1GIoM9clNjtSMSPKloUyOEgF9s81pebLBuw9SiS/lCbiYbZd6lgjApjfpPugTqWtb3W58w+X6nh3ucEmqVPM4b7YTS3iwM6xL6ZwrBd0WJalgPqUQ9oaiHw7KVmWaEAgDOcF/nw== X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: lqEI1hd0DyfoYe9Khg3vPPyPNuNbPsWRIvWqpecFZ46K2515HAI9f8UaZiwT2nzappCKApNulKIJuc7ZYPYQI4whcxpkotl/FUtEaWsfNKI7BAfbFb0pg8zBnfMJINjAsQnMKj5X6M3Y4t4QBni3TO/dXrwlEN6IvdYzF6XwU/kTINPsCX/T2+9vNK3zJoD5z3z9QdMGPwmVndwDJhRg9RymVwupwnhcMODRswcp3MKkvF9HGmwMJHkVcy+EuaULvkwFN+rZK/ff1gtiGgR14VXITN4CmF1/UngpPo9z7T0dhhYcRQe2tmI0CW/bsllsC02C4aSHc9pYqIi5xWIslTnTHJDtPy1Gw7FgxY0dXOvbtJH14WXWno0f+RDrOYA8yEPGzF58h+ZmOXeyFi0sdcc90ftrhcW+Db/DAxXvteTT0wCPLvuFhgCV+YDZ8ZGBlA4q7Yi+5SvGI5X5AFNl7El8XCjEJhSpULOwz6NmfRG0Dvxm/HQeYKLh7MK8xfUwSfngy8Wur6mQvOAP9zIMG/StlJVX7uJs8vDR5PeQpdSCutPtRQD0kNBdOAUqUPiBKqDXEGTGmQ9OwJV4VAZNWo8WP8ne+E7atQbIhqVrBQ4= X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: a83ccd39-3111-426a-4a59-08dc8c50ef75 X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB4313.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2024 09:04:02.3899 (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: L4prmE9CKqJUwj6X5bf06AeLJGMR/jhGp9cPoGq6gWb/Lmyq9A66I3I05WpNqqaxpqqG0KmfQThAIjXDJNkC6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB4600 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-06-13_15,2024-06-13_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 adultscore=0 phishscore=0 suspectscore=0 malwarescore=0 mlxscore=0 spamscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406140061 X-Proofpoint-ORIG-GUID: 5h1Pv9gOmjZo9F_WFoCQO1LyyLBMieuV X-Proofpoint-GUID: 5h1Pv9gOmjZo9F_WFoCQO1LyyLBMieuV Currently building for C=1 generates the following warning: block/bfq-iosched.c:5498:9: warning: context imbalance in 'bfq_exit_icq' - different lock contexts for basic block Refactor bfq_exit_icq() into a core part which loops for the actuators, and only lock calling this routine when necessary. Signed-off-by: John Garry Reviewed-by: Bart Van Assche --- block/bfq-iosched.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index 4b88a54a9b76..36a4998c4b37 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -5463,40 +5463,42 @@ static void bfq_exit_icq_bfqq(struct bfq_io_cq *bic, bool is_sync, } } +static void _bfq_exit_icq(struct bfq_io_cq *bic, unsigned int num_actuators) +{ + struct bfq_iocq_bfqq_data *bfqq_data = bic->bfqq_data; + unsigned int act_idx; + + for (act_idx = 0; act_idx < num_actuators; act_idx++) { + if (bfqq_data[act_idx].stable_merge_bfqq) + bfq_put_stable_ref(bfqq_data[act_idx].stable_merge_bfqq); + + bfq_exit_icq_bfqq(bic, true, act_idx); + bfq_exit_icq_bfqq(bic, false, act_idx); + } +} + static void bfq_exit_icq(struct io_cq *icq) { struct bfq_io_cq *bic = icq_to_bic(icq); struct bfq_data *bfqd = bic_to_bfqd(bic); unsigned long flags; - unsigned int act_idx; + /* * If bfqd and thus bfqd->num_actuators is not available any * longer, then cycle over all possible per-actuator bfqqs in * next loop. We rely on bic being zeroed on creation, and * therefore on its unused per-actuator fields being NULL. - */ - unsigned int num_actuators = BFQ_MAX_ACTUATORS; - struct bfq_iocq_bfqq_data *bfqq_data = bic->bfqq_data; - - /* + * * bfqd is NULL if scheduler already exited, and in that case * this is the last time these queues are accessed. */ if (bfqd) { spin_lock_irqsave(&bfqd->lock, flags); - num_actuators = bfqd->num_actuators; - } - - for (act_idx = 0; act_idx < num_actuators; act_idx++) { - if (bfqq_data[act_idx].stable_merge_bfqq) - bfq_put_stable_ref(bfqq_data[act_idx].stable_merge_bfqq); - - bfq_exit_icq_bfqq(bic, true, act_idx); - bfq_exit_icq_bfqq(bic, false, act_idx); - } - - if (bfqd) + _bfq_exit_icq(bic, bfqd->num_actuators); spin_unlock_irqrestore(&bfqd->lock, flags); + } else { + _bfq_exit_icq(bic, BFQ_MAX_ACTUATORS); + } } /*