From nobody Thu Apr 16 10:42:01 2026 Received: from out-174.mta0.migadu.com (out-174.mta0.migadu.com [91.218.175.174]) (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 699C635A394 for ; Sat, 28 Feb 2026 11:13:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772277221; cv=none; b=pVxvikP1knUXZnfkta3kH2Q4zDxtUjUtUMXRXHJUrw0+bHxEhKN7ckHhBwNoBaaixFIAtiNQC9jLXs2HqVPg0fydletjyclo+aO1rwbVrLRT4A3mLTcgprCNkRURMP6U4V9xWNnmUdGFiA+7TF+4QPNvaCrI1IF794rjn0y+ZvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772277221; c=relaxed/simple; bh=KEtfPjmed9vc8UYUJTd5WRO0PKUsvItWzznuXA+LWAg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=WREr47pRFmL9Up7KbWKgazsPSdx1sbutf0ZUWL/1pgad+4u95MVJKrz93wzbq2m9EVezX98hiEnE6gvdJBlwvCzI/+6LbhU4mhy+9cz0AfxSOP/gchlFhljqB9CrK2eUjJ6A7E9ZQtgeQ5fkGMWafXB4Aq9gJJU9P5yPzjYeUHA= 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.174 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: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" 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 =3D __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 Reviewed-by: Eric Dumazet --- 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) =3D=3D sizeof(long)) { - socket_lock_t tmp, old; + socket_lock_t tmp =3D { + .slock =3D __SPIN_LOCK_UNLOCKED(tmp.slock), + .owned =3D 1, + }; + socket_lock_t old =3D { + .slock =3D __SPIN_LOCK_UNLOCKED(old.slock), + .owned =3D 0, + }; =20 - tmp.slock =3D __SPIN_LOCK_UNLOCKED(tmp.slock); - tmp.owned =3D 1; - old.slock =3D __SPIN_LOCK_UNLOCKED(old.slock); - old.owned =3D 0; if (likely(try_cmpxchg(&sk->sk_lock.combined, &old.combined, tmp.combined))) return; --=20 2.43.0