Re: [PATCH net v2 0/2] net/smc: fix diag dump lifetime races

[Hidayath Khan <hidayath@linux.ibm.com>]

On 04/09/26 8:51 pm, Dust Li wrote:
> On 2026-09-03 13:26:30, Mahanta Jambigi wrote:
>> On 02/09/26 5:46 pm, Dust Li wrote:
>>> I think we can close this window by holding the SMC hash table lock in
>>> smcr_link_clear()? [...]
>> Hi Dust,
>>
>> After debugging further, I believe that __smcr_link_clear() cannot be
>> called from smc_switch_link_and_count() because
>> refcount_dec_and_test(&lnk->refcnt) is always false on that path — the
>> initial ref (set in smcr_link_init(), released only in
>> smcr_link_clear()) is always held while the switch executes. So there is
>> no UAF from that path. The only consequence is that the diag reader may
>> observe a stale conn->lnk pointer value — pointing to the old link which
>> is still fully live — and read the old link's ibport/link_id/ibname from it.
> Hi Mahanta,
>
> Sorry for the late reply. I've done some more thinking on this topic.
>
> That's true, but strictly I think there is still a small gap. The old link is
> memset later, in smcr_link_clear() after all connections have migrated, so a
> reader that loaded conn->lnk just before its own connection was switched has a
> few-instruction window before it dereferences. In practice this window is
> really narrow: the clear path runs the whole switch + LLC + QP teardown, orders
> of magnitude longer than the reader's load+deref.
>
>> The real UAF is via smc_conn_free(): it drops both the connection-owned
>> conn->lnk reference via smcr_link_put() and the connection-owned
>> conn->lgr reference via smc_lgr_put(), while the socket is still visible
>> in the hash table. [...] The current patch tries to fix this using
>> lgr_lnk_lock. Since you suggested we fix it with *unhash-before-free*, I
>> thought about it and here is my proposal.
>>
>> Proposed fix (high level):
>>
>> Introduce a smc_conn_unhash() helper with a per-connection unhashed flag
>> that ensures the socket is removed from the hash table exactly once.
>> Call it at the top of smc_conn_free(), before any lgr/lnk references are
>> dropped.
>>
>> This establishes the invariant: any socket still visible to the diag
>> reader under read_lock(hash->lock) has valid conn->lgr and conn->lnk
>> pointers. [...]
>>
>> Does this design look reasonable to you?
> Yes, I think it's the right fix and we can go ahead and fix it this way first.
>
>> There is a separate minor issue — smc_switch_link_and_count() updates
>> conn->lnk under send_lock while the diag reader loads it without any
>> lock, which can cause stale ibport/link_id/ibname in *smcss -R* during a
>> failover event. This is a data race but not a safety issue since the
>> link struct is always live at that point.
>>
>> This race is very rare in practice [...] Even when it occurs, the effect
>> is transient: one dump may show the old link's ibport/link_id/ibname, and
>> the next dump will show the correct values.
> I think this is acceptable.
>
> ---
>
> I've been re-thinking this a bit more. We've been plagued by SMC's tangled
> locks and ad-hoc lifetime handling for years — every fix adds another lock or
> another ordering rule. I think it's time to step back and refactor this area as
> a whole, and set up some rules for how we use locks/refcounts in SMC, instead of
> keeping patching individual races. Below are some rough thoughts.
>
> 1. Object layering
>
> SMC really has three lifetime tiers, and the top one has to be split the way
> TCP splits struct socket from struct sock:
>
> - the file (struct socket) — lifetime tied to fput;
> - the connection sock (smc_sock, with conn embedded) — lifetime tied to
>    sk_refcnt; like a TCP sock it can be orphaned and outlive the file. On an
>    active close, close(fd) orphans it first, but it stays alive — still bound to
>    the transport — to finish the close handshake;
> - the shared transport (lgr / link / device) — lifetime by refcount, multiplexed
>    across connections.
>
> It's the socket/sock split, plus one more tier because our transport is shared
> (TCP's sock is 1:1, our lgr/link is not). Today smc_conn_free() mixes all three
> and is called from the transport layer while the socket is still hashed —
> that's exactly where these races come from.
>
> With the tiers separated, teardown becomes two independent, idempotent steps
> rather than one:
>
> - orphan (file <-> sock): at fput, via sock_orphan();
> - transport-detach (sock <-> transport): the connection drops its lgr/link
>    refs. On an active close this happens later, after the handshake completes;
>    on a transport fault it happens immediately.
>
> The sock is freed only once it is orphaned, transport-detached, and the last
> sock_put lands; the order of the two steps just depends on who initiates
> teardown (app close vs. transport fault).
>
> 2. Lifetime & boundary contract
>
> Give each tier the right tool, and a clear boundary between them:
>
> - ownership by kref; traversal by RCU (conn->lgr / conn->lnk become RCU
>    pointers, the lgr is freed with kfree_rcu); fd-visible objects (clcsock)
>    released only after the last fput; and no in-place mutation of a published
>    object (stop memset()ing a link — mark it dead and reclaim it with the lgr
>    after a grace period);
>
> - boundary rule: on a transport fault the lower layer only signals and
>    transport-detaches; it never orphans, unhashes, or frees the sock.
>    - signal = wake the app with an error (sk_err + wakeup);
>    - transport-detach = publish rcu_assign_pointer(conn->lgr/lnk, NULL), then
>      drop the usage references (smc_lgr_put / smcr_link_put). The transport
>      object itself is reclaimed later by its own refcount + kfree_rcu; the sock
>      is left untouched.
>    Handle-side teardown (orphan, unhash, clcsock release, final sock_put)
>    belongs to the connection/file side and is driven by close — never by the
>    transport layer.
>
> With that, a diag reader under rcu_read_lock is guaranteed the link/lgr
> outlives its critical section, so the per-connection lgr_lnk_lock is no longer
> needed and smc_conn_unhash() can be retired too. (clcsock_release_lock goes
> away separately, via the clcsock lifetime series.) It's a larger, mostly
> mechanical change and would take a lot of careful rework, so I'd do it as a
> follow-up. Your smc_conn_unhash() is the right fix to take now (and for
> stable); the rework, if we agree on this direction, would retire it afterwards.
Hi Dust,

Thanks for writing this up and for the pointer from my abort_work patch.

You describe three tiers, with lgr, link and device as the transport one.
I was not sure where the buffer descriptor fits. It does not seem to
follow the lgr: smc_buf_unuse() returns conn->rmb_desc to lgr->rmbs, and
smc_buf_get_slot() can then hand it to another connection while the lgr is
still alive.

Two places look like they can outlive it:

- a splice reader still holding pipe pages, since smc_buf_unuse() does not
   consult conn->splice_pending;

- smc_cdc_msg_recv_action() and smc_cdc_handle_urg_data_arrival(), which
   read conn->rmb_desc after smc_cdc_rx_handler() has already left
   conns_lock. On the is_reg_err path smcr_buf_unuse() frees the
   descriptor rather than recycling it.

Have you already considered the descriptor in this model? Would it need
its own kref, or is it meant to sit inside the transport tier? I may be
missing something here.

One smaller question, on the boundary rule. The SMC-D side already looks
close to what you describe: smcd_handle_irq() holds smcd->lock across both
the lookup and the tasklet_schedule(), and smc_ism_unset_conn() clears the
slot under the same lock. The SMC-R receive path drops conns_lock between
the lookup and the action. Is that difference something the refactor
would make uniform, or is there a reason the receive path cannot hold the
lock that long?

If it would be useful, I can write up the lifetime assumptions I have run
into while working through the teardown paths. Please tell me if that
helps, or if it would only repeat what you already have.

Thanks,
Hidayath
>
> Best regards,
> Dust