From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=95.215.58.7 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794193222; b=QSESjaDXPO2c5+gRI9TBIuJGrummCNV6ay2NLsqttN2HkVRNDSm7n9JZqsBDT2ykZmDi 2/TsK4xYGbXOg0WKexzJxJDdVPl0alFsSTvrTRvgyV8ExBYjm3B4kZF5nqrKKF+tGHzYk /55EmhlJwz0CoZWzmcXbbS7GnWgtxUxC80tKLMTgCc6Sn5jsGe4BbnJvCz0f5dSFoBm6H emfGntBtL38LKBkizWmk75quqgm0nlJbYdDeWsBA5SycOUj2KJ+6nC9i46Er00ulfxyY1 /faNLG0iIsRmBv8fpUJEKowHzonrIaFJEnkkv+eOjIgEjdzFt3JmWOgtjyujkkIAbjw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794193222; h=DMARC-Filter:X-Envelope-To:DKIM-Signature:X-Envelope-To:Received: X-Mizu-Trace-ID:X-Migadu-Flow:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; bh=XKiQIorj2y2/pH/PLJmaYrty47uTj0nmh8YMBi+fHS0=; b=yTO1wVRhQ8dGw0ky1jektCFVDDcZHnjvgapGonMGZWIBGzeRaUv+kcEKOsgKz62ucvo2 Um7hVm6/INhRoEei0HDBbPYDTt08mZk2onsq/VQek/ChG0xYsPkluW634PTqN0kO0Bi7Z wBBm1yzpEV345QtqGh6OiWYHQvzriPfOVFGbRIiShiQN9CB4kWKnTxoiEetr3Mjp1rNfK CA1l7IdnPg8/OAF872K/6RK20B63FqJ7Ww8mPZNKfuELpybct2716Rn25CjJtPVHYWyha L0ckArMnDuxDWEjLGeUK2xqBkSi6F9l+EgxFt51++reWTYWzqi0bIU5Fj2Vbnnx1MEQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=Vm66UpuO; arc=none smtp.remote-ip=95.215.58.7 Received: from mta1.migadu.com (out-7.mta1.migadu.com [95.215.58.7]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DE4C606A326 for ; Mon, 9 Nov 2026 03:00:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 2DE4C606A326 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linux.dev header.i=@linux.dev header.a=rsa-sha256 header.s=key1 header.b=Vm66UpuO X-Envelope-To: bridge@lists.linux.dev DKIM-Signature: a=rsa-sha256; bh=KReNeCFx0VtyfDXYfamQGFIfQ6CxDn+RBqDsMYJq/6g=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1794193220; v=1; x=1794798020; b=Vm66UpuO8E4fNpKfGlG+KdV2TDMSHY6uNxBIiJqjGJ0Z/4bh/UD1aAhvzQCe2C4u/xBJ5Xd1 pjJsjxghuD8dr3E/bVBdwQUdo8k/7VMiqi++RoAxWdkClMrnB2TO0zrtwDqPAygirjSbHmKWTqk dByB/8uUCTPMhxZbM9m1Aawk= X-Envelope-To: bridge@lists.linux.dev Received: by smtp.migadu.com with ESMTPS id a14b75727c5eeb5f; Mon, 09 Nov 2026 03:00:15 +0000 X-Mizu-Trace-ID: a14b75727c5eeb5f X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen To: netdev@vger.kernel.org Cc: Jiayuan Chen , David Ahern , Ido Schimmel , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , Nikolay Aleksandrov , Paul Moore , Matthieu Baerts , Mat Martineau , Geliang Tang , Julian Anastasov , Allison Henderson , Marcelo Ricardo Leitner , Xin Long , "D. Wythe" , Dust Li , Sidraya Jayagond , Mahanta Jambigi , Tony Lu , Wen Gu , linux-kernel@vger.kernel.org, netfilter-devel@vger.kernel.org, coreteam@netfilter.org, bridge@lists.linux.dev, linux-security-module@vger.kernel.org, mptcp@lists.linux.dev, lvs-devel@vger.kernel.org, linux-rdma@vger.kernel.org, rds-devel@oss.oracle.com, linux-sctp@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH net-next 12/14] net/smc: annotate data-races around smc sysctls Date: Mon, 9 Nov 2026 10:52:11 +0800 Message-ID: <20261109025425.328445-13-jiayuan.chen@linux.dev> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261109025425.328445-1-jiayuan.chen@linux.dev> References: <20261109025425.328445-1-jiayuan.chen@linux.dev> X-Mailing-List: bridge@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit autocorking_size, smcr_buf_type, smcr_max_links_per_lgr, smcr_max_conns_per_lgr and limit_smc_hs are read without any lock while their sysctl handlers update them with WRITE_ONCE(), and the SMC netlink handlers toggle limit_smc_hs with plain writes. Add READ_ONCE() to the readers and WRITE_ONCE() to those handlers. Signed-off-by: Jiayuan Chen --- net/smc/af_smc.c | 8 ++++---- net/smc/smc_clc.c | 8 ++++---- net/smc/smc_core.c | 2 +- net/smc/smc_tx.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index d10244af5bd29..9a657172be8f9 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c @@ -88,7 +88,7 @@ int smc_nl_dump_hs_limitation(struct sk_buff *skb, struct netlink_callback *cb) return -ENOMEM; if (nla_put_u8(skb, SMC_NLA_HS_LIMITATION_ENABLED, - sock_net(skb->sk)->smc.limit_smc_hs)) + READ_ONCE(sock_net(skb->sk)->smc.limit_smc_hs))) goto err; genlmsg_end(skb, hdr); @@ -102,13 +102,13 @@ int smc_nl_dump_hs_limitation(struct sk_buff *skb, struct netlink_callback *cb) int smc_nl_enable_hs_limitation(struct sk_buff *skb, struct genl_info *info) { - sock_net(skb->sk)->smc.limit_smc_hs = true; + WRITE_ONCE(sock_net(skb->sk)->smc.limit_smc_hs, true); return 0; } int smc_nl_disable_hs_limitation(struct sk_buff *skb, struct genl_info *info) { - sock_net(skb->sk)->smc.limit_smc_hs = false; + WRITE_ONCE(sock_net(skb->sk)->smc.limit_smc_hs, false); return 0; } @@ -411,7 +411,7 @@ void smc_sk_init(struct net *net, struct sock *sk, int protocol) spin_lock_init(&smc->conn.send_lock); mutex_init(&smc->clcsock_release_lock); smc_init_saved_callbacks(smc); - smc->limit_smc_hs = net->smc.limit_smc_hs; + smc->limit_smc_hs = READ_ONCE(net->smc.limit_smc_hs); smc->use_fallback = false; /* assume rdma capability first */ smc->fallback_rsn = 0; smc_close_init(smc); diff --git a/net/smc/smc_clc.c b/net/smc/smc_clc.c index 014d527d5462d..df0afeef67cbd 100644 --- a/net/smc/smc_clc.c +++ b/net/smc/smc_clc.c @@ -990,8 +990,8 @@ int smc_clc_send_proposal(struct smc_sock *smc, struct smc_init_info *ini) } if (smcr_indicated(ini->smc_type_v2)) { memcpy(v2_ext->roce, ini->smcrv2.ib_gid_v2, SMC_GID_SIZE); - v2_ext->max_conns = net->smc.sysctl_max_conns_per_lgr; - v2_ext->max_links = net->smc.sysctl_max_links_per_lgr; + v2_ext->max_conns = READ_ONCE(net->smc.sysctl_max_conns_per_lgr); + v2_ext->max_links = READ_ONCE(net->smc.sysctl_max_links_per_lgr); } pclc_base->hdr.length = htons(plen); @@ -1272,12 +1272,12 @@ int smc_clc_srv_v2x_features_validate(struct smc_sock *smc, if (ini->smcr_version & SMC_V2) { ini->max_conns = min_t(u8, pclc_v2_ext->max_conns, - net->smc.sysctl_max_conns_per_lgr); + READ_ONCE(net->smc.sysctl_max_conns_per_lgr)); if (ini->max_conns < SMC_CONN_PER_LGR_MIN) return SMC_CLC_DECL_MAXCONNERR; ini->max_links = min_t(u8, pclc_v2_ext->max_links, - net->smc.sysctl_max_links_per_lgr); + READ_ONCE(net->smc.sysctl_max_links_per_lgr)); if (ini->max_links < SMC_LINKS_ADD_LNK_MIN) return SMC_CLC_DECL_MAXLINKERR; } diff --git a/net/smc/smc_core.c b/net/smc/smc_core.c index 6021322253e93..3d338019a1b8b 100644 --- a/net/smc/smc_core.c +++ b/net/smc/smc_core.c @@ -990,7 +990,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) lgr->net = smc_ib_net(lnk->smcibdev); lgr_list = &smc_lgr_list.list; lgr_lock = &smc_lgr_list.lock; - lgr->buf_type = lgr->net->smc.sysctl_smcr_buf_type; + lgr->buf_type = READ_ONCE(lgr->net->smc.sysctl_smcr_buf_type); atomic_inc(&lgr_cnt); } smc->conn.lgr = lgr; diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c index 0f0c6df3bf2ce..30bffe79d06a3 100644 --- a/net/smc/smc_tx.c +++ b/net/smc/smc_tx.c @@ -148,7 +148,7 @@ static bool smc_should_autocork(struct smc_sock *smc) int corking_size; corking_size = min_t(unsigned int, conn->sndbuf_desc->len >> 1, - sock_net(&smc->sk)->smc.sysctl_autocorking_size); + READ_ONCE(sock_net(&smc->sk)->smc.sysctl_autocorking_size)); if (atomic_read(&conn->cdc_pend_tx_wr) == 0 || smc_tx_prepared_sends(conn) > corking_size) -- 2.43.0