FAILED: patch "[PATCH] net/smc: stop killed, freed and out_of_sync sharing a byte" failed to apply to 6.12-stable tree
[email protected]
maintainerThe patch below does not apply to the 6.12-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x db51a8658c11a82432b64999519a269c3aabb447
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026090312-corporal-discover-f40c@gregkh' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From db51a8658c11a82432b64999519a269c3aabb447 Mon Sep 17 00:00:00 2001
From: Hidayath Khan <[email protected]>
Date: Thu, 20 Aug 2026 09:46:41 +0200
Subject: [PATCH] net/smc: stop killed, freed and out_of_sync sharing a byte
The three connection state flags are single-bit bitfields, so they occupy one byte of struct smc_connection and every store to one is a read-modify-write of the other two:
u8 killed : 1;
u8 freed : 1;
u8 out_of_sync : 1;They are not written under a common lock. smc_cdc_msg_validate() sets out_of_sync from the receive tasklet, while smc_conn_kill() sets killed from process context under lock_sock(), and the receive path does not defer to the backlog when the socket is owned -- smc_cdc_msg_recv() takes only bh_lock_sock().
Give each flag its own byte so a store no longer touches its neighbours. All readers test them as booleans and are unchanged. struct smc_connection grows by two bytes.
net/smc/smc.h +3 -3
@@ -277,9 +277,9 @@ struct smc_connection {* 0 for SMC-R, 32 for SMC-D */ u64 peer_token;/* SMC-D token of peer */ - u8 killed : 1; /* abnormal termination */ - u8 freed : 1; /* normal termination */ - u8 out_of_sync : 1; /* out of sync with peer */ +u8 killed;/* abnormal termination */ +u8 freed;/* normal termination */ +u8 out_of_sync;/* out of sync with peer */ };struct smc_sock {/* smc sock container */
Sasha Levin
maintainerPATCH 1/2 net/smc: Address spelling errors
From: Simon Horman <[email protected]>
[ Upstream commit cd959bf7c3bbaf64a29750c5e36776078a18a8fe ]
Address spelling errors flagged by codespell.
This patch is intended to cover all files under drivers/smc
Stable-dep-of: db51a8658c11 ("net/smc: stop killed, freed and out_of_sync sharing a byte")
--- net/smc/smc.h | 2 +- net/smc/smc_clc.h | 2 +- net/smc/smc_core.c | 2 +- net/smc/smc_core.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)
net/smc/smc.h +1 -1
@@ -278,7 +278,7 @@ struct smc_connection {*/ u64 peer_token;/* SMC-D token of peer */ u8 killed : 1; /* abnormal termination */ - u8 freed : 1; /* normal termiation */ + u8 freed : 1; /* normal termination */ u8 out_of_sync : 1; /* out of sync with peer */ };
net/smc/smc_clc.h +1 -1
@@ -156,7 +156,7 @@ struct smc_clc_msg_proposal_prefix { /* prefix part of clc proposal message*/ }__aligned(4) ;struct smc_clc_msg_smcd {/* SMC-D GID information */ -struct smc_clc_smcd_gid_chid ism;/* ISM native GID+CHID of requestor */ +struct smc_clc_smcd_gid_chid ism;/* ISM native GID+CHID of requester */ __be16 v2_ext_offset;/* SMC Version 2 Extension Offset */ u8 vendor_oui[3 ];/* vendor organizationally unique identifier */ u8 vendor_exp_options[5 ];
net/smc/smc_core.c +1 -1
@@ -2324,7 +2324,7 @@ static struct smc_buf_desc *smcr_new_buf_create(struct smc_link_group *lgr, }if (lgr->buf_type ==SMCR_PHYS_CONT_BUFS ) goto out; - fallthrough;// try virtually continguous buf + fallthrough;// try virtually contiguous buf case SMCR_VIRT_CONT_BUFS : buf_desc->order =get_order (bufsize); buf_desc->cpu_addr =vzalloc (PAGE_SIZE << buf_desc->order);
net/smc/smc_core.h +2 -2
@@ -30,7 +30,7 @@*/ #define SMC_CONN_PER_LGR_PREFER 255/* Preferred connections per link group used for * SMC-R v2.1 and later negotiation, vendors or -* distrubutions may modify it to a value between +* distributions may modify it to a value between * 16-255 as needed. */
@@ -181,7 +181,7 @@ struct smc_link {*/ #define SMC_LINKS_PER_LGR_MAX_PREFER 2/* Preferred max links per link group used for * SMC-R v2.1 and later negotiation, vendors or -* distrubutions may modify it to a value between +* distributions may modify it to a value between * 1-2 as needed. */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 net/smc: stop killed, freed and out_of_sync sharing a byte
From: Hidayath Khan <[email protected]>
[ Upstream commit db51a8658c11a82432b64999519a269c3aabb447 ]
The three connection state flags are single-bit bitfields, so they occupy one byte of struct smc_connection and every store to one is a read-modify-write of the other two:
u8 killed : 1;
u8 freed : 1;
u8 out_of_sync : 1;They are not written under a common lock. smc_cdc_msg_validate() sets out_of_sync from the receive tasklet, while smc_conn_kill() sets killed from process context under lock_sock(), and the receive path does not defer to the backlog when the socket is owned -- smc_cdc_msg_recv() takes only bh_lock_sock().
Give each flag its own byte so a store no longer touches its neighbours. All readers test them as booleans and are unchanged. struct smc_connection grows by two bytes.
--- net/smc/smc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/smc/smc.h +3 -3
@@ -277,9 +277,9 @@ struct smc_connection {* 0 for SMC-R, 32 for SMC-D */ u64 peer_token;/* SMC-D token of peer */ - u8 killed : 1; /* abnormal termination */ - u8 freed : 1; /* normal termination */ - u8 out_of_sync : 1; /* out of sync with peer */ +u8 killed;/* abnormal termination */ +u8 freed;/* normal termination */ +u8 out_of_sync;/* out of sync with peer */ };struct smc_sock {/* smc sock container */
Signature · 1 line
2.53.0