From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-177.mta0.migadu.com (out-177.mta0.migadu.com [91.218.175.177]) (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 724A336C5BB for ; Sat, 28 Feb 2026 11:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772277222; cv=none; b=U75tkGYybQtr2gTvf+DpNEny2RLKPX6GWDyW/yyL3pdyE/cg96QCoJkLEfILy7BxZ7IPRpuauuaLlMfmDrtvhfa0DRCEtvAEARscSBOcJfrxje9Z2AQ8SnqV9+l2HnIUJQ5XKsRA8nvGWSxztR8Tpc5cwapHtX1CUr/RlkHOAyA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772277222; c=relaxed/simple; bh=KEtfPjmed9vc8UYUJTd5WRO0PKUsvItWzznuXA+LWAg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Ebm8v/Fn1fsR/8fqib+8raOjF67h3hz1GGCy2+2SUw1ASplleYPhDil3GNCBNWLu1Gv7SjVA9gg7dZpKY00TCEpJGb/6TsXQ/J37w2odG8kyB0TgId9Y6Zznkv+Q4EIss5YY7QhFKPI4k0gRVgCdJ8DCG7Hyecdgzn4ZoquHB0M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=jYJ1YA/D; arc=none smtp.client-ip=91.218.175.177 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) header.d=linux.dev header.i=@linux.dev header.b="jYJ1YA/D" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1772277208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9Yg7j2EaokeIvhOnMiy2qGul7Iq/hLXN+CkZ2bmenGc=; b=jYJ1YA/DLC21QSpt5yFgGbUCKT5Kl7xSe7ek3iek8flsxo51hy6UcglF27f331wQSCPG/U xW92eKHrdnN0PrOB6Zz4LExpsYkPUJklV/rLPQ9dT2QLAlQtYVKxZ7Mv8e31W4cWTCk/4w 5TNFNeDT+ZHeixhJxN6Qf157D+2HuYw= From: Jiayuan Chen To: netdev@vger.kernel.org, edumazet@google.com Cc: jiayuan.chen@linux.dev, Jiayuan Chen , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S. Miller" , Jakub Kicinski , Simon Horman , Sebastian Andrzej Siewior , Clark Williams , Steven Rostedt , Jason Xing , linux-kernel@vger.kernel.org, linux-rt-devel@lists.linux.dev Subject: [PATCH net-next v2] net: fix sock compilation error under CONFIG_PREEMPT_RT Date: Sat, 28 Feb 2026 19:13:18 +0800 Message-ID: <20260228111319.79506-1-jiayuan.chen@linux.dev> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: Jiayuan Chen When CONFIG_PREEMPT_RT is enabled, __SPIN_LOCK_UNLOCKED() expands to a brace-enclosed initializer rather than a compound literal, which cannot be used in assignment expressions. This causes a build failure: net/core/sock.c:3787:29: error: expected expression before '{' token 3787 | tmp.slock = __SPIN_LOCK_UNLOCKED(tmp.slock); Use declaration-with-initializer instead of assignment, consistent with how __SPIN_LOCK_UNLOCKED() is used elsewhere in the kernel (e.g. DEFINE_SPINLOCK). Fixes: 5151ec54f586 ("net: use try_cmpxchg() in lock_sock_nested()") Suggested-by: Eric Dumazet Signed-off-by: Jiayuan Chen --- net/core/sock.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/net/core/sock.c b/net/core/sock.c index 9d841975a7a1..fba4d5b8553c 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -3782,12 +3782,15 @@ void noinline lock_sock_nested(struct sock *sk, int subclass) might_sleep(); #ifdef CONFIG_64BIT if (sizeof(struct slock_owned) == sizeof(long)) { - socket_lock_t tmp, old; + socket_lock_t tmp = { + .slock = __SPIN_LOCK_UNLOCKED(tmp.slock), + .owned = 1, + }; + socket_lock_t old = { + .slock = __SPIN_LOCK_UNLOCKED(old.slock), + .owned = 0, + }; - tmp.slock = __SPIN_LOCK_UNLOCKED(tmp.slock); - tmp.owned = 1; - old.slock = __SPIN_LOCK_UNLOCKED(old.slock); - old.owned = 0; if (likely(try_cmpxchg(&sk->sk_lock.combined, &old.combined, tmp.combined))) return; -- 2.43.0