From nobody Thu Mar 28 05:07:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V4s4B4p3dz5GCcp; Thu, 28 Mar 2024 05:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V4s4B2jF4z4WpX; Thu, 28 Mar 2024 05:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711602474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58wv6hBcVVdXrVt4l1TCBvaW0L3Zf1wTr99g3PHELTo=; b=MQifsnHMsaO/GJ3H0RZa3CABMc4nVw96F3aoHPLEg2RHzK9WhsqSXA5h2RmHgqoeUpSzAA hOV/wGth1dA3pibQuCFO9+cmGzeVNSwAtYrYOdl/KeAA85c4A1Ve4q8cyvoch81O3+olTj GimOiZ0vXduhcdd7qAtP3gmXEDtT9GtoNA/BwluWgc+wWGqbOvMV/lVE0bfFOz4Swf3ffs n3iPPCpjTnCLi828JfapEe+LXJy4qAA98fLFkFMz9leFBoIRh1uIBRA8PDp1JV7qtaqR6A L54N0wC4Zdyi/XBprzrzHVJEOD5LZHaDcqyuK8UPljqsfOLXWNkRZMJ3uhz03A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711602474; a=rsa-sha256; cv=none; b=ktclJfYx9UzT7okS1hAy2WWjdFTApQVzdRBmObtHhbQpzrUKA7Pb/7A2IpsKeWqY212/cz DXfph3RqapbY+XMQCMJcE+QY8W6tri/qGYLJW6mn6RxyNDSiz1tCMQgQEoQcVkRBkZYzDu zrkYEMc+QCgMMw9OAxlvH2S+W/JwJxRk8ufiX/nMuK0SiAKgblDKX60rrI7dC8YOsv/IMc j4L+UYnS0kUr0703ciiatd6xaBBwfNwZnZXptfsVZUjSbTJtLE1PPajtnmYysZkQPrtEVb iBItqc3Ltop7A8N3q2bzURUYrXHrFt8/XkBXvMUssYIj/7yfTDgsv7v/i4Y+TQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711602474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58wv6hBcVVdXrVt4l1TCBvaW0L3Zf1wTr99g3PHELTo=; b=SVbMiW2sk22lliiMcjsJAjUQNNrIGILxt+A4kFuIuDuKtsoPhsv4N98/NWsWjIHGz49wv2 EuM6eNeoXZP69lLR0s4AKQn0XZ4pJda5EnYXOjVqvFq1FZbqcpnei3228eIE37/J5PNdnc 9OmvgIpCDkW99xUcS3qjgE1ArJcSysS6XflmxYmj8I1ApAFLk2k8LUj9VA8szUbreg65r5 2K++fQlB8f5gVSRzTZwLqI5UUbMmgS7HB9iJ4S8rpcbA1U8WJDDNE/XMUkVJk3lFTvYRY/ pkTMPQmadjlSZrdwR8KEBIEzP+t1hc5HZgJcM2Iu4koMP5kS/i8ZoSxNbBI7Cw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V4s4B2Jk8zDr5; Thu, 28 Mar 2024 05:07:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42S57sew099786; Thu, 28 Mar 2024 05:07:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42S57s3J099783; Thu, 28 Mar 2024 05:07:54 GMT (envelope-from git) Date: Thu, 28 Mar 2024 05:07:54 GMT Message-Id: <202403280507.42S57s3J099783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Tetlow Subject: git: 8f1f4e60ceb9 - releng/13.2 - if_wg: use proper barriers around pkt->p_state List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gordon X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 8f1f4e60ceb9b8e5eddd54cf1fde62944f56eaa4 Auto-Submitted: auto-generated The branch releng/13.2 has been updated by gordon: URL: https://cgit.FreeBSD.org/src/commit/?id=8f1f4e60ceb9b8e5eddd54cf1fde62944f56eaa4 commit 8f1f4e60ceb9b8e5eddd54cf1fde62944f56eaa4 Author: Kyle Evans AuthorDate: 2024-03-15 01:19:18 +0000 Commit: Gordon Tetlow CommitDate: 2024-03-28 03:05:58 +0000 if_wg: use proper barriers around pkt->p_state Without appropriate load-synchronization to pair with store barriers in wg_encrypt() and wg_decrypt(), the compiler and hardware are often allowed to reorder these loads in wg_deliver_out() and wg_deliver_in() such that we end up with a garbage or intermediate mbuf that we try to pass on. The issue is particularly prevalent with the weaker memory models of !x86 platforms. Switch from the big-hammer wmb() to more explicit acq/rel atomics to both make it obvious what we're syncing up with, and to avoid somewhat hefty fences on platforms that don't necessarily need this. With this patch, my dual-iperf3 reproducer is dramatically more stable than it is without on aarch64. PR: 264115 Reviewed by: andrew, zlei Approved by: so Security: FreeBSD-EN-24:06.wireguard (cherry picked from commit 3705d679a6344c957cae7a1b6372a8bfb8c44f0e) (cherry picked from commit 806e51f81dbae21feb6e7ddd95d2ed2a28b04f8f) --- sys/dev/wg/if_wg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index 9c4ebe5dd393..99df8a6f0afc 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -1515,8 +1515,7 @@ wg_encrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_send); noise_remote_put(remote); } @@ -1588,8 +1587,7 @@ wg_decrypt(struct wg_softc *sc, struct wg_packet *pkt) state = WG_PACKET_CRYPTED; out: pkt->p_mbuf = m; - wmb(); - pkt->p_state = state; + atomic_store_rel_int(&pkt->p_state, state); GROUPTASK_ENQUEUE(&peer->p_recv); noise_remote_put(remote); } @@ -1645,7 +1643,7 @@ wg_deliver_out(struct wg_peer *peer) wg_peer_get_endpoint(peer, &endpoint); while ((pkt = wg_queue_dequeue_serial(&peer->p_encrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf; @@ -1687,7 +1685,7 @@ wg_deliver_in(struct wg_peer *peer) struct epoch_tracker et; while ((pkt = wg_queue_dequeue_serial(&peer->p_decrypt_serial)) != NULL) { - if (pkt->p_state != WG_PACKET_CRYPTED) + if (atomic_load_acq_int(&pkt->p_state) != WG_PACKET_CRYPTED) goto error; m = pkt->p_mbuf;