From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 B49B93F8236 for ; Mon, 13 Jul 2026 11:55:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783943756; cv=none; b=jpXwtHkP2aBuWPRA3zHydU5efCSa4/iVjHTUWVfvAIItQ+sx8LDkxlTiBJHo7CSJXQn8OXzDXTSTfmlffNB/DjfYnVFbboZyWOw+V9jBXV0GmlUWyUbtIIAcBDfJ5mDFn9+MqLXaeBIa20dXJZv0CahNYnKCguRXPSfBl6gqTtg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783943756; c=relaxed/simple; bh=9988o8QDOQwlYYeBqaUJ7f5erhURRSS4td6u7R3+Ut0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SbVke6wkZMgjlphKnEkOq2XLL12ZhrRW7VeEqOREpjOKu0OtISA2jtFdwHpzyMdX9kTdWZeFP0Ymt04P3CCrBIzY7A5IOk3Uyvnz7NFDIaPFma/LuhC1H/xhxTsWmrme0go43Dti0zV/RiJwOCtmICkWmta/2iJ3OJo6t0o32qo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=AzSmilwn; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="AzSmilwn" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66D7vTWq006795; Mon, 13 Jul 2026 11:55:41 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=B8ug9Et3HqRFe3N0G +eeisLxaTEy55ZyWgWF052eE4U=; b=AzSmilwnr+WivmdGjQdLq6rHfCpOGBxfG pEqF1mw0vDU2qPGMh/cEBPKtyshXbPllDRFt3ryaoQ7owVLjabJD/IHjbifELkdH 7bRZT4ryBb6FLPTKYd9FoG9cLUH32PJQUheqZMsElKvucYu4vBRtQt8I1X/C/ZzN 9oleoa3pReB3bqnKDFw6q2Euvtym3yShrVQYhHlZv/tUexFkiVj60vh+0jD0JXQF mUrSIncS93o1p9sSAK7YLCgNBaRZFtnX/1Z31NXT6MPNVHGbJDqpwDpDs4opqfye zCPi/4vtSwDT46bLP+NczcPFLTJviL/0xbJGr+wdPeXVo1y1xx/VA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4fcv330xyj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Jul 2026 11:55:41 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 66DBnmaZ023657; Mon, 13 Jul 2026 11:55:40 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fc1nh5cx7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Jul 2026 11:55:39 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 66DBtaCI48824586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Jul 2026 11:55:36 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 05B8420040; Mon, 13 Jul 2026 11:55:36 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E3FFF20043; Mon, 13 Jul 2026 11:55:33 +0000 (GMT) Received: from li-a84c74cc-2b13-11b2-a85c-acdd023f0674.bl1-in.ibm.com (unknown [9.123.7.57]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 13 Jul 2026 11:55:33 +0000 (GMT) From: Nilay Shroff To: linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Cc: hch@lst.de, elver@google.com, kbusch@kernel.org, sagi@grimberg.me, axboe@fb.com, bvanassche@acm.org, gjoyce@linux.ibm.com, Nilay Shroff Subject: [PATCH v4 18/20] nvme: add context annotations in tcp.c Date: Mon, 13 Jul 2026 17:24:19 +0530 Message-ID: <20260713115444.465704-19-nilay@linux.ibm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260713115444.465704-1-nilay@linux.ibm.com> References: <20260713115444.465704-1-nilay@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-Spam-Info: AW1haW4tMjYwNzEzMDEyMiBTYWx0ZWRfX0sEScOfTPZu8 HFm1TUQn/RgrwIbpOI6xbJL53i4ocpVINRydwBCKnaX3uuh1cz92hEbMA4NPd0L15Hp6ICM4gpf ti4kgYVe2wpWgaXB3ilDBNGYGNbFeE0= X-Authority-Analysis: v=2.4 cv=Mp1iLWae c=1 sm=1 tr=0 ts=6a54d23d cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=RAioF0-LDSMA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=TfvOO_zgRogsC6GeyRwA:9 X-Proofpoint-GUID: uOsSCATg7Q8ji4Z6xGEHnPuNxDBMkDg9 X-Proofpoint-ORIG-GUID: _zA-TdQiJ0xgBOJN1InFRycTkX1Jq3Pk X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzEzMDEyMiBTYWx0ZWRfX+hr7vVj1FYTA oGM12C3yhOiOqYApX7/10g278RIz7kb9gDiQZ5AJrAFmwzDC8UcpdtFBbEtVJdjIq6wUpVshquN eRaBs7zN5tgs2LmNDgKH3Pd5cBMltf4W7xinnBm7Hb16olgEAXwnxmL5K6u9kO3HLcpsO4YYlDC xlCXFSanbFMJaXnmljZES0NERE8P7lz0N3AsDxhRxfkCzZzbvd7ckzwArou9rj9bTDHi4rVBrrY 57mLwVGFriol1+ZI+jC6KJEZwHUqD51Az5L18TdQBWfeel3VLuJP4zygGAkytowbyMoIPG/R764 lvfs5pyVb1TNlw2Oe62fbABh5kpARFPMyczHdR8ImIwyEH29EXW8dOtokapHEk4C/yfICMnDdXu Lj8NQTzip/Ok1sXu3sk0iAFENURk7H2efrnwzKg8aTdY9D5EeeGTc5cxkyrF0tdG/Uqs+HfurKo 7wQSLTqGzzmDZF73yMw== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-13_02,2026-07-10_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 bulkscore=0 spamscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 suspectscore=0 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607130122 The nvme_tcp_ctrl_list and nvme_tcp_ctrl::list are protected by nvme_tcp_ctrl_mutex. Define nvme_tcp_ctrl_list using LIST_HEAD_GUARDED(nvme_tcp_ctrl_list, nvme_tcp_ctrl_mutex) and annotate nvme_tcp_ctrl::list using __guarded_by(&nvme_tcp_ctrl_mutex) so that Clang's context analysis can validate accesses against the corresponding locking requirements. It is safe to initialize nvme_tcp_ctrl::list while allocating the controller object because the list entry has not yet been added to nvme_tcp_ctrl_list. Annotate the initialization with context_unsafe() to suppress the corresponding Clang warning. Signed-off-by: Nilay Shroff --- drivers/nvme/host/tcp.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index ba5c7b3e2a7c..8d2fbfc7cd8d 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -149,13 +149,17 @@ struct nvme_tcp_queue { #endif }; +static DEFINE_MUTEX(nvme_tcp_ctrl_mutex); +static LIST_HEAD_GUARDED(nvme_tcp_ctrl_list, nvme_tcp_ctrl_mutex); + struct nvme_tcp_ctrl { /* read only in the hot path */ struct nvme_tcp_queue *queues; struct blk_mq_tag_set tag_set; /* other member variables */ - struct list_head list; + struct list_head list + __guarded_by(&nvme_tcp_ctrl_mutex); struct blk_mq_tag_set admin_tag_set; struct sockaddr_storage addr; struct sockaddr_storage src_addr; @@ -167,8 +171,6 @@ struct nvme_tcp_ctrl { u32 io_queues[HCTX_MAX_TYPES]; }; -static LIST_HEAD(nvme_tcp_ctrl_list); -static DEFINE_MUTEX(nvme_tcp_ctrl_mutex); static struct workqueue_struct *nvme_tcp_wq; static const struct blk_mq_ops nvme_tcp_mq_ops; static const struct blk_mq_ops nvme_tcp_admin_mq_ops; @@ -2919,7 +2921,10 @@ static struct nvme_tcp_ctrl *nvme_tcp_alloc_ctrl(struct device *dev, if (!ctrl) return ERR_PTR(-ENOMEM); - INIT_LIST_HEAD(&ctrl->list); + /* + * Safe to init list while allocating ctrl object. + */ + context_unsafe(INIT_LIST_HEAD(&ctrl->list)); ctrl->ctrl.opts = opts; ctrl->ctrl.queue_count = opts->nr_io_queues + opts->nr_write_queues + opts->nr_poll_queues + 1; -- 2.53.0